diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
index e892626..35817a6 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.magic.lef
@@ -93,21 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.635000  0.085000 1.310000 0.470000 ;
-        RECT 2.085000  0.085000 2.430000 0.485000 ;
-        RECT 3.715000  0.085000 3.955000 0.760000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -117,35 +102,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.565000 1.815000 0.895000 2.635000 ;
-        RECT 3.325000 1.835000 3.540000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.695000 0.650000 1.915000 0.655000 ;
-      RECT 0.695000 0.655000 2.805000 0.825000 ;
-      RECT 0.695000 0.825000 0.915000 1.465000 ;
-      RECT 0.695000 1.465000 1.345000 1.645000 ;
-      RECT 1.135000 1.645000 1.345000 2.460000 ;
-      RECT 1.585000 0.260000 1.915000 0.650000 ;
-      RECT 2.600000 0.260000 2.805000 0.655000 ;
-      RECT 2.860000 1.495000 3.990000 1.665000 ;
-      RECT 2.860000 1.665000 3.145000 2.460000 ;
-      RECT 3.720000 1.665000 3.990000 2.460000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.565000  1.815000 0.895000 2.635000 ;
+      RECT 0.635000  0.085000 1.310000 0.470000 ;
+      RECT 0.695000  0.650000 1.915000 0.655000 ;
+      RECT 0.695000  0.655000 2.805000 0.825000 ;
+      RECT 0.695000  0.825000 0.915000 1.465000 ;
+      RECT 0.695000  1.465000 1.345000 1.645000 ;
+      RECT 1.135000  1.645000 1.345000 2.460000 ;
+      RECT 1.585000  0.260000 1.915000 0.650000 ;
+      RECT 2.085000  0.085000 2.430000 0.485000 ;
+      RECT 2.600000  0.260000 2.805000 0.655000 ;
+      RECT 2.860000  1.495000 3.990000 1.665000 ;
+      RECT 2.860000  1.665000 3.145000 2.460000 ;
+      RECT 3.325000  1.835000 3.540000 2.635000 ;
+      RECT 3.715000  0.085000 3.955000 0.760000 ;
+      RECT 3.720000  1.665000 3.990000 2.460000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__a2111o_1
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
index 9d563af..59f1bfb 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.magic.lef
@@ -92,24 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.085000  0.085000 0.435000 0.885000 ;
-        RECT 1.065000  0.085000 2.010000 0.445000 ;
-        RECT 1.065000  0.445000 1.325000 0.865000 ;
-        RECT 2.590000  0.085000 2.920000 0.445000 ;
-        RECT 4.165000  0.085000 4.515000 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
@@ -119,37 +101,52 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.085000 1.635000 0.435000 2.635000 ;
-        RECT 1.065000 1.495000 1.315000 2.635000 ;
-        RECT 3.590000 2.255000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.065000 1.075000 1.705000 1.325000 ;
-      RECT 1.495000 0.615000 3.335000 0.785000 ;
-      RECT 1.495000 0.785000 1.705000 1.075000 ;
-      RECT 1.495000 1.325000 1.705000 1.495000 ;
-      RECT 1.495000 1.495000 1.785000 2.465000 ;
-      RECT 2.180000 0.255000 2.420000 0.615000 ;
-      RECT 3.070000 1.915000 4.515000 2.085000 ;
-      RECT 3.070000 2.085000 3.400000 2.465000 ;
-      RECT 3.090000 0.255000 3.335000 0.615000 ;
-      RECT 4.090000 2.085000 4.515000 2.465000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.085000 0.435000 0.885000 ;
+      RECT 0.085000  1.635000 0.435000 2.635000 ;
+      RECT 1.065000  0.085000 2.010000 0.445000 ;
+      RECT 1.065000  0.445000 1.325000 0.865000 ;
+      RECT 1.065000  1.075000 1.705000 1.325000 ;
+      RECT 1.065000  1.495000 1.315000 2.635000 ;
+      RECT 1.495000  0.615000 3.335000 0.785000 ;
+      RECT 1.495000  0.785000 1.705000 1.075000 ;
+      RECT 1.495000  1.325000 1.705000 1.495000 ;
+      RECT 1.495000  1.495000 1.785000 2.465000 ;
+      RECT 2.180000  0.255000 2.420000 0.615000 ;
+      RECT 2.590000  0.085000 2.920000 0.445000 ;
+      RECT 3.070000  1.915000 4.515000 2.085000 ;
+      RECT 3.070000  2.085000 3.400000 2.465000 ;
+      RECT 3.090000  0.255000 3.335000 0.615000 ;
+      RECT 3.590000  2.255000 3.920000 2.635000 ;
+      RECT 4.090000  2.085000 4.515000 2.465000 ;
+      RECT 4.165000  0.085000 4.515000 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 ;
+      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
 END sky130_fd_sc_hd__a2111o_2
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
index ac89c77..4eac206 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.magic.lef
@@ -96,33 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.610000  0.085000 0.940000 0.465000 ;
-        RECT 1.510000  0.085000 1.840000 0.445000 ;
-        RECT 2.420000  0.085000 3.295000 0.445000 ;
-        RECT 4.805000  0.085000 5.140000 0.445000 ;
-        RECT 5.665000  0.085000 5.995000 0.515000 ;
-        RECT 6.525000  0.085000 6.855000 0.445000 ;
-        RECT 7.385000  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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -132,63 +105,87 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 3.865000 2.165000 4.195000 2.635000 ;
-        RECT 4.805000 2.255000 5.140000 2.635000 ;
-        RECT 5.665000 1.800000 5.995000 2.635000 ;
-        RECT 6.525000 1.885000 6.855000 2.635000 ;
-        RECT 7.385000 1.805000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 1.795000 0.370000 2.295000 ;
-      RECT 0.110000 2.295000 2.160000 2.465000 ;
-      RECT 0.180000 0.255000 0.440000 0.635000 ;
-      RECT 0.180000 0.635000 3.655000 0.805000 ;
-      RECT 0.540000 0.805000 0.870000 2.125000 ;
-      RECT 1.040000 1.455000 1.230000 2.295000 ;
-      RECT 1.110000 0.255000 1.340000 0.615000 ;
-      RECT 1.110000 0.615000 3.655000 0.635000 ;
-      RECT 1.400000 1.455000 3.100000 1.625000 ;
-      RECT 1.400000 1.625000 1.730000 2.125000 ;
-      RECT 1.900000 1.795000 2.160000 2.295000 ;
-      RECT 2.015000 0.255000 2.240000 0.615000 ;
-      RECT 2.340000 1.795000 2.675000 2.295000 ;
-      RECT 2.340000 2.295000 3.650000 2.465000 ;
-      RECT 2.845000 1.625000 3.100000 2.125000 ;
-      RECT 3.320000 1.795000 5.495000 1.995000 ;
-      RECT 3.320000 1.995000 3.650000 2.295000 ;
-      RECT 3.465000 0.255000 4.585000 0.445000 ;
-      RECT 3.465000 0.445000 3.655000 0.615000 ;
-      RECT 3.465000 0.805000 3.655000 1.445000 ;
-      RECT 3.465000 1.445000 5.975000 1.625000 ;
-      RECT 3.825000 0.615000 5.495000 0.785000 ;
-      RECT 4.365000 1.995000 4.625000 2.415000 ;
-      RECT 5.310000 0.255000 5.495000 0.615000 ;
-      RECT 5.310000 1.995000 5.495000 2.465000 ;
-      RECT 5.795000 1.075000 7.320000 1.245000 ;
-      RECT 5.795000 1.245000 5.975000 1.445000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.110000  1.795000 0.370000 2.295000 ;
+      RECT 0.110000  2.295000 2.160000 2.465000 ;
+      RECT 0.180000  0.255000 0.440000 0.635000 ;
+      RECT 0.180000  0.635000 3.655000 0.805000 ;
+      RECT 0.540000  0.805000 0.870000 2.125000 ;
+      RECT 0.610000  0.085000 0.940000 0.465000 ;
+      RECT 1.040000  1.455000 1.230000 2.295000 ;
+      RECT 1.110000  0.255000 1.340000 0.615000 ;
+      RECT 1.110000  0.615000 3.655000 0.635000 ;
+      RECT 1.400000  1.455000 3.100000 1.625000 ;
+      RECT 1.400000  1.625000 1.730000 2.125000 ;
+      RECT 1.510000  0.085000 1.840000 0.445000 ;
+      RECT 1.900000  1.795000 2.160000 2.295000 ;
+      RECT 2.015000  0.255000 2.240000 0.615000 ;
+      RECT 2.340000  1.795000 2.675000 2.295000 ;
+      RECT 2.340000  2.295000 3.650000 2.465000 ;
+      RECT 2.420000  0.085000 3.295000 0.445000 ;
+      RECT 2.845000  1.625000 3.100000 2.125000 ;
+      RECT 3.320000  1.795000 5.495000 1.995000 ;
+      RECT 3.320000  1.995000 3.650000 2.295000 ;
+      RECT 3.465000  0.255000 4.585000 0.445000 ;
+      RECT 3.465000  0.445000 3.655000 0.615000 ;
+      RECT 3.465000  0.805000 3.655000 1.445000 ;
+      RECT 3.465000  1.445000 5.975000 1.625000 ;
+      RECT 3.825000  0.615000 5.495000 0.785000 ;
+      RECT 3.865000  2.165000 4.195000 2.635000 ;
+      RECT 4.365000  1.995000 4.625000 2.415000 ;
+      RECT 4.805000  0.085000 5.140000 0.445000 ;
+      RECT 4.805000  2.255000 5.140000 2.635000 ;
+      RECT 5.310000  0.255000 5.495000 0.615000 ;
+      RECT 5.310000  1.995000 5.495000 2.465000 ;
+      RECT 5.665000  0.085000 5.995000 0.515000 ;
+      RECT 5.665000  1.800000 5.995000 2.635000 ;
+      RECT 5.795000  1.075000 7.320000 1.245000 ;
+      RECT 5.795000  1.245000 5.975000 1.445000 ;
+      RECT 6.525000  0.085000 6.855000 0.445000 ;
+      RECT 6.525000  1.885000 6.855000 2.635000 ;
+      RECT 7.385000  0.085000 7.715000 0.465000 ;
+      RECT 7.385000  1.805000 7.715000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
   END
 END sky130_fd_sc_hd__a2111o_4
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
index 75fa9f9..c9dcd90 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.magic.lef
@@ -96,19 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.285000  0.085000 0.615000 0.465000 ;
-        RECT 1.210000  0.085000 1.540000 0.445000 ;
-        RECT 2.470000  0.085000 2.800000 0.480000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -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
@@ -118,25 +105,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 2.040000 2.255000 2.370000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.540000 1.905000 2.870000 2.085000 ;
-      RECT 1.540000 2.085000 1.870000 2.465000 ;
-      RECT 2.540000 2.085000 2.870000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.285000  0.085000 0.615000 0.465000 ;
+      RECT 1.210000  0.085000 1.540000 0.445000 ;
+      RECT 1.540000  1.905000 2.870000 2.085000 ;
+      RECT 1.540000  2.085000 1.870000 2.465000 ;
+      RECT 2.040000  2.255000 2.370000 2.635000 ;
+      RECT 2.470000  0.085000 2.800000 0.480000 ;
+      RECT 2.540000  2.085000 2.870000 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 ;
   END
 END sky130_fd_sc_hd__a2111oi_0
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
index f66e7a0..a875848 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.magic.lef
@@ -96,20 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.315000  0.085000 0.630000 0.525000 ;
-        RECT 1.550000  0.085000 1.880000 0.535000 ;
-        RECT 3.270000  0.085000 3.510000 0.760000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -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
@@ -119,26 +105,37 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 2.800000 1.920000 3.130000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 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 2.395000 1.580000 3.505000 1.750000 ;
-      RECT 2.395000 1.750000 2.625000 2.460000 ;
-      RECT 3.310000 1.750000 3.505000 2.460000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.315000  0.085000 0.630000 0.525000 ;
+      RECT 1.550000  0.085000 1.880000 0.535000 ;
+      RECT 2.395000  1.580000 3.505000 1.750000 ;
+      RECT 2.395000  1.750000 2.625000 2.460000 ;
+      RECT 2.800000  1.920000 3.130000 2.635000 ;
+      RECT 3.270000  0.085000 3.510000 0.760000 ;
+      RECT 3.310000  1.750000 3.505000 2.460000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__a2111oi_1
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
index 8ef2e88..7325092 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.magic.lef
@@ -104,25 +104,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.550000  0.085000 0.880000 0.445000 ;
-        RECT 1.465000  0.085000 1.795000 0.445000 ;
-        RECT 2.465000  0.085000 2.795000 0.445000 ;
-        RECT 4.125000  0.085000 4.455000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -132,40 +113,56 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 3.690000 2.275000 4.020000 2.635000 ;
-        RECT 4.570000 2.275000 4.900000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        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.100000 1.870000 0.460000 2.275000 ;
-      RECT 0.100000 2.275000 2.185000 2.295000 ;
-      RECT 0.100000 2.295000 2.985000 2.465000 ;
-      RECT 2.310000 1.795000 3.335000 1.845000 ;
-      RECT 2.310000 1.845000 5.400000 1.965000 ;
-      RECT 2.310000 1.965000 2.640000 2.060000 ;
-      RECT 2.815000 2.135000 2.985000 2.295000 ;
-      RECT 3.155000 1.965000 5.400000 2.095000 ;
-      RECT 3.155000 2.095000 3.520000 2.465000 ;
-      RECT 4.190000 2.095000 5.400000 2.105000 ;
-      RECT 4.190000 2.105000 4.400000 2.465000 ;
-      RECT 5.070000 2.105000 5.400000 2.465000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.100000  1.870000 0.460000 2.275000 ;
+      RECT 0.100000  2.275000 2.185000 2.295000 ;
+      RECT 0.100000  2.295000 2.985000 2.465000 ;
+      RECT 0.550000  0.085000 0.880000 0.445000 ;
+      RECT 1.465000  0.085000 1.795000 0.445000 ;
+      RECT 2.310000  1.795000 3.335000 1.845000 ;
+      RECT 2.310000  1.845000 5.400000 1.965000 ;
+      RECT 2.310000  1.965000 2.640000 2.060000 ;
+      RECT 2.465000  0.085000 2.795000 0.445000 ;
+      RECT 2.815000  2.135000 2.985000 2.295000 ;
+      RECT 3.155000  1.965000 5.400000 2.095000 ;
+      RECT 3.155000  2.095000 3.520000 2.465000 ;
+      RECT 3.690000  2.275000 4.020000 2.635000 ;
+      RECT 4.125000  0.085000 4.455000 0.445000 ;
+      RECT 4.190000  2.095000 5.400000 2.105000 ;
+      RECT 4.190000  2.105000 4.400000 2.465000 ;
+      RECT 4.570000  2.275000 4.900000 2.635000 ;
+      RECT 5.070000  2.105000 5.400000 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 ;
   END
 END sky130_fd_sc_hd__a2111oi_2
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
index c6f2bb5..f19567a 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.magic.lef
@@ -100,40 +100,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.115000  0.085000  0.445000 0.445000 ;
-        RECT 0.960000  0.085000  1.290000 0.445000 ;
-        RECT 1.820000  0.085000  2.230000 0.445000 ;
-        RECT 2.760000  0.085000  3.090000 0.445000 ;
-        RECT 3.680000  0.085000  4.010000 0.445000 ;
-        RECT 4.590000  0.085000  4.920000 0.445000 ;
-        RECT 5.445000  0.085000  5.780000 0.445000 ;
-        RECT 8.245000  0.085000  8.575000 0.445000 ;
-        RECT 9.105000  0.085000  9.435000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        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
@@ -143,70 +109,101 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 6.220000 1.785000  6.550000 2.635000 ;
-        RECT 7.080000 1.805000  7.410000 2.635000 ;
-        RECT 8.080000 1.895000  8.410000 2.635000 ;
-        RECT 9.030000 1.915000  9.360000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 1.835000 0.360000 2.255000 ;
-      RECT 0.100000 2.255000 3.870000 2.445000 ;
-      RECT 1.030000 1.855000 1.220000 2.255000 ;
-      RECT 1.890000 1.855000 2.080000 2.255000 ;
-      RECT 2.250000 1.475000 5.680000 1.655000 ;
-      RECT 2.250000 1.655000 3.440000 1.685000 ;
-      RECT 2.250000 1.685000 2.580000 2.085000 ;
-      RECT 2.750000 1.855000 2.940000 2.255000 ;
-      RECT 3.110000 1.685000 3.440000 2.085000 ;
-      RECT 3.610000 1.835000 3.870000 2.255000 ;
-      RECT 4.060000 1.835000 4.320000 2.255000 ;
-      RECT 4.060000 2.255000 5.180000 2.275000 ;
-      RECT 4.060000 2.275000 6.050000 2.445000 ;
-      RECT 4.490000 1.655000 5.680000 1.685000 ;
-      RECT 4.490000 1.685000 4.820000 2.085000 ;
-      RECT 4.990000 1.855000 5.180000 2.255000 ;
-      RECT 5.350000 1.685000 5.680000 2.085000 ;
-      RECT 5.860000 1.445000 9.770000 1.615000 ;
-      RECT 5.860000 1.615000 6.050000 2.275000 ;
-      RECT 5.980000 0.275000 8.075000 0.445000 ;
-      RECT 6.720000 1.615000 6.910000 2.315000 ;
-      RECT 7.580000 1.615000 9.770000 1.665000 ;
-      RECT 7.580000 1.665000 7.910000 2.315000 ;
-      RECT 7.885000 0.445000 8.075000 0.615000 ;
-      RECT 7.885000 0.615000 9.865000 0.785000 ;
-      RECT 8.580000 1.665000 9.770000 1.670000 ;
-      RECT 8.580000 1.670000 8.840000 2.290000 ;
-      RECT 8.745000 0.300000 8.935000 0.615000 ;
-      RECT 9.530000 1.670000 9.770000 2.260000 ;
-      RECT 9.605000 0.290000 9.865000 0.615000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.100000  1.835000  0.360000 2.255000 ;
+      RECT 0.100000  2.255000  3.870000 2.445000 ;
+      RECT 0.115000  0.085000  0.445000 0.445000 ;
+      RECT 0.960000  0.085000  1.290000 0.445000 ;
+      RECT 1.030000  1.855000  1.220000 2.255000 ;
+      RECT 1.820000  0.085000  2.230000 0.445000 ;
+      RECT 1.890000  1.855000  2.080000 2.255000 ;
+      RECT 2.250000  1.475000  5.680000 1.655000 ;
+      RECT 2.250000  1.655000  3.440000 1.685000 ;
+      RECT 2.250000  1.685000  2.580000 2.085000 ;
+      RECT 2.750000  1.855000  2.940000 2.255000 ;
+      RECT 2.760000  0.085000  3.090000 0.445000 ;
+      RECT 3.110000  1.685000  3.440000 2.085000 ;
+      RECT 3.610000  1.835000  3.870000 2.255000 ;
+      RECT 3.680000  0.085000  4.010000 0.445000 ;
+      RECT 4.060000  1.835000  4.320000 2.255000 ;
+      RECT 4.060000  2.255000  5.180000 2.275000 ;
+      RECT 4.060000  2.275000  6.050000 2.445000 ;
+      RECT 4.490000  1.655000  5.680000 1.685000 ;
+      RECT 4.490000  1.685000  4.820000 2.085000 ;
+      RECT 4.590000  0.085000  4.920000 0.445000 ;
+      RECT 4.990000  1.855000  5.180000 2.255000 ;
+      RECT 5.350000  1.685000  5.680000 2.085000 ;
+      RECT 5.445000  0.085000  5.780000 0.445000 ;
+      RECT 5.860000  1.445000  9.770000 1.615000 ;
+      RECT 5.860000  1.615000  6.050000 2.275000 ;
+      RECT 5.980000  0.275000  8.075000 0.445000 ;
+      RECT 6.220000  1.785000  6.550000 2.635000 ;
+      RECT 6.720000  1.615000  6.910000 2.315000 ;
+      RECT 7.080000  1.805000  7.410000 2.635000 ;
+      RECT 7.580000  1.615000  9.770000 1.665000 ;
+      RECT 7.580000  1.665000  7.910000 2.315000 ;
+      RECT 7.885000  0.445000  8.075000 0.615000 ;
+      RECT 7.885000  0.615000  9.865000 0.785000 ;
+      RECT 8.080000  1.895000  8.410000 2.635000 ;
+      RECT 8.245000  0.085000  8.575000 0.445000 ;
+      RECT 8.580000  1.665000  9.770000 1.670000 ;
+      RECT 8.580000  1.670000  8.840000 2.290000 ;
+      RECT 8.745000  0.300000  8.935000 0.615000 ;
+      RECT 9.030000  1.915000  9.360000 2.635000 ;
+      RECT 9.105000  0.085000  9.435000 0.445000 ;
+      RECT 9.530000  1.670000  9.770000 2.260000 ;
+      RECT 9.605000  0.290000  9.865000 0.615000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__a2111oi_4
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
index 078f5c6..72e2faa 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_1.magic.lef
@@ -81,18 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.605000  0.085000 1.350000 0.455000 ;
-        RECT 2.350000  0.085000 2.680000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -102,32 +90,41 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.525000 1.915000 0.855000 2.635000 ;
-        RECT 1.475000 2.265000 1.805000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.600000 0.625000 3.085000 0.815000 ;
-      RECT 0.600000 0.815000 0.825000 1.505000 ;
-      RECT 0.600000 1.505000 3.095000 1.685000 ;
-      RECT 1.045000 1.865000 2.235000 2.095000 ;
-      RECT 1.045000 2.095000 1.305000 2.455000 ;
-      RECT 1.915000 0.265000 2.170000 0.625000 ;
-      RECT 1.975000 2.095000 2.235000 2.455000 ;
-      RECT 2.805000 1.685000 3.095000 2.455000 ;
-      RECT 2.860000 0.265000 3.085000 0.625000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.525000  1.915000 0.855000 2.635000 ;
+      RECT 0.600000  0.625000 3.085000 0.815000 ;
+      RECT 0.600000  0.815000 0.825000 1.505000 ;
+      RECT 0.600000  1.505000 3.095000 1.685000 ;
+      RECT 0.605000  0.085000 1.350000 0.455000 ;
+      RECT 1.045000  1.865000 2.235000 2.095000 ;
+      RECT 1.045000  2.095000 1.305000 2.455000 ;
+      RECT 1.475000  2.265000 1.805000 2.635000 ;
+      RECT 1.915000  0.265000 2.170000 0.625000 ;
+      RECT 1.975000  2.095000 2.235000 2.455000 ;
+      RECT 2.350000  0.085000 2.680000 0.455000 ;
+      RECT 2.805000  1.685000 3.095000 2.455000 ;
+      RECT 2.860000  0.265000 3.085000 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 ;
   END
 END sky130_fd_sc_hd__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
index ecba842..f195c6d 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_2.magic.lef
@@ -81,20 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.090000  0.085000 0.385000 0.905000 ;
-        RECT 0.945000  0.085000 1.795000 0.445000 ;
-        RECT 2.810000  0.085000 3.085000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -104,34 +90,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.090000 1.490000 0.385000 2.635000 ;
-        RECT 1.000000 1.830000 1.255000 2.635000 ;
-        RECT 1.955000 2.190000 2.230000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.000000 0.695000 3.585000 0.875000 ;
-      RECT 1.000000 0.875000 1.310000 1.490000 ;
-      RECT 1.000000 1.490000 3.585000 1.660000 ;
-      RECT 1.455000 1.840000 2.795000 2.020000 ;
-      RECT 1.455000 2.020000 1.785000 2.465000 ;
-      RECT 2.275000 0.275000 2.605000 0.695000 ;
-      RECT 2.465000 2.020000 2.795000 2.465000 ;
-      RECT 3.255000 0.275000 3.585000 0.695000 ;
-      RECT 3.255000 1.660000 3.585000 2.325000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  0.085000 0.385000 0.905000 ;
+      RECT 0.090000  1.490000 0.385000 2.635000 ;
+      RECT 0.945000  0.085000 1.795000 0.445000 ;
+      RECT 1.000000  0.695000 3.585000 0.875000 ;
+      RECT 1.000000  0.875000 1.310000 1.490000 ;
+      RECT 1.000000  1.490000 3.585000 1.660000 ;
+      RECT 1.000000  1.830000 1.255000 2.635000 ;
+      RECT 1.455000  1.840000 2.795000 2.020000 ;
+      RECT 1.455000  2.020000 1.785000 2.465000 ;
+      RECT 1.955000  2.190000 2.230000 2.635000 ;
+      RECT 2.275000  0.275000 2.605000 0.695000 ;
+      RECT 2.465000  2.020000 2.795000 2.465000 ;
+      RECT 2.810000  0.085000 3.085000 0.525000 ;
+      RECT 3.255000  0.275000 3.585000 0.695000 ;
+      RECT 3.255000  1.660000 3.585000 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 ;
   END
 END sky130_fd_sc_hd__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
index 3785442..bbc70fd 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_4.magic.lef
@@ -93,29 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.485000  0.085000 0.815000 0.465000 ;
-        RECT 1.345000  0.085000 1.675000 0.445000 ;
-        RECT 2.220000  0.085000 2.555000 0.445000 ;
-        RECT 3.140000  0.085000 3.470000 0.445000 ;
-        RECT 4.190000  0.085000 4.560000 0.445000 ;
-        RECT 6.015000  0.085000 6.345000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -125,49 +102,69 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.090000 1.875000 0.425000 2.635000 ;
-        RECT 0.950000 1.875000 1.280000 2.635000 ;
-        RECT 1.810000 1.835000 2.060000 2.635000 ;
-        RECT 4.620000 2.275000 4.950000 2.635000 ;
-        RECT 5.590000 2.275000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.045000 2.370000 1.325000 ;
-      RECT 2.185000 1.325000 2.370000 1.505000 ;
-      RECT 2.185000 1.505000 2.455000 1.675000 ;
-      RECT 2.195000 0.615000 5.490000 0.805000 ;
-      RECT 2.195000 0.805000 2.370000 1.045000 ;
-      RECT 2.280000 1.675000 2.455000 1.870000 ;
-      RECT 2.280000 1.870000 3.510000 2.040000 ;
-      RECT 2.320000 2.210000 4.450000 2.465000 ;
-      RECT 2.725000 0.255000 2.970000 0.615000 ;
-      RECT 3.640000 0.255000 4.020000 0.615000 ;
-      RECT 4.120000 1.880000 6.345000 2.105000 ;
-      RECT 4.120000 2.105000 4.450000 2.210000 ;
-      RECT 5.160000 0.275000 5.490000 0.615000 ;
-      RECT 5.160000 2.105000 5.420000 2.465000 ;
-      RECT 6.015000 1.535000 6.345000 1.880000 ;
-      RECT 6.090000 2.105000 6.345000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.090000  1.875000 0.425000 2.635000 ;
+      RECT 0.485000  0.085000 0.815000 0.465000 ;
+      RECT 0.525000  1.045000 2.370000 1.325000 ;
+      RECT 0.950000  1.875000 1.280000 2.635000 ;
+      RECT 1.345000  0.085000 1.675000 0.445000 ;
+      RECT 1.810000  1.835000 2.060000 2.635000 ;
+      RECT 2.185000  1.325000 2.370000 1.505000 ;
+      RECT 2.185000  1.505000 2.455000 1.675000 ;
+      RECT 2.195000  0.615000 5.490000 0.805000 ;
+      RECT 2.195000  0.805000 2.370000 1.045000 ;
+      RECT 2.220000  0.085000 2.555000 0.445000 ;
+      RECT 2.280000  1.675000 2.455000 1.870000 ;
+      RECT 2.280000  1.870000 3.510000 2.040000 ;
+      RECT 2.320000  2.210000 4.450000 2.465000 ;
+      RECT 2.725000  0.255000 2.970000 0.615000 ;
+      RECT 3.140000  0.085000 3.470000 0.445000 ;
+      RECT 3.640000  0.255000 4.020000 0.615000 ;
+      RECT 4.120000  1.880000 6.345000 2.105000 ;
+      RECT 4.120000  2.105000 4.450000 2.210000 ;
+      RECT 4.190000  0.085000 4.560000 0.445000 ;
+      RECT 4.620000  2.275000 4.950000 2.635000 ;
+      RECT 5.160000  0.275000 5.490000 0.615000 ;
+      RECT 5.160000  2.105000 5.420000 2.465000 ;
+      RECT 5.590000  2.275000 5.920000 2.635000 ;
+      RECT 6.015000  0.085000 6.345000 0.805000 ;
+      RECT 6.015000  1.535000 6.345000 1.880000 ;
+      RECT 6.090000  2.105000 6.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 ;
+      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
 END sky130_fd_sc_hd__a211o_4
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
index 5d68072..0584668 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.magic.lef
@@ -86,17 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.085000  0.085000 0.425000 0.595000 ;
-        RECT 1.545000  0.085000 1.875000 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
@@ -106,24 +95,32 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.670000 1.905000 1.000000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 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.250000 1.525000 1.355000 1.725000 ;
-      RECT 0.250000 1.725000 0.500000 2.455000 ;
-      RECT 1.170000 1.725000 1.355000 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.250000  1.525000 1.355000 1.725000 ;
+      RECT 0.250000  1.725000 0.500000 2.455000 ;
+      RECT 0.670000  1.905000 1.000000 2.635000 ;
+      RECT 1.170000  1.725000 1.355000 2.455000 ;
+      RECT 1.545000  0.085000 1.875000 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
 END sky130_fd_sc_hd__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
index 983deda..189e8b9 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.magic.lef
@@ -86,23 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.145000  0.085000 0.395000 0.815000 ;
-        RECT 1.005000  0.085000 1.335000 0.475000 ;
-        RECT 1.865000  0.085000 2.195000 0.475000 ;
-        RECT 3.675000  0.085000 4.005000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -112,40 +95,54 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 2.435000 1.835000 2.665000 2.635000 ;
-        RECT 3.295000 1.835000 3.525000 2.635000 ;
-        RECT 4.155000 1.835000 4.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 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 1.785000 0.405000 2.285000 ;
-      RECT 0.145000 2.285000 2.215000 2.455000 ;
-      RECT 1.075000 1.785000 1.265000 2.255000 ;
-      RECT 1.075000 2.255000 2.215000 2.285000 ;
-      RECT 1.435000 1.455000 3.975000 1.655000 ;
-      RECT 1.435000 1.655000 1.765000 2.075000 ;
-      RECT 1.935000 1.835000 2.215000 2.255000 ;
-      RECT 2.385000 0.265000 3.495000 0.475000 ;
-      RECT 2.845000 1.655000 3.115000 2.465000 ;
-      RECT 3.325000 0.475000 3.495000 0.635000 ;
-      RECT 3.325000 0.635000 4.435000 0.855000 ;
-      RECT 3.705000 1.655000 3.975000 2.465000 ;
-      RECT 4.185000 0.265000 4.435000 0.635000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 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.215000 2.455000 ;
+      RECT 1.005000  0.085000 1.335000 0.475000 ;
+      RECT 1.075000  1.785000 1.265000 2.255000 ;
+      RECT 1.075000  2.255000 2.215000 2.285000 ;
+      RECT 1.435000  1.455000 3.975000 1.655000 ;
+      RECT 1.435000  1.655000 1.765000 2.075000 ;
+      RECT 1.865000  0.085000 2.195000 0.475000 ;
+      RECT 1.935000  1.835000 2.215000 2.255000 ;
+      RECT 2.385000  0.265000 3.495000 0.475000 ;
+      RECT 2.435000  1.835000 2.665000 2.635000 ;
+      RECT 2.845000  1.655000 3.115000 2.465000 ;
+      RECT 3.295000  1.835000 3.525000 2.635000 ;
+      RECT 3.325000  0.475000 3.495000 0.635000 ;
+      RECT 3.325000  0.635000 4.435000 0.855000 ;
+      RECT 3.675000  0.085000 4.005000 0.455000 ;
+      RECT 3.705000  1.655000 3.975000 2.465000 ;
+      RECT 4.155000  1.835000 4.385000 2.635000 ;
+      RECT 4.185000  0.265000 4.435000 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 ;
   END
 END sky130_fd_sc_hd__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
index 1fe69ab..c7e704c 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.magic.lef
@@ -60,11 +60,17 @@
       LAYER li1 ;
         RECT 3.745000 1.035000 4.755000 1.275000 ;
         RECT 3.745000 1.275000 4.460000 1.615000 ;
+      LAYER mcon ;
+        RECT 3.830000 1.445000 4.000000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 6.590000 0.995000 6.935000 1.325000 ;
         RECT 6.590000 1.325000 6.760000 1.615000 ;
       LAYER mcon ;
-        RECT 3.830000 1.445000 4.000000 1.615000 ;
         RECT 6.590000 1.445000 6.760000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.770000 1.415000 4.060000 1.460000 ;
         RECT 3.770000 1.460000 6.820000 1.600000 ;
@@ -108,32 +114,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.395000 0.585000 ;
-        RECT 0.950000  0.085000 1.185000 0.525000 ;
-        RECT 3.535000  0.085000 3.705000 0.525000 ;
-        RECT 4.365000  0.085000 4.695000 0.445000 ;
-        RECT 5.215000  0.085000 5.545000 0.445000 ;
-        RECT 6.055000  0.085000 6.385000 0.445000 ;
-        RECT 6.915000  0.085000 7.270000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -143,49 +123,72 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 1.355000 2.275000 1.685000 2.635000 ;
-        RECT 2.195000 2.275000 2.525000 2.635000 ;
-        RECT 3.035000 2.275000 3.365000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.795000 3.705000 2.085000 ;
-      RECT 0.095000 2.085000 0.345000 2.465000 ;
-      RECT 0.565000 0.530000 0.775000 0.695000 ;
-      RECT 0.565000 0.695000 1.605000 0.865000 ;
-      RECT 1.015000 2.085000 3.705000 2.105000 ;
-      RECT 1.015000 2.105000 1.185000 2.465000 ;
-      RECT 1.355000 0.255000 3.365000 0.505000 ;
-      RECT 1.355000 0.505000 1.605000 0.695000 ;
-      RECT 1.855000 2.105000 2.025000 2.465000 ;
-      RECT 2.695000 2.105000 2.865000 2.465000 ;
-      RECT 3.535000 2.105000 3.705000 2.255000 ;
-      RECT 3.535000 2.255000 7.270000 2.465000 ;
-      RECT 3.875000 1.785000 4.910000 2.085000 ;
-      RECT 4.630000 1.445000 5.960000 1.695000 ;
-      RECT 4.630000 1.695000 4.910000 1.785000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.095000  0.085000 0.395000 0.585000 ;
+      RECT 0.095000  1.795000 3.705000 2.085000 ;
+      RECT 0.095000  2.085000 0.345000 2.465000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 0.565000  0.530000 0.775000 0.695000 ;
+      RECT 0.565000  0.695000 1.605000 0.865000 ;
+      RECT 0.950000  0.085000 1.185000 0.525000 ;
+      RECT 1.015000  2.085000 3.705000 2.105000 ;
+      RECT 1.015000  2.105000 1.185000 2.465000 ;
+      RECT 1.355000  0.255000 3.365000 0.505000 ;
+      RECT 1.355000  0.505000 1.605000 0.695000 ;
+      RECT 1.355000  2.275000 1.685000 2.635000 ;
+      RECT 1.855000  2.105000 2.025000 2.465000 ;
+      RECT 2.195000  2.275000 2.525000 2.635000 ;
+      RECT 2.695000  2.105000 2.865000 2.465000 ;
+      RECT 3.035000  2.275000 3.365000 2.635000 ;
+      RECT 3.535000  0.085000 3.705000 0.525000 ;
+      RECT 3.535000  2.105000 3.705000 2.255000 ;
+      RECT 3.535000  2.255000 7.270000 2.465000 ;
+      RECT 3.875000  1.785000 4.910000 2.085000 ;
+      RECT 4.365000  0.085000 4.695000 0.445000 ;
+      RECT 4.630000  1.445000 5.960000 1.695000 ;
+      RECT 4.630000  1.695000 4.910000 1.785000 ;
+      RECT 5.215000  0.085000 5.545000 0.445000 ;
+      RECT 6.055000  0.085000 6.385000 0.445000 ;
+      RECT 6.915000  0.085000 7.270000 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  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
 END sky130_fd_sc_hd__a211oi_4
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
index 11b9664..fe504c8 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.magic.lef
@@ -71,19 +71,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.945000  0.085000 1.190000 0.865000 ;
-        RECT 2.370000  0.085000 3.100000 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
@@ -93,38 +80,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.225000 0.865000 2.635000 ;
-        RECT 1.885000 2.155000 2.215000 2.635000 ;
-        RECT 2.825000 1.495000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.845000 0.855000 2.045000 ;
-      RECT 0.105000 2.045000 0.345000 2.435000 ;
-      RECT 0.515000 0.265000 0.745000 1.165000 ;
-      RECT 0.515000 1.165000 0.855000 1.845000 ;
-      RECT 1.035000 1.045000 1.580000 1.345000 ;
-      RECT 1.035000 1.345000 1.365000 2.455000 ;
-      RECT 1.360000 0.265000 1.790000 0.625000 ;
-      RECT 1.360000 0.625000 3.100000 0.815000 ;
-      RECT 1.360000 0.815000 1.580000 1.045000 ;
-      RECT 1.535000 1.785000 2.560000 1.985000 ;
-      RECT 1.535000 1.985000 1.715000 2.455000 ;
-      RECT 2.390000 1.985000 2.560000 2.455000 ;
-      RECT 2.840000 0.815000 3.100000 1.325000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.105000  1.845000 0.855000 2.045000 ;
+      RECT 0.105000  2.045000 0.345000 2.435000 ;
+      RECT 0.515000  0.265000 0.745000 1.165000 ;
+      RECT 0.515000  1.165000 0.855000 1.845000 ;
+      RECT 0.515000  2.225000 0.865000 2.635000 ;
+      RECT 0.945000  0.085000 1.190000 0.865000 ;
+      RECT 1.035000  1.045000 1.580000 1.345000 ;
+      RECT 1.035000  1.345000 1.365000 2.455000 ;
+      RECT 1.360000  0.265000 1.790000 0.625000 ;
+      RECT 1.360000  0.625000 3.100000 0.815000 ;
+      RECT 1.360000  0.815000 1.580000 1.045000 ;
+      RECT 1.535000  1.785000 2.560000 1.985000 ;
+      RECT 1.535000  1.985000 1.715000 2.455000 ;
+      RECT 1.885000  2.155000 2.215000 2.635000 ;
+      RECT 2.370000  0.085000 3.100000 0.455000 ;
+      RECT 2.390000  1.985000 2.560000 2.455000 ;
+      RECT 2.825000  1.495000 3.110000 2.635000 ;
+      RECT 2.840000  0.815000 3.100000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
 END sky130_fd_sc_hd__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
index 870e4c5..7b2268a 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.magic.lef
@@ -76,21 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.545000 ;
-        RECT 1.020000  0.085000 1.220000 0.865000 ;
-        RECT 1.975000  0.085000 2.305000 0.465000 ;
-        RECT 3.235000  0.085000 3.565000 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
@@ -100,42 +85,54 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.090000 2.255000 0.425000 2.635000 ;
-        RECT 1.040000 2.275000 1.370000 2.635000 ;
-        RECT 2.895000 2.185000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 1.075000 0.900000 1.495000 ;
-      RECT 0.570000 1.495000 1.285000 1.665000 ;
-      RECT 1.115000 1.665000 1.285000 1.895000 ;
-      RECT 1.115000 1.895000 2.225000 2.105000 ;
-      RECT 1.455000 0.655000 1.865000 0.825000 ;
-      RECT 1.455000 1.555000 1.865000 1.725000 ;
-      RECT 1.695000 0.825000 1.865000 0.995000 ;
-      RECT 1.695000 0.995000 2.175000 1.325000 ;
-      RECT 1.695000 1.325000 1.865000 1.555000 ;
-      RECT 1.975000 2.105000 2.225000 2.465000 ;
-      RECT 2.055000 1.505000 2.515000 1.675000 ;
-      RECT 2.055000 1.675000 2.225000 1.895000 ;
-      RECT 2.345000 0.635000 2.740000 0.825000 ;
-      RECT 2.345000 0.825000 2.515000 1.505000 ;
-      RECT 2.395000 1.845000 3.565000 2.015000 ;
-      RECT 2.395000 2.015000 2.725000 2.465000 ;
-      RECT 3.235000 2.015000 3.565000 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.345000 0.545000 ;
+      RECT 0.090000  2.255000 0.425000 2.635000 ;
+      RECT 0.570000  1.075000 0.900000 1.495000 ;
+      RECT 0.570000  1.495000 1.285000 1.665000 ;
+      RECT 1.020000  0.085000 1.220000 0.865000 ;
+      RECT 1.040000  2.275000 1.370000 2.635000 ;
+      RECT 1.115000  1.665000 1.285000 1.895000 ;
+      RECT 1.115000  1.895000 2.225000 2.105000 ;
+      RECT 1.455000  0.655000 1.865000 0.825000 ;
+      RECT 1.455000  1.555000 1.865000 1.725000 ;
+      RECT 1.695000  0.825000 1.865000 0.995000 ;
+      RECT 1.695000  0.995000 2.175000 1.325000 ;
+      RECT 1.695000  1.325000 1.865000 1.555000 ;
+      RECT 1.975000  0.085000 2.305000 0.465000 ;
+      RECT 1.975000  2.105000 2.225000 2.465000 ;
+      RECT 2.055000  1.505000 2.515000 1.675000 ;
+      RECT 2.055000  1.675000 2.225000 1.895000 ;
+      RECT 2.345000  0.635000 2.740000 0.825000 ;
+      RECT 2.345000  0.825000 2.515000 1.505000 ;
+      RECT 2.395000  1.845000 3.565000 2.015000 ;
+      RECT 2.395000  2.015000 2.725000 2.465000 ;
+      RECT 2.895000  2.185000 3.065000 2.635000 ;
+      RECT 3.235000  0.085000 3.565000 0.825000 ;
+      RECT 3.235000  2.015000 3.565000 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
 END sky130_fd_sc_hd__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
index 6f76157..3809f98 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.magic.lef
@@ -77,27 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.710000  0.085000 1.050000 0.445000 ;
-        RECT 1.580000  0.085000 1.910000 0.445000 ;
-        RECT 2.515000  0.085000 3.285000 0.445000 ;
-        RECT 3.855000  0.085000 4.185000 0.445000 ;
-        RECT 5.545000  0.085000 5.825000 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
@@ -107,56 +86,74 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.720000 2.275000 1.050000 2.635000 ;
-        RECT 1.580000 2.275000 1.910000 2.635000 ;
-        RECT 2.435000 2.275000 2.770000 2.635000 ;
-        RECT 4.235000 2.275000 4.565000 2.635000 ;
-        RECT 5.075000 2.275000 5.405000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.255000 0.540000 0.840000 ;
-      RECT 0.105000 0.840000 0.330000 1.795000 ;
-      RECT 0.105000 1.795000 0.565000 1.935000 ;
-      RECT 0.105000 1.935000 2.870000 2.105000 ;
-      RECT 0.105000 2.105000 0.550000 2.465000 ;
-      RECT 1.405000 0.995000 2.810000 1.185000 ;
-      RECT 1.405000 1.185000 2.530000 1.325000 ;
-      RECT 2.640000 0.615000 3.645000 0.670000 ;
-      RECT 2.640000 0.670000 4.965000 0.785000 ;
-      RECT 2.640000 0.785000 3.010000 0.800000 ;
-      RECT 2.640000 0.800000 2.810000 0.995000 ;
-      RECT 2.700000 1.355000 3.305000 1.525000 ;
-      RECT 2.700000 1.525000 2.870000 1.935000 ;
-      RECT 2.995000 0.995000 3.305000 1.355000 ;
-      RECT 3.055000 1.695000 3.225000 2.210000 ;
-      RECT 3.055000 2.210000 4.065000 2.380000 ;
-      RECT 3.475000 0.255000 3.645000 0.615000 ;
-      RECT 3.475000 0.785000 4.965000 0.840000 ;
-      RECT 3.475000 0.840000 3.645000 1.805000 ;
-      RECT 3.885000 1.445000 4.065000 1.935000 ;
-      RECT 3.885000 1.935000 5.825000 2.105000 ;
-      RECT 3.885000 2.105000 4.065000 2.210000 ;
-      RECT 4.685000 0.405000 4.965000 0.670000 ;
-      RECT 5.570000 1.460000 5.825000 1.935000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.105000  0.255000 0.540000 0.840000 ;
+      RECT 0.105000  0.840000 0.330000 1.795000 ;
+      RECT 0.105000  1.795000 0.565000 1.935000 ;
+      RECT 0.105000  1.935000 2.870000 2.105000 ;
+      RECT 0.105000  2.105000 0.550000 2.465000 ;
+      RECT 0.710000  0.085000 1.050000 0.445000 ;
+      RECT 0.720000  2.275000 1.050000 2.635000 ;
+      RECT 1.405000  0.995000 2.810000 1.185000 ;
+      RECT 1.405000  1.185000 2.530000 1.325000 ;
+      RECT 1.580000  0.085000 1.910000 0.445000 ;
+      RECT 1.580000  2.275000 1.910000 2.635000 ;
+      RECT 2.435000  2.275000 2.770000 2.635000 ;
+      RECT 2.515000  0.085000 3.285000 0.445000 ;
+      RECT 2.640000  0.615000 3.645000 0.670000 ;
+      RECT 2.640000  0.670000 4.965000 0.785000 ;
+      RECT 2.640000  0.785000 3.010000 0.800000 ;
+      RECT 2.640000  0.800000 2.810000 0.995000 ;
+      RECT 2.700000  1.355000 3.305000 1.525000 ;
+      RECT 2.700000  1.525000 2.870000 1.935000 ;
+      RECT 2.995000  0.995000 3.305000 1.355000 ;
+      RECT 3.055000  1.695000 3.225000 2.210000 ;
+      RECT 3.055000  2.210000 4.065000 2.380000 ;
+      RECT 3.475000  0.255000 3.645000 0.615000 ;
+      RECT 3.475000  0.785000 4.965000 0.840000 ;
+      RECT 3.475000  0.840000 3.645000 1.805000 ;
+      RECT 3.855000  0.085000 4.185000 0.445000 ;
+      RECT 3.885000  1.445000 4.065000 1.935000 ;
+      RECT 3.885000  1.935000 5.825000 2.105000 ;
+      RECT 3.885000  2.105000 4.065000 2.210000 ;
+      RECT 4.235000  2.275000 4.565000 2.635000 ;
+      RECT 4.685000  0.405000 4.965000 0.670000 ;
+      RECT 5.075000  2.275000 5.405000 2.635000 ;
+      RECT 5.545000  0.085000 5.825000 0.885000 ;
+      RECT 5.570000  1.460000 5.825000 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 ;
   END
 END sky130_fd_sc_hd__a21bo_4
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
index 369bf85..c8938bb 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.magic.lef
@@ -73,17 +73,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.550000  0.085000 1.145000 0.610000 ;
-        RECT 2.335000  0.085000 2.665000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -93,29 +82,37 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.525000 2.175000 0.855000 2.635000 ;
-        RECT 1.975000 2.175000 2.165000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.280000 0.380000 0.780000 ;
-      RECT 0.095000 0.780000 1.145000 1.030000 ;
-      RECT 0.095000 1.030000 0.300000 2.085000 ;
-      RECT 0.095000 2.085000 0.355000 2.465000 ;
-      RECT 1.475000 1.825000 2.665000 2.005000 ;
-      RECT 1.475000 2.005000 1.805000 2.465000 ;
-      RECT 2.335000 2.005000 2.665000 2.465000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  0.280000 0.380000 0.780000 ;
+      RECT 0.095000  0.780000 1.145000 1.030000 ;
+      RECT 0.095000  1.030000 0.300000 2.085000 ;
+      RECT 0.095000  2.085000 0.355000 2.465000 ;
+      RECT 0.525000  2.175000 0.855000 2.635000 ;
+      RECT 0.550000  0.085000 1.145000 0.610000 ;
+      RECT 1.475000  1.825000 2.665000 2.005000 ;
+      RECT 1.475000  2.005000 1.805000 2.465000 ;
+      RECT 1.975000  2.175000 2.165000 2.635000 ;
+      RECT 2.335000  0.085000 2.665000 0.595000 ;
+      RECT 2.335000  2.005000 2.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 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  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
 END sky130_fd_sc_hd__a21boi_0
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
index dc3c1ec..1465a83 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.magic.lef
@@ -75,17 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.925000  0.085000 1.155000 0.865000 ;
-        RECT 2.325000  0.085000 2.655000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -95,30 +84,38 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.525000 2.225000 0.855000 2.635000 ;
-        RECT 1.905000 1.905000 2.235000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.845000 0.855000 2.045000 ;
-      RECT 0.095000 2.045000 0.355000 2.435000 ;
-      RECT 0.365000 0.265000 0.745000 0.715000 ;
-      RECT 0.515000 0.715000 0.745000 1.165000 ;
-      RECT 0.515000 1.165000 0.855000 1.845000 ;
-      RECT 1.545000 1.525000 2.585000 1.725000 ;
-      RECT 1.545000 1.725000 1.735000 2.455000 ;
-      RECT 2.415000 1.725000 2.585000 2.455000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  1.845000 0.855000 2.045000 ;
+      RECT 0.095000  2.045000 0.355000 2.435000 ;
+      RECT 0.365000  0.265000 0.745000 0.715000 ;
+      RECT 0.515000  0.715000 0.745000 1.165000 ;
+      RECT 0.515000  1.165000 0.855000 1.845000 ;
+      RECT 0.525000  2.225000 0.855000 2.635000 ;
+      RECT 0.925000  0.085000 1.155000 0.865000 ;
+      RECT 1.545000  1.525000 2.585000 1.725000 ;
+      RECT 1.545000  1.725000 1.735000 2.455000 ;
+      RECT 1.905000  1.905000 2.235000 2.635000 ;
+      RECT 2.325000  0.085000 2.655000 0.815000 ;
+      RECT 2.415000  1.725000 2.585000 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 ;
   END
 END sky130_fd_sc_hd__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
index 2d615f3..c624171 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.magic.lef
@@ -78,21 +78,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.985000  0.085000 1.225000 0.885000 ;
-        RECT 1.940000  0.085000 2.270000 0.445000 ;
-        RECT 3.635000  0.085000 3.930000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -102,37 +87,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.095000 2.080000 0.425000 2.635000 ;
-        RECT 2.385000 2.195000 2.555000 2.635000 ;
-        RECT 3.160000 2.275000 3.490000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.265000 0.360000 0.795000 0.530000 ;
-      RECT 0.595000 0.530000 0.795000 1.070000 ;
-      RECT 0.595000 1.070000 1.325000 1.285000 ;
-      RECT 0.595000 1.285000 0.855000 2.265000 ;
-      RECT 1.045000 1.795000 1.350000 2.285000 ;
-      RECT 1.045000 2.285000 2.215000 2.465000 ;
-      RECT 1.885000 1.855000 3.920000 2.025000 ;
-      RECT 1.885000 2.025000 2.215000 2.285000 ;
-      RECT 2.810000 2.025000 3.920000 2.105000 ;
-      RECT 2.810000 2.105000 2.980000 2.465000 ;
-      RECT 3.660000 2.105000 3.920000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.095000  2.080000 0.425000 2.635000 ;
+      RECT 0.265000  0.360000 0.795000 0.530000 ;
+      RECT 0.595000  0.530000 0.795000 1.070000 ;
+      RECT 0.595000  1.070000 1.325000 1.285000 ;
+      RECT 0.595000  1.285000 0.855000 2.265000 ;
+      RECT 0.985000  0.085000 1.225000 0.885000 ;
+      RECT 1.045000  1.795000 1.350000 2.285000 ;
+      RECT 1.045000  2.285000 2.215000 2.465000 ;
+      RECT 1.885000  1.855000 3.920000 2.025000 ;
+      RECT 1.885000  2.025000 2.215000 2.285000 ;
+      RECT 1.940000  0.085000 2.270000 0.445000 ;
+      RECT 2.385000  2.195000 2.555000 2.635000 ;
+      RECT 2.810000  2.025000 3.920000 2.105000 ;
+      RECT 2.810000  2.105000 2.980000 2.465000 ;
+      RECT 3.160000  2.275000 3.490000 2.635000 ;
+      RECT 3.635000  0.085000 3.930000 0.865000 ;
+      RECT 3.660000  2.105000 3.920000 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
 END sky130_fd_sc_hd__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
index 6fd0d46..663fe7f 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.magic.lef
@@ -82,29 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.720000  0.085000 1.105000 0.445000 ;
-        RECT 1.635000  0.085000 1.965000 0.445000 ;
-        RECT 2.495000  0.085000 3.085000 0.525000 ;
-        RECT 5.485000  0.085000 5.675000 0.565000 ;
-        RECT 6.345000  0.085000 6.605000 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
@@ -114,53 +91,73 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.625000 2.175000 0.885000 2.635000 ;
-        RECT 3.265000 2.275000 3.595000 2.635000 ;
-        RECT 4.125000 2.275000 4.455000 2.635000 ;
-        RECT 4.985000 2.275000 5.315000 2.635000 ;
-        RECT 5.845000 2.275000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.445000 0.615000 ;
-      RECT 0.090000 0.615000 1.105000 0.795000 ;
-      RECT 0.125000 1.785000 0.990000 2.005000 ;
-      RECT 0.125000 2.005000 0.455000 2.465000 ;
-      RECT 0.820000 0.795000 1.105000 1.035000 ;
-      RECT 0.820000 1.035000 2.400000 1.345000 ;
-      RECT 0.820000 1.345000 0.990000 1.785000 ;
-      RECT 1.160000 1.795000 1.355000 2.215000 ;
-      RECT 1.160000 2.215000 3.095000 2.465000 ;
-      RECT 1.935000 2.205000 3.095000 2.215000 ;
-      RECT 2.895000 1.875000 6.605000 2.105000 ;
-      RECT 2.895000 2.105000 3.095000 2.205000 ;
-      RECT 3.265000 0.255000 5.315000 0.505000 ;
-      RECT 4.625000 2.105000 4.815000 2.465000 ;
-      RECT 5.055000 0.505000 5.315000 0.735000 ;
-      RECT 5.055000 0.735000 6.175000 0.905000 ;
-      RECT 5.485000 2.105000 5.665000 2.465000 ;
-      RECT 5.845000 0.255000 6.175000 0.735000 ;
-      RECT 6.345000 2.105000 6.605000 2.465000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.090000  0.255000 0.445000 0.615000 ;
+      RECT 0.090000  0.615000 1.105000 0.795000 ;
+      RECT 0.125000  1.785000 0.990000 2.005000 ;
+      RECT 0.125000  2.005000 0.455000 2.465000 ;
+      RECT 0.625000  2.175000 0.885000 2.635000 ;
+      RECT 0.720000  0.085000 1.105000 0.445000 ;
+      RECT 0.820000  0.795000 1.105000 1.035000 ;
+      RECT 0.820000  1.035000 2.400000 1.345000 ;
+      RECT 0.820000  1.345000 0.990000 1.785000 ;
+      RECT 1.160000  1.795000 1.355000 2.215000 ;
+      RECT 1.160000  2.215000 3.095000 2.465000 ;
+      RECT 1.635000  0.085000 1.965000 0.445000 ;
+      RECT 1.935000  2.205000 3.095000 2.215000 ;
+      RECT 2.495000  0.085000 3.085000 0.525000 ;
+      RECT 2.895000  1.875000 6.605000 2.105000 ;
+      RECT 2.895000  2.105000 3.095000 2.205000 ;
+      RECT 3.265000  0.255000 5.315000 0.505000 ;
+      RECT 3.265000  2.275000 3.595000 2.635000 ;
+      RECT 4.125000  2.275000 4.455000 2.635000 ;
+      RECT 4.625000  2.105000 4.815000 2.465000 ;
+      RECT 4.985000  2.275000 5.315000 2.635000 ;
+      RECT 5.055000  0.505000 5.315000 0.735000 ;
+      RECT 5.055000  0.735000 6.175000 0.905000 ;
+      RECT 5.485000  0.085000 5.675000 0.565000 ;
+      RECT 5.485000  2.105000 5.665000 2.465000 ;
+      RECT 5.845000  0.255000 6.175000 0.735000 ;
+      RECT 5.845000  2.275000 6.175000 2.635000 ;
+      RECT 6.345000  0.085000 6.605000 0.885000 ;
+      RECT 6.345000  2.105000 6.605000 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
 END sky130_fd_sc_hd__a21boi_4
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
index 7031ac5..a1c7617 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_1.magic.lef
@@ -72,17 +72,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.615000  0.085000 1.285000 0.455000 ;
-        RECT 2.365000  0.085000 2.655000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -92,30 +81,38 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.525000 1.905000 0.865000 2.635000 ;
-        RECT 1.895000 1.925000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.635000 1.775000 0.835000 ;
-      RECT 0.545000 0.835000 0.835000 1.505000 ;
-      RECT 0.545000 1.505000 1.315000 1.725000 ;
-      RECT 1.045000 1.725000 1.315000 2.455000 ;
-      RECT 1.465000 0.265000 1.775000 0.635000 ;
-      RECT 1.495000 1.505000 2.655000 1.745000 ;
-      RECT 1.495000 1.745000 1.725000 2.455000 ;
-      RECT 2.395000 1.745000 2.655000 2.455000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.525000  1.905000 0.865000 2.635000 ;
+      RECT 0.545000  0.635000 1.775000 0.835000 ;
+      RECT 0.545000  0.835000 0.835000 1.505000 ;
+      RECT 0.545000  1.505000 1.315000 1.725000 ;
+      RECT 0.615000  0.085000 1.285000 0.455000 ;
+      RECT 1.045000  1.725000 1.315000 2.455000 ;
+      RECT 1.465000  0.265000 1.775000 0.635000 ;
+      RECT 1.495000  1.505000 2.655000 1.745000 ;
+      RECT 1.495000  1.745000 1.725000 2.455000 ;
+      RECT 1.895000  1.925000 2.225000 2.635000 ;
+      RECT 2.365000  0.085000 2.655000 0.815000 ;
+      RECT 2.395000  1.745000 2.655000 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 ;
   END
 END sky130_fd_sc_hd__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
index fbd4568..7e661c9 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_2.magic.lef
@@ -73,19 +73,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.265000  0.085000 0.595000 0.465000 ;
-        RECT 1.125000  0.085000 1.455000 0.445000 ;
-        RECT 2.805000  0.085000 3.135000 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
@@ -95,33 +82,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.095000 1.665000 0.385000 2.635000 ;
-        RECT 0.955000 2.220000 1.285000 2.635000 ;
-        RECT 2.355000 2.125000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.955000 0.995000 1.295000 1.690000 ;
-      RECT 0.955000 1.690000 1.790000 1.920000 ;
-      RECT 1.125000 0.655000 1.865000 0.825000 ;
-      RECT 1.125000 0.825000 1.295000 0.995000 ;
-      RECT 1.475000 1.920000 1.790000 2.465000 ;
-      RECT 1.675000 0.255000 1.865000 0.655000 ;
-      RECT 1.960000 1.670000 3.075000 1.935000 ;
-      RECT 1.960000 1.935000 2.185000 2.465000 ;
-      RECT 2.855000 1.935000 3.075000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.095000  1.665000 0.385000 2.635000 ;
+      RECT 0.265000  0.085000 0.595000 0.465000 ;
+      RECT 0.955000  0.995000 1.295000 1.690000 ;
+      RECT 0.955000  1.690000 1.790000 1.920000 ;
+      RECT 0.955000  2.220000 1.285000 2.635000 ;
+      RECT 1.125000  0.085000 1.455000 0.445000 ;
+      RECT 1.125000  0.655000 1.865000 0.825000 ;
+      RECT 1.125000  0.825000 1.295000 0.995000 ;
+      RECT 1.475000  1.920000 1.790000 2.465000 ;
+      RECT 1.675000  0.255000 1.865000 0.655000 ;
+      RECT 1.960000  1.670000 3.075000 1.935000 ;
+      RECT 1.960000  1.935000 2.185000 2.465000 ;
+      RECT 2.355000  2.125000 2.685000 2.635000 ;
+      RECT 2.805000  0.085000 3.135000 0.565000 ;
+      RECT 2.855000  1.935000 3.075000 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 ;
   END
 END sky130_fd_sc_hd__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
index c3b1349..a79c123 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_4.magic.lef
@@ -79,26 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.105000  0.085000 0.445000 0.445000 ;
-        RECT 0.975000  0.085000 1.305000 0.445000 ;
-        RECT 1.910000  0.085000 2.685000 0.445000 ;
-        RECT 3.255000  0.085000 3.585000 0.445000 ;
-        RECT 4.945000  0.085000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -108,47 +88,64 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.115000 1.935000 0.445000 2.635000 ;
-        RECT 0.975000 1.935000 1.305000 2.635000 ;
-        RECT 1.915000 1.515000 2.165000 2.635000 ;
-        RECT 3.635000 2.275000 3.965000 2.635000 ;
-        RECT 4.475000 2.275000 4.805000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.800000 0.995000 2.205000 1.325000 ;
-      RECT 2.035000 0.615000 3.045000 0.670000 ;
-      RECT 2.035000 0.670000 4.365000 0.785000 ;
-      RECT 2.035000 0.785000 2.205000 0.995000 ;
-      RECT 2.455000 1.695000 2.625000 2.295000 ;
-      RECT 2.455000 2.295000 3.465000 2.465000 ;
-      RECT 2.875000 0.255000 3.045000 0.615000 ;
-      RECT 2.875000 0.785000 4.365000 0.840000 ;
-      RECT 2.875000 0.840000 3.045000 2.125000 ;
-      RECT 3.285000 1.445000 3.465000 1.850000 ;
-      RECT 3.285000 1.850000 5.360000 2.020000 ;
-      RECT 3.285000 2.020000 3.465000 2.295000 ;
-      RECT 4.085000 0.405000 4.365000 0.670000 ;
-      RECT 4.135000 2.020000 4.305000 2.465000 ;
-      RECT 5.030000 2.020000 5.360000 2.395000 ;
-      RECT 5.105000 1.460000 5.360000 1.850000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.105000  0.085000 0.445000 0.445000 ;
+      RECT 0.115000  1.935000 0.445000 2.635000 ;
+      RECT 0.800000  0.995000 2.205000 1.325000 ;
+      RECT 0.975000  0.085000 1.305000 0.445000 ;
+      RECT 0.975000  1.935000 1.305000 2.635000 ;
+      RECT 1.910000  0.085000 2.685000 0.445000 ;
+      RECT 1.915000  1.515000 2.165000 2.635000 ;
+      RECT 2.035000  0.615000 3.045000 0.670000 ;
+      RECT 2.035000  0.670000 4.365000 0.785000 ;
+      RECT 2.035000  0.785000 2.205000 0.995000 ;
+      RECT 2.455000  1.695000 2.625000 2.295000 ;
+      RECT 2.455000  2.295000 3.465000 2.465000 ;
+      RECT 2.875000  0.255000 3.045000 0.615000 ;
+      RECT 2.875000  0.785000 4.365000 0.840000 ;
+      RECT 2.875000  0.840000 3.045000 2.125000 ;
+      RECT 3.255000  0.085000 3.585000 0.445000 ;
+      RECT 3.285000  1.445000 3.465000 1.850000 ;
+      RECT 3.285000  1.850000 5.360000 2.020000 ;
+      RECT 3.285000  2.020000 3.465000 2.295000 ;
+      RECT 3.635000  2.275000 3.965000 2.635000 ;
+      RECT 4.085000  0.405000 4.365000 0.670000 ;
+      RECT 4.135000  2.020000 4.305000 2.465000 ;
+      RECT 4.475000  2.275000 4.805000 2.635000 ;
+      RECT 4.945000  0.085000 5.225000 0.885000 ;
+      RECT 5.030000  2.020000 5.360000 2.395000 ;
+      RECT 5.105000  1.460000 5.360000 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 ;
   END
 END sky130_fd_sc_hd__a21o_4
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
index 45c8638..cf7a706 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.magic.lef
@@ -76,15 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 0.475000 ;
-        RECT 1.445000  0.085000 1.745000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -94,23 +85,29 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 1.040000 2.195000 1.235000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 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.540000 1.855000 1.745000 2.025000 ;
-      RECT 0.540000 2.025000 0.870000 2.455000 ;
-      RECT 0.850000 1.525000 1.745000 1.855000 ;
-      RECT 1.415000 2.025000 1.745000 2.455000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.110000  0.085000 0.440000 0.475000 ;
+      RECT 0.540000  1.855000 1.745000 2.025000 ;
+      RECT 0.540000  2.025000 0.870000 2.455000 ;
+      RECT 0.850000  1.525000 1.745000 1.855000 ;
+      RECT 1.040000  2.195000 1.235000 2.635000 ;
+      RECT 1.415000  2.025000 1.745000 2.455000 ;
+      RECT 1.445000  0.085000 1.745000 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 ;
   END
 END sky130_fd_sc_hd__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
index f8de1b5..78eee9d 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.magic.lef
@@ -77,19 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.100000  0.085000 0.395000 0.865000 ;
-        RECT 1.760000  0.085000 2.090000 0.445000 ;
-        RECT 2.795000  0.085000 3.125000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -99,30 +86,40 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.540000 2.275000 0.870000 2.635000 ;
-        RECT 1.475000 2.195000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 1.855000 2.145000 2.025000 ;
-      RECT 0.110000 2.025000 1.220000 2.105000 ;
-      RECT 0.110000 2.105000 0.370000 2.465000 ;
-      RECT 1.050000 2.105000 1.220000 2.465000 ;
-      RECT 1.815000 2.025000 2.145000 2.285000 ;
-      RECT 1.815000 2.285000 3.090000 2.465000 ;
-      RECT 2.785000 1.795000 3.090000 2.285000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.100000  0.085000 0.395000 0.865000 ;
+      RECT 0.110000  1.855000 2.145000 2.025000 ;
+      RECT 0.110000  2.025000 1.220000 2.105000 ;
+      RECT 0.110000  2.105000 0.370000 2.465000 ;
+      RECT 0.540000  2.275000 0.870000 2.635000 ;
+      RECT 1.050000  2.105000 1.220000 2.465000 ;
+      RECT 1.475000  2.195000 1.645000 2.635000 ;
+      RECT 1.760000  0.085000 2.090000 0.445000 ;
+      RECT 1.815000  2.025000 2.145000 2.285000 ;
+      RECT 1.815000  2.285000 3.090000 2.465000 ;
+      RECT 2.785000  1.795000 3.090000 2.285000 ;
+      RECT 2.795000  0.085000 3.125000 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 ;
   END
 END sky130_fd_sc_hd__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
index a2727e4..566677b 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.magic.lef
@@ -82,27 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.805000 ;
-        RECT 0.955000  0.085000 1.285000 0.445000 ;
-        RECT 1.835000  0.085000 2.115000 0.525000 ;
-        RECT 4.505000  0.085000 4.695000 0.565000 ;
-        RECT 5.365000  0.085000 5.625000 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
@@ -112,44 +91,62 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 2.285000 2.275000 2.615000 2.635000 ;
-        RECT 3.145000 2.275000 3.475000 2.635000 ;
-        RECT 4.005000 2.275000 4.335000 2.635000 ;
-        RECT 4.865000 2.275000 5.195000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.180000 1.795000 0.375000 2.215000 ;
-      RECT 0.180000 2.215000 2.115000 2.465000 ;
-      RECT 0.955000 2.205000 2.115000 2.215000 ;
-      RECT 1.915000 1.875000 5.625000 2.105000 ;
-      RECT 1.915000 2.105000 2.115000 2.205000 ;
-      RECT 2.285000 0.255000 4.335000 0.505000 ;
-      RECT 2.785000 2.105000 2.975000 2.465000 ;
-      RECT 3.645000 2.105000 3.835000 2.465000 ;
-      RECT 4.075000 0.505000 4.335000 0.735000 ;
-      RECT 4.075000 0.735000 5.195000 0.905000 ;
-      RECT 4.505000 2.105000 4.685000 2.465000 ;
-      RECT 4.865000 0.255000 5.195000 0.735000 ;
-      RECT 5.365000 2.105000 5.625000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 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.115000 2.465000 ;
+      RECT 0.955000  0.085000 1.285000 0.445000 ;
+      RECT 0.955000  2.205000 2.115000 2.215000 ;
+      RECT 1.835000  0.085000 2.115000 0.525000 ;
+      RECT 1.915000  1.875000 5.625000 2.105000 ;
+      RECT 1.915000  2.105000 2.115000 2.205000 ;
+      RECT 2.285000  0.255000 4.335000 0.505000 ;
+      RECT 2.285000  2.275000 2.615000 2.635000 ;
+      RECT 2.785000  2.105000 2.975000 2.465000 ;
+      RECT 3.145000  2.275000 3.475000 2.635000 ;
+      RECT 3.645000  2.105000 3.835000 2.465000 ;
+      RECT 4.005000  2.275000 4.335000 2.635000 ;
+      RECT 4.075000  0.505000 4.335000 0.735000 ;
+      RECT 4.075000  0.735000 5.195000 0.905000 ;
+      RECT 4.505000  0.085000 4.695000 0.565000 ;
+      RECT 4.505000  2.105000 4.685000 2.465000 ;
+      RECT 4.865000  0.255000 5.195000 0.735000 ;
+      RECT 4.865000  2.275000 5.195000 2.635000 ;
+      RECT 5.365000  0.085000 5.625000 0.885000 ;
+      RECT 5.365000  2.105000 5.625000 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
 END sky130_fd_sc_hd__a21oi_4
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
index 5a138f5..6625569 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_1.magic.lef
@@ -94,19 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.565000 ;
-        RECT 2.775000  0.085000 3.105000 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
@@ -116,39 +103,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 1.875000 2.215000 2.230000 2.635000 ;
-        RECT 2.820000 1.875000 3.150000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.345000 0.735000 ;
-      RECT 0.175000 0.735000 1.240000 0.905000 ;
-      RECT 0.175000 1.455000 3.235000 1.625000 ;
-      RECT 0.175000 1.625000 0.345000 2.465000 ;
-      RECT 0.515000 1.795000 0.845000 2.295000 ;
-      RECT 0.515000 2.295000 1.685000 2.465000 ;
-      RECT 1.015000 1.795000 2.650000 2.035000 ;
-      RECT 1.015000 2.035000 1.245000 2.125000 ;
-      RECT 1.070000 0.255000 2.605000 0.505000 ;
-      RECT 1.070000 0.505000 1.240000 0.735000 ;
-      RECT 1.355000 2.255000 1.685000 2.295000 ;
-      RECT 2.400000 2.035000 2.650000 2.465000 ;
-      RECT 2.435000 0.505000 2.605000 0.735000 ;
-      RECT 2.435000 0.735000 3.235000 0.905000 ;
-      RECT 3.065000 0.905000 3.235000 1.455000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.175000  0.255000 0.345000 0.735000 ;
+      RECT 0.175000  0.735000 1.240000 0.905000 ;
+      RECT 0.175000  1.455000 3.235000 1.625000 ;
+      RECT 0.175000  1.625000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.565000 ;
+      RECT 0.515000  1.795000 0.845000 2.295000 ;
+      RECT 0.515000  2.295000 1.685000 2.465000 ;
+      RECT 1.015000  1.795000 2.650000 2.035000 ;
+      RECT 1.015000  2.035000 1.245000 2.125000 ;
+      RECT 1.070000  0.255000 2.605000 0.505000 ;
+      RECT 1.070000  0.505000 1.240000 0.735000 ;
+      RECT 1.355000  2.255000 1.685000 2.295000 ;
+      RECT 1.875000  2.215000 2.230000 2.635000 ;
+      RECT 2.400000  2.035000 2.650000 2.465000 ;
+      RECT 2.435000  0.505000 2.605000 0.735000 ;
+      RECT 2.435000  0.735000 3.235000 0.905000 ;
+      RECT 2.775000  0.085000 3.105000 0.565000 ;
+      RECT 2.820000  1.875000 3.150000 2.635000 ;
+      RECT 3.065000  0.905000 3.235000 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 ;
   END
 END sky130_fd_sc_hd__a221o_1
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
index 8347a58..6d0dddd 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_2.magic.lef
@@ -94,21 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.565000 ;
-        RECT 2.775000  0.085000 3.105000 0.565000 ;
-        RECT 3.745000  0.085000 3.915000 0.980000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -118,41 +103,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 1.875000 2.215000 2.230000 2.635000 ;
-        RECT 2.820000 1.875000 3.150000 2.635000 ;
-        RECT 3.745000 1.445000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.345000 0.735000 ;
-      RECT 0.175000 0.735000 1.240000 0.905000 ;
-      RECT 0.175000 1.455000 3.235000 1.625000 ;
-      RECT 0.175000 1.625000 0.345000 2.465000 ;
-      RECT 0.515000 1.795000 0.845000 2.295000 ;
-      RECT 0.515000 2.295000 1.685000 2.465000 ;
-      RECT 1.015000 1.795000 2.650000 2.035000 ;
-      RECT 1.015000 2.035000 1.245000 2.125000 ;
-      RECT 1.070000 0.255000 2.605000 0.505000 ;
-      RECT 1.070000 0.505000 1.240000 0.735000 ;
-      RECT 1.355000 2.255000 1.685000 2.295000 ;
-      RECT 2.400000 2.035000 2.650000 2.465000 ;
-      RECT 2.435000 0.505000 2.605000 0.735000 ;
-      RECT 2.435000 0.735000 3.235000 0.905000 ;
-      RECT 3.065000 0.905000 3.235000 1.455000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.175000  0.255000 0.345000 0.735000 ;
+      RECT 0.175000  0.735000 1.240000 0.905000 ;
+      RECT 0.175000  1.455000 3.235000 1.625000 ;
+      RECT 0.175000  1.625000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.565000 ;
+      RECT 0.515000  1.795000 0.845000 2.295000 ;
+      RECT 0.515000  2.295000 1.685000 2.465000 ;
+      RECT 1.015000  1.795000 2.650000 2.035000 ;
+      RECT 1.015000  2.035000 1.245000 2.125000 ;
+      RECT 1.070000  0.255000 2.605000 0.505000 ;
+      RECT 1.070000  0.505000 1.240000 0.735000 ;
+      RECT 1.355000  2.255000 1.685000 2.295000 ;
+      RECT 1.875000  2.215000 2.230000 2.635000 ;
+      RECT 2.400000  2.035000 2.650000 2.465000 ;
+      RECT 2.435000  0.505000 2.605000 0.735000 ;
+      RECT 2.435000  0.735000 3.235000 0.905000 ;
+      RECT 2.775000  0.085000 3.105000 0.565000 ;
+      RECT 2.820000  1.875000 3.150000 2.635000 ;
+      RECT 3.065000  0.905000 3.235000 1.455000 ;
+      RECT 3.745000  0.085000 3.915000 0.980000 ;
+      RECT 3.745000  1.445000 3.915000 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
 END sky130_fd_sc_hd__a221o_2
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
index 5fde850..a46d82f 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_4.magic.lef
@@ -98,32 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.555000 ;
-        RECT 1.015000  0.085000 1.185000 0.555000 ;
-        RECT 1.855000  0.085000 2.025000 0.555000 ;
-        RECT 2.695000  0.085000 2.865000 0.895000 ;
-        RECT 4.475000  0.085000 4.645000 0.555000 ;
-        RECT 6.675000  0.085000 6.845000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        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
@@ -133,72 +107,94 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.155000 1.795000 0.385000 2.635000 ;
-        RECT 0.975000 1.795000 1.225000 2.635000 ;
-        RECT 1.815000 1.795000 2.065000 2.635000 ;
-        RECT 2.655000 2.135000 2.905000 2.635000 ;
-        RECT 3.500000 2.135000 3.750000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.495000 1.075000 1.845000 1.115000 ;
-      RECT 0.495000 1.115000 1.985000 1.285000 ;
-      RECT 1.815000 1.285000 1.985000 1.455000 ;
-      RECT 1.815000 1.455000 5.065000 1.625000 ;
-      RECT 1.855000 0.735000 2.525000 0.905000 ;
-      RECT 1.945000 0.905000 2.165000 0.935000 ;
-      RECT 2.195000 0.255000 2.525000 0.735000 ;
-      RECT 2.235000 1.795000 4.230000 1.875000 ;
-      RECT 2.235000 1.875000 5.575000 1.965000 ;
-      RECT 2.235000 1.965000 2.485000 2.465000 ;
-      RECT 3.075000 1.965000 3.330000 2.465000 ;
-      RECT 3.080000 0.305000 4.305000 0.475000 ;
-      RECT 3.190000 0.735000 3.885000 0.905000 ;
-      RECT 3.315000 0.905000 3.610000 0.935000 ;
-      RECT 3.550000 0.645000 3.885000 0.735000 ;
-      RECT 3.940000 2.215000 6.385000 2.295000 ;
-      RECT 3.940000 2.295000 7.225000 2.465000 ;
-      RECT 4.055000 0.475000 4.305000 0.725000 ;
-      RECT 4.055000 0.725000 5.065000 0.905000 ;
-      RECT 4.060000 1.965000 5.575000 2.045000 ;
-      RECT 4.405000 1.625000 4.735000 1.705000 ;
-      RECT 4.815000 0.255000 5.985000 0.475000 ;
-      RECT 4.815000 0.475000 5.065000 0.725000 ;
-      RECT 4.895000 0.905000 5.065000 1.455000 ;
-      RECT 5.235000 0.645000 6.505000 0.725000 ;
-      RECT 5.235000 0.725000 7.345000 0.905000 ;
-      RECT 5.245000 1.455000 6.805000 1.625000 ;
-      RECT 5.245000 1.625000 5.575000 1.875000 ;
-      RECT 5.745000 1.795000 6.385000 2.215000 ;
-      RECT 6.555000 1.625000 6.805000 2.125000 ;
-      RECT 6.975000 1.785000 7.225000 2.295000 ;
-      RECT 7.015000 0.255000 7.345000 0.725000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.155000  1.795000 0.385000 2.635000 ;
+      RECT 0.175000  0.085000 0.345000 0.555000 ;
+      RECT 0.495000  1.075000 1.845000 1.115000 ;
+      RECT 0.495000  1.115000 1.985000 1.285000 ;
+      RECT 0.975000  1.795000 1.225000 2.635000 ;
+      RECT 1.015000  0.085000 1.185000 0.555000 ;
+      RECT 1.815000  1.285000 1.985000 1.455000 ;
+      RECT 1.815000  1.455000 5.065000 1.625000 ;
+      RECT 1.815000  1.795000 2.065000 2.635000 ;
+      RECT 1.855000  0.085000 2.025000 0.555000 ;
+      RECT 1.855000  0.735000 2.525000 0.905000 ;
+      RECT 1.945000  0.905000 2.165000 0.935000 ;
+      RECT 2.195000  0.255000 2.525000 0.735000 ;
+      RECT 2.235000  1.795000 4.230000 1.875000 ;
+      RECT 2.235000  1.875000 5.575000 1.965000 ;
+      RECT 2.235000  1.965000 2.485000 2.465000 ;
+      RECT 2.655000  2.135000 2.905000 2.635000 ;
+      RECT 2.695000  0.085000 2.865000 0.895000 ;
+      RECT 3.075000  1.965000 3.330000 2.465000 ;
+      RECT 3.080000  0.305000 4.305000 0.475000 ;
+      RECT 3.190000  0.735000 3.885000 0.905000 ;
+      RECT 3.315000  0.905000 3.610000 0.935000 ;
+      RECT 3.500000  2.135000 3.750000 2.635000 ;
+      RECT 3.550000  0.645000 3.885000 0.735000 ;
+      RECT 3.940000  2.215000 6.385000 2.295000 ;
+      RECT 3.940000  2.295000 7.225000 2.465000 ;
+      RECT 4.055000  0.475000 4.305000 0.725000 ;
+      RECT 4.055000  0.725000 5.065000 0.905000 ;
+      RECT 4.060000  1.965000 5.575000 2.045000 ;
+      RECT 4.405000  1.625000 4.735000 1.705000 ;
+      RECT 4.475000  0.085000 4.645000 0.555000 ;
+      RECT 4.815000  0.255000 5.985000 0.475000 ;
+      RECT 4.815000  0.475000 5.065000 0.725000 ;
+      RECT 4.895000  0.905000 5.065000 1.455000 ;
+      RECT 5.235000  0.645000 6.505000 0.725000 ;
+      RECT 5.235000  0.725000 7.345000 0.905000 ;
+      RECT 5.245000  1.455000 6.805000 1.625000 ;
+      RECT 5.245000  1.625000 5.575000 1.875000 ;
+      RECT 5.745000  1.795000 6.385000 2.215000 ;
+      RECT 6.555000  1.625000 6.805000 2.125000 ;
+      RECT 6.675000  0.085000 6.845000 0.555000 ;
+      RECT 6.975000  1.785000 7.225000 2.295000 ;
+      RECT 7.015000  0.255000 7.345000 0.725000 ;
     LAYER mcon ;
-      RECT 1.995000 0.765000 2.165000 0.935000 ;
-      RECT 3.400000 0.765000 3.570000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 1.995000  0.765000 2.165000 0.935000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.400000  0.765000 3.570000 0.935000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 1.935000 0.735000 2.225000 0.780000 ;
       RECT 1.935000 0.780000 3.630000 0.920000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
index e8a8d35..e248064 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.magic.lef
@@ -101,18 +101,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.565000 ;
-        RECT 2.750000  0.085000 3.080000 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
@@ -122,30 +110,39 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.875000 2.215000 2.205000 2.635000 ;
-        RECT 2.795000 1.875000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.795000 0.765000 2.295000 ;
-      RECT 0.515000 2.295000 1.685000 2.465000 ;
-      RECT 1.015000 1.795000 2.025000 1.835000 ;
-      RECT 1.015000 1.835000 2.625000 2.045000 ;
-      RECT 1.015000 2.045000 1.240000 2.125000 ;
-      RECT 1.355000 2.255000 1.685000 2.295000 ;
-      RECT 2.375000 2.045000 2.625000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.515000  0.085000 0.845000 0.565000 ;
+      RECT 0.515000  1.795000 0.765000 2.295000 ;
+      RECT 0.515000  2.295000 1.685000 2.465000 ;
+      RECT 1.015000  1.795000 2.025000 1.835000 ;
+      RECT 1.015000  1.835000 2.625000 2.045000 ;
+      RECT 1.015000  2.045000 1.240000 2.125000 ;
+      RECT 1.355000  2.255000 1.685000 2.295000 ;
+      RECT 1.875000  2.215000 2.205000 2.635000 ;
+      RECT 2.375000  2.045000 2.625000 2.465000 ;
+      RECT 2.750000  0.085000 3.080000 0.485000 ;
+      RECT 2.795000  1.875000 3.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 ;
   END
 END sky130_fd_sc_hd__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
index 611e2d1..d3523fc 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.magic.lef
@@ -99,25 +99,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.105000  0.085000 0.355000 0.895000 ;
-        RECT 1.025000  0.085000 1.715000 0.555000 ;
-        RECT 3.270000  0.085000 3.440000 0.555000 ;
-        RECT 4.985000  0.085000 5.155000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -127,46 +108,62 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 3.685000 2.125000 3.935000 2.635000 ;
-        RECT 4.525000 2.125000 4.775000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.795000 0.435000 2.295000 ;
-      RECT 0.090000 2.295000 1.275000 2.465000 ;
-      RECT 1.025000 1.495000 1.275000 1.785000 ;
-      RECT 1.025000 1.785000 3.015000 1.955000 ;
-      RECT 1.025000 1.955000 1.275000 2.295000 ;
-      RECT 1.505000 2.125000 1.755000 2.295000 ;
-      RECT 1.505000 2.295000 3.475000 2.465000 ;
-      RECT 1.885000 0.255000 3.055000 0.475000 ;
-      RECT 1.925000 1.955000 2.175000 2.125000 ;
-      RECT 2.345000 2.125000 2.595000 2.295000 ;
-      RECT 2.765000 1.955000 3.015000 2.125000 ;
-      RECT 3.225000 1.785000 5.195000 1.955000 ;
-      RECT 3.225000 1.955000 3.475000 2.295000 ;
-      RECT 3.645000 0.255000 4.815000 0.475000 ;
-      RECT 4.105000 1.955000 4.355000 2.465000 ;
-      RECT 4.565000 0.475000 4.815000 0.905000 ;
-      RECT 4.990000 1.455000 5.195000 1.785000 ;
-      RECT 4.990000 1.955000 5.195000 2.465000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.090000  1.795000 0.435000 2.295000 ;
+      RECT 0.090000  2.295000 1.275000 2.465000 ;
+      RECT 0.105000  0.085000 0.355000 0.895000 ;
+      RECT 1.025000  0.085000 1.715000 0.555000 ;
+      RECT 1.025000  1.495000 1.275000 1.785000 ;
+      RECT 1.025000  1.785000 3.015000 1.955000 ;
+      RECT 1.025000  1.955000 1.275000 2.295000 ;
+      RECT 1.505000  2.125000 1.755000 2.295000 ;
+      RECT 1.505000  2.295000 3.475000 2.465000 ;
+      RECT 1.885000  0.255000 3.055000 0.475000 ;
+      RECT 1.925000  1.955000 2.175000 2.125000 ;
+      RECT 2.345000  2.125000 2.595000 2.295000 ;
+      RECT 2.765000  1.955000 3.015000 2.125000 ;
+      RECT 3.225000  1.785000 5.195000 1.955000 ;
+      RECT 3.225000  1.955000 3.475000 2.295000 ;
+      RECT 3.270000  0.085000 3.440000 0.555000 ;
+      RECT 3.645000  0.255000 4.815000 0.475000 ;
+      RECT 3.685000  2.125000 3.935000 2.635000 ;
+      RECT 4.105000  1.955000 4.355000 2.465000 ;
+      RECT 4.525000  2.125000 4.775000 2.635000 ;
+      RECT 4.565000  0.475000 4.815000 0.905000 ;
+      RECT 4.985000  0.085000 5.155000 0.905000 ;
+      RECT 4.990000  1.455000 5.195000 1.785000 ;
+      RECT 4.990000  1.955000 5.195000 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 ;
   END
 END sky130_fd_sc_hd__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
index 94ab996..56034e4 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.magic.lef
@@ -108,38 +108,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 0.895000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.645000 ;
-        RECT 1.875000  0.645000 2.905000 0.925000 ;
-        RECT 2.735000  0.595000 2.905000 0.645000 ;
-        RECT 5.835000  0.085000 6.005000 0.555000 ;
-        RECT 8.355000  0.085000 8.525000 0.555000 ;
-        RECT 9.195000  0.085000 9.365000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -149,59 +117,88 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 6.175000 2.215000 8.185000 2.635000 ;
-        RECT 8.775000 1.795000 8.945000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.445000 0.405000 2.295000 ;
-      RECT 0.090000 2.295000 2.125000 2.465000 ;
-      RECT 0.995000 1.785000 1.245000 2.295000 ;
-      RECT 1.875000 1.445000 3.030000 1.615000 ;
-      RECT 1.875000 1.615000 2.125000 2.295000 ;
-      RECT 2.235000 0.255000 5.585000 0.425000 ;
-      RECT 2.235000 0.425000 2.610000 0.475000 ;
-      RECT 2.315000 1.795000 2.565000 2.215000 ;
-      RECT 2.315000 2.215000 6.005000 2.465000 ;
-      RECT 2.735000 1.615000 3.030000 1.835000 ;
-      RECT 2.735000 1.835000 5.585000 2.045000 ;
-      RECT 3.035000 0.425000 5.585000 0.475000 ;
-      RECT 5.755000 1.785000 8.605000 2.045000 ;
-      RECT 5.755000 2.045000 6.005000 2.215000 ;
-      RECT 6.175000 0.255000 8.185000 0.475000 ;
-      RECT 7.935000 0.475000 8.185000 0.725000 ;
-      RECT 7.935000 0.725000 9.025000 0.905000 ;
-      RECT 8.355000 2.045000 8.525000 2.465000 ;
-      RECT 8.435000 1.445000 9.405000 1.615000 ;
-      RECT 8.435000 1.615000 8.605000 1.785000 ;
-      RECT 8.695000 0.255000 9.025000 0.725000 ;
-      RECT 9.155000 1.615000 9.405000 2.465000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.090000  1.445000 0.405000 2.295000 ;
+      RECT 0.090000  2.295000 2.125000 2.465000 ;
+      RECT 0.115000  0.085000 0.365000 0.895000 ;
+      RECT 0.995000  1.785000 1.245000 2.295000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.875000  0.085000 2.045000 0.645000 ;
+      RECT 1.875000  0.645000 2.905000 0.925000 ;
+      RECT 1.875000  1.445000 3.030000 1.615000 ;
+      RECT 1.875000  1.615000 2.125000 2.295000 ;
+      RECT 2.235000  0.255000 5.585000 0.425000 ;
+      RECT 2.235000  0.425000 2.610000 0.475000 ;
+      RECT 2.315000  1.795000 2.565000 2.215000 ;
+      RECT 2.315000  2.215000 6.005000 2.465000 ;
+      RECT 2.735000  0.595000 2.905000 0.645000 ;
+      RECT 2.735000  1.615000 3.030000 1.835000 ;
+      RECT 2.735000  1.835000 5.585000 2.045000 ;
+      RECT 3.035000  0.425000 5.585000 0.475000 ;
+      RECT 5.755000  1.785000 8.605000 2.045000 ;
+      RECT 5.755000  2.045000 6.005000 2.215000 ;
+      RECT 5.835000  0.085000 6.005000 0.555000 ;
+      RECT 6.175000  0.255000 8.185000 0.475000 ;
+      RECT 6.175000  2.215000 8.185000 2.635000 ;
+      RECT 7.935000  0.475000 8.185000 0.725000 ;
+      RECT 7.935000  0.725000 9.025000 0.905000 ;
+      RECT 8.355000  0.085000 8.525000 0.555000 ;
+      RECT 8.355000  2.045000 8.525000 2.465000 ;
+      RECT 8.435000  1.445000 9.405000 1.615000 ;
+      RECT 8.435000  1.615000 8.605000 1.785000 ;
+      RECT 8.695000  0.255000 9.025000 0.725000 ;
+      RECT 8.775000  1.795000 8.945000 2.635000 ;
+      RECT 9.155000  1.615000 9.405000 2.465000 ;
+      RECT 9.195000  0.085000 9.365000 0.905000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
   END
 END sky130_fd_sc_hd__a221oi_4
diff --git a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
index 7190114..94b26de 100644
--- a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.magic.lef
@@ -108,19 +108,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.875000  0.085000 1.605000 0.465000 ;
-        RECT 3.255000  0.085000 3.585000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -130,41 +117,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 2.775000 1.905000 3.105000 2.075000 ;
-        RECT 2.855000 2.075000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.875000 0.845000 2.075000 ;
-      RECT 0.595000 2.075000 0.765000 2.295000 ;
-      RECT 0.595000 2.295000 2.185000 2.465000 ;
-      RECT 1.515000 1.825000 2.015000 1.965000 ;
-      RECT 1.515000 1.965000 1.970000 1.970000 ;
-      RECT 1.515000 1.970000 1.935000 1.980000 ;
-      RECT 1.515000 1.980000 1.915000 1.995000 ;
-      RECT 1.845000 1.655000 3.595000 1.670000 ;
-      RECT 1.845000 1.670000 2.685000 1.735000 ;
-      RECT 1.845000 1.735000 2.605000 1.825000 ;
-      RECT 2.015000 2.135000 2.185000 2.295000 ;
-      RECT 2.355000 1.500000 3.595000 1.655000 ;
-      RECT 2.355000 1.825000 2.605000 2.255000 ;
-      RECT 2.355000 2.255000 2.685000 2.465000 ;
-      RECT 3.220000 1.670000 3.595000 1.735000 ;
-      RECT 3.255000 2.255000 3.595000 2.465000 ;
-      RECT 3.335000 1.735000 3.595000 2.255000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.515000  1.875000 0.845000 2.075000 ;
+      RECT 0.595000  2.075000 0.765000 2.295000 ;
+      RECT 0.595000  2.295000 2.185000 2.465000 ;
+      RECT 0.875000  0.085000 1.605000 0.465000 ;
+      RECT 1.515000  1.825000 2.015000 1.965000 ;
+      RECT 1.515000  1.965000 1.970000 1.970000 ;
+      RECT 1.515000  1.970000 1.935000 1.980000 ;
+      RECT 1.515000  1.980000 1.915000 1.995000 ;
+      RECT 1.845000  1.655000 3.595000 1.670000 ;
+      RECT 1.845000  1.670000 2.685000 1.735000 ;
+      RECT 1.845000  1.735000 2.605000 1.825000 ;
+      RECT 2.015000  2.135000 2.185000 2.295000 ;
+      RECT 2.355000  1.500000 3.595000 1.655000 ;
+      RECT 2.355000  1.825000 2.605000 2.255000 ;
+      RECT 2.355000  2.255000 2.685000 2.465000 ;
+      RECT 2.775000  1.905000 3.105000 2.075000 ;
+      RECT 2.855000  2.075000 3.025000 2.635000 ;
+      RECT 3.220000  1.670000 3.595000 1.735000 ;
+      RECT 3.255000  0.085000 3.585000 0.815000 ;
+      RECT 3.255000  2.255000 3.595000 2.465000 ;
+      RECT 3.335000  1.735000 3.595000 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 ;
   END
 END sky130_fd_sc_hd__a222oi_1
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
index d01a494..0b0e6a5 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_1.magic.lef
@@ -84,18 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.090000  0.085000 0.545000 0.850000 ;
-        RECT 2.375000  0.085000 2.705000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -105,41 +93,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.430000 2.255000 1.785000 2.635000 ;
-        RECT 2.455000 1.855000 2.705000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 1.265000 1.515000 ;
-      RECT 0.090000 1.515000 2.795000 1.625000 ;
-      RECT 0.090000 1.625000 0.345000 2.245000 ;
-      RECT 0.090000 2.245000 0.425000 2.465000 ;
-      RECT 0.595000 1.795000 0.780000 1.885000 ;
-      RECT 0.595000 1.885000 2.205000 2.085000 ;
-      RECT 0.595000 2.085000 0.825000 2.125000 ;
-      RECT 0.820000 0.255000 2.120000 0.465000 ;
-      RECT 0.935000 1.625000 2.735000 1.685000 ;
-      RECT 0.935000 1.685000 1.265000 1.715000 ;
-      RECT 1.370000 1.875000 2.205000 1.885000 ;
-      RECT 1.950000 0.465000 2.120000 0.615000 ;
-      RECT 1.950000 0.615000 2.705000 0.740000 ;
-      RECT 1.950000 0.740000 2.795000 0.785000 ;
-      RECT 1.955000 2.085000 2.205000 2.465000 ;
-      RECT 2.525000 0.785000 2.795000 0.905000 ;
-      RECT 2.595000 1.480000 2.795000 1.515000 ;
-      RECT 2.625000 0.905000 2.795000 1.480000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  0.085000 0.545000 0.850000 ;
+      RECT 0.090000  1.455000 1.265000 1.515000 ;
+      RECT 0.090000  1.515000 2.795000 1.625000 ;
+      RECT 0.090000  1.625000 0.345000 2.245000 ;
+      RECT 0.090000  2.245000 0.425000 2.465000 ;
+      RECT 0.595000  1.795000 0.780000 1.885000 ;
+      RECT 0.595000  1.885000 2.205000 2.085000 ;
+      RECT 0.595000  2.085000 0.825000 2.125000 ;
+      RECT 0.820000  0.255000 2.120000 0.465000 ;
+      RECT 0.935000  1.625000 2.735000 1.685000 ;
+      RECT 0.935000  1.685000 1.265000 1.715000 ;
+      RECT 1.370000  1.875000 2.205000 1.885000 ;
+      RECT 1.430000  2.255000 1.785000 2.635000 ;
+      RECT 1.950000  0.465000 2.120000 0.615000 ;
+      RECT 1.950000  0.615000 2.705000 0.740000 ;
+      RECT 1.950000  0.740000 2.795000 0.785000 ;
+      RECT 1.955000  2.085000 2.205000 2.465000 ;
+      RECT 2.375000  0.085000 2.705000 0.445000 ;
+      RECT 2.455000  1.855000 2.705000 2.635000 ;
+      RECT 2.525000  0.785000 2.795000 0.905000 ;
+      RECT 2.595000  1.480000 2.795000 1.515000 ;
+      RECT 2.625000  0.905000 2.795000 1.480000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  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
 END sky130_fd_sc_hd__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
index 40a3147..215823d 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_2.magic.lef
@@ -84,20 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.095000  0.085000 0.545000 0.850000 ;
-        RECT 2.355000  0.085000 2.685000 0.565000 ;
-        RECT 3.330000  0.085000 3.500000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -107,36 +93,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 1.455000 2.215000 1.810000 2.635000 ;
-        RECT 2.400000 1.875000 2.730000 2.635000 ;
-        RECT 3.330000 1.445000 3.500000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.455000 2.815000 1.625000 ;
-      RECT 0.095000 1.625000 0.425000 2.295000 ;
-      RECT 0.095000 2.295000 1.265000 2.465000 ;
-      RECT 0.595000 1.795000 2.230000 2.035000 ;
-      RECT 0.595000 2.035000 0.825000 2.125000 ;
-      RECT 0.820000 0.255000 2.145000 0.505000 ;
-      RECT 0.935000 2.255000 1.265000 2.295000 ;
-      RECT 1.975000 0.505000 2.145000 0.735000 ;
-      RECT 1.975000 0.735000 2.815000 0.905000 ;
-      RECT 1.980000 2.035000 2.230000 2.465000 ;
-      RECT 2.645000 0.905000 2.815000 1.455000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.095000  0.085000 0.545000 0.850000 ;
+      RECT 0.095000  1.455000 2.815000 1.625000 ;
+      RECT 0.095000  1.625000 0.425000 2.295000 ;
+      RECT 0.095000  2.295000 1.265000 2.465000 ;
+      RECT 0.595000  1.795000 2.230000 2.035000 ;
+      RECT 0.595000  2.035000 0.825000 2.125000 ;
+      RECT 0.820000  0.255000 2.145000 0.505000 ;
+      RECT 0.935000  2.255000 1.265000 2.295000 ;
+      RECT 1.455000  2.215000 1.810000 2.635000 ;
+      RECT 1.975000  0.505000 2.145000 0.735000 ;
+      RECT 1.975000  0.735000 2.815000 0.905000 ;
+      RECT 1.980000  2.035000 2.230000 2.465000 ;
+      RECT 2.355000  0.085000 2.685000 0.565000 ;
+      RECT 2.400000  1.875000 2.730000 2.635000 ;
+      RECT 2.645000  0.905000 2.815000 1.455000 ;
+      RECT 3.330000  0.085000 3.500000 0.985000 ;
+      RECT 3.330000  1.445000 3.500000 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
 END sky130_fd_sc_hd__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
index c14d4a7..40fea62 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_4.magic.lef
@@ -91,28 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.260000  0.085000 0.430000 0.555000 ;
-        RECT 1.100000  0.085000 1.270000 0.555000 ;
-        RECT 1.940000  0.085000 2.630000 0.555000 ;
-        RECT 4.185000  0.085000 4.355000 0.555000 ;
-        RECT 5.900000  0.085000 6.070000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -122,53 +100,72 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.220000 1.825000 0.470000 2.635000 ;
-        RECT 1.060000 1.795000 1.310000 2.635000 ;
-        RECT 1.900000 2.125000 2.150000 2.635000 ;
-        RECT 4.600000 2.125000 4.850000 2.635000 ;
-        RECT 5.440000 2.125000 5.690000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        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.540000 1.075000 2.230000 1.275000 ;
-      RECT 1.900000 1.275000 2.230000 1.785000 ;
-      RECT 1.900000 1.785000 3.930000 1.955000 ;
-      RECT 1.940000 0.735000 5.310000 0.905000 ;
-      RECT 1.940000 0.905000 2.230000 1.075000 ;
-      RECT 2.420000 2.125000 2.670000 2.295000 ;
-      RECT 2.420000 2.295000 4.430000 2.465000 ;
-      RECT 2.800000 0.255000 3.970000 0.475000 ;
-      RECT 2.840000 1.955000 3.090000 2.125000 ;
-      RECT 3.170000 0.645000 3.605000 0.735000 ;
-      RECT 3.260000 2.125000 3.510000 2.295000 ;
-      RECT 3.680000 1.955000 3.930000 2.125000 ;
-      RECT 4.100000 1.785000 6.110000 1.955000 ;
-      RECT 4.100000 1.955000 4.430000 2.295000 ;
-      RECT 4.560000 0.255000 5.730000 0.475000 ;
-      RECT 4.935000 0.645000 5.310000 0.735000 ;
-      RECT 5.020000 1.955000 5.270000 2.465000 ;
-      RECT 5.480000 0.475000 5.730000 0.895000 ;
-      RECT 5.905000 1.455000 6.110000 1.785000 ;
-      RECT 5.905000 1.955000 6.110000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 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.230000 1.275000 ;
+      RECT 1.060000  1.795000 1.310000 2.635000 ;
+      RECT 1.100000  0.085000 1.270000 0.555000 ;
+      RECT 1.900000  1.275000 2.230000 1.785000 ;
+      RECT 1.900000  1.785000 3.930000 1.955000 ;
+      RECT 1.900000  2.125000 2.150000 2.635000 ;
+      RECT 1.940000  0.085000 2.630000 0.555000 ;
+      RECT 1.940000  0.735000 5.310000 0.905000 ;
+      RECT 1.940000  0.905000 2.230000 1.075000 ;
+      RECT 2.420000  2.125000 2.670000 2.295000 ;
+      RECT 2.420000  2.295000 4.430000 2.465000 ;
+      RECT 2.800000  0.255000 3.970000 0.475000 ;
+      RECT 2.840000  1.955000 3.090000 2.125000 ;
+      RECT 3.170000  0.645000 3.605000 0.735000 ;
+      RECT 3.260000  2.125000 3.510000 2.295000 ;
+      RECT 3.680000  1.955000 3.930000 2.125000 ;
+      RECT 4.100000  1.785000 6.110000 1.955000 ;
+      RECT 4.100000  1.955000 4.430000 2.295000 ;
+      RECT 4.185000  0.085000 4.355000 0.555000 ;
+      RECT 4.560000  0.255000 5.730000 0.475000 ;
+      RECT 4.600000  2.125000 4.850000 2.635000 ;
+      RECT 4.935000  0.645000 5.310000 0.735000 ;
+      RECT 5.020000  1.955000 5.270000 2.465000 ;
+      RECT 5.440000  2.125000 5.690000 2.635000 ;
+      RECT 5.480000  0.475000 5.730000 0.895000 ;
+      RECT 5.900000  0.085000 6.070000 0.895000 ;
+      RECT 5.905000  1.455000 6.110000 1.785000 ;
+      RECT 5.905000  1.955000 6.110000 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
 END sky130_fd_sc_hd__a22o_4
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
index fedaba9..487f88a 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.magic.lef
@@ -91,17 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.095000  0.085000 0.545000 0.595000 ;
-        RECT 2.305000  0.085000 2.635000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -111,27 +100,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 1.435000 2.255000 1.810000 2.635000 ;
-        RECT 2.360000 1.855000 2.625000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 1.795000 1.475000 1.835000 ;
-      RECT 0.595000 1.835000 2.125000 2.035000 ;
-      RECT 0.595000 2.035000 1.210000 2.085000 ;
-      RECT 0.595000 2.085000 0.825000 2.125000 ;
-      RECT 1.955000 2.035000 2.125000 2.165000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  0.085000 0.545000 0.595000 ;
+      RECT 0.595000  1.795000 1.475000 1.835000 ;
+      RECT 0.595000  1.835000 2.125000 2.035000 ;
+      RECT 0.595000  2.035000 1.210000 2.085000 ;
+      RECT 0.595000  2.085000 0.825000 2.125000 ;
+      RECT 1.435000  2.255000 1.810000 2.635000 ;
+      RECT 1.955000  2.035000 2.125000 2.165000 ;
+      RECT 2.305000  0.085000 2.635000 0.485000 ;
+      RECT 2.360000  1.855000 2.625000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  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
 END sky130_fd_sc_hd__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
index d7676e0..45e3871 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.magic.lef
@@ -85,21 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.510000 ;
-        RECT 3.555000  0.085000 3.885000 0.510000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -109,41 +94,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 2.795000 1.825000 2.965000 2.635000 ;
-        RECT 3.635000 1.825000 3.805000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.345000 0.680000 ;
-      RECT 0.095000 0.680000 1.185000 0.850000 ;
-      RECT 0.515000 1.825000 0.765000 2.295000 ;
-      RECT 0.515000 2.295000 2.625000 2.465000 ;
-      RECT 1.015000 0.255000 2.105000 0.505000 ;
-      RECT 1.015000 0.505000 1.185000 0.680000 ;
-      RECT 1.435000 1.825000 1.605000 2.295000 ;
-      RECT 2.295000 0.255000 3.385000 0.505000 ;
-      RECT 2.375000 1.485000 4.305000 1.655000 ;
-      RECT 2.375000 1.655000 2.625000 2.295000 ;
-      RECT 3.135000 1.655000 3.465000 2.465000 ;
-      RECT 3.215000 0.505000 3.385000 0.680000 ;
-      RECT 3.215000 0.680000 4.375000 0.850000 ;
-      RECT 3.975000 1.655000 4.305000 2.465000 ;
-      RECT 4.055000 0.255000 4.375000 0.680000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.095000  0.255000 0.345000 0.680000 ;
+      RECT 0.095000  0.680000 1.185000 0.850000 ;
+      RECT 0.515000  0.085000 0.845000 0.510000 ;
+      RECT 0.515000  1.825000 0.765000 2.295000 ;
+      RECT 0.515000  2.295000 2.625000 2.465000 ;
+      RECT 1.015000  0.255000 2.105000 0.505000 ;
+      RECT 1.015000  0.505000 1.185000 0.680000 ;
+      RECT 1.435000  1.825000 1.605000 2.295000 ;
+      RECT 2.295000  0.255000 3.385000 0.505000 ;
+      RECT 2.375000  1.485000 4.305000 1.655000 ;
+      RECT 2.375000  1.655000 2.625000 2.295000 ;
+      RECT 2.795000  1.825000 2.965000 2.635000 ;
+      RECT 3.135000  1.655000 3.465000 2.465000 ;
+      RECT 3.215000  0.505000 3.385000 0.680000 ;
+      RECT 3.215000  0.680000 4.375000 0.850000 ;
+      RECT 3.555000  0.085000 3.885000 0.510000 ;
+      RECT 3.635000  1.825000 3.805000 2.635000 ;
+      RECT 3.975000  1.655000 4.305000 2.465000 ;
+      RECT 4.055000  0.255000 4.375000 0.680000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
index a3733ed..3c14944 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.magic.lef
@@ -86,30 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.555000 ;
-        RECT 1.435000  0.085000 1.605000 0.555000 ;
-        RECT 6.155000  0.085000 6.325000 0.555000 ;
-        RECT 6.995000  0.085000 7.165000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        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
@@ -119,56 +95,77 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 4.435000 1.795000 4.685000 2.635000 ;
-        RECT 5.275000 1.795000 5.525000 2.635000 ;
-        RECT 6.115000 1.795000 6.365000 2.635000 ;
-        RECT 6.955000 1.795000 7.205000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 0.425000 2.295000 ;
-      RECT 0.090000 2.295000 4.265000 2.465000 ;
-      RECT 0.095000 0.255000 0.425000 0.725000 ;
-      RECT 0.095000 0.725000 2.025000 0.905000 ;
-      RECT 0.935000 0.255000 1.265000 0.725000 ;
-      RECT 0.975000 1.795000 1.225000 2.295000 ;
-      RECT 1.775000 0.255000 3.785000 0.475000 ;
-      RECT 1.775000 0.475000 2.025000 0.725000 ;
-      RECT 1.815000 1.795000 2.065000 2.295000 ;
-      RECT 2.655000 1.795000 2.905000 2.295000 ;
-      RECT 3.495000 1.455000 7.625000 1.625000 ;
-      RECT 3.495000 1.625000 4.265000 2.295000 ;
-      RECT 3.975000 0.255000 5.985000 0.475000 ;
-      RECT 4.855000 1.625000 5.105000 2.465000 ;
-      RECT 5.695000 1.625000 5.945000 2.465000 ;
-      RECT 5.735000 0.475000 5.985000 0.725000 ;
-      RECT 5.735000 0.725000 7.665000 0.905000 ;
-      RECT 6.495000 0.255000 6.825000 0.725000 ;
-      RECT 6.535000 1.625000 6.785000 2.465000 ;
-      RECT 7.335000 0.255000 7.665000 0.725000 ;
-      RECT 7.375000 1.625000 7.625000 2.465000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.090000  1.455000 0.425000 2.295000 ;
+      RECT 0.090000  2.295000 4.265000 2.465000 ;
+      RECT 0.095000  0.255000 0.425000 0.725000 ;
+      RECT 0.095000  0.725000 2.025000 0.905000 ;
+      RECT 0.595000  0.085000 0.765000 0.555000 ;
+      RECT 0.935000  0.255000 1.265000 0.725000 ;
+      RECT 0.975000  1.795000 1.225000 2.295000 ;
+      RECT 1.435000  0.085000 1.605000 0.555000 ;
+      RECT 1.775000  0.255000 3.785000 0.475000 ;
+      RECT 1.775000  0.475000 2.025000 0.725000 ;
+      RECT 1.815000  1.795000 2.065000 2.295000 ;
+      RECT 2.655000  1.795000 2.905000 2.295000 ;
+      RECT 3.495000  1.455000 7.625000 1.625000 ;
+      RECT 3.495000  1.625000 4.265000 2.295000 ;
+      RECT 3.975000  0.255000 5.985000 0.475000 ;
+      RECT 4.435000  1.795000 4.685000 2.635000 ;
+      RECT 4.855000  1.625000 5.105000 2.465000 ;
+      RECT 5.275000  1.795000 5.525000 2.635000 ;
+      RECT 5.695000  1.625000 5.945000 2.465000 ;
+      RECT 5.735000  0.475000 5.985000 0.725000 ;
+      RECT 5.735000  0.725000 7.665000 0.905000 ;
+      RECT 6.115000  1.795000 6.365000 2.635000 ;
+      RECT 6.155000  0.085000 6.325000 0.555000 ;
+      RECT 6.495000  0.255000 6.825000 0.725000 ;
+      RECT 6.535000  1.625000 6.785000 2.465000 ;
+      RECT 6.955000  1.795000 7.205000 2.635000 ;
+      RECT 6.995000  0.085000 7.165000 0.555000 ;
+      RECT 7.335000  0.255000 7.665000 0.725000 ;
+      RECT 7.375000  1.625000 7.625000 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 ;
   END
 END sky130_fd_sc_hd__a22oi_4
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
index 2062c30..2d49514 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.magic.lef
@@ -83,20 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.945000 0.530000 ;
-        RECT 1.520000  0.085000 2.240000 0.485000 ;
-        RECT 3.155000  0.085000 3.555000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -106,44 +92,55 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.235000 0.845000 2.635000 ;
-        RECT 2.915000 2.175000 3.165000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.995000 0.685000 1.325000 ;
-      RECT 0.515000 1.325000 0.685000 1.805000 ;
-      RECT 0.515000 1.805000 1.275000 1.975000 ;
-      RECT 1.105000 1.975000 1.275000 2.200000 ;
-      RECT 1.105000 2.200000 2.245000 2.370000 ;
-      RECT 1.180000 0.255000 1.350000 0.655000 ;
-      RECT 1.180000 0.655000 2.060000 0.825000 ;
-      RECT 1.540000 1.545000 2.060000 1.715000 ;
-      RECT 1.540000 1.715000 1.710000 1.905000 ;
-      RECT 1.890000 0.825000 2.060000 1.545000 ;
-      RECT 1.990000 1.895000 2.400000 2.065000 ;
-      RECT 1.990000 2.065000 2.245000 2.200000 ;
-      RECT 1.990000 2.370000 2.245000 2.465000 ;
-      RECT 2.230000 0.700000 2.580000 0.870000 ;
-      RECT 2.230000 0.870000 2.400000 1.895000 ;
-      RECT 2.410000 0.255000 2.580000 0.700000 ;
-      RECT 2.415000 2.255000 2.745000 2.425000 ;
-      RECT 2.575000 1.835000 3.515000 2.005000 ;
-      RECT 2.575000 2.005000 2.745000 2.255000 ;
-      RECT 3.335000 2.005000 3.515000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.430000  0.995000 0.685000 1.325000 ;
+      RECT 0.515000  0.085000 0.945000 0.530000 ;
+      RECT 0.515000  1.325000 0.685000 1.805000 ;
+      RECT 0.515000  1.805000 1.275000 1.975000 ;
+      RECT 0.515000  2.235000 0.845000 2.635000 ;
+      RECT 1.105000  1.975000 1.275000 2.200000 ;
+      RECT 1.105000  2.200000 2.245000 2.370000 ;
+      RECT 1.180000  0.255000 1.350000 0.655000 ;
+      RECT 1.180000  0.655000 2.060000 0.825000 ;
+      RECT 1.520000  0.085000 2.240000 0.485000 ;
+      RECT 1.540000  1.545000 2.060000 1.715000 ;
+      RECT 1.540000  1.715000 1.710000 1.905000 ;
+      RECT 1.890000  0.825000 2.060000 1.545000 ;
+      RECT 1.990000  1.895000 2.400000 2.065000 ;
+      RECT 1.990000  2.065000 2.245000 2.200000 ;
+      RECT 1.990000  2.370000 2.245000 2.465000 ;
+      RECT 2.230000  0.700000 2.580000 0.870000 ;
+      RECT 2.230000  0.870000 2.400000 1.895000 ;
+      RECT 2.410000  0.255000 2.580000 0.700000 ;
+      RECT 2.415000  2.255000 2.745000 2.425000 ;
+      RECT 2.575000  1.835000 3.515000 2.005000 ;
+      RECT 2.575000  2.005000 2.745000 2.255000 ;
+      RECT 2.915000  2.175000 3.165000 2.635000 ;
+      RECT 3.155000  0.085000 3.555000 0.595000 ;
+      RECT 3.335000  2.005000 3.515000 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
 END sky130_fd_sc_hd__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
index 49ad884..4c2870f 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.magic.lef
@@ -83,22 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.185000  0.085000 0.355000 0.930000 ;
-        RECT 0.950000  0.085000 1.380000 0.530000 ;
-        RECT 1.955000  0.085000 2.690000 0.485000 ;
-        RECT 3.605000  0.085000 4.005000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -108,46 +92,59 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.185000 1.445000 0.355000 2.635000 ;
-        RECT 0.950000 2.235000 1.280000 2.635000 ;
-        RECT 3.375000 2.175000 3.625000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.865000 0.995000 1.120000 1.325000 ;
-      RECT 0.950000 1.325000 1.120000 1.805000 ;
-      RECT 0.950000 1.805000 1.710000 1.975000 ;
-      RECT 1.540000 1.975000 1.710000 2.200000 ;
-      RECT 1.540000 2.200000 2.670000 2.370000 ;
-      RECT 1.615000 0.255000 1.785000 0.655000 ;
-      RECT 1.615000 0.655000 2.510000 0.825000 ;
-      RECT 1.975000 1.545000 2.510000 1.715000 ;
-      RECT 1.975000 1.715000 2.145000 1.905000 ;
-      RECT 2.340000 0.825000 2.510000 1.545000 ;
-      RECT 2.440000 1.895000 2.850000 2.065000 ;
-      RECT 2.440000 2.065000 2.670000 2.200000 ;
-      RECT 2.500000 2.370000 2.670000 2.465000 ;
-      RECT 2.680000 0.700000 3.030000 0.870000 ;
-      RECT 2.680000 0.870000 2.850000 1.895000 ;
-      RECT 2.860000 0.255000 3.030000 0.700000 ;
-      RECT 2.875000 2.255000 3.205000 2.425000 ;
-      RECT 3.035000 1.835000 3.965000 2.005000 ;
-      RECT 3.035000 2.005000 3.205000 2.255000 ;
-      RECT 3.795000 2.005000 3.965000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.185000  0.085000 0.355000 0.930000 ;
+      RECT 0.185000  1.445000 0.355000 2.635000 ;
+      RECT 0.865000  0.995000 1.120000 1.325000 ;
+      RECT 0.950000  0.085000 1.380000 0.530000 ;
+      RECT 0.950000  1.325000 1.120000 1.805000 ;
+      RECT 0.950000  1.805000 1.710000 1.975000 ;
+      RECT 0.950000  2.235000 1.280000 2.635000 ;
+      RECT 1.540000  1.975000 1.710000 2.200000 ;
+      RECT 1.540000  2.200000 2.670000 2.370000 ;
+      RECT 1.615000  0.255000 1.785000 0.655000 ;
+      RECT 1.615000  0.655000 2.510000 0.825000 ;
+      RECT 1.955000  0.085000 2.690000 0.485000 ;
+      RECT 1.975000  1.545000 2.510000 1.715000 ;
+      RECT 1.975000  1.715000 2.145000 1.905000 ;
+      RECT 2.340000  0.825000 2.510000 1.545000 ;
+      RECT 2.440000  1.895000 2.850000 2.065000 ;
+      RECT 2.440000  2.065000 2.670000 2.200000 ;
+      RECT 2.500000  2.370000 2.670000 2.465000 ;
+      RECT 2.680000  0.700000 3.030000 0.870000 ;
+      RECT 2.680000  0.870000 2.850000 1.895000 ;
+      RECT 2.860000  0.255000 3.030000 0.700000 ;
+      RECT 2.875000  2.255000 3.205000 2.425000 ;
+      RECT 3.035000  1.835000 3.965000 2.005000 ;
+      RECT 3.035000  2.005000 3.205000 2.255000 ;
+      RECT 3.375000  2.175000 3.625000 2.635000 ;
+      RECT 3.605000  0.085000 4.005000 0.595000 ;
+      RECT 3.795000  2.005000 3.965000 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
 END sky130_fd_sc_hd__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
index f73dd25..3d5303b 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.magic.lef
@@ -94,32 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.895000 ;
-        RECT 1.855000  0.085000 2.025000 0.555000 ;
-        RECT 2.695000  0.085000 3.385000 0.555000 ;
-        RECT 4.055000  0.085000 4.225000 0.555000 ;
-        RECT 4.895000  0.085000 5.065000 0.895000 ;
-        RECT 5.735000  0.085000 5.905000 0.555000 ;
-        RECT 6.575000  0.085000 6.745000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -129,70 +103,92 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.555000 2.125000 0.805000 2.635000 ;
-        RECT 1.395000 2.125000 1.645000 2.635000 ;
-        RECT 3.175000 2.135000 3.425000 2.635000 ;
-        RECT 4.855000 1.795000 5.105000 2.635000 ;
-        RECT 5.695000 2.165000 5.945000 2.635000 ;
-        RECT 6.535000 1.825000 6.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 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 1.785000 2.065000 1.955000 ;
-      RECT 0.135000 1.955000 0.385000 2.465000 ;
-      RECT 0.515000 0.255000 1.685000 0.475000 ;
-      RECT 0.515000 0.475000 0.765000 0.905000 ;
-      RECT 0.935000 0.645000 1.270000 0.735000 ;
-      RECT 0.935000 0.735000 2.525000 0.905000 ;
-      RECT 0.975000 1.955000 1.225000 2.465000 ;
-      RECT 1.815000 1.955000 2.065000 2.295000 ;
-      RECT 1.815000 2.295000 2.905000 2.465000 ;
-      RECT 1.855000 1.455000 2.065000 1.785000 ;
-      RECT 2.195000 0.255000 2.525000 0.735000 ;
-      RECT 2.235000 0.905000 2.445000 1.415000 ;
-      RECT 2.235000 1.415000 2.620000 1.965000 ;
-      RECT 2.235000 1.965000 2.485000 2.125000 ;
-      RECT 2.615000 1.075000 3.145000 1.245000 ;
-      RECT 2.655000 2.135000 2.905000 2.295000 ;
-      RECT 2.955000 0.725000 4.725000 0.905000 ;
-      RECT 2.955000 0.905000 3.145000 1.075000 ;
-      RECT 2.955000 1.245000 3.145000 1.495000 ;
-      RECT 2.955000 1.495000 3.305000 1.665000 ;
-      RECT 3.135000 1.665000 3.305000 1.785000 ;
-      RECT 3.135000 1.785000 4.265000 1.965000 ;
-      RECT 3.555000 0.255000 3.885000 0.725000 ;
-      RECT 3.595000 2.135000 3.845000 2.295000 ;
-      RECT 3.595000 2.295000 4.685000 2.465000 ;
-      RECT 4.015000 1.965000 4.265000 2.125000 ;
-      RECT 4.395000 0.255000 4.725000 0.725000 ;
-      RECT 4.435000 1.785000 4.685000 2.295000 ;
-      RECT 5.135000 1.075000 6.440000 1.245000 ;
-      RECT 5.135000 1.245000 5.460000 1.615000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.135000  1.785000 2.065000 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.685000 0.475000 ;
+      RECT 0.515000  0.475000 0.765000 0.905000 ;
+      RECT 0.555000  2.125000 0.805000 2.635000 ;
+      RECT 0.935000  0.645000 1.270000 0.735000 ;
+      RECT 0.935000  0.735000 2.525000 0.905000 ;
+      RECT 0.975000  1.955000 1.225000 2.465000 ;
+      RECT 1.395000  2.125000 1.645000 2.635000 ;
+      RECT 1.815000  1.955000 2.065000 2.295000 ;
+      RECT 1.815000  2.295000 2.905000 2.465000 ;
+      RECT 1.855000  0.085000 2.025000 0.555000 ;
+      RECT 1.855000  1.455000 2.065000 1.785000 ;
+      RECT 2.195000  0.255000 2.525000 0.735000 ;
+      RECT 2.235000  0.905000 2.445000 1.415000 ;
+      RECT 2.235000  1.415000 2.620000 1.965000 ;
+      RECT 2.235000  1.965000 2.485000 2.125000 ;
+      RECT 2.615000  1.075000 3.145000 1.245000 ;
+      RECT 2.655000  2.135000 2.905000 2.295000 ;
+      RECT 2.695000  0.085000 3.385000 0.555000 ;
+      RECT 2.955000  0.725000 4.725000 0.905000 ;
+      RECT 2.955000  0.905000 3.145000 1.075000 ;
+      RECT 2.955000  1.245000 3.145000 1.495000 ;
+      RECT 2.955000  1.495000 3.305000 1.665000 ;
+      RECT 3.135000  1.665000 3.305000 1.785000 ;
+      RECT 3.135000  1.785000 4.265000 1.965000 ;
+      RECT 3.175000  2.135000 3.425000 2.635000 ;
+      RECT 3.555000  0.255000 3.885000 0.725000 ;
+      RECT 3.595000  2.135000 3.845000 2.295000 ;
+      RECT 3.595000  2.295000 4.685000 2.465000 ;
+      RECT 4.015000  1.965000 4.265000 2.125000 ;
+      RECT 4.055000  0.085000 4.225000 0.555000 ;
+      RECT 4.395000  0.255000 4.725000 0.725000 ;
+      RECT 4.435000  1.785000 4.685000 2.295000 ;
+      RECT 4.855000  1.795000 5.105000 2.635000 ;
+      RECT 4.895000  0.085000 5.065000 0.895000 ;
+      RECT 5.135000  1.075000 6.440000 1.245000 ;
+      RECT 5.135000  1.245000 5.460000 1.615000 ;
+      RECT 5.695000  2.165000 5.945000 2.635000 ;
+      RECT 5.735000  0.085000 5.905000 0.555000 ;
+      RECT 6.535000  1.825000 6.785000 2.635000 ;
+      RECT 6.575000  0.085000 6.745000 0.555000 ;
     LAYER mcon ;
-      RECT 2.450000 1.445000 2.620000 1.615000 ;
-      RECT 5.230000 1.445000 5.400000 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.450000  1.445000 2.620000 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.230000  1.445000 5.400000 1.615000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
     LAYER met1 ;
       RECT 2.390000 1.415000 2.680000 1.460000 ;
       RECT 2.390000 1.460000 5.460000 1.600000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
index 5f2f25a..a079fe8 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.magic.lef
@@ -84,19 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.825000 ;
-        RECT 0.935000  0.085000 1.605000 0.490000 ;
-        RECT 2.795000  0.085000 3.125000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -106,32 +93,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.095000 1.805000 0.425000 2.635000 ;
-        RECT 2.455000 2.135000 2.705000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 0.255000 0.765000 0.660000 ;
-      RECT 0.595000 0.660000 1.580000 0.830000 ;
-      RECT 0.875000 1.445000 1.580000 1.615000 ;
-      RECT 0.875000 1.615000 1.205000 2.465000 ;
-      RECT 1.410000 0.830000 1.580000 1.445000 ;
-      RECT 1.955000 2.235000 2.285000 2.465000 ;
-      RECT 2.115000 1.785000 3.130000 1.955000 ;
-      RECT 2.115000 1.955000 2.285000 2.235000 ;
-      RECT 2.875000 1.955000 3.130000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.825000 ;
+      RECT 0.095000  1.805000 0.425000 2.635000 ;
+      RECT 0.595000  0.255000 0.765000 0.660000 ;
+      RECT 0.595000  0.660000 1.580000 0.830000 ;
+      RECT 0.875000  1.445000 1.580000 1.615000 ;
+      RECT 0.875000  1.615000 1.205000 2.465000 ;
+      RECT 0.935000  0.085000 1.605000 0.490000 ;
+      RECT 1.410000  0.830000 1.580000 1.445000 ;
+      RECT 1.955000  2.235000 2.285000 2.465000 ;
+      RECT 2.115000  1.785000 3.130000 1.955000 ;
+      RECT 2.115000  1.955000 2.285000 2.235000 ;
+      RECT 2.455000  2.135000 2.705000 2.635000 ;
+      RECT 2.795000  0.085000 3.125000 0.825000 ;
+      RECT 2.875000  1.955000 3.130000 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 ;
   END
 END sky130_fd_sc_hd__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
index 8d7ae8f..d06bd7a 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.magic.lef
@@ -86,26 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.310000  0.085000 0.480000 0.895000 ;
-        RECT 1.990000  0.085000 2.160000 0.555000 ;
-        RECT 2.830000  0.085000 3.520000 0.555000 ;
-        RECT 4.190000  0.085000 4.360000 0.555000 ;
-        RECT 5.030000  0.085000 5.200000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -115,50 +95,67 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.690000 2.135000 0.940000 2.635000 ;
-        RECT 1.530000 2.135000 1.780000 2.635000 ;
-        RECT 3.730000 2.135000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.270000 1.785000 2.200000 1.955000 ;
-      RECT 0.270000 1.955000 0.520000 2.465000 ;
-      RECT 0.650000 0.255000 1.820000 0.475000 ;
-      RECT 0.650000 0.475000 0.900000 0.895000 ;
-      RECT 1.110000 1.955000 1.360000 2.465000 ;
-      RECT 1.950000 1.955000 2.200000 2.295000 ;
-      RECT 1.950000 2.295000 3.040000 2.465000 ;
-      RECT 2.790000 1.795000 3.040000 2.295000 ;
-      RECT 2.830000 0.995000 3.120000 1.325000 ;
-      RECT 2.950000 0.725000 4.860000 0.905000 ;
-      RECT 2.950000 0.905000 3.120000 0.995000 ;
-      RECT 2.950000 1.325000 3.120000 1.445000 ;
-      RECT 2.950000 1.445000 4.820000 1.615000 ;
-      RECT 3.310000 1.785000 4.400000 1.965000 ;
-      RECT 3.310000 1.965000 3.560000 2.465000 ;
-      RECT 3.690000 0.255000 4.020000 0.725000 ;
-      RECT 4.150000 1.965000 4.400000 2.295000 ;
-      RECT 4.150000 2.295000 5.240000 2.465000 ;
-      RECT 4.530000 0.255000 4.860000 0.725000 ;
-      RECT 4.570000 1.615000 4.820000 2.125000 ;
-      RECT 4.990000 1.455000 5.240000 2.295000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.270000  1.785000 2.200000 1.955000 ;
+      RECT 0.270000  1.955000 0.520000 2.465000 ;
+      RECT 0.310000  0.085000 0.480000 0.895000 ;
+      RECT 0.650000  0.255000 1.820000 0.475000 ;
+      RECT 0.650000  0.475000 0.900000 0.895000 ;
+      RECT 0.690000  2.135000 0.940000 2.635000 ;
+      RECT 1.110000  1.955000 1.360000 2.465000 ;
+      RECT 1.530000  2.135000 1.780000 2.635000 ;
+      RECT 1.950000  1.955000 2.200000 2.295000 ;
+      RECT 1.950000  2.295000 3.040000 2.465000 ;
+      RECT 1.990000  0.085000 2.160000 0.555000 ;
+      RECT 2.790000  1.795000 3.040000 2.295000 ;
+      RECT 2.830000  0.085000 3.520000 0.555000 ;
+      RECT 2.830000  0.995000 3.120000 1.325000 ;
+      RECT 2.950000  0.725000 4.860000 0.905000 ;
+      RECT 2.950000  0.905000 3.120000 0.995000 ;
+      RECT 2.950000  1.325000 3.120000 1.445000 ;
+      RECT 2.950000  1.445000 4.820000 1.615000 ;
+      RECT 3.310000  1.785000 4.400000 1.965000 ;
+      RECT 3.310000  1.965000 3.560000 2.465000 ;
+      RECT 3.690000  0.255000 4.020000 0.725000 ;
+      RECT 3.730000  2.135000 3.980000 2.635000 ;
+      RECT 4.150000  1.965000 4.400000 2.295000 ;
+      RECT 4.150000  2.295000 5.240000 2.465000 ;
+      RECT 4.190000  0.085000 4.360000 0.555000 ;
+      RECT 4.530000  0.255000 4.860000 0.725000 ;
+      RECT 4.570000  1.615000 4.820000 2.125000 ;
+      RECT 4.990000  1.455000 5.240000 2.295000 ;
+      RECT 5.030000  0.085000 5.200000 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 ;
   END
 END sky130_fd_sc_hd__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
index 241995a..825916a 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.magic.lef
@@ -90,39 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.895000 ;
-        RECT 1.015000  0.085000 1.185000 0.555000 ;
-        RECT 3.535000  0.085000 3.705000 0.555000 ;
-        RECT 4.375000  0.085000 4.545000 0.555000 ;
-        RECT 5.215000  0.085000 5.905000 0.555000 ;
-        RECT 6.575000  0.085000 6.745000 0.555000 ;
-        RECT 7.415000  0.085000 7.585000 0.555000 ;
-        RECT 8.255000  0.085000 8.425000 0.555000 ;
-        RECT 9.095000  0.085000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -132,75 +99,105 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.595000 1.795000 0.805000 2.635000 ;
-        RECT 1.395000 2.135000 1.645000 2.635000 ;
-        RECT 2.235000 2.135000 2.485000 2.635000 ;
-        RECT 3.075000 2.135000 3.325000 2.635000 ;
-        RECT 6.155000 1.795000 6.365000 2.635000 ;
-        RECT 6.955000 1.795000 7.205000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        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.085000 1.455000 1.215000 1.625000 ;
-      RECT 0.085000 1.625000 0.425000 2.465000 ;
-      RECT 0.515000 0.255000 0.845000 0.725000 ;
-      RECT 0.515000 0.725000 1.605000 0.905000 ;
-      RECT 0.975000 1.625000 1.215000 1.795000 ;
-      RECT 0.975000 1.795000 3.745000 1.965000 ;
-      RECT 0.975000 1.965000 1.215000 2.465000 ;
-      RECT 1.355000 0.255000 3.365000 0.475000 ;
-      RECT 1.355000 0.475000 1.605000 0.725000 ;
-      RECT 1.815000 1.965000 2.065000 2.465000 ;
-      RECT 2.655000 1.965000 2.905000 2.465000 ;
-      RECT 3.495000 1.965000 3.745000 2.295000 ;
-      RECT 3.495000 2.295000 5.465000 2.465000 ;
-      RECT 4.085000 1.075000 5.725000 1.245000 ;
-      RECT 4.335000 1.795000 4.575000 2.295000 ;
-      RECT 5.135000 1.455000 5.465000 2.295000 ;
-      RECT 5.555000 0.735000 9.575000 0.905000 ;
-      RECT 5.555000 0.905000 5.725000 1.075000 ;
-      RECT 5.655000 1.455000 7.625000 1.625000 ;
-      RECT 5.655000 1.625000 5.985000 2.465000 ;
-      RECT 6.075000 0.255000 6.405000 0.725000 ;
-      RECT 6.075000 0.725000 8.925000 0.735000 ;
-      RECT 6.540000 1.625000 6.780000 2.465000 ;
-      RECT 6.915000 0.255000 7.245000 0.725000 ;
-      RECT 7.375000 1.625000 7.625000 2.295000 ;
-      RECT 7.375000 2.295000 9.310000 2.465000 ;
-      RECT 7.755000 0.255000 8.085000 0.725000 ;
-      RECT 7.795000 1.455000 9.575000 1.625000 ;
-      RECT 7.795000 1.625000 8.045000 2.125000 ;
-      RECT 8.215000 1.795000 8.465000 2.295000 ;
-      RECT 8.595000 0.255000 8.925000 0.725000 ;
-      RECT 8.635000 1.625000 8.885000 2.125000 ;
-      RECT 9.060000 1.795000 9.310000 2.295000 ;
-      RECT 9.215000 0.905000 9.575000 1.455000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.085000  1.455000 1.215000 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.845000 0.725000 ;
+      RECT 0.515000  0.725000 1.605000 0.905000 ;
+      RECT 0.595000  1.795000 0.805000 2.635000 ;
+      RECT 0.975000  1.625000 1.215000 1.795000 ;
+      RECT 0.975000  1.795000 3.745000 1.965000 ;
+      RECT 0.975000  1.965000 1.215000 2.465000 ;
+      RECT 1.015000  0.085000 1.185000 0.555000 ;
+      RECT 1.355000  0.255000 3.365000 0.475000 ;
+      RECT 1.355000  0.475000 1.605000 0.725000 ;
+      RECT 1.395000  2.135000 1.645000 2.635000 ;
+      RECT 1.815000  1.965000 2.065000 2.465000 ;
+      RECT 2.235000  2.135000 2.485000 2.635000 ;
+      RECT 2.655000  1.965000 2.905000 2.465000 ;
+      RECT 3.075000  2.135000 3.325000 2.635000 ;
+      RECT 3.495000  1.965000 3.745000 2.295000 ;
+      RECT 3.495000  2.295000 5.465000 2.465000 ;
+      RECT 3.535000  0.085000 3.705000 0.555000 ;
+      RECT 4.085000  1.075000 5.725000 1.245000 ;
+      RECT 4.335000  1.795000 4.575000 2.295000 ;
+      RECT 4.375000  0.085000 4.545000 0.555000 ;
+      RECT 5.135000  1.455000 5.465000 2.295000 ;
+      RECT 5.215000  0.085000 5.905000 0.555000 ;
+      RECT 5.555000  0.735000 9.575000 0.905000 ;
+      RECT 5.555000  0.905000 5.725000 1.075000 ;
+      RECT 5.655000  1.455000 7.625000 1.625000 ;
+      RECT 5.655000  1.625000 5.985000 2.465000 ;
+      RECT 6.075000  0.255000 6.405000 0.725000 ;
+      RECT 6.075000  0.725000 8.925000 0.735000 ;
+      RECT 6.155000  1.795000 6.365000 2.635000 ;
+      RECT 6.540000  1.625000 6.780000 2.465000 ;
+      RECT 6.575000  0.085000 6.745000 0.555000 ;
+      RECT 6.915000  0.255000 7.245000 0.725000 ;
+      RECT 6.955000  1.795000 7.205000 2.635000 ;
+      RECT 7.375000  1.625000 7.625000 2.295000 ;
+      RECT 7.375000  2.295000 9.310000 2.465000 ;
+      RECT 7.415000  0.085000 7.585000 0.555000 ;
+      RECT 7.755000  0.255000 8.085000 0.725000 ;
+      RECT 7.795000  1.455000 9.575000 1.625000 ;
+      RECT 7.795000  1.625000 8.045000 2.125000 ;
+      RECT 8.215000  1.795000 8.465000 2.295000 ;
+      RECT 8.255000  0.085000 8.425000 0.555000 ;
+      RECT 8.595000  0.255000 8.925000 0.725000 ;
+      RECT 8.635000  1.625000 8.885000 2.125000 ;
+      RECT 9.060000  1.795000 9.310000 2.295000 ;
+      RECT 9.095000  0.085000 9.265000 0.555000 ;
+      RECT 9.215000  0.905000 9.575000 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 ;
   END
 END sky130_fd_sc_hd__a2bb2oi_4
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
index d7b841c..2273df5 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_1.magic.lef
@@ -92,19 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.590000  0.085000 0.920000 0.465000 ;
-        RECT 2.765000  0.085000 3.095000 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
@@ -114,38 +101,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.595000 2.175000 0.840000 2.635000 ;
-        RECT 1.455000 2.255000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 0.995000 0.735000 1.325000 ;
-      RECT 0.565000 0.655000 1.260000 0.825000 ;
-      RECT 0.565000 0.825000 0.735000 0.995000 ;
-      RECT 0.565000 1.325000 0.735000 1.495000 ;
-      RECT 0.565000 1.495000 3.505000 1.665000 ;
-      RECT 1.015000 1.835000 2.575000 2.005000 ;
-      RECT 1.015000 2.005000 1.265000 2.465000 ;
-      RECT 1.090000 0.255000 2.495000 0.425000 ;
-      RECT 1.090000 0.425000 1.260000 0.655000 ;
-      RECT 2.325000 0.425000 2.495000 0.655000 ;
-      RECT 2.325000 0.655000 3.505000 0.825000 ;
-      RECT 2.325000 2.005000 2.575000 2.465000 ;
-      RECT 3.335000 0.255000 3.505000 0.655000 ;
-      RECT 3.335000 1.665000 3.505000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.425000  0.995000 0.735000 1.325000 ;
+      RECT 0.565000  0.655000 1.260000 0.825000 ;
+      RECT 0.565000  0.825000 0.735000 0.995000 ;
+      RECT 0.565000  1.325000 0.735000 1.495000 ;
+      RECT 0.565000  1.495000 3.505000 1.665000 ;
+      RECT 0.590000  0.085000 0.920000 0.465000 ;
+      RECT 0.595000  2.175000 0.840000 2.635000 ;
+      RECT 1.015000  1.835000 2.575000 2.005000 ;
+      RECT 1.015000  2.005000 1.265000 2.465000 ;
+      RECT 1.090000  0.255000 2.495000 0.425000 ;
+      RECT 1.090000  0.425000 1.260000 0.655000 ;
+      RECT 1.455000  2.255000 2.125000 2.635000 ;
+      RECT 2.325000  0.425000 2.495000 0.655000 ;
+      RECT 2.325000  0.655000 3.505000 0.825000 ;
+      RECT 2.325000  2.005000 2.575000 2.465000 ;
+      RECT 2.765000  0.085000 3.095000 0.485000 ;
+      RECT 3.335000  0.255000 3.505000 0.655000 ;
+      RECT 3.335000  1.665000 3.505000 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
 END sky130_fd_sc_hd__a311o_1
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
index 4cd0fe8..a4d66ca 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_2.magic.lef
@@ -90,21 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.885000 ;
-        RECT 1.015000  0.085000 1.345000 0.465000 ;
-        RECT 3.220000  0.085000 3.550000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -114,38 +99,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.160000 1.835000 1.380000 2.635000 ;
-        RECT 2.125000 2.255000 2.455000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.015000 0.655000 1.695000 0.825000 ;
-      RECT 1.015000 0.825000 1.185000 1.495000 ;
-      RECT 1.015000 1.495000 3.965000 1.665000 ;
-      RECT 1.525000 0.255000 2.960000 0.425000 ;
-      RECT 1.525000 0.425000 1.695000 0.655000 ;
-      RECT 1.590000 1.835000 3.025000 2.005000 ;
-      RECT 1.590000 2.005000 1.840000 2.465000 ;
-      RECT 2.715000 2.005000 3.025000 2.465000 ;
-      RECT 2.790000 0.425000 2.960000 0.655000 ;
-      RECT 2.790000 0.655000 3.965000 0.825000 ;
-      RECT 3.795000 0.255000 3.965000 0.655000 ;
-      RECT 3.795000 1.665000 3.965000 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.885000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 1.015000  0.085000 1.345000 0.465000 ;
+      RECT 1.015000  0.655000 1.695000 0.825000 ;
+      RECT 1.015000  0.825000 1.185000 1.495000 ;
+      RECT 1.015000  1.495000 3.965000 1.665000 ;
+      RECT 1.160000  1.835000 1.380000 2.635000 ;
+      RECT 1.525000  0.255000 2.960000 0.425000 ;
+      RECT 1.525000  0.425000 1.695000 0.655000 ;
+      RECT 1.590000  1.835000 3.025000 2.005000 ;
+      RECT 1.590000  2.005000 1.840000 2.465000 ;
+      RECT 2.125000  2.255000 2.455000 2.635000 ;
+      RECT 2.715000  2.005000 3.025000 2.465000 ;
+      RECT 2.790000  0.425000 2.960000 0.655000 ;
+      RECT 2.790000  0.655000 3.965000 0.825000 ;
+      RECT 3.220000  0.085000 3.550000 0.485000 ;
+      RECT 3.795000  0.255000 3.965000 0.655000 ;
+      RECT 3.795000  1.665000 3.965000 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
 END sky130_fd_sc_hd__a311o_2
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
index ad8c95d..9997994 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_4.magic.lef
@@ -96,31 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.345000 0.565000 ;
-        RECT 1.015000  0.085000 1.185000 0.545000 ;
-        RECT 1.855000  0.085000 2.025000 0.545000 ;
-        RECT 2.715000  0.085000 2.885000 0.545000 ;
-        RECT 3.555000  0.085000 4.065000 0.545000 ;
-        RECT 4.775000  0.085000 4.945000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -130,73 +105,95 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 2.295000 2.255000 2.625000 2.635000 ;
-        RECT 3.135000 2.255000 3.465000 2.635000 ;
-        RECT 3.975000 2.255000 4.305000 2.635000 ;
-        RECT 4.815000 2.255000 5.175000 2.635000 ;
-        RECT 5.715000 2.255000 6.045000 2.635000 ;
-        RECT 6.935000 1.795000 7.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 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.795000 0.345000 2.295000 ;
-      RECT 0.175000 2.295000 2.025000 2.465000 ;
-      RECT 0.515000 0.295000 0.845000 0.465000 ;
-      RECT 0.515000 1.955000 0.845000 2.125000 ;
-      RECT 0.595000 0.465000 0.765000 0.715000 ;
-      RECT 0.595000 0.715000 2.025000 0.885000 ;
-      RECT 0.595000 0.885000 0.765000 1.955000 ;
-      RECT 1.015000 1.795000 1.185000 2.295000 ;
-      RECT 1.355000 0.295000 1.685000 0.465000 ;
-      RECT 1.435000 0.465000 1.605000 0.715000 ;
-      RECT 1.435000 1.455000 2.385000 1.625000 ;
-      RECT 1.435000 1.625000 1.605000 2.125000 ;
-      RECT 1.855000 0.885000 2.025000 1.075000 ;
-      RECT 1.855000 1.075000 2.705000 1.245000 ;
-      RECT 1.855000 1.795000 2.025000 2.295000 ;
-      RECT 2.195000 1.625000 2.385000 1.915000 ;
-      RECT 2.195000 1.915000 6.765000 2.085000 ;
-      RECT 3.275000 1.075000 4.320000 1.245000 ;
-      RECT 4.150000 1.245000 4.320000 1.455000 ;
-      RECT 4.150000 1.455000 6.685000 1.625000 ;
-      RECT 4.275000 0.295000 4.605000 0.465000 ;
-      RECT 4.355000 0.465000 4.525000 0.715000 ;
-      RECT 4.355000 0.715000 6.005000 0.885000 ;
-      RECT 4.475000 1.795000 4.645000 1.915000 ;
-      RECT 4.475000 2.085000 4.645000 2.465000 ;
-      RECT 5.255000 0.255000 7.270000 0.425000 ;
-      RECT 5.255000 0.425000 6.345000 0.465000 ;
-      RECT 5.375000 1.795000 5.545000 1.915000 ;
-      RECT 5.375000 2.085000 5.545000 2.465000 ;
-      RECT 5.675000 0.645000 6.005000 0.715000 ;
-      RECT 6.175000 0.465000 6.345000 0.885000 ;
-      RECT 6.515000 0.645000 6.845000 0.825000 ;
-      RECT 6.515000 0.825000 6.685000 1.455000 ;
-      RECT 6.595000 1.795000 6.765000 1.915000 ;
-      RECT 6.595000 2.085000 6.765000 2.465000 ;
-      RECT 6.935000 0.425000 7.270000 0.500000 ;
-      RECT 7.015000 0.500000 7.270000 0.905000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.095000  0.085000 0.345000 0.565000 ;
+      RECT 0.175000  1.795000 0.345000 2.295000 ;
+      RECT 0.175000  2.295000 2.025000 2.465000 ;
+      RECT 0.515000  0.295000 0.845000 0.465000 ;
+      RECT 0.515000  1.955000 0.845000 2.125000 ;
+      RECT 0.595000  0.465000 0.765000 0.715000 ;
+      RECT 0.595000  0.715000 2.025000 0.885000 ;
+      RECT 0.595000  0.885000 0.765000 1.955000 ;
+      RECT 1.015000  0.085000 1.185000 0.545000 ;
+      RECT 1.015000  1.795000 1.185000 2.295000 ;
+      RECT 1.355000  0.295000 1.685000 0.465000 ;
+      RECT 1.435000  0.465000 1.605000 0.715000 ;
+      RECT 1.435000  1.455000 2.385000 1.625000 ;
+      RECT 1.435000  1.625000 1.605000 2.125000 ;
+      RECT 1.855000  0.085000 2.025000 0.545000 ;
+      RECT 1.855000  0.885000 2.025000 1.075000 ;
+      RECT 1.855000  1.075000 2.705000 1.245000 ;
+      RECT 1.855000  1.795000 2.025000 2.295000 ;
+      RECT 2.195000  1.625000 2.385000 1.915000 ;
+      RECT 2.195000  1.915000 6.765000 2.085000 ;
+      RECT 2.295000  2.255000 2.625000 2.635000 ;
+      RECT 2.715000  0.085000 2.885000 0.545000 ;
+      RECT 3.135000  2.255000 3.465000 2.635000 ;
+      RECT 3.275000  1.075000 4.320000 1.245000 ;
+      RECT 3.555000  0.085000 4.065000 0.545000 ;
+      RECT 3.975000  2.255000 4.305000 2.635000 ;
+      RECT 4.150000  1.245000 4.320000 1.455000 ;
+      RECT 4.150000  1.455000 6.685000 1.625000 ;
+      RECT 4.275000  0.295000 4.605000 0.465000 ;
+      RECT 4.355000  0.465000 4.525000 0.715000 ;
+      RECT 4.355000  0.715000 6.005000 0.885000 ;
+      RECT 4.475000  1.795000 4.645000 1.915000 ;
+      RECT 4.475000  2.085000 4.645000 2.465000 ;
+      RECT 4.775000  0.085000 4.945000 0.545000 ;
+      RECT 4.815000  2.255000 5.175000 2.635000 ;
+      RECT 5.255000  0.255000 7.270000 0.425000 ;
+      RECT 5.255000  0.425000 6.345000 0.465000 ;
+      RECT 5.375000  1.795000 5.545000 1.915000 ;
+      RECT 5.375000  2.085000 5.545000 2.465000 ;
+      RECT 5.675000  0.645000 6.005000 0.715000 ;
+      RECT 5.715000  2.255000 6.045000 2.635000 ;
+      RECT 6.175000  0.465000 6.345000 0.885000 ;
+      RECT 6.515000  0.645000 6.845000 0.825000 ;
+      RECT 6.515000  0.825000 6.685000 1.455000 ;
+      RECT 6.595000  1.795000 6.765000 1.915000 ;
+      RECT 6.595000  2.085000 6.765000 2.465000 ;
+      RECT 6.935000  0.425000 7.270000 0.500000 ;
+      RECT 6.935000  1.795000 7.270000 2.635000 ;
+      RECT 7.015000  0.500000 7.270000 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 ;
   END
 END sky130_fd_sc_hd__a311o_4
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
index a8899bd..a9b14a1 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.magic.lef
@@ -99,18 +99,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.805000 ;
-        RECT 1.905000  0.085000 2.235000 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
@@ -120,27 +108,36 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.095000 1.495000 0.425000 2.635000 ;
-        RECT 0.940000 1.915000 1.200000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.600000 1.575000 1.540000 1.745000 ;
-      RECT 0.600000 1.745000 0.770000 2.305000 ;
-      RECT 1.370000 1.745000 1.540000 2.175000 ;
-      RECT 1.370000 2.175000 1.700000 2.345000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.805000 ;
+      RECT 0.095000  1.495000 0.425000 2.635000 ;
+      RECT 0.600000  1.575000 1.540000 1.745000 ;
+      RECT 0.600000  1.745000 0.770000 2.305000 ;
+      RECT 0.940000  1.915000 1.200000 2.635000 ;
+      RECT 1.370000  1.745000 1.540000 2.175000 ;
+      RECT 1.370000  2.175000 1.700000 2.345000 ;
+      RECT 1.905000  0.085000 2.235000 0.485000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  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
 END sky130_fd_sc_hd__a311oi_1
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
index f777f0b..94b7991 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.magic.lef
@@ -99,24 +99,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 3.585000  0.085000 3.915000 0.465000 ;
-        RECT 4.675000  0.085000 5.005000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -126,44 +108,59 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.095000 1.495000 0.345000 2.635000 ;
-        RECT 0.935000 1.915000 1.265000 2.635000 ;
-        RECT 1.785000 1.915000 2.135000 2.635000 ;
-        RECT 2.645000 1.915000 2.975000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.175000 0.255000 0.345000 0.655000 ;
-      RECT 0.175000 0.655000 2.105000 0.825000 ;
-      RECT 0.595000 1.575000 3.915000 1.745000 ;
-      RECT 0.595000 1.745000 0.765000 2.465000 ;
-      RECT 1.015000 0.255000 1.185000 0.655000 ;
-      RECT 1.355000 0.305000 3.045000 0.475000 ;
-      RECT 1.435000 1.745000 1.605000 2.465000 ;
-      RECT 2.305000 1.745000 2.475000 2.465000 ;
-      RECT 3.145000 2.255000 5.345000 2.425000 ;
-      RECT 3.585000 1.745000 3.915000 2.085000 ;
-      RECT 4.110000 1.915000 4.440000 2.255000 ;
-      RECT 4.110000 2.425000 4.440000 2.465000 ;
-      RECT 5.175000 1.795000 5.345000 2.255000 ;
-      RECT 5.175000 2.425000 5.345000 2.465000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.095000  1.495000 0.345000 2.635000 ;
+      RECT 0.175000  0.255000 0.345000 0.655000 ;
+      RECT 0.175000  0.655000 2.105000 0.825000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.595000  1.575000 3.915000 1.745000 ;
+      RECT 0.595000  1.745000 0.765000 2.465000 ;
+      RECT 0.935000  1.915000 1.265000 2.635000 ;
+      RECT 1.015000  0.255000 1.185000 0.655000 ;
+      RECT 1.355000  0.305000 3.045000 0.475000 ;
+      RECT 1.435000  1.745000 1.605000 2.465000 ;
+      RECT 1.785000  1.915000 2.135000 2.635000 ;
+      RECT 2.305000  1.745000 2.475000 2.465000 ;
+      RECT 2.645000  1.915000 2.975000 2.635000 ;
+      RECT 3.145000  2.255000 5.345000 2.425000 ;
+      RECT 3.585000  0.085000 3.915000 0.465000 ;
+      RECT 3.585000  1.745000 3.915000 2.085000 ;
+      RECT 4.110000  1.915000 4.440000 2.255000 ;
+      RECT 4.110000  2.425000 4.440000 2.465000 ;
+      RECT 4.675000  0.085000 5.005000 0.465000 ;
+      RECT 5.175000  1.795000 5.345000 2.255000 ;
+      RECT 5.175000  2.425000 5.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 ;
+      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
 END sky130_fd_sc_hd__a311oi_2
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
index 23cee1a..ececf43 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.magic.lef
@@ -99,36 +99,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.355000  0.085000 1.685000 0.465000 ;
-        RECT 6.075000  0.085000 6.405000 0.465000 ;
-        RECT 6.915000  0.085000 7.245000 0.465000 ;
-        RECT 7.975000  0.085000 8.305000 0.465000 ;
-        RECT 8.815000  0.085000 9.145000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -138,58 +108,85 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.095000 1.575000 0.425000 2.635000 ;
-        RECT 0.935000 1.915000 1.265000 2.635000 ;
-        RECT 1.775000 1.915000 2.105000 2.635000 ;
-        RECT 2.615000 1.915000 2.945000 2.635000 ;
-        RECT 3.455000 1.915000 3.785000 2.635000 ;
-        RECT 4.295000 1.915000 4.625000 2.635000 ;
-        RECT 5.135000 2.255000 5.465000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 3.785000 0.805000 ;
-      RECT 0.595000 1.495000 4.965000 1.665000 ;
-      RECT 0.595000 1.665000 0.765000 2.465000 ;
-      RECT 1.015000 0.255000 1.185000 0.635000 ;
-      RECT 1.435000 1.665000 1.605000 2.465000 ;
-      RECT 1.855000 0.255000 2.025000 0.635000 ;
-      RECT 2.195000 0.295000 5.565000 0.465000 ;
-      RECT 2.275000 1.665000 2.445000 2.465000 ;
-      RECT 3.115000 1.665000 3.285000 2.465000 ;
-      RECT 3.955000 1.665000 4.125000 2.465000 ;
-      RECT 4.795000 1.665000 4.965000 1.915000 ;
-      RECT 4.795000 1.915000 7.245000 2.085000 ;
-      RECT 4.795000 2.085000 4.965000 2.465000 ;
-      RECT 5.655000 2.255000 9.565000 2.425000 ;
-      RECT 9.315000 1.835000 9.565000 2.255000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.095000  1.575000 0.425000 2.635000 ;
+      RECT 0.175000  0.255000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 3.785000 0.805000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.595000  1.495000 4.965000 1.665000 ;
+      RECT 0.595000  1.665000 0.765000 2.465000 ;
+      RECT 0.935000  1.915000 1.265000 2.635000 ;
+      RECT 1.015000  0.255000 1.185000 0.635000 ;
+      RECT 1.355000  0.085000 1.685000 0.465000 ;
+      RECT 1.435000  1.665000 1.605000 2.465000 ;
+      RECT 1.775000  1.915000 2.105000 2.635000 ;
+      RECT 1.855000  0.255000 2.025000 0.635000 ;
+      RECT 2.195000  0.295000 5.565000 0.465000 ;
+      RECT 2.275000  1.665000 2.445000 2.465000 ;
+      RECT 2.615000  1.915000 2.945000 2.635000 ;
+      RECT 3.115000  1.665000 3.285000 2.465000 ;
+      RECT 3.455000  1.915000 3.785000 2.635000 ;
+      RECT 3.955000  1.665000 4.125000 2.465000 ;
+      RECT 4.295000  1.915000 4.625000 2.635000 ;
+      RECT 4.795000  1.665000 4.965000 1.915000 ;
+      RECT 4.795000  1.915000 7.245000 2.085000 ;
+      RECT 4.795000  2.085000 4.965000 2.465000 ;
+      RECT 5.135000  2.255000 5.465000 2.635000 ;
+      RECT 5.655000  2.255000 9.565000 2.425000 ;
+      RECT 6.075000  0.085000 6.405000 0.465000 ;
+      RECT 6.915000  0.085000 7.245000 0.465000 ;
+      RECT 7.975000  0.085000 8.305000 0.465000 ;
+      RECT 8.815000  0.085000 9.145000 0.465000 ;
+      RECT 9.315000  1.835000 9.565000 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 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
   END
 END sky130_fd_sc_hd__a311oi_4
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
index 6236082..efd2849 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_1.magic.lef
@@ -83,18 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.595000  0.085000 0.925000 0.485000 ;
-        RECT 2.475000  0.085000 2.805000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -104,33 +92,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.595000 1.495000 0.845000 2.635000 ;
-        RECT 1.515000 2.165000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.455000 0.995000 0.765000 1.325000 ;
-      RECT 0.595000 0.655000 2.960000 0.825000 ;
-      RECT 0.595000 0.825000 0.765000 0.995000 ;
-      RECT 1.035000 1.825000 2.325000 1.995000 ;
-      RECT 1.035000 1.995000 1.285000 2.415000 ;
-      RECT 1.975000 0.315000 2.305000 0.655000 ;
-      RECT 2.075000 1.995000 2.325000 2.415000 ;
-      RECT 2.505000 1.825000 2.960000 1.995000 ;
-      RECT 2.505000 1.995000 2.835000 2.425000 ;
-      RECT 2.790000 0.825000 2.960000 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.765000 1.325000 ;
+      RECT 0.595000  0.085000 0.925000 0.485000 ;
+      RECT 0.595000  0.655000 2.960000 0.825000 ;
+      RECT 0.595000  0.825000 0.765000 0.995000 ;
+      RECT 0.595000  1.495000 0.845000 2.635000 ;
+      RECT 1.035000  1.825000 2.325000 1.995000 ;
+      RECT 1.035000  1.995000 1.285000 2.415000 ;
+      RECT 1.515000  2.165000 1.845000 2.635000 ;
+      RECT 1.975000  0.315000 2.305000 0.655000 ;
+      RECT 2.075000  1.995000 2.325000 2.415000 ;
+      RECT 2.475000  0.085000 2.805000 0.485000 ;
+      RECT 2.505000  1.825000 2.960000 1.995000 ;
+      RECT 2.505000  1.995000 2.835000 2.425000 ;
+      RECT 2.790000  0.825000 2.960000 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
 END sky130_fd_sc_hd__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
index eb5e505..fc2c99c 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_2.magic.lef
@@ -91,20 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.545000 ;
-        RECT 0.955000  0.085000 1.285000 0.465000 ;
-        RECT 1.015000  0.465000 1.185000 0.545000 ;
-        RECT 2.875000  0.085000 3.135000 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
@@ -114,34 +100,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.135000 2.175000 0.385000 2.635000 ;
-        RECT 0.935000 1.835000 1.185000 2.635000 ;
-        RECT 1.815000 2.175000 2.145000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.555000 1.075000 0.885000 1.245000 ;
-      RECT 0.555000 1.245000 0.725000 1.495000 ;
-      RECT 0.555000 1.495000 3.045000 1.665000 ;
-      RECT 1.355000 1.835000 2.645000 2.005000 ;
-      RECT 1.355000 2.005000 1.605000 2.425000 ;
-      RECT 2.335000 2.005000 2.585000 2.425000 ;
-      RECT 2.375000 0.335000 2.705000 0.505000 ;
-      RECT 2.460000 0.255000 2.705000 0.335000 ;
-      RECT 2.535000 0.505000 2.705000 1.495000 ;
-      RECT 2.875000 1.665000 3.045000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  0.085000 0.345000 0.545000 ;
+      RECT 0.135000  2.175000 0.385000 2.635000 ;
+      RECT 0.555000  1.075000 0.885000 1.245000 ;
+      RECT 0.555000  1.245000 0.725000 1.495000 ;
+      RECT 0.555000  1.495000 3.045000 1.665000 ;
+      RECT 0.935000  1.835000 1.185000 2.635000 ;
+      RECT 0.955000  0.085000 1.285000 0.465000 ;
+      RECT 1.015000  0.465000 1.185000 0.545000 ;
+      RECT 1.355000  1.835000 2.645000 2.005000 ;
+      RECT 1.355000  2.005000 1.605000 2.425000 ;
+      RECT 1.815000  2.175000 2.145000 2.635000 ;
+      RECT 2.335000  2.005000 2.585000 2.425000 ;
+      RECT 2.375000  0.335000 2.705000 0.505000 ;
+      RECT 2.460000  0.255000 2.705000 0.335000 ;
+      RECT 2.535000  0.505000 2.705000 1.495000 ;
+      RECT 2.875000  0.085000 3.135000 0.565000 ;
+      RECT 2.875000  1.665000 3.045000 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 ;
   END
 END sky130_fd_sc_hd__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
index 8a39434..f1feb6f 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_4.magic.lef
@@ -91,28 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.905000 ;
-        RECT 2.700000  0.085000 2.985000 0.530000 ;
-        RECT 3.735000  0.085000 4.265000 0.565000 ;
-        RECT 4.935000  0.085000 5.265000 0.485000 ;
-        RECT 5.775000  0.085000 6.105000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -122,51 +100,70 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.125000 0.845000 2.635000 ;
-        RECT 1.355000 2.125000 1.685000 2.635000 ;
-        RECT 2.195000 2.125000 2.525000 2.635000 ;
-        RECT 4.095000 2.125000 4.425000 2.635000 ;
-        RECT 4.935000 2.125000 5.265000 2.635000 ;
-        RECT 5.775000 2.125000 6.105000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.785000 2.985000 1.955000 ;
-      RECT 0.175000 1.955000 0.345000 2.465000 ;
-      RECT 1.015000 1.955000 1.185000 2.465000 ;
-      RECT 1.355000 0.395000 2.520000 0.565000 ;
-      RECT 1.855000 1.955000 2.025000 2.465000 ;
-      RECT 2.350000 0.565000 2.520000 0.700000 ;
-      RECT 2.350000 0.700000 3.485000 0.805000 ;
-      RECT 2.350000 0.805000 3.345000 0.870000 ;
-      RECT 2.815000 1.955000 2.985000 2.295000 ;
-      RECT 2.815000 2.295000 3.825000 2.465000 ;
-      RECT 3.155000 0.295000 3.485000 0.700000 ;
-      RECT 3.155000 0.870000 3.345000 1.455000 ;
-      RECT 3.155000 1.455000 4.395000 1.625000 ;
-      RECT 3.155000 1.625000 3.485000 2.115000 ;
-      RECT 3.655000 1.795000 3.825000 2.295000 ;
-      RECT 4.225000 0.995000 5.935000 1.325000 ;
-      RECT 4.225000 1.325000 4.395000 1.455000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.175000  0.085000 0.345000 0.905000 ;
+      RECT 0.175000  1.785000 2.985000 1.955000 ;
+      RECT 0.175000  1.955000 0.345000 2.465000 ;
+      RECT 0.515000  2.125000 0.845000 2.635000 ;
+      RECT 1.015000  1.955000 1.185000 2.465000 ;
+      RECT 1.355000  0.395000 2.520000 0.565000 ;
+      RECT 1.355000  2.125000 1.685000 2.635000 ;
+      RECT 1.855000  1.955000 2.025000 2.465000 ;
+      RECT 2.195000  2.125000 2.525000 2.635000 ;
+      RECT 2.350000  0.565000 2.520000 0.700000 ;
+      RECT 2.350000  0.700000 3.485000 0.805000 ;
+      RECT 2.350000  0.805000 3.345000 0.870000 ;
+      RECT 2.700000  0.085000 2.985000 0.530000 ;
+      RECT 2.815000  1.955000 2.985000 2.295000 ;
+      RECT 2.815000  2.295000 3.825000 2.465000 ;
+      RECT 3.155000  0.295000 3.485000 0.700000 ;
+      RECT 3.155000  0.870000 3.345000 1.455000 ;
+      RECT 3.155000  1.455000 4.395000 1.625000 ;
+      RECT 3.155000  1.625000 3.485000 2.115000 ;
+      RECT 3.655000  1.795000 3.825000 2.295000 ;
+      RECT 3.735000  0.085000 4.265000 0.565000 ;
+      RECT 4.095000  2.125000 4.425000 2.635000 ;
+      RECT 4.225000  0.995000 5.935000 1.325000 ;
+      RECT 4.225000  1.325000 4.395000 1.455000 ;
+      RECT 4.935000  0.085000 5.265000 0.485000 ;
+      RECT 4.935000  2.125000 5.265000 2.635000 ;
+      RECT 5.775000  0.085000 6.105000 0.485000 ;
+      RECT 5.775000  2.125000 6.105000 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
 END sky130_fd_sc_hd__a31o_4
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
index ac667b0..e32b97b 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.magic.lef
@@ -85,16 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.090000  0.085000 0.430000 0.815000 ;
-        RECT 1.955000  0.085000 2.215000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -104,24 +94,31 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.090000 1.495000 0.420000 2.635000 ;
-        RECT 0.935000 2.175000 1.265000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.590000 1.835000 1.695000 2.005000 ;
-      RECT 0.590000 2.005000 0.765000 2.415000 ;
-      RECT 1.470000 2.005000 1.695000 2.415000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.090000  0.085000 0.430000 0.815000 ;
+      RECT 0.090000  1.495000 0.420000 2.635000 ;
+      RECT 0.590000  1.835000 1.695000 2.005000 ;
+      RECT 0.590000  2.005000 0.765000 2.415000 ;
+      RECT 0.935000  2.175000 1.265000 2.635000 ;
+      RECT 1.470000  2.005000 1.695000 2.415000 ;
+      RECT 1.955000  0.085000 2.215000 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 ;
   END
 END sky130_fd_sc_hd__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
index 0bf72d3..11e85fa 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.magic.lef
@@ -87,21 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 3.675000  0.085000 4.005000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -111,36 +96,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.515000 2.125000 0.845000 2.635000 ;
-        RECT 1.355000 2.125000 1.685000 2.635000 ;
-        RECT 2.310000 2.125000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.655000 2.105000 0.825000 ;
-      RECT 0.175000 1.785000 3.505000 1.955000 ;
-      RECT 0.175000 1.955000 0.345000 2.465000 ;
-      RECT 1.015000 1.955000 1.185000 2.465000 ;
-      RECT 1.355000 0.295000 3.075000 0.465000 ;
-      RECT 1.855000 1.955000 2.025000 2.465000 ;
-      RECT 3.335000 1.955000 3.505000 2.295000 ;
-      RECT 3.335000 2.295000 4.425000 2.465000 ;
-      RECT 4.255000 1.795000 4.425000 2.295000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.095000  0.655000 2.105000 0.825000 ;
+      RECT 0.175000  1.785000 3.505000 1.955000 ;
+      RECT 0.175000  1.955000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.125000 0.845000 2.635000 ;
+      RECT 1.015000  1.955000 1.185000 2.465000 ;
+      RECT 1.355000  0.295000 3.075000 0.465000 ;
+      RECT 1.355000  2.125000 1.685000 2.635000 ;
+      RECT 1.855000  1.955000 2.025000 2.465000 ;
+      RECT 2.310000  2.125000 2.980000 2.635000 ;
+      RECT 3.335000  1.955000 3.505000 2.295000 ;
+      RECT 3.335000  2.295000 4.425000 2.465000 ;
+      RECT 3.675000  0.085000 4.005000 0.465000 ;
+      RECT 4.255000  1.795000 4.425000 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 ;
   END
 END sky130_fd_sc_hd__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
index 2cb513b..2158046 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.magic.lef
@@ -84,30 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.355000  0.085000 1.685000 0.465000 ;
-        RECT 6.075000  0.085000 6.405000 0.465000 ;
-        RECT 6.915000  0.085000 7.245000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -117,53 +93,74 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.515000 1.915000 0.845000 2.635000 ;
-        RECT 1.355000 1.915000 1.685000 2.635000 ;
-        RECT 2.195000 1.915000 2.525000 2.635000 ;
-        RECT 3.035000 1.915000 3.365000 2.635000 ;
-        RECT 3.895000 1.915000 4.225000 2.635000 ;
-        RECT 4.735000 2.255000 5.065000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 3.785000 0.805000 ;
-      RECT 0.175000 1.495000 5.405000 1.665000 ;
-      RECT 0.175000 1.665000 0.345000 2.465000 ;
-      RECT 1.015000 0.255000 1.185000 0.635000 ;
-      RECT 1.015000 1.665000 1.185000 2.465000 ;
-      RECT 1.855000 0.255000 2.025000 0.635000 ;
-      RECT 1.855000 1.665000 2.025000 2.465000 ;
-      RECT 2.195000 0.295000 5.565000 0.465000 ;
-      RECT 2.695000 1.665000 2.865000 2.465000 ;
-      RECT 3.535000 1.665000 3.705000 2.465000 ;
-      RECT 4.395000 1.665000 4.565000 2.465000 ;
-      RECT 5.235000 1.665000 5.405000 2.255000 ;
-      RECT 5.235000 2.255000 7.665000 2.425000 ;
-      RECT 5.235000 2.425000 5.405000 2.465000 ;
-      RECT 7.415000 1.495000 7.665000 2.255000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.175000  0.255000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 3.785000 0.805000 ;
+      RECT 0.175000  1.495000 5.405000 1.665000 ;
+      RECT 0.175000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  1.915000 0.845000 2.635000 ;
+      RECT 1.015000  0.255000 1.185000 0.635000 ;
+      RECT 1.015000  1.665000 1.185000 2.465000 ;
+      RECT 1.355000  0.085000 1.685000 0.465000 ;
+      RECT 1.355000  1.915000 1.685000 2.635000 ;
+      RECT 1.855000  0.255000 2.025000 0.635000 ;
+      RECT 1.855000  1.665000 2.025000 2.465000 ;
+      RECT 2.195000  0.295000 5.565000 0.465000 ;
+      RECT 2.195000  1.915000 2.525000 2.635000 ;
+      RECT 2.695000  1.665000 2.865000 2.465000 ;
+      RECT 3.035000  1.915000 3.365000 2.635000 ;
+      RECT 3.535000  1.665000 3.705000 2.465000 ;
+      RECT 3.895000  1.915000 4.225000 2.635000 ;
+      RECT 4.395000  1.665000 4.565000 2.465000 ;
+      RECT 4.735000  2.255000 5.065000 2.635000 ;
+      RECT 5.235000  1.665000 5.405000 2.255000 ;
+      RECT 5.235000  2.255000 7.665000 2.425000 ;
+      RECT 5.235000  2.425000 5.405000 2.465000 ;
+      RECT 6.075000  0.085000 6.405000 0.465000 ;
+      RECT 6.915000  0.085000 7.245000 0.465000 ;
+      RECT 7.415000  1.495000 7.665000 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 ;
   END
 END sky130_fd_sc_hd__a31oi_4
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
index bd98629..996c0df 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_1.magic.lef
@@ -92,19 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.595000  0.085000 0.925000 0.485000 ;
-        RECT 3.255000  0.085000 3.585000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -114,37 +101,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.675000 1.835000 1.005000 2.635000 ;
-        RECT 1.790000 2.215000 2.120000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 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.570000 0.995000 0.875000 1.325000 ;
-      RECT 0.705000 0.655000 1.265000 0.825000 ;
-      RECT 0.705000 0.825000 0.875000 0.995000 ;
-      RECT 0.705000 1.325000 0.875000 1.495000 ;
-      RECT 0.705000 1.495000 3.075000 1.665000 ;
-      RECT 1.095000 0.315000 2.710000 0.485000 ;
-      RECT 1.095000 0.485000 1.265000 0.655000 ;
-      RECT 1.250000 1.875000 2.675000 2.045000 ;
-      RECT 1.250000 2.045000 1.535000 2.465000 ;
-      RECT 2.345000 2.045000 2.675000 2.295000 ;
-      RECT 2.345000 2.295000 3.505000 2.465000 ;
-      RECT 2.905000 1.665000 3.075000 2.125000 ;
-      RECT 3.335000 1.795000 3.505000 2.295000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.570000  0.995000 0.875000 1.325000 ;
+      RECT 0.595000  0.085000 0.925000 0.485000 ;
+      RECT 0.675000  1.835000 1.005000 2.635000 ;
+      RECT 0.705000  0.655000 1.265000 0.825000 ;
+      RECT 0.705000  0.825000 0.875000 0.995000 ;
+      RECT 0.705000  1.325000 0.875000 1.495000 ;
+      RECT 0.705000  1.495000 3.075000 1.665000 ;
+      RECT 1.095000  0.315000 2.710000 0.485000 ;
+      RECT 1.095000  0.485000 1.265000 0.655000 ;
+      RECT 1.250000  1.875000 2.675000 2.045000 ;
+      RECT 1.250000  2.045000 1.535000 2.465000 ;
+      RECT 1.790000  2.215000 2.120000 2.635000 ;
+      RECT 2.345000  2.045000 2.675000 2.295000 ;
+      RECT 2.345000  2.295000 3.505000 2.465000 ;
+      RECT 2.905000  1.665000 3.075000 2.125000 ;
+      RECT 3.255000  0.085000 3.585000 0.805000 ;
+      RECT 3.335000  1.795000 3.505000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
 END sky130_fd_sc_hd__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
index eb92dd8..837c2b7 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_2.magic.lef
@@ -99,21 +99,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.465000 ;
-        RECT 0.935000  0.085000 1.640000 0.445000 ;
-        RECT 3.715000  0.085000 4.050000 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
@@ -123,38 +108,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.125000 0.845000 2.635000 ;
-        RECT 2.715000 2.140000 3.045000 2.635000 ;
-        RECT 3.715000 1.915000 4.050000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 0.995000 0.705000 1.445000 ;
-      RECT 0.535000 1.445000 2.125000 1.615000 ;
-      RECT 1.535000 1.785000 1.705000 2.295000 ;
-      RECT 1.535000 2.295000 2.545000 2.465000 ;
-      RECT 1.700000 0.615000 2.585000 0.785000 ;
-      RECT 1.700000 0.785000 1.890000 1.445000 ;
-      RECT 1.875000 1.615000 2.125000 1.945000 ;
-      RECT 1.875000 1.945000 2.205000 2.115000 ;
-      RECT 2.255000 0.275000 2.585000 0.615000 ;
-      RECT 2.375000 1.795000 3.545000 1.965000 ;
-      RECT 2.375000 1.965000 2.545000 2.295000 ;
-      RECT 3.375000 1.965000 3.545000 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.425000 0.465000 ;
+      RECT 0.515000  2.125000 0.845000 2.635000 ;
+      RECT 0.535000  0.995000 0.705000 1.445000 ;
+      RECT 0.535000  1.445000 2.125000 1.615000 ;
+      RECT 0.935000  0.085000 1.640000 0.445000 ;
+      RECT 1.535000  1.785000 1.705000 2.295000 ;
+      RECT 1.535000  2.295000 2.545000 2.465000 ;
+      RECT 1.700000  0.615000 2.585000 0.785000 ;
+      RECT 1.700000  0.785000 1.890000 1.445000 ;
+      RECT 1.875000  1.615000 2.125000 1.945000 ;
+      RECT 1.875000  1.945000 2.205000 2.115000 ;
+      RECT 2.255000  0.275000 2.585000 0.615000 ;
+      RECT 2.375000  1.795000 3.545000 1.965000 ;
+      RECT 2.375000  1.965000 2.545000 2.295000 ;
+      RECT 2.715000  2.140000 3.045000 2.635000 ;
+      RECT 3.375000  1.965000 3.545000 2.465000 ;
+      RECT 3.715000  0.085000 4.050000 0.805000 ;
+      RECT 3.715000  1.915000 4.050000 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
 END sky130_fd_sc_hd__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
index b23d200..61b0421 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_4.magic.lef
@@ -96,31 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 0.935000  0.085000 1.265000 0.465000 ;
-        RECT 1.775000  0.085000 2.105000 0.465000 ;
-        RECT 2.615000  0.085000 2.945000 0.465000 ;
-        RECT 6.975000  0.085000 7.305000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -130,61 +105,83 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.095000 1.915000 0.425000 2.635000 ;
-        RECT 0.935000 1.915000 1.265000 2.635000 ;
-        RECT 1.775000 1.915000 2.105000 2.635000 ;
-        RECT 2.615000 2.255000 2.945000 2.635000 ;
-        RECT 3.555000 2.255000 3.885000 2.635000 ;
-        RECT 4.395000 2.255000 4.725000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 0.995000 1.970000 1.325000 ;
-      RECT 1.800000 1.325000 1.970000 1.495000 ;
-      RECT 1.800000 1.495000 5.450000 1.665000 ;
-      RECT 2.275000 0.255000 2.445000 0.655000 ;
-      RECT 2.275000 0.655000 3.885000 0.825000 ;
-      RECT 2.275000 1.915000 5.065000 2.085000 ;
-      RECT 2.275000 2.085000 2.445000 2.465000 ;
-      RECT 3.135000 0.295000 5.145000 0.465000 ;
-      RECT 3.215000 2.085000 3.385000 2.465000 ;
-      RECT 4.055000 2.085000 4.225000 2.465000 ;
-      RECT 4.395000 0.635000 6.425000 0.805000 ;
-      RECT 4.895000 2.085000 5.065000 2.255000 ;
-      RECT 4.895000 2.255000 7.725000 2.425000 ;
-      RECT 5.280000 0.805000 5.450000 1.495000 ;
-      RECT 5.280000 1.665000 5.450000 1.905000 ;
-      RECT 5.280000 1.905000 6.200000 1.915000 ;
-      RECT 5.280000 1.915000 7.305000 2.075000 ;
-      RECT 5.670000 0.295000 6.805000 0.465000 ;
-      RECT 6.135000 2.075000 7.305000 2.085000 ;
-      RECT 6.635000 0.255000 6.805000 0.295000 ;
-      RECT 6.635000 0.465000 6.805000 0.645000 ;
-      RECT 6.635000 0.645000 7.645000 0.815000 ;
-      RECT 7.475000 0.255000 7.645000 0.645000 ;
-      RECT 7.475000 1.755000 7.725000 2.255000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 0.095000  1.915000 0.425000 2.635000 ;
+      RECT 0.570000  0.995000 1.970000 1.325000 ;
+      RECT 0.935000  0.085000 1.265000 0.465000 ;
+      RECT 0.935000  1.915000 1.265000 2.635000 ;
+      RECT 1.775000  0.085000 2.105000 0.465000 ;
+      RECT 1.775000  1.915000 2.105000 2.635000 ;
+      RECT 1.800000  1.325000 1.970000 1.495000 ;
+      RECT 1.800000  1.495000 5.450000 1.665000 ;
+      RECT 2.275000  0.255000 2.445000 0.655000 ;
+      RECT 2.275000  0.655000 3.885000 0.825000 ;
+      RECT 2.275000  1.915000 5.065000 2.085000 ;
+      RECT 2.275000  2.085000 2.445000 2.465000 ;
+      RECT 2.615000  0.085000 2.945000 0.465000 ;
+      RECT 2.615000  2.255000 2.945000 2.635000 ;
+      RECT 3.135000  0.295000 5.145000 0.465000 ;
+      RECT 3.215000  2.085000 3.385000 2.465000 ;
+      RECT 3.555000  2.255000 3.885000 2.635000 ;
+      RECT 4.055000  2.085000 4.225000 2.465000 ;
+      RECT 4.395000  0.635000 6.425000 0.805000 ;
+      RECT 4.395000  2.255000 4.725000 2.635000 ;
+      RECT 4.895000  2.085000 5.065000 2.255000 ;
+      RECT 4.895000  2.255000 7.725000 2.425000 ;
+      RECT 5.280000  0.805000 5.450000 1.495000 ;
+      RECT 5.280000  1.665000 5.450000 1.905000 ;
+      RECT 5.280000  1.905000 6.200000 1.915000 ;
+      RECT 5.280000  1.915000 7.305000 2.075000 ;
+      RECT 5.670000  0.295000 6.805000 0.465000 ;
+      RECT 6.135000  2.075000 7.305000 2.085000 ;
+      RECT 6.635000  0.255000 6.805000 0.295000 ;
+      RECT 6.635000  0.465000 6.805000 0.645000 ;
+      RECT 6.635000  0.645000 7.645000 0.815000 ;
+      RECT 6.975000  0.085000 7.305000 0.465000 ;
+      RECT 7.475000  0.255000 7.645000 0.645000 ;
+      RECT 7.475000  1.755000 7.725000 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 ;
   END
 END sky130_fd_sc_hd__a32o_4
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
index 99e020c..651f995 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.magic.lef
@@ -96,18 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 2.355000  0.085000 2.695000 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
@@ -117,29 +105,38 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.555000 2.135000 1.805000 2.635000 ;
-        RECT 2.355000 1.495000 2.695000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.835000 0.345000 2.255000 ;
-      RECT 0.085000 2.255000 1.345000 2.465000 ;
-      RECT 1.095000 1.785000 2.185000 1.955000 ;
-      RECT 1.095000 1.955000 1.345000 2.255000 ;
-      RECT 2.015000 1.745000 2.185000 1.785000 ;
-      RECT 2.015000 1.955000 2.185000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 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.345000 2.465000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 1.095000  1.785000 2.185000 1.955000 ;
+      RECT 1.095000  1.955000 1.345000 2.255000 ;
+      RECT 1.555000  2.135000 1.805000 2.635000 ;
+      RECT 2.015000  1.745000 2.185000 1.785000 ;
+      RECT 2.015000  1.955000 2.185000 2.465000 ;
+      RECT 2.355000  0.085000 2.695000 0.805000 ;
+      RECT 2.355000  1.495000 2.695000 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
 END sky130_fd_sc_hd__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
index a6acac4..1017b6d 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.magic.lef
@@ -96,25 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.545000 ;
-        RECT 4.555000  0.085000 4.890000 0.465000 ;
-        RECT 5.560000  0.085000 5.885000 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
@@ -124,50 +105,66 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 2.270000 2.255000 2.940000 2.635000 ;
-        RECT 3.550000 2.255000 4.220000 2.635000 ;
-        RECT 4.765000 2.255000 5.435000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.295000 0.425000 0.465000 ;
-      RECT 0.175000 0.465000 0.345000 0.715000 ;
-      RECT 0.175000 0.715000 1.185000 0.885000 ;
-      RECT 0.175000 1.795000 0.345000 2.295000 ;
-      RECT 0.175000 2.295000 2.025000 2.465000 ;
-      RECT 0.935000 0.295000 2.115000 0.465000 ;
-      RECT 1.015000 0.465000 1.185000 0.715000 ;
-      RECT 1.015000 1.795000 1.185000 2.295000 ;
-      RECT 1.855000 1.795000 2.025000 1.915000 ;
-      RECT 1.855000 1.915000 5.805000 2.085000 ;
-      RECT 1.855000 2.085000 2.025000 2.295000 ;
-      RECT 2.350000 0.295000 4.370000 0.465000 ;
-      RECT 3.180000 1.795000 3.350000 1.915000 ;
-      RECT 3.180000 2.085000 3.350000 2.465000 ;
-      RECT 3.620000 0.635000 5.390000 0.805000 ;
-      RECT 4.390000 1.795000 4.560000 1.915000 ;
-      RECT 4.390000 2.085000 4.560000 2.465000 ;
-      RECT 5.060000 0.275000 5.390000 0.635000 ;
-      RECT 5.635000 1.795000 5.805000 1.915000 ;
-      RECT 5.635000 2.085000 5.805000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.095000  0.295000 0.425000 0.465000 ;
+      RECT 0.175000  0.465000 0.345000 0.715000 ;
+      RECT 0.175000  0.715000 1.185000 0.885000 ;
+      RECT 0.175000  1.795000 0.345000 2.295000 ;
+      RECT 0.175000  2.295000 2.025000 2.465000 ;
+      RECT 0.595000  0.085000 0.765000 0.545000 ;
+      RECT 0.935000  0.295000 2.115000 0.465000 ;
+      RECT 1.015000  0.465000 1.185000 0.715000 ;
+      RECT 1.015000  1.795000 1.185000 2.295000 ;
+      RECT 1.855000  1.795000 2.025000 1.915000 ;
+      RECT 1.855000  1.915000 5.805000 2.085000 ;
+      RECT 1.855000  2.085000 2.025000 2.295000 ;
+      RECT 2.270000  2.255000 2.940000 2.635000 ;
+      RECT 2.350000  0.295000 4.370000 0.465000 ;
+      RECT 3.180000  1.795000 3.350000 1.915000 ;
+      RECT 3.180000  2.085000 3.350000 2.465000 ;
+      RECT 3.550000  2.255000 4.220000 2.635000 ;
+      RECT 3.620000  0.635000 5.390000 0.805000 ;
+      RECT 4.390000  1.795000 4.560000 1.915000 ;
+      RECT 4.390000  2.085000 4.560000 2.465000 ;
+      RECT 4.555000  0.085000 4.890000 0.465000 ;
+      RECT 4.765000  2.255000 5.435000 2.635000 ;
+      RECT 5.060000  0.275000 5.390000 0.635000 ;
+      RECT 5.560000  0.085000 5.885000 0.885000 ;
+      RECT 5.635000  1.795000 5.805000 1.915000 ;
+      RECT 5.635000  2.085000 5.805000 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
 END sky130_fd_sc_hd__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
index 1c141de..c449887 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.magic.lef
@@ -98,36 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.515000  0.085000  0.845000 0.465000 ;
-        RECT 1.355000  0.085000  1.685000 0.465000 ;
-        RECT 7.995000  0.085000  8.325000 0.465000 ;
-        RECT 8.835000  0.085000  9.165000 0.465000 ;
-        RECT 9.685000  0.085000 10.025000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -137,60 +107,87 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 3.895000 1.915000  4.225000 2.635000 ;
-        RECT 4.770000 1.915000  5.440000 2.635000 ;
-        RECT 6.215000 1.915000  6.545000 2.635000 ;
-        RECT 7.055000 1.915000  7.385000 2.635000 ;
-        RECT 8.415000 1.915000  8.745000 2.635000 ;
-        RECT 9.255000 1.915000  9.585000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.095000 2.255000 3.705000 2.425000 ;
-      RECT 0.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 2.025000 0.805000 ;
-      RECT 1.015000 0.255000 1.185000 0.635000 ;
-      RECT 1.855000 0.295000 3.785000 0.465000 ;
-      RECT 1.855000 0.465000 2.025000 0.635000 ;
-      RECT 3.535000 1.575000 9.925000 1.745000 ;
-      RECT 3.535000 1.745000 3.705000 2.255000 ;
-      RECT 3.975000 0.295000 7.805000 0.465000 ;
-      RECT 4.395000 1.745000 4.565000 2.465000 ;
-      RECT 5.640000 1.745000 5.810000 2.465000 ;
-      RECT 6.215000 0.635000 9.505000 0.805000 ;
-      RECT 6.715000 1.745000 6.885000 2.465000 ;
-      RECT 7.555000 1.745000 7.725000 2.465000 ;
-      RECT 8.495000 0.255000 8.665000 0.635000 ;
-      RECT 8.915000 1.745000 9.085000 2.465000 ;
-      RECT 9.335000 0.255000 9.505000 0.635000 ;
-      RECT 9.755000 1.745000 9.925000 2.465000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.095000  2.255000  3.705000 2.425000 ;
+      RECT 0.175000  0.255000  0.345000 0.635000 ;
+      RECT 0.175000  0.635000  2.025000 0.805000 ;
+      RECT 0.515000  0.085000  0.845000 0.465000 ;
+      RECT 1.015000  0.255000  1.185000 0.635000 ;
+      RECT 1.355000  0.085000  1.685000 0.465000 ;
+      RECT 1.855000  0.295000  3.785000 0.465000 ;
+      RECT 1.855000  0.465000  2.025000 0.635000 ;
+      RECT 3.535000  1.575000  9.925000 1.745000 ;
+      RECT 3.535000  1.745000  3.705000 2.255000 ;
+      RECT 3.895000  1.915000  4.225000 2.635000 ;
+      RECT 3.975000  0.295000  7.805000 0.465000 ;
+      RECT 4.395000  1.745000  4.565000 2.465000 ;
+      RECT 4.770000  1.915000  5.440000 2.635000 ;
+      RECT 5.640000  1.745000  5.810000 2.465000 ;
+      RECT 6.215000  0.635000  9.505000 0.805000 ;
+      RECT 6.215000  1.915000  6.545000 2.635000 ;
+      RECT 6.715000  1.745000  6.885000 2.465000 ;
+      RECT 7.055000  1.915000  7.385000 2.635000 ;
+      RECT 7.555000  1.745000  7.725000 2.465000 ;
+      RECT 7.995000  0.085000  8.325000 0.465000 ;
+      RECT 8.415000  1.915000  8.745000 2.635000 ;
+      RECT 8.495000  0.255000  8.665000 0.635000 ;
+      RECT 8.835000  0.085000  9.165000 0.465000 ;
+      RECT 8.915000  1.745000  9.085000 2.465000 ;
+      RECT 9.255000  1.915000  9.585000 2.635000 ;
+      RECT 9.335000  0.255000  9.505000 0.635000 ;
+      RECT 9.685000  0.085000 10.025000 0.465000 ;
+      RECT 9.755000  1.745000  9.925000 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 ;
   END
 END sky130_fd_sc_hd__a32oi_4
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
index 9cc38dd..ea4075e 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_1.magic.lef
@@ -94,19 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.595000  0.085000 0.925000 0.565000 ;
-        RECT 3.255000  0.085000 3.595000 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
@@ -116,35 +103,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.595000 2.175000 0.845000 2.635000 ;
-        RECT 1.915000 2.175000 2.165000 2.635000 ;
-        RECT 2.845000 2.175000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.735000 1.530000 0.810000 ;
-      RECT 0.515000 0.810000 1.335000 0.905000 ;
-      RECT 0.515000 0.905000 0.685000 1.825000 ;
-      RECT 0.515000 1.825000 1.365000 1.995000 ;
-      RECT 1.035000 1.995000 1.365000 2.425000 ;
-      RECT 1.115000 0.300000 1.530000 0.735000 ;
-      RECT 1.535000 1.795000 3.505000 1.965000 ;
-      RECT 1.535000 1.965000 1.705000 2.465000 ;
-      RECT 2.375000 1.965000 2.545000 2.465000 ;
-      RECT 3.335000 1.965000 3.505000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.515000  0.735000 1.530000 0.810000 ;
+      RECT 0.515000  0.810000 1.335000 0.905000 ;
+      RECT 0.515000  0.905000 0.685000 1.825000 ;
+      RECT 0.515000  1.825000 1.365000 1.995000 ;
+      RECT 0.595000  0.085000 0.925000 0.565000 ;
+      RECT 0.595000  2.175000 0.845000 2.635000 ;
+      RECT 1.035000  1.995000 1.365000 2.425000 ;
+      RECT 1.115000  0.300000 1.530000 0.735000 ;
+      RECT 1.535000  1.795000 3.505000 1.965000 ;
+      RECT 1.535000  1.965000 1.705000 2.465000 ;
+      RECT 1.915000  2.175000 2.165000 2.635000 ;
+      RECT 2.375000  1.965000 2.545000 2.465000 ;
+      RECT 2.845000  2.175000 3.095000 2.635000 ;
+      RECT 3.255000  0.085000 3.595000 0.810000 ;
+      RECT 3.335000  1.965000 3.505000 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
 END sky130_fd_sc_hd__a41o_1
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
index d425601..cdd84f5 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_2.magic.lef
@@ -93,21 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.805000 ;
-        RECT 0.935000  0.085000 1.265000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 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
@@ -117,38 +102,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.095000 1.495000 0.425000 2.635000 ;
-        RECT 1.015000 1.835000 1.265000 2.635000 ;
-        RECT 2.335000 2.175000 2.585000 2.635000 ;
-        RECT 3.335000 2.175000 3.585000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.980000 0.635000 2.545000 0.805000 ;
-      RECT 0.980000 0.805000 1.150000 1.495000 ;
-      RECT 0.980000 1.495000 1.785000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.425000 ;
-      RECT 1.495000 0.255000 1.705000 0.635000 ;
-      RECT 1.955000 1.795000 3.965000 1.965000 ;
-      RECT 1.955000 1.965000 2.125000 2.465000 ;
-      RECT 2.375000 0.295000 4.045000 0.465000 ;
-      RECT 2.375000 0.465000 2.545000 0.635000 ;
-      RECT 2.795000 1.965000 2.965000 2.465000 ;
-      RECT 3.795000 1.965000 3.965000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.805000 ;
+      RECT 0.095000  1.495000 0.425000 2.635000 ;
+      RECT 0.935000  0.085000 1.265000 0.465000 ;
+      RECT 0.980000  0.635000 2.545000 0.805000 ;
+      RECT 0.980000  0.805000 1.150000 1.495000 ;
+      RECT 0.980000  1.495000 1.785000 1.665000 ;
+      RECT 1.015000  1.835000 1.265000 2.635000 ;
+      RECT 1.455000  1.665000 1.785000 2.425000 ;
+      RECT 1.495000  0.255000 1.705000 0.635000 ;
+      RECT 1.875000  0.085000 2.205000 0.465000 ;
+      RECT 1.955000  1.795000 3.965000 1.965000 ;
+      RECT 1.955000  1.965000 2.125000 2.465000 ;
+      RECT 2.335000  2.175000 2.585000 2.635000 ;
+      RECT 2.375000  0.295000 4.045000 0.465000 ;
+      RECT 2.375000  0.465000 2.545000 0.635000 ;
+      RECT 2.795000  1.965000 2.965000 2.465000 ;
+      RECT 3.335000  2.175000 3.585000 2.635000 ;
+      RECT 3.795000  1.965000 3.965000 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
 END sky130_fd_sc_hd__a41o_2
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
index a39768f..d704fdb 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_4.magic.lef
@@ -95,31 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 0.935000  0.085000 1.265000 0.465000 ;
-        RECT 1.775000  0.085000 2.125000 0.465000 ;
-        RECT 2.635000  0.085000 2.965000 0.465000 ;
-        RECT 6.615000  0.085000 6.945000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -129,60 +104,82 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.095000 1.915000 0.425000 2.635000 ;
-        RECT 0.935000 1.915000 1.265000 2.635000 ;
-        RECT 1.775000 1.915000 2.125000 2.635000 ;
-        RECT 3.575000 1.915000 3.905000 2.635000 ;
-        RECT 4.415000 1.915000 4.745000 2.635000 ;
-        RECT 5.345000 1.915000 6.035000 2.635000 ;
-        RECT 6.615000 1.915000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.490000 1.075000 1.945000 1.245000 ;
-      RECT 1.775000 0.645000 3.905000 0.815000 ;
-      RECT 1.775000 0.815000 1.945000 1.075000 ;
-      RECT 1.775000 1.245000 1.945000 1.455000 ;
-      RECT 1.775000 1.455000 2.965000 1.625000 ;
-      RECT 2.295000 0.255000 2.465000 0.645000 ;
-      RECT 2.375000 1.795000 2.545000 2.295000 ;
-      RECT 2.375000 2.295000 3.405000 2.465000 ;
-      RECT 2.715000 1.955000 3.045000 2.125000 ;
-      RECT 2.795000 1.625000 2.965000 1.955000 ;
-      RECT 3.155000 0.295000 4.245000 0.465000 ;
-      RECT 3.235000 1.535000 7.370000 1.705000 ;
-      RECT 3.235000 1.705000 3.405000 2.295000 ;
-      RECT 4.075000 0.465000 4.245000 0.645000 ;
-      RECT 4.075000 0.645000 5.165000 0.815000 ;
-      RECT 4.075000 1.705000 4.245000 2.465000 ;
-      RECT 4.415000 0.295000 6.105000 0.465000 ;
-      RECT 4.935000 1.705000 5.105000 2.465000 ;
-      RECT 5.355000 0.645000 7.285000 0.815000 ;
-      RECT 6.275000 1.705000 6.445000 2.465000 ;
-      RECT 7.115000 0.255000 7.285000 0.645000 ;
-      RECT 7.115000 1.705000 7.285000 2.465000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 0.095000  1.915000 0.425000 2.635000 ;
+      RECT 0.490000  1.075000 1.945000 1.245000 ;
+      RECT 0.935000  0.085000 1.265000 0.465000 ;
+      RECT 0.935000  1.915000 1.265000 2.635000 ;
+      RECT 1.775000  0.085000 2.125000 0.465000 ;
+      RECT 1.775000  0.645000 3.905000 0.815000 ;
+      RECT 1.775000  0.815000 1.945000 1.075000 ;
+      RECT 1.775000  1.245000 1.945000 1.455000 ;
+      RECT 1.775000  1.455000 2.965000 1.625000 ;
+      RECT 1.775000  1.915000 2.125000 2.635000 ;
+      RECT 2.295000  0.255000 2.465000 0.645000 ;
+      RECT 2.375000  1.795000 2.545000 2.295000 ;
+      RECT 2.375000  2.295000 3.405000 2.465000 ;
+      RECT 2.635000  0.085000 2.965000 0.465000 ;
+      RECT 2.715000  1.955000 3.045000 2.125000 ;
+      RECT 2.795000  1.625000 2.965000 1.955000 ;
+      RECT 3.155000  0.295000 4.245000 0.465000 ;
+      RECT 3.235000  1.535000 7.370000 1.705000 ;
+      RECT 3.235000  1.705000 3.405000 2.295000 ;
+      RECT 3.575000  1.915000 3.905000 2.635000 ;
+      RECT 4.075000  0.465000 4.245000 0.645000 ;
+      RECT 4.075000  0.645000 5.165000 0.815000 ;
+      RECT 4.075000  1.705000 4.245000 2.465000 ;
+      RECT 4.415000  0.295000 6.105000 0.465000 ;
+      RECT 4.415000  1.915000 4.745000 2.635000 ;
+      RECT 4.935000  1.705000 5.105000 2.465000 ;
+      RECT 5.345000  1.915000 6.035000 2.635000 ;
+      RECT 5.355000  0.645000 7.285000 0.815000 ;
+      RECT 6.275000  1.705000 6.445000 2.465000 ;
+      RECT 6.615000  0.085000 6.945000 0.465000 ;
+      RECT 6.615000  1.915000 6.945000 2.635000 ;
+      RECT 7.115000  0.255000 7.285000 0.645000 ;
+      RECT 7.115000  1.705000 7.285000 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 ;
   END
 END sky130_fd_sc_hd__a41o_4
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
index 7720c81..4cddac5 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.magic.lef
@@ -95,17 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.620000  0.085000 0.950000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -115,27 +104,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.120000 2.195000 1.450000 2.635000 ;
-        RECT 2.215000 2.195000 2.545000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 1.845000 3.015000 2.015000 ;
-      RECT 0.595000 2.015000 0.845000 2.465000 ;
-      RECT 1.760000 2.015000 1.930000 2.465000 ;
-      RECT 2.765000 2.015000 3.015000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.595000  1.845000 3.015000 2.015000 ;
+      RECT 0.595000  2.015000 0.845000 2.465000 ;
+      RECT 0.620000  0.085000 0.950000 0.445000 ;
+      RECT 1.120000  2.195000 1.450000 2.635000 ;
+      RECT 1.760000  2.015000 1.930000 2.465000 ;
+      RECT 2.215000  2.195000 2.545000 2.635000 ;
+      RECT 2.765000  2.015000 3.015000 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 ;
   END
 END sky130_fd_sc_hd__a41oi_1
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
index 3f0fae5..7acfccc 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.magic.lef
@@ -93,25 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.185000  0.085000 0.515000 0.465000 ;
-        RECT 1.025000  0.085000 1.375000 0.465000 ;
-        RECT 5.005000  0.085000 5.335000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -121,45 +102,61 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 1.965000 1.915000 2.295000 2.635000 ;
-        RECT 2.805000 1.915000 3.135000 2.635000 ;
-        RECT 3.755000 1.915000 4.425000 2.635000 ;
-        RECT 5.005000 1.915000 5.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 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.785000 1.795000 0.955000 2.295000 ;
-      RECT 0.785000 2.295000 1.795000 2.465000 ;
-      RECT 1.545000 0.295000 2.635000 0.465000 ;
-      RECT 1.625000 1.535000 5.760000 1.705000 ;
-      RECT 1.625000 1.705000 1.795000 2.295000 ;
-      RECT 2.465000 0.465000 2.635000 0.645000 ;
-      RECT 2.465000 0.645000 3.555000 0.815000 ;
-      RECT 2.465000 1.705000 2.635000 2.465000 ;
-      RECT 2.805000 0.295000 4.495000 0.465000 ;
-      RECT 3.325000 1.705000 3.495000 2.465000 ;
-      RECT 3.745000 0.645000 5.675000 0.815000 ;
-      RECT 4.665000 1.705000 4.835000 2.465000 ;
-      RECT 5.505000 0.255000 5.675000 0.645000 ;
-      RECT 5.505000 1.705000 5.675000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.185000  0.085000 0.515000 0.465000 ;
+      RECT 0.785000  1.795000 0.955000 2.295000 ;
+      RECT 0.785000  2.295000 1.795000 2.465000 ;
+      RECT 1.025000  0.085000 1.375000 0.465000 ;
+      RECT 1.545000  0.295000 2.635000 0.465000 ;
+      RECT 1.625000  1.535000 5.760000 1.705000 ;
+      RECT 1.625000  1.705000 1.795000 2.295000 ;
+      RECT 1.965000  1.915000 2.295000 2.635000 ;
+      RECT 2.465000  0.465000 2.635000 0.645000 ;
+      RECT 2.465000  0.645000 3.555000 0.815000 ;
+      RECT 2.465000  1.705000 2.635000 2.465000 ;
+      RECT 2.805000  0.295000 4.495000 0.465000 ;
+      RECT 2.805000  1.915000 3.135000 2.635000 ;
+      RECT 3.325000  1.705000 3.495000 2.465000 ;
+      RECT 3.745000  0.645000 5.675000 0.815000 ;
+      RECT 3.755000  1.915000 4.425000 2.635000 ;
+      RECT 4.665000  1.705000 4.835000 2.465000 ;
+      RECT 5.005000  0.085000 5.335000 0.465000 ;
+      RECT 5.005000  1.915000 5.335000 2.635000 ;
+      RECT 5.505000  0.255000 5.675000 0.645000 ;
+      RECT 5.505000  1.705000 5.675000 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
 END sky130_fd_sc_hd__a41oi_2
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
index 658b9ff..0d1f4bd 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.magic.lef
@@ -98,36 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.090000  0.085000  0.425000 0.465000 ;
-        RECT 0.935000  0.085000  1.265000 0.465000 ;
-        RECT 1.775000  0.085000  2.105000 0.465000 ;
-        RECT 8.405000  0.085000  8.735000 0.465000 ;
-        RECT 9.245000  0.085000  9.575000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -137,66 +107,93 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 2.505000 2.255000  3.175000 2.635000 ;
-        RECT 3.685000 1.915000  4.015000 2.635000 ;
-        RECT 4.620000 1.915000  4.950000 2.635000 ;
-        RECT 5.495000 1.915000  6.165000 2.635000 ;
-        RECT 6.725000 1.915000  7.055000 2.635000 ;
-        RECT 7.565000 1.915000  7.895000 2.635000 ;
-        RECT 8.405000 1.915000  8.735000 2.635000 ;
-        RECT 9.245000 1.915000  9.575000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        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 2.255000 2.335000 2.425000 ;
-      RECT 2.165000 1.905000 3.515000 2.075000 ;
-      RECT 2.165000 2.075000 2.335000 2.255000 ;
-      RECT 2.165000 2.425000 2.335000 2.465000 ;
-      RECT 2.425000 0.295000 6.115000 0.465000 ;
-      RECT 3.345000 1.575000 9.945000 1.745000 ;
-      RECT 3.345000 1.745000 3.515000 1.905000 ;
-      RECT 3.345000 2.075000 3.515000 2.465000 ;
-      RECT 4.185000 1.745000 4.355000 2.425000 ;
-      RECT 4.525000 0.635000 7.895000 0.805000 ;
-      RECT 5.120000 1.745000 5.290000 2.465000 ;
-      RECT 6.305000 0.295000 8.235000 0.465000 ;
-      RECT 6.385000 1.745000 6.555000 2.465000 ;
-      RECT 7.225000 1.745000 7.395000 2.465000 ;
-      RECT 8.065000 0.255000 8.235000 0.295000 ;
-      RECT 8.065000 0.465000 8.235000 0.635000 ;
-      RECT 8.065000 0.635000 9.915000 0.805000 ;
-      RECT 8.065000 1.745000 8.235000 2.465000 ;
-      RECT 8.905000 0.255000 9.075000 0.635000 ;
-      RECT 8.905000 1.745000 9.075000 2.465000 ;
-      RECT 9.745000 0.255000 9.915000 0.635000 ;
-      RECT 9.775000 1.745000 9.945000 2.465000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.090000  0.085000  0.425000 0.465000 ;
+      RECT 0.090000  2.255000  2.335000 2.425000 ;
+      RECT 0.935000  0.085000  1.265000 0.465000 ;
+      RECT 1.775000  0.085000  2.105000 0.465000 ;
+      RECT 2.165000  1.905000  3.515000 2.075000 ;
+      RECT 2.165000  2.075000  2.335000 2.255000 ;
+      RECT 2.165000  2.425000  2.335000 2.465000 ;
+      RECT 2.425000  0.295000  6.115000 0.465000 ;
+      RECT 2.505000  2.255000  3.175000 2.635000 ;
+      RECT 3.345000  1.575000  9.945000 1.745000 ;
+      RECT 3.345000  1.745000  3.515000 1.905000 ;
+      RECT 3.345000  2.075000  3.515000 2.465000 ;
+      RECT 3.685000  1.915000  4.015000 2.635000 ;
+      RECT 4.185000  1.745000  4.355000 2.425000 ;
+      RECT 4.525000  0.635000  7.895000 0.805000 ;
+      RECT 4.620000  1.915000  4.950000 2.635000 ;
+      RECT 5.120000  1.745000  5.290000 2.465000 ;
+      RECT 5.495000  1.915000  6.165000 2.635000 ;
+      RECT 6.305000  0.295000  8.235000 0.465000 ;
+      RECT 6.385000  1.745000  6.555000 2.465000 ;
+      RECT 6.725000  1.915000  7.055000 2.635000 ;
+      RECT 7.225000  1.745000  7.395000 2.465000 ;
+      RECT 7.565000  1.915000  7.895000 2.635000 ;
+      RECT 8.065000  0.255000  8.235000 0.295000 ;
+      RECT 8.065000  0.465000  8.235000 0.635000 ;
+      RECT 8.065000  0.635000  9.915000 0.805000 ;
+      RECT 8.065000  1.745000  8.235000 2.465000 ;
+      RECT 8.405000  0.085000  8.735000 0.465000 ;
+      RECT 8.405000  1.915000  8.735000 2.635000 ;
+      RECT 8.905000  0.255000  9.075000 0.635000 ;
+      RECT 8.905000  1.745000  9.075000 2.465000 ;
+      RECT 9.245000  0.085000  9.575000 0.465000 ;
+      RECT 9.245000  1.915000  9.575000 2.635000 ;
+      RECT 9.745000  0.255000  9.915000 0.635000 ;
+      RECT 9.775000  1.745000  9.945000 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 ;
   END
 END sky130_fd_sc_hd__a41oi_4
diff --git a/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
index e166d16..6495ff7 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_0.magic.lef
@@ -64,15 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.950000  0.085000 1.390000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -82,27 +73,33 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.160000 2.175000 0.430000 2.635000 ;
-        RECT 1.110000 1.835000 1.620000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.185000 0.280000 0.490000 0.695000 ;
-      RECT 0.185000 0.695000 1.780000 0.910000 ;
-      RECT 0.185000 0.910000 0.770000 0.950000 ;
-      RECT 0.600000 0.950000 0.770000 2.135000 ;
-      RECT 0.600000 2.135000 0.865000 2.465000 ;
-      RECT 1.450000 0.910000 1.780000 1.435000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.160000  2.175000 0.430000 2.635000 ;
+      RECT 0.185000  0.280000 0.490000 0.695000 ;
+      RECT 0.185000  0.695000 1.780000 0.910000 ;
+      RECT 0.185000  0.910000 0.770000 0.950000 ;
+      RECT 0.600000  0.950000 0.770000 2.135000 ;
+      RECT 0.600000  2.135000 0.865000 2.465000 ;
+      RECT 0.950000  0.085000 1.390000 0.525000 ;
+      RECT 1.110000  1.835000 1.620000 2.635000 ;
+      RECT 1.450000  0.910000 1.780000 1.435000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  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
 END sky130_fd_sc_hd__and2_0
diff --git a/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
index 7b22ba1..ba4a40e 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_1.magic.lef
@@ -65,15 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 1.235000  0.085000 1.485000 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
@@ -83,28 +74,34 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.285000 1.965000 0.565000 2.635000 ;
-        RECT 1.235000 1.915000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.285000 0.355000 0.615000 0.715000 ;
-      RECT 0.285000 0.715000 1.675000 0.905000 ;
-      RECT 0.735000 1.575000 1.675000 1.745000 ;
-      RECT 0.735000 1.745000 1.035000 2.295000 ;
-      RECT 1.505000 0.905000 1.675000 0.995000 ;
-      RECT 1.505000 0.995000 1.795000 1.325000 ;
-      RECT 1.505000 1.325000 1.675000 1.575000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.285000  0.355000 0.615000 0.715000 ;
+      RECT 0.285000  0.715000 1.675000 0.905000 ;
+      RECT 0.285000  1.965000 0.565000 2.635000 ;
+      RECT 0.735000  1.575000 1.675000 1.745000 ;
+      RECT 0.735000  1.745000 1.035000 2.295000 ;
+      RECT 1.235000  0.085000 1.485000 0.545000 ;
+      RECT 1.235000  1.915000 1.565000 2.635000 ;
+      RECT 1.505000  0.905000 1.675000 0.995000 ;
+      RECT 1.505000  0.995000 1.795000 1.325000 ;
+      RECT 1.505000  1.325000 1.675000 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
 END sky130_fd_sc_hd__and2_1
diff --git a/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
index 7bb76f7..ea01b2f 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_2.magic.lef
@@ -65,17 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 1.245000  0.085000 1.495000 0.545000 ;
-        RECT 2.385000  0.085000 2.675000 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
@@ -85,30 +74,38 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.285000 1.965000 0.565000 2.635000 ;
-        RECT 1.245000 1.915000 1.575000 2.635000 ;
-        RECT 2.385000 1.495000 2.675000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.285000 0.355000 0.615000 0.715000 ;
-      RECT 0.285000 0.715000 1.675000 0.905000 ;
-      RECT 0.735000 1.575000 1.675000 1.745000 ;
-      RECT 0.735000 1.745000 1.035000 2.295000 ;
-      RECT 1.505000 0.905000 1.675000 0.995000 ;
-      RECT 1.505000 0.995000 1.795000 1.325000 ;
-      RECT 1.505000 1.325000 1.675000 1.575000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.285000  0.355000 0.615000 0.715000 ;
+      RECT 0.285000  0.715000 1.675000 0.905000 ;
+      RECT 0.285000  1.965000 0.565000 2.635000 ;
+      RECT 0.735000  1.575000 1.675000 1.745000 ;
+      RECT 0.735000  1.745000 1.035000 2.295000 ;
+      RECT 1.245000  0.085000 1.495000 0.545000 ;
+      RECT 1.245000  1.915000 1.575000 2.635000 ;
+      RECT 1.505000  0.905000 1.675000 0.995000 ;
+      RECT 1.505000  0.995000 1.795000 1.325000 ;
+      RECT 1.505000  1.325000 1.675000 1.575000 ;
+      RECT 2.385000  0.085000 2.675000 0.885000 ;
+      RECT 2.385000  1.495000 2.675000 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
 END sky130_fd_sc_hd__and2_2
diff --git a/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
index b54eb25..ce491a7 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hd__and2_4.magic.lef
@@ -69,19 +69,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.955000  0.085000 1.285000 0.445000 ;
-        RECT 1.890000  0.085000 2.220000 0.445000 ;
-        RECT 2.750000  0.085000 3.080000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -91,32 +78,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.095000 1.880000 0.425000 2.635000 ;
-        RECT 0.990000 1.935000 1.320000 2.635000 ;
-        RECT 1.890000 1.935000 2.220000 2.635000 ;
-        RECT 2.750000 1.935000 3.080000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.425000 0.615000 ;
-      RECT 0.095000 0.615000 1.360000 0.805000 ;
-      RECT 0.605000 1.580000 1.360000 1.750000 ;
-      RECT 0.605000 1.750000 0.785000 2.465000 ;
-      RECT 1.150000 0.805000 1.360000 1.020000 ;
-      RECT 1.150000 1.020000 2.685000 1.355000 ;
-      RECT 1.150000 1.355000 1.360000 1.580000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.095000  0.255000 0.425000 0.615000 ;
+      RECT 0.095000  0.615000 1.360000 0.805000 ;
+      RECT 0.095000  1.880000 0.425000 2.635000 ;
+      RECT 0.605000  1.580000 1.360000 1.750000 ;
+      RECT 0.605000  1.750000 0.785000 2.465000 ;
+      RECT 0.955000  0.085000 1.285000 0.445000 ;
+      RECT 0.990000  1.935000 1.320000 2.635000 ;
+      RECT 1.150000  0.805000 1.360000 1.020000 ;
+      RECT 1.150000  1.020000 2.685000 1.355000 ;
+      RECT 1.150000  1.355000 1.360000 1.580000 ;
+      RECT 1.890000  0.085000 2.220000 0.445000 ;
+      RECT 1.890000  1.935000 2.220000 2.635000 ;
+      RECT 2.750000  0.085000 3.080000 0.445000 ;
+      RECT 2.750000  1.935000 3.080000 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
 END sky130_fd_sc_hd__and2_4
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
index dab2378..0c715ac 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_1.magic.lef
@@ -64,17 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.590000 ;
-        RECT 1.850000  0.085000 2.245000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -84,35 +73,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.515000 2.185000 0.845000 2.635000 ;
-        RECT 1.485000 2.165000 2.170000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 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.175000 1.785000 0.850000 2.015000 ;
-      RECT 0.175000 2.015000 0.345000 2.445000 ;
-      RECT 0.595000 0.280000 0.835000 0.655000 ;
-      RECT 0.615000 0.655000 0.835000 0.805000 ;
-      RECT 0.615000 0.805000 1.150000 1.135000 ;
-      RECT 0.615000 1.135000 0.850000 1.785000 ;
-      RECT 1.020000 1.305000 2.305000 1.325000 ;
-      RECT 1.020000 1.325000 1.880000 1.475000 ;
-      RECT 1.020000 1.475000 1.305000 2.420000 ;
-      RECT 1.115000 0.270000 1.285000 0.415000 ;
-      RECT 1.115000 0.415000 1.490000 0.610000 ;
-      RECT 1.320000 0.610000 1.490000 0.945000 ;
-      RECT 1.320000 0.945000 2.305000 1.305000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.590000 ;
+      RECT 0.175000  1.785000 0.850000 2.015000 ;
+      RECT 0.175000  2.015000 0.345000 2.445000 ;
+      RECT 0.515000  2.185000 0.845000 2.635000 ;
+      RECT 0.595000  0.280000 0.835000 0.655000 ;
+      RECT 0.615000  0.655000 0.835000 0.805000 ;
+      RECT 0.615000  0.805000 1.150000 1.135000 ;
+      RECT 0.615000  1.135000 0.850000 1.785000 ;
+      RECT 1.020000  1.305000 2.305000 1.325000 ;
+      RECT 1.020000  1.325000 1.880000 1.475000 ;
+      RECT 1.020000  1.475000 1.305000 2.420000 ;
+      RECT 1.115000  0.270000 1.285000 0.415000 ;
+      RECT 1.115000  0.415000 1.490000 0.610000 ;
+      RECT 1.320000  0.610000 1.490000 0.945000 ;
+      RECT 1.320000  0.945000 2.305000 1.305000 ;
+      RECT 1.485000  2.165000 2.170000 2.635000 ;
+      RECT 1.850000  0.085000 2.245000 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 ;
   END
 END sky130_fd_sc_hd__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
index d273c55..5040c99 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_2.magic.lef
@@ -64,19 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.590000 ;
-        RECT 1.875000  0.085000 2.275000 0.580000 ;
-        RECT 2.865000  0.085000 3.135000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -86,37 +73,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.515000 2.185000 0.845000 2.635000 ;
-        RECT 1.510000 2.165000 2.195000 2.635000 ;
-        RECT 2.865000 1.680000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.785000 0.855000 2.015000 ;
-      RECT 0.175000 2.015000 0.345000 2.445000 ;
-      RECT 0.595000 0.280000 0.835000 0.655000 ;
-      RECT 0.620000 0.655000 0.835000 0.805000 ;
-      RECT 0.620000 0.805000 1.175000 1.135000 ;
-      RECT 0.620000 1.135000 0.855000 1.785000 ;
-      RECT 1.045000 1.305000 2.335000 1.325000 ;
-      RECT 1.045000 1.325000 1.905000 1.475000 ;
-      RECT 1.045000 1.475000 1.330000 2.420000 ;
-      RECT 1.115000 0.270000 1.285000 0.415000 ;
-      RECT 1.115000 0.415000 1.515000 0.610000 ;
-      RECT 1.345000 0.610000 1.515000 0.945000 ;
-      RECT 1.345000 0.945000 2.335000 1.305000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.590000 ;
+      RECT 0.175000  1.785000 0.855000 2.015000 ;
+      RECT 0.175000  2.015000 0.345000 2.445000 ;
+      RECT 0.515000  2.185000 0.845000 2.635000 ;
+      RECT 0.595000  0.280000 0.835000 0.655000 ;
+      RECT 0.620000  0.655000 0.835000 0.805000 ;
+      RECT 0.620000  0.805000 1.175000 1.135000 ;
+      RECT 0.620000  1.135000 0.855000 1.785000 ;
+      RECT 1.045000  1.305000 2.335000 1.325000 ;
+      RECT 1.045000  1.325000 1.905000 1.475000 ;
+      RECT 1.045000  1.475000 1.330000 2.420000 ;
+      RECT 1.115000  0.270000 1.285000 0.415000 ;
+      RECT 1.115000  0.415000 1.515000 0.610000 ;
+      RECT 1.345000  0.610000 1.515000 0.945000 ;
+      RECT 1.345000  0.945000 2.335000 1.305000 ;
+      RECT 1.510000  2.165000 2.195000 2.635000 ;
+      RECT 1.875000  0.085000 2.275000 0.580000 ;
+      RECT 2.865000  0.085000 3.135000 0.720000 ;
+      RECT 2.865000  1.680000 3.135000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
index c896af9..59baadf 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_4.magic.lef
@@ -67,20 +67,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.955000  0.085000 1.285000 0.445000 ;
-        RECT 1.885000  0.085000 2.215000 0.445000 ;
-        RECT 2.745000  0.085000 3.075000 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
@@ -90,42 +76,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.090000 2.255000 0.425000 2.635000 ;
-        RECT 0.990000 2.275000 1.320000 2.635000 ;
-        RECT 1.905000 2.275000 2.235000 2.635000 ;
-        RECT 2.745000 2.275000 3.075000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.615000 ;
-      RECT 0.090000 0.615000 1.355000 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.505000 2.085000 ;
-      RECT 0.515000 1.500000 1.315000 1.745000 ;
-      RECT 1.110000 1.435000 1.320000 1.485000 ;
-      RECT 1.110000 1.485000 1.315000 1.500000 ;
-      RECT 1.145000 0.805000 1.355000 0.995000 ;
-      RECT 1.145000 0.995000 2.260000 1.355000 ;
-      RECT 1.145000 1.355000 1.320000 1.435000 ;
-      RECT 3.330000 0.495000 3.500000 0.675000 ;
-      RECT 3.330000 0.675000 3.545000 0.845000 ;
-      RECT 3.335000 1.530000 3.545000 1.700000 ;
-      RECT 3.335000 1.700000 3.505000 1.915000 ;
-      RECT 3.375000 0.845000 3.545000 1.530000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.615000 ;
+      RECT 0.090000  0.615000 1.355000 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.505000 2.085000 ;
+      RECT 0.515000  1.500000 1.315000 1.745000 ;
+      RECT 0.955000  0.085000 1.285000 0.445000 ;
+      RECT 0.990000  2.275000 1.320000 2.635000 ;
+      RECT 1.110000  1.435000 1.320000 1.485000 ;
+      RECT 1.110000  1.485000 1.315000 1.500000 ;
+      RECT 1.145000  0.805000 1.355000 0.995000 ;
+      RECT 1.145000  0.995000 2.260000 1.355000 ;
+      RECT 1.145000  1.355000 1.320000 1.435000 ;
+      RECT 1.885000  0.085000 2.215000 0.445000 ;
+      RECT 1.905000  2.275000 2.235000 2.635000 ;
+      RECT 2.745000  0.085000 3.075000 0.445000 ;
+      RECT 2.745000  2.275000 3.075000 2.635000 ;
+      RECT 3.330000  0.495000 3.500000 0.675000 ;
+      RECT 3.330000  0.675000 3.545000 0.845000 ;
+      RECT 3.335000  1.530000 3.545000 1.700000 ;
+      RECT 3.335000  1.700000 3.505000 1.915000 ;
+      RECT 3.375000  0.845000 3.545000 1.530000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__and2b_4
diff --git a/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
index b26d3eb..2a96118 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_1.magic.lef
@@ -74,15 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 1.535000  0.085000 1.785000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -92,55 +83,61 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.085000 1.980000 0.700000 2.080000 ;
-        RECT 0.085000 2.080000 0.690000 2.635000 ;
-        RECT 0.515000 1.710000 0.845000 1.955000 ;
-        RECT 0.515000 1.955000 0.700000 1.980000 ;
-        RECT 1.515000 2.090000 1.770000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.295000 0.975000 0.465000 ;
-      RECT 0.085000 1.190000 0.975000 1.260000 ;
-      RECT 0.085000 1.260000 0.980000 1.285000 ;
-      RECT 0.085000 1.285000 0.990000 1.300000 ;
-      RECT 0.085000 1.300000 0.995000 1.315000 ;
-      RECT 0.085000 1.315000 1.005000 1.320000 ;
-      RECT 0.085000 1.320000 1.010000 1.330000 ;
-      RECT 0.085000 1.330000 1.015000 1.340000 ;
-      RECT 0.085000 1.340000 1.025000 1.345000 ;
-      RECT 0.085000 1.345000 1.035000 1.355000 ;
-      RECT 0.085000 1.355000 1.045000 1.360000 ;
-      RECT 0.085000 1.360000 0.345000 1.810000 ;
-      RECT 0.710000 1.360000 1.045000 1.365000 ;
-      RECT 0.710000 1.365000 1.060000 1.370000 ;
-      RECT 0.710000 1.370000 1.075000 1.380000 ;
-      RECT 0.710000 1.380000 1.100000 1.385000 ;
-      RECT 0.710000 1.385000 1.875000 1.390000 ;
-      RECT 0.740000 1.390000 1.875000 1.425000 ;
-      RECT 0.775000 1.425000 1.875000 1.450000 ;
-      RECT 0.805000 0.465000 0.975000 1.190000 ;
-      RECT 0.805000 1.450000 1.875000 1.480000 ;
-      RECT 0.825000 1.480000 1.875000 1.510000 ;
-      RECT 0.845000 1.510000 1.875000 1.540000 ;
-      RECT 0.915000 1.540000 1.875000 1.550000 ;
-      RECT 0.940000 1.550000 1.875000 1.560000 ;
-      RECT 0.960000 1.560000 1.875000 1.575000 ;
-      RECT 0.980000 1.575000 1.875000 1.590000 ;
-      RECT 0.985000 1.590000 1.770000 1.600000 ;
-      RECT 1.000000 1.600000 1.770000 1.635000 ;
-      RECT 1.015000 1.635000 1.770000 1.885000 ;
-      RECT 1.645000 0.990000 1.875000 1.385000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.085000  0.295000 0.975000 0.465000 ;
+      RECT 0.085000  1.190000 0.975000 1.260000 ;
+      RECT 0.085000  1.260000 0.980000 1.285000 ;
+      RECT 0.085000  1.285000 0.990000 1.300000 ;
+      RECT 0.085000  1.300000 0.995000 1.315000 ;
+      RECT 0.085000  1.315000 1.005000 1.320000 ;
+      RECT 0.085000  1.320000 1.010000 1.330000 ;
+      RECT 0.085000  1.330000 1.015000 1.340000 ;
+      RECT 0.085000  1.340000 1.025000 1.345000 ;
+      RECT 0.085000  1.345000 1.035000 1.355000 ;
+      RECT 0.085000  1.355000 1.045000 1.360000 ;
+      RECT 0.085000  1.360000 0.345000 1.810000 ;
+      RECT 0.085000  1.980000 0.700000 2.080000 ;
+      RECT 0.085000  2.080000 0.690000 2.635000 ;
+      RECT 0.515000  1.710000 0.845000 1.955000 ;
+      RECT 0.515000  1.955000 0.700000 1.980000 ;
+      RECT 0.710000  1.360000 1.045000 1.365000 ;
+      RECT 0.710000  1.365000 1.060000 1.370000 ;
+      RECT 0.710000  1.370000 1.075000 1.380000 ;
+      RECT 0.710000  1.380000 1.100000 1.385000 ;
+      RECT 0.710000  1.385000 1.875000 1.390000 ;
+      RECT 0.740000  1.390000 1.875000 1.425000 ;
+      RECT 0.775000  1.425000 1.875000 1.450000 ;
+      RECT 0.805000  0.465000 0.975000 1.190000 ;
+      RECT 0.805000  1.450000 1.875000 1.480000 ;
+      RECT 0.825000  1.480000 1.875000 1.510000 ;
+      RECT 0.845000  1.510000 1.875000 1.540000 ;
+      RECT 0.915000  1.540000 1.875000 1.550000 ;
+      RECT 0.940000  1.550000 1.875000 1.560000 ;
+      RECT 0.960000  1.560000 1.875000 1.575000 ;
+      RECT 0.980000  1.575000 1.875000 1.590000 ;
+      RECT 0.985000  1.590000 1.770000 1.600000 ;
+      RECT 1.000000  1.600000 1.770000 1.635000 ;
+      RECT 1.015000  1.635000 1.770000 1.885000 ;
+      RECT 1.515000  2.090000 1.770000 2.635000 ;
+      RECT 1.535000  0.085000 1.785000 0.625000 ;
+      RECT 1.645000  0.990000 1.875000 1.385000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  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
 END sky130_fd_sc_hd__and3_1
diff --git a/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
index 65f1bb1..4e1fe60 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_2.magic.lef
@@ -76,17 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 1.475000  0.085000 1.805000 0.580000 ;
-        RECT 2.400000  0.085000 2.675000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -96,31 +85,39 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.085000 2.130000 0.715000 2.635000 ;
-        RECT 0.525000 1.765000 0.855000 1.955000 ;
-        RECT 0.525000 1.955000 0.715000 2.130000 ;
-        RECT 1.555000 1.790000 1.770000 2.635000 ;
-        RECT 2.415000 1.625000 2.675000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 1.425000 1.890000 1.595000 ;
-      RECT 0.100000 1.595000 0.355000 1.960000 ;
-      RECT 0.105000 0.305000 0.895000 0.570000 ;
-      RECT 0.640000 0.570000 0.895000 1.425000 ;
-      RECT 1.080000 1.595000 1.330000 1.890000 ;
-      RECT 1.660000 0.995000 1.890000 1.425000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  2.130000 0.715000 2.635000 ;
+      RECT 0.100000  1.425000 1.890000 1.595000 ;
+      RECT 0.100000  1.595000 0.355000 1.960000 ;
+      RECT 0.105000  0.305000 0.895000 0.570000 ;
+      RECT 0.525000  1.765000 0.855000 1.955000 ;
+      RECT 0.525000  1.955000 0.715000 2.130000 ;
+      RECT 0.640000  0.570000 0.895000 1.425000 ;
+      RECT 1.080000  1.595000 1.330000 1.890000 ;
+      RECT 1.475000  0.085000 1.805000 0.580000 ;
+      RECT 1.555000  1.790000 1.770000 2.635000 ;
+      RECT 1.660000  0.995000 1.890000 1.425000 ;
+      RECT 2.400000  0.085000 2.675000 0.745000 ;
+      RECT 2.415000  1.625000 2.675000 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
 END sky130_fd_sc_hd__and3_2
diff --git a/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
index c2a69db..6f7e295 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hd__and3_4.magic.lef
@@ -79,21 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 1.905000  0.085000 2.235000 0.445000 ;
-        RECT 2.810000  0.085000 3.140000 0.445000 ;
-        RECT 3.670000  0.085000 4.000000 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
@@ -103,38 +88,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.895000 1.935000 1.345000 2.635000 ;
-        RECT 1.910000 1.935000 2.240000 2.635000 ;
-        RECT 2.810000 1.935000 3.140000 2.635000 ;
-        RECT 3.670000 1.935000 4.000000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.465000 0.255000 0.800000 0.375000 ;
-      RECT 0.465000 0.375000 1.725000 0.565000 ;
-      RECT 0.465000 0.565000 0.800000 0.805000 ;
-      RECT 0.545000 1.580000 2.280000 1.750000 ;
-      RECT 0.545000 1.750000 0.725000 2.465000 ;
-      RECT 1.520000 1.750000 1.700000 2.465000 ;
-      RECT 1.535000 0.565000 1.725000 0.615000 ;
-      RECT 1.535000 0.615000 2.280000 0.805000 ;
-      RECT 2.070000 0.805000 2.280000 1.020000 ;
-      RECT 2.070000 1.020000 3.605000 1.355000 ;
-      RECT 2.070000 1.355000 2.280000 1.580000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.465000  0.255000 0.800000 0.375000 ;
+      RECT 0.465000  0.375000 1.725000 0.565000 ;
+      RECT 0.465000  0.565000 0.800000 0.805000 ;
+      RECT 0.545000  1.580000 2.280000 1.750000 ;
+      RECT 0.545000  1.750000 0.725000 2.465000 ;
+      RECT 0.895000  1.935000 1.345000 2.635000 ;
+      RECT 1.520000  1.750000 1.700000 2.465000 ;
+      RECT 1.535000  0.565000 1.725000 0.615000 ;
+      RECT 1.535000  0.615000 2.280000 0.805000 ;
+      RECT 1.905000  0.085000 2.235000 0.445000 ;
+      RECT 1.910000  1.935000 2.240000 2.635000 ;
+      RECT 2.070000  0.805000 2.280000 1.020000 ;
+      RECT 2.070000  1.020000 3.605000 1.355000 ;
+      RECT 2.070000  1.355000 2.280000 1.580000 ;
+      RECT 2.810000  0.085000 3.140000 0.445000 ;
+      RECT 2.810000  1.935000 3.140000 2.635000 ;
+      RECT 3.670000  0.085000 4.000000 0.445000 ;
+      RECT 3.670000  1.935000 4.000000 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
 END sky130_fd_sc_hd__and3_4
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
index ea66cee..75e5762 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_1.magic.lef
@@ -74,18 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.905000 ;
-        RECT 2.375000  0.085000 2.705000 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,36 +83,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 2.125000 0.345000 2.635000 ;
-        RECT 1.005000 2.130000 1.620000 2.635000 ;
-        RECT 1.425000 1.765000 1.755000 1.955000 ;
-        RECT 1.425000 1.955000 1.620000 2.130000 ;
-        RECT 2.435000 2.090000 2.650000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.485000 0.845000 0.905000 ;
-      RECT 0.595000 0.905000 0.845000 0.995000 ;
-      RECT 0.595000 0.995000 1.390000 1.245000 ;
-      RECT 0.595000 1.245000 0.765000 2.465000 ;
-      RECT 1.005000 1.425000 2.795000 1.595000 ;
-      RECT 1.005000 1.595000 1.255000 1.960000 ;
-      RECT 1.025000 0.305000 1.815000 0.570000 ;
-      RECT 1.560000 0.570000 1.815000 1.425000 ;
-      RECT 1.975000 1.595000 2.690000 1.890000 ;
-      RECT 2.565000 0.995000 2.795000 1.425000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 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.845000 0.905000 ;
+      RECT 0.595000  0.905000 0.845000 0.995000 ;
+      RECT 0.595000  0.995000 1.390000 1.245000 ;
+      RECT 0.595000  1.245000 0.765000 2.465000 ;
+      RECT 1.005000  1.425000 2.795000 1.595000 ;
+      RECT 1.005000  1.595000 1.255000 1.960000 ;
+      RECT 1.005000  2.130000 1.620000 2.635000 ;
+      RECT 1.025000  0.305000 1.815000 0.570000 ;
+      RECT 1.425000  1.765000 1.755000 1.955000 ;
+      RECT 1.425000  1.955000 1.620000 2.130000 ;
+      RECT 1.560000  0.570000 1.815000 1.425000 ;
+      RECT 1.975000  1.595000 2.690000 1.890000 ;
+      RECT 2.375000  0.085000 2.705000 0.545000 ;
+      RECT 2.435000  2.090000 2.650000 2.635000 ;
+      RECT 2.565000  0.995000 2.795000 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 ;
   END
 END sky130_fd_sc_hd__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
index 6b2be31..ba0098f 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_2.magic.lef
@@ -76,20 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 0.355000 0.575000 ;
-        RECT 2.410000  0.085000 2.740000 0.580000 ;
-        RECT 3.330000  0.085000 3.595000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -99,37 +85,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.575000 0.400000 2.635000 ;
-        RECT 1.030000 2.130000 1.645000 2.635000 ;
-        RECT 1.455000 1.765000 1.785000 1.955000 ;
-        RECT 1.455000 1.955000 1.645000 2.130000 ;
-        RECT 2.460000 1.790000 2.675000 2.635000 ;
-        RECT 3.330000 1.625000 3.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.580000 0.305000 0.855000 1.015000 ;
-      RECT 0.580000 1.015000 1.415000 1.245000 ;
-      RECT 0.580000 1.245000 0.855000 1.905000 ;
-      RECT 1.050000 1.425000 2.820000 1.595000 ;
-      RECT 1.050000 1.595000 1.285000 1.960000 ;
-      RECT 1.055000 0.305000 1.840000 0.570000 ;
-      RECT 1.585000 0.570000 1.840000 1.425000 ;
-      RECT 2.010000 1.595000 2.200000 1.890000 ;
-      RECT 2.590000 0.995000 2.820000 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.355000 0.575000 ;
+      RECT 0.085000  1.575000 0.400000 2.635000 ;
+      RECT 0.580000  0.305000 0.855000 1.015000 ;
+      RECT 0.580000  1.015000 1.415000 1.245000 ;
+      RECT 0.580000  1.245000 0.855000 1.905000 ;
+      RECT 1.030000  2.130000 1.645000 2.635000 ;
+      RECT 1.050000  1.425000 2.820000 1.595000 ;
+      RECT 1.050000  1.595000 1.285000 1.960000 ;
+      RECT 1.055000  0.305000 1.840000 0.570000 ;
+      RECT 1.455000  1.765000 1.785000 1.955000 ;
+      RECT 1.455000  1.955000 1.645000 2.130000 ;
+      RECT 1.585000  0.570000 1.840000 1.425000 ;
+      RECT 2.010000  1.595000 2.200000 1.890000 ;
+      RECT 2.410000  0.085000 2.740000 0.580000 ;
+      RECT 2.460000  1.790000 2.675000 2.635000 ;
+      RECT 2.590000  0.995000 2.820000 1.425000 ;
+      RECT 3.330000  0.085000 3.595000 0.745000 ;
+      RECT 3.330000  1.625000 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
 END sky130_fd_sc_hd__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
index cff3b7e..8cac280 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_4.magic.lef
@@ -75,22 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 1.780000  0.085000 2.110000 0.445000 ;
-        RECT 2.645000  0.085000 2.975000 0.445000 ;
-        RECT 3.505000  0.085000 3.835000 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
@@ -100,43 +84,56 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.730000 2.275000 1.180000 2.635000 ;
-        RECT 1.745000 2.275000 2.075000 2.635000 ;
-        RECT 2.645000 2.275000 2.980000 2.635000 ;
-        RECT 3.505000 2.275000 3.835000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 0.255000 0.635000 0.355000 ;
-      RECT 0.150000 0.355000 1.600000 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.850000 1.325000 ;
-      RECT 0.680000 1.325000 0.850000 1.875000 ;
-      RECT 0.680000 1.875000 4.445000 2.105000 ;
-      RECT 1.280000 1.525000 2.055000 1.695000 ;
-      RECT 1.420000 0.545000 1.600000 0.615000 ;
-      RECT 1.420000 0.615000 2.115000 0.805000 ;
-      RECT 1.885000 0.805000 2.115000 1.020000 ;
-      RECT 1.885000 1.020000 3.100000 1.355000 ;
-      RECT 1.885000 1.355000 2.055000 1.525000 ;
-      RECT 4.165000 0.425000 4.445000 1.875000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.150000  0.255000 0.635000 0.355000 ;
+      RECT 0.150000  0.355000 1.600000 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.850000 1.325000 ;
+      RECT 0.680000  1.325000 0.850000 1.875000 ;
+      RECT 0.680000  1.875000 4.445000 2.105000 ;
+      RECT 0.730000  2.275000 1.180000 2.635000 ;
+      RECT 1.280000  1.525000 2.055000 1.695000 ;
+      RECT 1.420000  0.545000 1.600000 0.615000 ;
+      RECT 1.420000  0.615000 2.115000 0.805000 ;
+      RECT 1.745000  2.275000 2.075000 2.635000 ;
+      RECT 1.780000  0.085000 2.110000 0.445000 ;
+      RECT 1.885000  0.805000 2.115000 1.020000 ;
+      RECT 1.885000  1.020000 3.100000 1.355000 ;
+      RECT 1.885000  1.355000 2.055000 1.525000 ;
+      RECT 2.645000  0.085000 2.975000 0.445000 ;
+      RECT 2.645000  2.275000 2.980000 2.635000 ;
+      RECT 3.505000  0.085000 3.835000 0.445000 ;
+      RECT 3.505000  2.275000 3.835000 2.635000 ;
+      RECT 4.165000  0.425000 4.445000 1.875000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
 END sky130_fd_sc_hd__and3b_4
diff --git a/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
index 44586e8..ebb0312 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_1.magic.lef
@@ -82,17 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 2.355000  0.085000 2.625000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -102,31 +91,39 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.090000 2.255000 0.425000 2.635000 ;
-        RECT 1.065000 1.915000 1.395000 2.635000 ;
-        RECT 2.295000 1.835000 2.625000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.255000 0.665000 0.585000 ;
-      RECT 0.495000 0.585000 0.665000 1.495000 ;
-      RECT 0.495000 1.495000 2.685000 1.665000 ;
-      RECT 0.595000 1.665000 0.845000 2.465000 ;
-      RECT 1.580000 1.665000 1.830000 2.465000 ;
-      RECT 2.370000 1.075000 2.700000 1.325000 ;
-      RECT 2.370000 1.325000 2.685000 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.665000 0.585000 ;
+      RECT 0.495000  0.585000 0.665000 1.495000 ;
+      RECT 0.495000  1.495000 2.685000 1.665000 ;
+      RECT 0.595000  1.665000 0.845000 2.465000 ;
+      RECT 1.065000  1.915000 1.395000 2.635000 ;
+      RECT 1.580000  1.665000 1.830000 2.465000 ;
+      RECT 2.295000  1.835000 2.625000 2.635000 ;
+      RECT 2.355000  0.085000 2.625000 0.885000 ;
+      RECT 2.370000  1.075000 2.700000 1.325000 ;
+      RECT 2.370000  1.325000 2.685000 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
 END sky130_fd_sc_hd__and4_1
diff --git a/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
index 145f5b1..1325df3 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_2.magic.lef
@@ -84,19 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 2.330000  0.085000 2.565000 0.890000 ;
-        RECT 3.255000  0.085000 3.585000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -106,33 +93,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.095000 2.255000 0.425000 2.635000 ;
-        RECT 1.070000 1.915000 1.400000 2.635000 ;
-        RECT 2.235000 1.835000 2.565000 2.635000 ;
-        RECT 3.245000 1.835000 3.575000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.670000 0.585000 ;
-      RECT 0.500000 0.585000 0.670000 1.495000 ;
-      RECT 0.500000 1.495000 2.555000 1.665000 ;
-      RECT 0.600000 1.665000 0.850000 2.465000 ;
-      RECT 1.585000 1.665000 1.835000 2.465000 ;
-      RECT 2.330000 1.075000 2.725000 1.315000 ;
-      RECT 2.330000 1.315000 2.555000 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.555000 1.665000 ;
+      RECT 0.600000  1.665000 0.850000 2.465000 ;
+      RECT 1.070000  1.915000 1.400000 2.635000 ;
+      RECT 1.585000  1.665000 1.835000 2.465000 ;
+      RECT 2.235000  1.835000 2.565000 2.635000 ;
+      RECT 2.330000  0.085000 2.565000 0.890000 ;
+      RECT 2.330000  1.075000 2.725000 1.315000 ;
+      RECT 2.330000  1.315000 2.555000 1.495000 ;
+      RECT 3.245000  1.835000 3.575000 2.635000 ;
+      RECT 3.255000  0.085000 3.585000 0.810000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__and4_2
diff --git a/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
index 4708dd5..884f53b 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hd__and4_4.magic.lef
@@ -90,21 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 2.025000  0.085000 2.335000 0.550000 ;
-        RECT 2.875000  0.085000 3.205000 0.470000 ;
-        RECT 3.715000  0.085000 4.045000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -114,36 +99,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.105000 1.835000 0.385000 2.635000 ;
-        RECT 0.955000 1.935000 1.285000 2.635000 ;
-        RECT 2.025000 1.855000 2.355000 2.635000 ;
-        RECT 2.955000 1.835000 3.205000 2.635000 ;
-        RECT 3.715000 1.915000 4.045000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.670000 0.585000 ;
-      RECT 0.500000 0.585000 0.670000 1.495000 ;
-      RECT 0.500000 1.495000 2.415000 1.665000 ;
-      RECT 0.555000 1.665000 0.765000 2.465000 ;
-      RECT 1.455000 1.665000 1.645000 2.465000 ;
-      RECT 2.245000 1.105000 3.585000 1.305000 ;
-      RECT 2.245000 1.305000 2.415000 1.495000 ;
-      RECT 2.575000 1.075000 3.585000 1.105000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.105000  1.835000 0.385000 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.415000 1.665000 ;
+      RECT 0.555000  1.665000 0.765000 2.465000 ;
+      RECT 0.955000  1.935000 1.285000 2.635000 ;
+      RECT 1.455000  1.665000 1.645000 2.465000 ;
+      RECT 2.025000  0.085000 2.335000 0.550000 ;
+      RECT 2.025000  1.855000 2.355000 2.635000 ;
+      RECT 2.245000  1.105000 3.585000 1.305000 ;
+      RECT 2.245000  1.305000 2.415000 1.495000 ;
+      RECT 2.575000  1.075000 3.585000 1.105000 ;
+      RECT 2.875000  0.085000 3.205000 0.470000 ;
+      RECT 2.955000  1.835000 3.205000 2.635000 ;
+      RECT 3.715000  0.085000 4.045000 0.470000 ;
+      RECT 3.715000  1.915000 4.045000 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
 END sky130_fd_sc_hd__and4_4
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
index 6ccf900..3a4eb37 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_1.magic.lef
@@ -83,19 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 2.755000  0.085000 3.085000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -105,39 +92,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.195000 0.845000 2.635000 ;
-        RECT 1.555000 2.225000 2.225000 2.635000 ;
-        RECT 2.810000 2.225000 3.140000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 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.170000 0.255000 0.345000 0.655000 ;
-      RECT 0.170000 0.655000 0.800000 0.825000 ;
-      RECT 0.170000 1.845000 0.800000 2.015000 ;
-      RECT 0.170000 2.015000 0.345000 2.465000 ;
-      RECT 0.630000 0.825000 0.800000 0.995000 ;
-      RECT 0.630000 0.995000 0.980000 1.325000 ;
-      RECT 0.630000 1.325000 0.800000 1.845000 ;
-      RECT 1.090000 0.255000 1.320000 0.585000 ;
-      RECT 1.150000 0.585000 1.320000 1.875000 ;
-      RECT 1.150000 1.875000 3.165000 2.045000 ;
-      RECT 1.150000 2.045000 1.320000 2.465000 ;
-      RECT 2.440000 2.045000 2.610000 2.465000 ;
-      RECT 2.995000 0.995000 3.255000 1.325000 ;
-      RECT 2.995000 1.325000 3.165000 1.875000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.170000  0.255000 0.345000 0.655000 ;
+      RECT 0.170000  0.655000 0.800000 0.825000 ;
+      RECT 0.170000  1.845000 0.800000 2.015000 ;
+      RECT 0.170000  2.015000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.195000 0.845000 2.635000 ;
+      RECT 0.630000  0.825000 0.800000 0.995000 ;
+      RECT 0.630000  0.995000 0.980000 1.325000 ;
+      RECT 0.630000  1.325000 0.800000 1.845000 ;
+      RECT 1.090000  0.255000 1.320000 0.585000 ;
+      RECT 1.150000  0.585000 1.320000 1.875000 ;
+      RECT 1.150000  1.875000 3.165000 2.045000 ;
+      RECT 1.150000  2.045000 1.320000 2.465000 ;
+      RECT 1.555000  2.225000 2.225000 2.635000 ;
+      RECT 2.440000  2.045000 2.610000 2.465000 ;
+      RECT 2.755000  0.085000 3.085000 0.465000 ;
+      RECT 2.810000  2.225000 3.140000 2.635000 ;
+      RECT 2.995000  0.995000 3.255000 1.325000 ;
+      RECT 2.995000  1.325000 3.165000 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 ;
   END
 END sky130_fd_sc_hd__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
index ebecfb3..d96419e 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_2.magic.lef
@@ -84,21 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 2.760000  0.085000 3.090000 0.465000 ;
-        RECT 3.715000  0.085000 4.050000 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
@@ -108,43 +93,55 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.195000 0.845000 2.635000 ;
-        RECT 1.555000 2.255000 2.225000 2.635000 ;
-        RECT 2.840000 2.195000 3.170000 2.635000 ;
-        RECT 3.715000 1.915000 4.050000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.830000 0.805000 2.000000 ;
-      RECT 0.175000 2.000000 0.345000 2.465000 ;
-      RECT 0.595000 0.255000 0.805000 0.585000 ;
-      RECT 0.635000 0.585000 0.805000 0.995000 ;
-      RECT 0.635000 0.995000 0.975000 1.325000 ;
-      RECT 0.635000 1.325000 0.805000 1.830000 ;
-      RECT 1.015000 1.660000 1.315000 1.915000 ;
-      RECT 1.015000 1.915000 3.165000 1.965000 ;
-      RECT 1.015000 1.965000 2.610000 2.085000 ;
-      RECT 1.015000 2.085000 1.185000 2.465000 ;
-      RECT 1.095000 0.255000 1.315000 0.585000 ;
-      RECT 1.145000 0.585000 1.315000 1.660000 ;
-      RECT 2.440000 1.795000 3.165000 1.915000 ;
-      RECT 2.440000 2.085000 2.610000 2.465000 ;
-      RECT 2.995000 0.995000 3.255000 1.325000 ;
-      RECT 2.995000 1.325000 3.165000 1.795000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 0.175000  1.830000 0.805000 2.000000 ;
+      RECT 0.175000  2.000000 0.345000 2.465000 ;
+      RECT 0.515000  2.195000 0.845000 2.635000 ;
+      RECT 0.595000  0.255000 0.805000 0.585000 ;
+      RECT 0.635000  0.585000 0.805000 0.995000 ;
+      RECT 0.635000  0.995000 0.975000 1.325000 ;
+      RECT 0.635000  1.325000 0.805000 1.830000 ;
+      RECT 1.015000  1.660000 1.315000 1.915000 ;
+      RECT 1.015000  1.915000 3.165000 1.965000 ;
+      RECT 1.015000  1.965000 2.610000 2.085000 ;
+      RECT 1.015000  2.085000 1.185000 2.465000 ;
+      RECT 1.095000  0.255000 1.315000 0.585000 ;
+      RECT 1.145000  0.585000 1.315000 1.660000 ;
+      RECT 1.555000  2.255000 2.225000 2.635000 ;
+      RECT 2.440000  1.795000 3.165000 1.915000 ;
+      RECT 2.440000  2.085000 2.610000 2.465000 ;
+      RECT 2.760000  0.085000 3.090000 0.465000 ;
+      RECT 2.840000  2.195000 3.170000 2.635000 ;
+      RECT 2.995000  0.995000 3.255000 1.325000 ;
+      RECT 2.995000  1.325000 3.165000 1.795000 ;
+      RECT 3.715000  0.085000 4.050000 0.465000 ;
+      RECT 3.715000  1.915000 4.050000 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
 END sky130_fd_sc_hd__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
index 2e27b97..85917e7 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_4.magic.lef
@@ -84,23 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.570000  0.085000 0.900000 0.470000 ;
-        RECT 1.410000  0.085000 1.740000 0.470000 ;
-        RECT 2.285000  0.085000 2.615000 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
@@ -110,43 +93,57 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 1.410000 2.255000 1.740000 2.635000 ;
-        RECT 2.250000 2.255000 2.580000 2.635000 ;
-        RECT 3.475000 2.255000 3.805000 2.635000 ;
-        RECT 4.635000 2.255000 4.965000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.260000 1.915000 ;
-      RECT 0.085000 1.915000 4.900000 2.085000 ;
-      RECT 0.085000 2.085000 0.345000 2.465000 ;
-      RECT 1.440000 1.075000 2.550000 1.245000 ;
-      RECT 2.380000 0.615000 2.965000 0.785000 ;
-      RECT 2.380000 0.785000 2.550000 1.075000 ;
-      RECT 2.380000 1.245000 2.550000 1.545000 ;
-      RECT 2.380000 1.545000 4.545000 1.715000 ;
-      RECT 2.795000 0.300000 4.965000 0.470000 ;
-      RECT 2.795000 0.470000 2.965000 0.615000 ;
-      RECT 4.390000 0.470000 4.965000 0.810000 ;
-      RECT 4.730000 0.995000 4.900000 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.900000 2.085000 ;
+      RECT 0.085000  2.085000 0.345000 2.465000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 0.570000  0.085000 0.900000 0.470000 ;
+      RECT 1.410000  0.085000 1.740000 0.470000 ;
+      RECT 1.410000  2.255000 1.740000 2.635000 ;
+      RECT 1.440000  1.075000 2.550000 1.245000 ;
+      RECT 2.250000  2.255000 2.580000 2.635000 ;
+      RECT 2.285000  0.085000 2.615000 0.445000 ;
+      RECT 2.380000  0.615000 2.965000 0.785000 ;
+      RECT 2.380000  0.785000 2.550000 1.075000 ;
+      RECT 2.380000  1.245000 2.550000 1.545000 ;
+      RECT 2.380000  1.545000 4.545000 1.715000 ;
+      RECT 2.795000  0.300000 4.965000 0.470000 ;
+      RECT 2.795000  0.470000 2.965000 0.615000 ;
+      RECT 3.475000  2.255000 3.805000 2.635000 ;
+      RECT 4.390000  0.470000 4.965000 0.810000 ;
+      RECT 4.635000  2.255000 4.965000 2.635000 ;
+      RECT 4.730000  0.995000 4.900000 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
 END sky130_fd_sc_hd__and4b_4
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
index 92521fc..8d624b9 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.magic.lef
@@ -85,21 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.655000  0.085000 0.985000 0.465000 ;
-        RECT 3.755000  0.085000 4.085000 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
@@ -109,49 +94,61 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.655000 2.255000 0.985000 2.635000 ;
-        RECT 1.665000 2.255000 1.995000 2.635000 ;
-        RECT 2.570000 2.255000 2.900000 2.635000 ;
-        RECT 3.755000 2.255000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.285000 ;
-      RECT 0.085000 1.285000 1.215000 1.455000 ;
-      RECT 0.085000 1.455000 0.255000 2.135000 ;
-      RECT 0.085000 2.135000 0.345000 2.465000 ;
-      RECT 1.045000 1.455000 1.215000 1.575000 ;
-      RECT 1.045000 1.575000 1.625000 1.745000 ;
-      RECT 1.165000 0.255000 2.645000 0.425000 ;
-      RECT 1.165000 0.425000 1.565000 0.755000 ;
-      RECT 1.225000 1.915000 1.965000 2.085000 ;
-      RECT 1.225000 2.085000 1.415000 2.465000 ;
-      RECT 1.395000 0.755000 1.565000 1.235000 ;
-      RECT 1.395000 1.235000 1.965000 1.405000 ;
-      RECT 1.755000 0.595000 2.305000 0.925000 ;
-      RECT 1.795000 1.405000 1.965000 1.915000 ;
-      RECT 2.135000 0.925000 2.305000 1.915000 ;
-      RECT 2.135000 1.915000 4.085000 2.085000 ;
-      RECT 2.205000 2.085000 2.375000 2.465000 ;
-      RECT 2.475000 0.425000 2.645000 1.325000 ;
-      RECT 3.160000 2.085000 3.330000 2.465000 ;
-      RECT 3.915000 0.995000 4.085000 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.215000 1.455000 ;
+      RECT 0.085000  1.455000 0.255000 2.135000 ;
+      RECT 0.085000  2.135000 0.345000 2.465000 ;
+      RECT 0.655000  0.085000 0.985000 0.465000 ;
+      RECT 0.655000  2.255000 0.985000 2.635000 ;
+      RECT 1.045000  1.455000 1.215000 1.575000 ;
+      RECT 1.045000  1.575000 1.625000 1.745000 ;
+      RECT 1.165000  0.255000 2.645000 0.425000 ;
+      RECT 1.165000  0.425000 1.565000 0.755000 ;
+      RECT 1.225000  1.915000 1.965000 2.085000 ;
+      RECT 1.225000  2.085000 1.415000 2.465000 ;
+      RECT 1.395000  0.755000 1.565000 1.235000 ;
+      RECT 1.395000  1.235000 1.965000 1.405000 ;
+      RECT 1.665000  2.255000 1.995000 2.635000 ;
+      RECT 1.755000  0.595000 2.305000 0.925000 ;
+      RECT 1.795000  1.405000 1.965000 1.915000 ;
+      RECT 2.135000  0.925000 2.305000 1.915000 ;
+      RECT 2.135000  1.915000 4.085000 2.085000 ;
+      RECT 2.205000  2.085000 2.375000 2.465000 ;
+      RECT 2.475000  0.425000 2.645000 1.325000 ;
+      RECT 2.570000  2.255000 2.900000 2.635000 ;
+      RECT 3.160000  2.085000 3.330000 2.465000 ;
+      RECT 3.755000  0.085000 4.085000 0.465000 ;
+      RECT 3.755000  2.255000 4.085000 2.635000 ;
+      RECT 3.915000  0.995000 4.085000 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
 END sky130_fd_sc_hd__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
index e17d918..9306a6c 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.magic.lef
@@ -81,22 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.410000  0.085000 1.740000 0.465000 ;
-        RECT 3.835000  0.085000 4.085000 0.585000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -106,49 +90,62 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 1.490000 2.255000 2.160000 2.635000 ;
-        RECT 2.735000 2.255000 3.075000 2.635000 ;
-        RECT 3.755000 2.255000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.670000 0.805000 ;
-      RECT 0.175000 1.885000 1.925000 2.055000 ;
-      RECT 0.175000 2.055000 0.345000 2.465000 ;
-      RECT 0.500000 0.805000 0.670000 1.885000 ;
-      RECT 1.415000 0.635000 2.405000 0.805000 ;
-      RECT 1.415000 0.805000 1.585000 1.325000 ;
-      RECT 1.755000 0.995000 2.065000 1.325000 ;
-      RECT 1.755000 1.325000 1.925000 1.885000 ;
-      RECT 2.010000 0.255000 2.180000 0.635000 ;
-      RECT 2.235000 0.805000 2.405000 1.915000 ;
-      RECT 2.235000 1.915000 3.415000 2.085000 ;
-      RECT 2.395000 2.085000 2.565000 2.465000 ;
-      RECT 2.575000 1.400000 2.745000 1.575000 ;
-      RECT 2.575000 1.575000 3.755000 1.745000 ;
-      RECT 3.245000 2.085000 3.415000 2.465000 ;
-      RECT 3.585000 1.745000 3.755000 1.915000 ;
-      RECT 3.585000 1.915000 4.515000 2.085000 ;
-      RECT 4.255000 0.255000 4.515000 0.585000 ;
-      RECT 4.255000 2.085000 4.515000 2.465000 ;
-      RECT 4.345000 0.585000 4.515000 1.915000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.175000  0.255000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.670000 0.805000 ;
+      RECT 0.175000  1.885000 1.925000 2.055000 ;
+      RECT 0.175000  2.055000 0.345000 2.465000 ;
+      RECT 0.500000  0.805000 0.670000 1.885000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 1.410000  0.085000 1.740000 0.465000 ;
+      RECT 1.415000  0.635000 2.405000 0.805000 ;
+      RECT 1.415000  0.805000 1.585000 1.325000 ;
+      RECT 1.490000  2.255000 2.160000 2.635000 ;
+      RECT 1.755000  0.995000 2.065000 1.325000 ;
+      RECT 1.755000  1.325000 1.925000 1.885000 ;
+      RECT 2.010000  0.255000 2.180000 0.635000 ;
+      RECT 2.235000  0.805000 2.405000 1.915000 ;
+      RECT 2.235000  1.915000 3.415000 2.085000 ;
+      RECT 2.395000  2.085000 2.565000 2.465000 ;
+      RECT 2.575000  1.400000 2.745000 1.575000 ;
+      RECT 2.575000  1.575000 3.755000 1.745000 ;
+      RECT 2.735000  2.255000 3.075000 2.635000 ;
+      RECT 3.245000  2.085000 3.415000 2.465000 ;
+      RECT 3.585000  1.745000 3.755000 1.915000 ;
+      RECT 3.585000  1.915000 4.515000 2.085000 ;
+      RECT 3.755000  2.255000 4.085000 2.635000 ;
+      RECT 3.835000  0.085000 4.085000 0.585000 ;
+      RECT 4.255000  0.255000 4.515000 0.585000 ;
+      RECT 4.255000  2.085000 4.515000 2.465000 ;
+      RECT 4.345000  0.585000 4.515000 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
 END sky130_fd_sc_hd__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
index 04613a2..ee5de02 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.magic.lef
@@ -84,26 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.570000  0.085000 0.900000 0.470000 ;
-        RECT 1.410000  0.085000 1.740000 0.470000 ;
-        RECT 2.270000  0.085000 2.600000 0.445000 ;
-        RECT 4.975000  0.085000 5.305000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -113,52 +93,69 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 1.410000 2.255000 1.740000 2.635000 ;
-        RECT 2.250000 2.255000 2.580000 2.635000 ;
-        RECT 3.330000 2.255000 3.660000 2.635000 ;
-        RECT 4.360000 2.255000 5.370000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.260000 1.915000 ;
-      RECT 0.085000 1.915000 4.490000 2.085000 ;
-      RECT 0.085000 2.085000 0.345000 2.465000 ;
-      RECT 1.410000 1.075000 2.500000 1.245000 ;
-      RECT 2.330000 0.615000 2.940000 0.785000 ;
-      RECT 2.330000 0.785000 2.500000 1.075000 ;
-      RECT 2.330000 1.245000 2.500000 1.545000 ;
-      RECT 2.330000 1.545000 4.150000 1.715000 ;
-      RECT 2.770000 0.300000 4.610000 0.470000 ;
-      RECT 2.770000 0.470000 2.940000 0.615000 ;
-      RECT 3.730000 0.995000 3.900000 1.155000 ;
-      RECT 3.730000 1.155000 4.490000 1.325000 ;
-      RECT 4.255000 0.470000 4.610000 0.810000 ;
-      RECT 4.320000 1.325000 4.490000 1.915000 ;
-      RECT 4.950000 0.655000 5.805000 0.825000 ;
-      RECT 4.950000 0.825000 5.120000 1.915000 ;
-      RECT 4.950000 1.915000 5.805000 2.085000 ;
-      RECT 5.635000 0.255000 5.805000 0.655000 ;
-      RECT 5.635000 2.085000 5.805000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 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.490000 2.085000 ;
+      RECT 0.085000  2.085000 0.345000 2.465000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 0.570000  0.085000 0.900000 0.470000 ;
+      RECT 1.410000  0.085000 1.740000 0.470000 ;
+      RECT 1.410000  1.075000 2.500000 1.245000 ;
+      RECT 1.410000  2.255000 1.740000 2.635000 ;
+      RECT 2.250000  2.255000 2.580000 2.635000 ;
+      RECT 2.270000  0.085000 2.600000 0.445000 ;
+      RECT 2.330000  0.615000 2.940000 0.785000 ;
+      RECT 2.330000  0.785000 2.500000 1.075000 ;
+      RECT 2.330000  1.245000 2.500000 1.545000 ;
+      RECT 2.330000  1.545000 4.150000 1.715000 ;
+      RECT 2.770000  0.300000 4.610000 0.470000 ;
+      RECT 2.770000  0.470000 2.940000 0.615000 ;
+      RECT 3.330000  2.255000 3.660000 2.635000 ;
+      RECT 3.730000  0.995000 3.900000 1.155000 ;
+      RECT 3.730000  1.155000 4.490000 1.325000 ;
+      RECT 4.255000  0.470000 4.610000 0.810000 ;
+      RECT 4.320000  1.325000 4.490000 1.915000 ;
+      RECT 4.360000  2.255000 5.370000 2.635000 ;
+      RECT 4.950000  0.655000 5.805000 0.825000 ;
+      RECT 4.950000  0.825000 5.120000 1.915000 ;
+      RECT 4.950000  1.915000 5.805000 2.085000 ;
+      RECT 4.975000  0.085000 5.305000 0.465000 ;
+      RECT 5.635000  0.255000 5.805000 0.655000 ;
+      RECT 5.635000  2.085000 5.805000 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
 END sky130_fd_sc_hd__and4bb_4
diff --git a/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
index 007d290..c3b894c 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_1.magic.lef
@@ -55,13 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -71,25 +64,29 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.525000 1.875000 0.855000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 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.165000 1.535000 0.840000 1.705000 ;
-      RECT 0.165000 1.705000 0.345000 2.465000 ;
-      RECT 0.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.670000 0.805000 0.840000 1.060000 ;
-      RECT 0.670000 1.060000 0.945000 1.390000 ;
-      RECT 0.670000 1.390000 0.840000 1.535000 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.165000  1.535000 0.840000 1.705000 ;
+      RECT 0.165000  1.705000 0.345000 2.465000 ;
+      RECT 0.175000  0.255000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.840000 0.805000 ;
+      RECT 0.525000  0.085000 0.855000 0.465000 ;
+      RECT 0.525000  1.875000 0.855000 2.635000 ;
+      RECT 0.670000  0.805000 0.840000 1.060000 ;
+      RECT 0.670000  1.060000 0.945000 1.390000 ;
+      RECT 0.670000  1.390000 0.840000 1.535000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  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
 END sky130_fd_sc_hd__buf_1
diff --git a/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
index 37d552e..b8aad97 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_12.magic.lef
@@ -67,34 +67,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.565000 ;
-        RECT 0.935000  0.085000 1.265000 0.565000 ;
-        RECT 1.775000  0.085000 2.105000 0.565000 ;
-        RECT 2.615000  0.085000 2.945000 0.565000 ;
-        RECT 3.455000  0.085000 3.785000 0.565000 ;
-        RECT 4.295000  0.085000 4.625000 0.565000 ;
-        RECT 5.135000  0.085000 5.465000 0.565000 ;
-        RECT 5.975000  0.085000 6.305000 0.565000 ;
-        RECT 6.815000  0.085000 7.145000 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
@@ -104,48 +76,73 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.175000 1.835000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.025000 2.635000 ;
-        RECT 2.615000 1.835000 2.945000 2.635000 ;
-        RECT 3.455000 1.835000 3.785000 2.635000 ;
-        RECT 4.295000 1.835000 4.625000 2.635000 ;
-        RECT 5.135000 1.835000 5.465000 2.635000 ;
-        RECT 5.975000 1.835000 6.305000 2.635000 ;
-        RECT 6.815000 1.485000 7.145000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.445000 2.015000 1.615000 ;
-      RECT 0.515000 1.615000 0.845000 2.465000 ;
-      RECT 0.595000 0.255000 0.765000 0.735000 ;
-      RECT 0.595000 0.735000 2.015000 0.905000 ;
-      RECT 1.355000 1.615000 1.685000 2.465000 ;
-      RECT 1.435000 0.260000 1.605000 0.735000 ;
-      RECT 1.840000 0.905000 2.015000 1.075000 ;
-      RECT 1.840000 1.075000 4.465000 1.245000 ;
-      RECT 1.840000 1.245000 2.015000 1.445000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.565000 ;
+      RECT 0.175000  1.835000 0.345000 2.635000 ;
+      RECT 0.515000  1.445000 2.015000 1.615000 ;
+      RECT 0.515000  1.615000 0.845000 2.465000 ;
+      RECT 0.595000  0.255000 0.765000 0.735000 ;
+      RECT 0.595000  0.735000 2.015000 0.905000 ;
+      RECT 0.935000  0.085000 1.265000 0.565000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.355000  1.615000 1.685000 2.465000 ;
+      RECT 1.435000  0.260000 1.605000 0.735000 ;
+      RECT 1.775000  0.085000 2.105000 0.565000 ;
+      RECT 1.840000  0.905000 2.015000 1.075000 ;
+      RECT 1.840000  1.075000 4.465000 1.245000 ;
+      RECT 1.840000  1.245000 2.015000 1.445000 ;
+      RECT 1.855000  1.835000 2.025000 2.635000 ;
+      RECT 2.615000  0.085000 2.945000 0.565000 ;
+      RECT 2.615000  1.835000 2.945000 2.635000 ;
+      RECT 3.455000  0.085000 3.785000 0.565000 ;
+      RECT 3.455000  1.835000 3.785000 2.635000 ;
+      RECT 4.295000  0.085000 4.625000 0.565000 ;
+      RECT 4.295000  1.835000 4.625000 2.635000 ;
+      RECT 5.135000  0.085000 5.465000 0.565000 ;
+      RECT 5.135000  1.835000 5.465000 2.635000 ;
+      RECT 5.975000  0.085000 6.305000 0.565000 ;
+      RECT 5.975000  1.835000 6.305000 2.635000 ;
+      RECT 6.815000  0.085000 7.145000 0.885000 ;
+      RECT 6.815000  1.485000 7.145000 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
 END sky130_fd_sc_hd__buf_12
diff --git a/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
index 09f3bc5..1185249 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_16.magic.lef
@@ -76,43 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.175000  0.085000  0.345000 0.905000 ;
-        RECT 1.015000  0.085000  1.185000 0.565000 ;
-        RECT 1.855000  0.085000  2.025000 0.565000 ;
-        RECT 2.695000  0.085000  2.865000 0.565000 ;
-        RECT 3.535000  0.085000  3.705000 0.565000 ;
-        RECT 4.375000  0.085000  4.545000 0.565000 ;
-        RECT 5.215000  0.085000  5.385000 0.565000 ;
-        RECT 6.055000  0.085000  6.225000 0.565000 ;
-        RECT 6.895000  0.085000  7.065000 0.565000 ;
-        RECT 7.735000  0.085000  7.905000 0.565000 ;
-        RECT 8.575000  0.085000  8.745000 0.565000 ;
-        RECT 9.415000  0.085000  9.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 ;
-        RECT 2.905000 -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
@@ -122,59 +85,93 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.175000 1.445000  0.345000 2.635000 ;
-        RECT 1.015000 1.835000  1.185000 2.635000 ;
-        RECT 1.855000 1.835000  2.025000 2.635000 ;
-        RECT 2.695000 1.835000  2.865000 2.635000 ;
-        RECT 3.535000 1.835000  3.705000 2.635000 ;
-        RECT 4.375000 1.835000  4.545000 2.635000 ;
-        RECT 5.215000 1.835000  5.385000 2.635000 ;
-        RECT 6.055000 1.835000  6.225000 2.635000 ;
-        RECT 6.895000 1.835000  7.065000 2.635000 ;
-        RECT 7.735000 1.835000  7.905000 2.635000 ;
-        RECT 8.575000 1.835000  8.745000 2.635000 ;
-        RECT 9.415000 1.835000  9.585000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.515000 0.260000 0.845000 0.735000 ;
-      RECT 0.515000 0.735000 2.865000 0.905000 ;
-      RECT 0.515000 1.445000 2.865000 1.615000 ;
-      RECT 0.515000 1.615000 0.845000 2.465000 ;
-      RECT 1.355000 0.260000 1.685000 0.735000 ;
-      RECT 1.355000 1.615000 1.685000 2.465000 ;
-      RECT 2.195000 0.260000 2.525000 0.735000 ;
-      RECT 2.195000 1.615000 2.525000 2.465000 ;
-      RECT 2.690000 0.905000 2.865000 1.075000 ;
-      RECT 2.690000 1.075000 9.410000 1.275000 ;
-      RECT 2.690000 1.275000 2.865000 1.445000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 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.845000 0.735000 ;
+      RECT 0.515000  0.735000  2.865000 0.905000 ;
+      RECT 0.515000  1.445000  2.865000 1.615000 ;
+      RECT 0.515000  1.615000  0.845000 2.465000 ;
+      RECT 1.015000  0.085000  1.185000 0.565000 ;
+      RECT 1.015000  1.835000  1.185000 2.635000 ;
+      RECT 1.355000  0.260000  1.685000 0.735000 ;
+      RECT 1.355000  1.615000  1.685000 2.465000 ;
+      RECT 1.855000  0.085000  2.025000 0.565000 ;
+      RECT 1.855000  1.835000  2.025000 2.635000 ;
+      RECT 2.195000  0.260000  2.525000 0.735000 ;
+      RECT 2.195000  1.615000  2.525000 2.465000 ;
+      RECT 2.690000  0.905000  2.865000 1.075000 ;
+      RECT 2.690000  1.075000  9.410000 1.275000 ;
+      RECT 2.690000  1.275000  2.865000 1.445000 ;
+      RECT 2.695000  0.085000  2.865000 0.565000 ;
+      RECT 2.695000  1.835000  2.865000 2.635000 ;
+      RECT 3.535000  0.085000  3.705000 0.565000 ;
+      RECT 3.535000  1.835000  3.705000 2.635000 ;
+      RECT 4.375000  0.085000  4.545000 0.565000 ;
+      RECT 4.375000  1.835000  4.545000 2.635000 ;
+      RECT 5.215000  0.085000  5.385000 0.565000 ;
+      RECT 5.215000  1.835000  5.385000 2.635000 ;
+      RECT 6.055000  0.085000  6.225000 0.565000 ;
+      RECT 6.055000  1.835000  6.225000 2.635000 ;
+      RECT 6.895000  0.085000  7.065000 0.565000 ;
+      RECT 6.895000  1.835000  7.065000 2.635000 ;
+      RECT 7.735000  0.085000  7.905000 0.565000 ;
+      RECT 7.735000  1.835000  7.905000 2.635000 ;
+      RECT 8.575000  0.085000  8.745000 0.565000 ;
+      RECT 8.575000  1.835000  8.745000 2.635000 ;
+      RECT 9.415000  0.085000  9.585000 0.565000 ;
+      RECT 9.415000  1.835000  9.585000 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
 END sky130_fd_sc_hd__buf_16
diff --git a/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
index 29e0de9..edfa2d2 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_2.magic.lef
@@ -55,15 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.560000  0.085000 0.890000 0.465000 ;
-        RECT 1.490000  0.085000 1.750000 0.925000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -73,27 +64,33 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.560000 1.875000 0.890000 2.635000 ;
-        RECT 1.490000 1.485000 1.750000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.890000 0.805000 ;
-      RECT 0.175000 1.535000 0.890000 1.705000 ;
-      RECT 0.175000 1.705000 0.345000 2.465000 ;
-      RECT 0.720000 0.805000 0.890000 0.995000 ;
-      RECT 0.720000 0.995000 0.975000 1.325000 ;
-      RECT 0.720000 1.325000 0.890000 1.535000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.175000  0.255000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.890000 0.805000 ;
+      RECT 0.175000  1.535000 0.890000 1.705000 ;
+      RECT 0.175000  1.705000 0.345000 2.465000 ;
+      RECT 0.560000  0.085000 0.890000 0.465000 ;
+      RECT 0.560000  1.875000 0.890000 2.635000 ;
+      RECT 0.720000  0.805000 0.890000 0.995000 ;
+      RECT 0.720000  0.995000 0.975000 1.325000 ;
+      RECT 0.720000  1.325000 0.890000 1.535000 ;
+      RECT 1.490000  0.085000 1.750000 0.925000 ;
+      RECT 1.490000  1.485000 1.750000 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
 END sky130_fd_sc_hd__buf_2
diff --git a/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
index e10ddb0..acf06d4 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_4.magic.lef
@@ -59,18 +59,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.525000  0.085000 0.765000 0.565000 ;
-        RECT 1.355000  0.085000 1.685000 0.565000 ;
-        RECT 2.195000  0.085000 2.525000 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
@@ -80,30 +68,39 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.595000 1.835000 0.835000 2.635000 ;
-        RECT 1.355000 1.835000 1.685000 2.635000 ;
-        RECT 2.195000 1.485000 2.525000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.485000 0.810000 1.655000 ;
-      RECT 0.095000 1.655000 0.425000 2.465000 ;
-      RECT 0.175000 0.255000 0.345000 0.735000 ;
-      RECT 0.175000 0.735000 0.810000 0.905000 ;
-      RECT 0.640000 0.905000 0.810000 1.075000 ;
-      RECT 0.640000 1.075000 1.140000 1.245000 ;
-      RECT 0.640000 1.245000 0.810000 1.485000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  1.485000 0.810000 1.655000 ;
+      RECT 0.095000  1.655000 0.425000 2.465000 ;
+      RECT 0.175000  0.255000 0.345000 0.735000 ;
+      RECT 0.175000  0.735000 0.810000 0.905000 ;
+      RECT 0.525000  0.085000 0.765000 0.565000 ;
+      RECT 0.595000  1.835000 0.835000 2.635000 ;
+      RECT 0.640000  0.905000 0.810000 1.075000 ;
+      RECT 0.640000  1.075000 1.140000 1.245000 ;
+      RECT 0.640000  1.245000 0.810000 1.485000 ;
+      RECT 1.355000  0.085000 1.685000 0.565000 ;
+      RECT 1.355000  1.835000 1.685000 2.635000 ;
+      RECT 2.195000  0.085000 2.525000 0.885000 ;
+      RECT 2.195000  1.485000 2.525000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__buf_4
diff --git a/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
index 68f5abb..214e481 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_6.magic.lef
@@ -61,23 +61,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.435000  0.085000 0.605000 0.565000 ;
-        RECT 1.275000  0.085000 1.445000 0.565000 ;
-        RECT 2.035000  0.085000 2.365000 0.565000 ;
-        RECT 2.875000  0.085000 3.205000 0.565000 ;
-        RECT 3.715000  0.085000 4.045000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -87,35 +70,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.435000 1.485000 0.605000 2.635000 ;
-        RECT 1.275000 1.835000 1.515000 2.635000 ;
-        RECT 2.035000 1.835000 2.365000 2.635000 ;
-        RECT 2.875000 1.835000 3.205000 2.635000 ;
-        RECT 3.715000 1.485000 4.045000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.775000 0.255000 1.105000 0.735000 ;
-      RECT 0.775000 0.735000 1.525000 0.905000 ;
-      RECT 0.775000 1.485000 1.525000 1.655000 ;
-      RECT 0.775000 1.655000 1.105000 2.465000 ;
-      RECT 1.355000 0.905000 1.525000 1.075000 ;
-      RECT 1.355000 1.075000 1.825000 1.245000 ;
-      RECT 1.355000 1.245000 1.525000 1.485000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.435000  0.085000 0.605000 0.565000 ;
+      RECT 0.435000  1.485000 0.605000 2.635000 ;
+      RECT 0.775000  0.255000 1.105000 0.735000 ;
+      RECT 0.775000  0.735000 1.525000 0.905000 ;
+      RECT 0.775000  1.485000 1.525000 1.655000 ;
+      RECT 0.775000  1.655000 1.105000 2.465000 ;
+      RECT 1.275000  0.085000 1.445000 0.565000 ;
+      RECT 1.275000  1.835000 1.515000 2.635000 ;
+      RECT 1.355000  0.905000 1.525000 1.075000 ;
+      RECT 1.355000  1.075000 1.825000 1.245000 ;
+      RECT 1.355000  1.245000 1.525000 1.485000 ;
+      RECT 2.035000  0.085000 2.365000 0.565000 ;
+      RECT 2.035000  1.835000 2.365000 2.635000 ;
+      RECT 2.875000  0.085000 3.205000 0.565000 ;
+      RECT 2.875000  1.835000 3.205000 2.635000 ;
+      RECT 3.715000  0.085000 4.045000 0.885000 ;
+      RECT 3.715000  1.485000 4.045000 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
 END sky130_fd_sc_hd__buf_6
diff --git a/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
index f5fa9ad..98a6d94 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hd__buf_8.magic.lef
@@ -63,27 +63,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.565000 ;
-        RECT 1.355000  0.085000 1.685000 0.565000 ;
-        RECT 2.195000  0.085000 2.525000 0.565000 ;
-        RECT 3.035000  0.085000 3.365000 0.565000 ;
-        RECT 3.875000  0.085000 4.205000 0.565000 ;
-        RECT 4.715000  0.085000 5.045000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -93,41 +72,59 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.595000 1.835000 0.765000 2.635000 ;
-        RECT 1.435000 1.835000 1.605000 2.635000 ;
-        RECT 2.195000 1.835000 2.525000 2.635000 ;
-        RECT 3.035000 1.835000 3.365000 2.635000 ;
-        RECT 3.875000 1.835000 4.205000 2.635000 ;
-        RECT 4.715000 1.485000 5.045000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.445000 1.595000 1.615000 ;
-      RECT 0.095000 1.615000 0.425000 2.465000 ;
-      RECT 0.175000 0.255000 0.345000 0.735000 ;
-      RECT 0.175000 0.735000 1.595000 0.905000 ;
-      RECT 0.935000 1.615000 1.265000 2.465000 ;
-      RECT 1.015000 0.260000 1.185000 0.735000 ;
-      RECT 1.420000 0.905000 1.595000 1.075000 ;
-      RECT 1.420000 1.075000 4.045000 1.245000 ;
-      RECT 1.420000 1.245000 1.595000 1.445000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.095000  1.445000 1.595000 1.615000 ;
+      RECT 0.095000  1.615000 0.425000 2.465000 ;
+      RECT 0.175000  0.255000 0.345000 0.735000 ;
+      RECT 0.175000  0.735000 1.595000 0.905000 ;
+      RECT 0.515000  0.085000 0.845000 0.565000 ;
+      RECT 0.595000  1.835000 0.765000 2.635000 ;
+      RECT 0.935000  1.615000 1.265000 2.465000 ;
+      RECT 1.015000  0.260000 1.185000 0.735000 ;
+      RECT 1.355000  0.085000 1.685000 0.565000 ;
+      RECT 1.420000  0.905000 1.595000 1.075000 ;
+      RECT 1.420000  1.075000 4.045000 1.245000 ;
+      RECT 1.420000  1.245000 1.595000 1.445000 ;
+      RECT 1.435000  1.835000 1.605000 2.635000 ;
+      RECT 2.195000  0.085000 2.525000 0.565000 ;
+      RECT 2.195000  1.835000 2.525000 2.635000 ;
+      RECT 3.035000  0.085000 3.365000 0.565000 ;
+      RECT 3.035000  1.835000 3.365000 2.635000 ;
+      RECT 3.875000  0.085000 4.205000 0.565000 ;
+      RECT 3.875000  1.835000 4.205000 2.635000 ;
+      RECT 4.715000  0.085000 5.045000 0.885000 ;
+      RECT 4.715000  1.485000 5.045000 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
 END sky130_fd_sc_hd__buf_8
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
index 0070cc3..cf6de87 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.magic.lef
@@ -74,49 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.175000  0.085000  0.345000 0.905000 ;
-        RECT  1.535000  0.085000  1.705000 0.565000 ;
-        RECT  2.375000  0.085000  2.545000 0.565000 ;
-        RECT  3.215000  0.085000  3.385000 0.565000 ;
-        RECT  4.055000  0.085000  4.225000 0.565000 ;
-        RECT  4.895000  0.085000  5.065000 0.565000 ;
-        RECT  5.735000  0.085000  5.905000 0.565000 ;
-        RECT  6.575000  0.085000  6.745000 0.565000 ;
-        RECT  7.415000  0.085000  7.585000 0.565000 ;
-        RECT  8.255000  0.085000  8.425000 0.565000 ;
-        RECT  9.095000  0.085000  9.265000 0.565000 ;
-        RECT  9.935000  0.085000 10.105000 0.565000 ;
-        RECT 10.775000  0.085000 10.945000 0.565000 ;
-        RECT 11.615000  0.085000 11.785000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -126,79 +83,119 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.175000 1.445000  0.345000 2.635000 ;
-        RECT  1.535000 1.785000  1.705000 2.635000 ;
-        RECT  2.375000 1.785000  2.545000 2.635000 ;
-        RECT  3.215000 1.835000  3.385000 2.635000 ;
-        RECT  4.055000 1.835000  4.225000 2.635000 ;
-        RECT  4.895000 1.835000  5.065000 2.635000 ;
-        RECT  5.735000 1.835000  5.905000 2.635000 ;
-        RECT  6.575000 1.835000  6.745000 2.635000 ;
-        RECT  7.415000 1.835000  7.585000 2.635000 ;
-        RECT  8.255000 1.835000  8.425000 2.635000 ;
-        RECT  9.095000 1.835000  9.265000 2.635000 ;
-        RECT  9.935000 1.835000 10.105000 2.635000 ;
-        RECT 10.775000 1.835000 10.945000 2.635000 ;
-        RECT 11.615000 1.835000 11.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 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.260000  0.845000 0.905000 ;
-      RECT 0.515000 1.445000  0.845000 2.465000 ;
-      RECT 0.610000 0.905000  0.845000 1.075000 ;
-      RECT 0.610000 1.075000  2.205000 1.275000 ;
-      RECT 0.610000 1.275000  0.845000 1.445000 ;
-      RECT 1.035000 0.260000  1.365000 0.735000 ;
-      RECT 1.035000 0.735000  2.545000 0.905000 ;
-      RECT 1.035000 1.445000  2.545000 1.615000 ;
-      RECT 1.035000 1.615000  1.365000 2.465000 ;
-      RECT 1.875000 0.260000  2.205000 0.735000 ;
-      RECT 1.875000 1.615000  2.205000 2.465000 ;
-      RECT 2.375000 0.905000  2.545000 1.075000 ;
-      RECT 2.375000 1.075000  4.685000 1.275000 ;
-      RECT 2.375000 1.275000  2.545000 1.445000 ;
-      RECT 2.715000 0.260000  3.045000 0.735000 ;
-      RECT 2.715000 0.735000  5.065000 0.905000 ;
-      RECT 2.715000 1.445000  5.065000 1.615000 ;
-      RECT 2.715000 1.615000  3.045000 2.465000 ;
-      RECT 3.555000 0.260000  3.885000 0.735000 ;
-      RECT 3.555000 1.615000  3.885000 2.465000 ;
-      RECT 4.395000 0.260000  4.725000 0.735000 ;
-      RECT 4.395000 1.615000  4.725000 2.465000 ;
-      RECT 4.890000 0.905000  5.065000 1.075000 ;
-      RECT 4.890000 1.075000 11.450000 1.275000 ;
-      RECT 4.890000 1.275000  5.065000 1.445000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 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.845000 0.905000 ;
+      RECT  0.515000  1.445000  0.845000 2.465000 ;
+      RECT  0.610000  0.905000  0.845000 1.075000 ;
+      RECT  0.610000  1.075000  2.205000 1.275000 ;
+      RECT  0.610000  1.275000  0.845000 1.445000 ;
+      RECT  1.035000  0.260000  1.365000 0.735000 ;
+      RECT  1.035000  0.735000  2.545000 0.905000 ;
+      RECT  1.035000  1.445000  2.545000 1.615000 ;
+      RECT  1.035000  1.615000  1.365000 2.465000 ;
+      RECT  1.535000  0.085000  1.705000 0.565000 ;
+      RECT  1.535000  1.785000  1.705000 2.635000 ;
+      RECT  1.875000  0.260000  2.205000 0.735000 ;
+      RECT  1.875000  1.615000  2.205000 2.465000 ;
+      RECT  2.375000  0.085000  2.545000 0.565000 ;
+      RECT  2.375000  0.905000  2.545000 1.075000 ;
+      RECT  2.375000  1.075000  4.685000 1.275000 ;
+      RECT  2.375000  1.275000  2.545000 1.445000 ;
+      RECT  2.375000  1.785000  2.545000 2.635000 ;
+      RECT  2.715000  0.260000  3.045000 0.735000 ;
+      RECT  2.715000  0.735000  5.065000 0.905000 ;
+      RECT  2.715000  1.445000  5.065000 1.615000 ;
+      RECT  2.715000  1.615000  3.045000 2.465000 ;
+      RECT  3.215000  0.085000  3.385000 0.565000 ;
+      RECT  3.215000  1.835000  3.385000 2.635000 ;
+      RECT  3.555000  0.260000  3.885000 0.735000 ;
+      RECT  3.555000  1.615000  3.885000 2.465000 ;
+      RECT  4.055000  0.085000  4.225000 0.565000 ;
+      RECT  4.055000  1.835000  4.225000 2.635000 ;
+      RECT  4.395000  0.260000  4.725000 0.735000 ;
+      RECT  4.395000  1.615000  4.725000 2.465000 ;
+      RECT  4.890000  0.905000  5.065000 1.075000 ;
+      RECT  4.890000  1.075000 11.450000 1.275000 ;
+      RECT  4.890000  1.275000  5.065000 1.445000 ;
+      RECT  4.895000  0.085000  5.065000 0.565000 ;
+      RECT  4.895000  1.835000  5.065000 2.635000 ;
+      RECT  5.735000  0.085000  5.905000 0.565000 ;
+      RECT  5.735000  1.835000  5.905000 2.635000 ;
+      RECT  6.575000  0.085000  6.745000 0.565000 ;
+      RECT  6.575000  1.835000  6.745000 2.635000 ;
+      RECT  7.415000  0.085000  7.585000 0.565000 ;
+      RECT  7.415000  1.835000  7.585000 2.635000 ;
+      RECT  8.255000  0.085000  8.425000 0.565000 ;
+      RECT  8.255000  1.835000  8.425000 2.635000 ;
+      RECT  9.095000  0.085000  9.265000 0.565000 ;
+      RECT  9.095000  1.835000  9.265000 2.635000 ;
+      RECT  9.935000  0.085000 10.105000 0.565000 ;
+      RECT  9.935000  1.835000 10.105000 2.635000 ;
+      RECT 10.775000  0.085000 10.945000 0.565000 ;
+      RECT 10.775000  1.835000 10.945000 2.635000 ;
+      RECT 11.615000  0.085000 11.785000 0.565000 ;
+      RECT 11.615000  1.835000 11.785000 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 ;
   END
 END sky130_fd_sc_hd__bufbuf_16
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
index 2b9181c..ec40a4e 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.magic.lef
@@ -63,31 +63,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.565000 ;
-        RECT 2.050000  0.085000 2.220000 0.565000 ;
-        RECT 2.890000  0.085000 3.060000 0.565000 ;
-        RECT 3.730000  0.085000 3.900000 0.565000 ;
-        RECT 4.570000  0.085000 4.740000 0.565000 ;
-        RECT 5.410000  0.085000 5.580000 0.565000 ;
-        RECT 6.250000  0.085000 6.420000 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
@@ -97,57 +72,79 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.595000 1.785000 0.765000 2.635000 ;
-        RECT 2.050000 1.785000 2.220000 2.635000 ;
-        RECT 2.890000 1.785000 3.060000 2.635000 ;
-        RECT 3.730000 1.835000 3.900000 2.635000 ;
-        RECT 4.570000 1.835000 4.740000 2.635000 ;
-        RECT 5.410000 1.835000 5.580000 2.635000 ;
-        RECT 6.250000 1.835000 6.420000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.260000 0.425000 0.735000 ;
-      RECT 0.095000 0.735000 0.780000 0.905000 ;
-      RECT 0.095000 1.445000 0.780000 1.615000 ;
-      RECT 0.095000 1.615000 0.425000 2.160000 ;
-      RECT 0.610000 0.905000 0.780000 0.995000 ;
-      RECT 0.610000 0.995000 1.040000 1.325000 ;
-      RECT 0.610000 1.325000 0.780000 1.445000 ;
-      RECT 1.000000 0.260000 1.380000 0.825000 ;
-      RECT 1.000000 1.545000 1.380000 2.465000 ;
-      RECT 1.210000 0.825000 1.380000 1.075000 ;
-      RECT 1.210000 1.075000 2.720000 1.275000 ;
-      RECT 1.210000 1.275000 1.380000 1.545000 ;
-      RECT 1.550000 0.260000 1.880000 0.735000 ;
-      RECT 1.550000 0.735000 3.060000 0.905000 ;
-      RECT 1.550000 1.445000 3.060000 1.615000 ;
-      RECT 1.550000 1.615000 1.880000 2.465000 ;
-      RECT 2.390000 0.260000 2.720000 0.735000 ;
-      RECT 2.390000 1.615000 2.720000 2.465000 ;
-      RECT 2.890000 0.905000 3.060000 1.075000 ;
-      RECT 2.890000 1.075000 5.360000 1.275000 ;
-      RECT 2.890000 1.275000 3.060000 1.445000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.095000  0.260000 0.425000 0.735000 ;
+      RECT 0.095000  0.735000 0.780000 0.905000 ;
+      RECT 0.095000  1.445000 0.780000 1.615000 ;
+      RECT 0.095000  1.615000 0.425000 2.160000 ;
+      RECT 0.595000  0.085000 0.765000 0.565000 ;
+      RECT 0.595000  1.785000 0.765000 2.635000 ;
+      RECT 0.610000  0.905000 0.780000 0.995000 ;
+      RECT 0.610000  0.995000 1.040000 1.325000 ;
+      RECT 0.610000  1.325000 0.780000 1.445000 ;
+      RECT 1.000000  0.260000 1.380000 0.825000 ;
+      RECT 1.000000  1.545000 1.380000 2.465000 ;
+      RECT 1.210000  0.825000 1.380000 1.075000 ;
+      RECT 1.210000  1.075000 2.720000 1.275000 ;
+      RECT 1.210000  1.275000 1.380000 1.545000 ;
+      RECT 1.550000  0.260000 1.880000 0.735000 ;
+      RECT 1.550000  0.735000 3.060000 0.905000 ;
+      RECT 1.550000  1.445000 3.060000 1.615000 ;
+      RECT 1.550000  1.615000 1.880000 2.465000 ;
+      RECT 2.050000  0.085000 2.220000 0.565000 ;
+      RECT 2.050000  1.785000 2.220000 2.635000 ;
+      RECT 2.390000  0.260000 2.720000 0.735000 ;
+      RECT 2.390000  1.615000 2.720000 2.465000 ;
+      RECT 2.890000  0.085000 3.060000 0.565000 ;
+      RECT 2.890000  0.905000 3.060000 1.075000 ;
+      RECT 2.890000  1.075000 5.360000 1.275000 ;
+      RECT 2.890000  1.275000 3.060000 1.445000 ;
+      RECT 2.890000  1.785000 3.060000 2.635000 ;
+      RECT 3.730000  0.085000 3.900000 0.565000 ;
+      RECT 3.730000  1.835000 3.900000 2.635000 ;
+      RECT 4.570000  0.085000 4.740000 0.565000 ;
+      RECT 4.570000  1.835000 4.740000 2.635000 ;
+      RECT 5.410000  0.085000 5.580000 0.565000 ;
+      RECT 5.410000  1.835000 5.580000 2.635000 ;
+      RECT 6.250000  0.085000 6.420000 0.565000 ;
+      RECT 6.250000  1.835000 6.420000 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
 END sky130_fd_sc_hd__bufbuf_8
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
index 64be374..ce647f0 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.magic.lef
@@ -74,46 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.595000  0.085000  0.765000 0.565000 ;
-        RECT  1.435000  0.085000  1.605000 0.565000 ;
-        RECT  2.275000  0.085000  2.445000 0.565000 ;
-        RECT  3.115000  0.085000  3.285000 0.565000 ;
-        RECT  3.955000  0.085000  4.125000 0.565000 ;
-        RECT  4.795000  0.085000  4.965000 0.565000 ;
-        RECT  5.635000  0.085000  5.805000 0.565000 ;
-        RECT  6.475000  0.085000  6.645000 0.565000 ;
-        RECT  7.315000  0.085000  7.485000 0.565000 ;
-        RECT  8.155000  0.085000  8.325000 0.565000 ;
-        RECT  8.995000  0.085000  9.165000 0.565000 ;
-        RECT  9.835000  0.085000 10.005000 0.565000 ;
-        RECT 10.675000  0.085000 10.845000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -123,71 +83,108 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.595000 1.785000  0.765000 2.635000 ;
-        RECT  1.435000 1.785000  1.605000 2.635000 ;
-        RECT  2.275000 1.835000  2.445000 2.635000 ;
-        RECT  3.115000 1.835000  3.285000 2.635000 ;
-        RECT  3.955000 1.835000  4.125000 2.635000 ;
-        RECT  4.795000 1.835000  4.965000 2.635000 ;
-        RECT  5.635000 1.835000  5.805000 2.635000 ;
-        RECT  6.475000 1.835000  6.645000 2.635000 ;
-        RECT  7.315000 1.835000  7.485000 2.635000 ;
-        RECT  8.155000 1.835000  8.325000 2.635000 ;
-        RECT  8.995000 1.835000  9.165000 2.635000 ;
-        RECT  9.835000 1.835000 10.005000 2.635000 ;
-        RECT 10.675000 1.835000 10.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 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.260000  0.425000 0.735000 ;
-      RECT 0.095000 0.735000  1.605000 0.905000 ;
-      RECT 0.095000 1.445000  1.605000 1.615000 ;
-      RECT 0.095000 1.615000  0.425000 2.465000 ;
-      RECT 0.935000 0.260000  1.265000 0.735000 ;
-      RECT 0.935000 1.615000  1.265000 2.465000 ;
-      RECT 1.435000 0.905000  1.605000 1.075000 ;
-      RECT 1.435000 1.075000  3.745000 1.275000 ;
-      RECT 1.435000 1.275000  1.605000 1.445000 ;
-      RECT 1.775000 0.260000  2.105000 0.735000 ;
-      RECT 1.775000 0.735000  4.125000 0.905000 ;
-      RECT 1.775000 1.445000  4.125000 1.615000 ;
-      RECT 1.775000 1.615000  2.105000 2.465000 ;
-      RECT 2.615000 0.260000  2.945000 0.735000 ;
-      RECT 2.615000 1.615000  2.945000 2.465000 ;
-      RECT 3.455000 0.260000  3.785000 0.735000 ;
-      RECT 3.455000 1.615000  3.785000 2.465000 ;
-      RECT 3.950000 0.905000  4.125000 1.075000 ;
-      RECT 3.950000 1.075000 10.510000 1.275000 ;
-      RECT 3.950000 1.275000  4.125000 1.445000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.095000  0.260000  0.425000 0.735000 ;
+      RECT  0.095000  0.735000  1.605000 0.905000 ;
+      RECT  0.095000  1.445000  1.605000 1.615000 ;
+      RECT  0.095000  1.615000  0.425000 2.465000 ;
+      RECT  0.595000  0.085000  0.765000 0.565000 ;
+      RECT  0.595000  1.785000  0.765000 2.635000 ;
+      RECT  0.935000  0.260000  1.265000 0.735000 ;
+      RECT  0.935000  1.615000  1.265000 2.465000 ;
+      RECT  1.435000  0.085000  1.605000 0.565000 ;
+      RECT  1.435000  0.905000  1.605000 1.075000 ;
+      RECT  1.435000  1.075000  3.745000 1.275000 ;
+      RECT  1.435000  1.275000  1.605000 1.445000 ;
+      RECT  1.435000  1.785000  1.605000 2.635000 ;
+      RECT  1.775000  0.260000  2.105000 0.735000 ;
+      RECT  1.775000  0.735000  4.125000 0.905000 ;
+      RECT  1.775000  1.445000  4.125000 1.615000 ;
+      RECT  1.775000  1.615000  2.105000 2.465000 ;
+      RECT  2.275000  0.085000  2.445000 0.565000 ;
+      RECT  2.275000  1.835000  2.445000 2.635000 ;
+      RECT  2.615000  0.260000  2.945000 0.735000 ;
+      RECT  2.615000  1.615000  2.945000 2.465000 ;
+      RECT  3.115000  0.085000  3.285000 0.565000 ;
+      RECT  3.115000  1.835000  3.285000 2.635000 ;
+      RECT  3.455000  0.260000  3.785000 0.735000 ;
+      RECT  3.455000  1.615000  3.785000 2.465000 ;
+      RECT  3.950000  0.905000  4.125000 1.075000 ;
+      RECT  3.950000  1.075000 10.510000 1.275000 ;
+      RECT  3.950000  1.275000  4.125000 1.445000 ;
+      RECT  3.955000  0.085000  4.125000 0.565000 ;
+      RECT  3.955000  1.835000  4.125000 2.635000 ;
+      RECT  4.795000  0.085000  4.965000 0.565000 ;
+      RECT  4.795000  1.835000  4.965000 2.635000 ;
+      RECT  5.635000  0.085000  5.805000 0.565000 ;
+      RECT  5.635000  1.835000  5.805000 2.635000 ;
+      RECT  6.475000  0.085000  6.645000 0.565000 ;
+      RECT  6.475000  1.835000  6.645000 2.635000 ;
+      RECT  7.315000  0.085000  7.485000 0.565000 ;
+      RECT  7.315000  1.835000  7.485000 2.635000 ;
+      RECT  8.155000  0.085000  8.325000 0.565000 ;
+      RECT  8.155000  1.835000  8.325000 2.635000 ;
+      RECT  8.995000  0.085000  9.165000 0.565000 ;
+      RECT  8.995000  1.835000  9.165000 2.635000 ;
+      RECT  9.835000  0.085000 10.005000 0.565000 ;
+      RECT  9.835000  1.835000 10.005000 2.635000 ;
+      RECT 10.675000  0.085000 10.845000 0.565000 ;
+      RECT 10.675000  1.835000 10.845000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
   END
 END sky130_fd_sc_hd__bufinv_16
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
index 65d5661..f746224 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.magic.lef
@@ -63,30 +63,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.905000 ;
-        RECT 1.535000  0.085000 1.705000 0.565000 ;
-        RECT 2.375000  0.085000 2.545000 0.565000 ;
-        RECT 3.215000  0.085000 3.385000 0.565000 ;
-        RECT 4.055000  0.085000 4.225000 0.565000 ;
-        RECT 4.895000  0.085000 5.065000 0.565000 ;
-        RECT 5.735000  0.085000 5.905000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -96,49 +72,70 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.175000 1.445000 0.345000 2.635000 ;
-        RECT 1.535000 1.785000 1.705000 2.635000 ;
-        RECT 2.375000 1.785000 2.545000 2.635000 ;
-        RECT 3.215000 1.835000 3.385000 2.635000 ;
-        RECT 4.055000 1.835000 4.225000 2.635000 ;
-        RECT 4.895000 1.835000 5.065000 2.635000 ;
-        RECT 5.735000 1.835000 5.905000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        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.515000 0.260000 0.845000 0.905000 ;
-      RECT 0.515000 1.545000 0.845000 2.465000 ;
-      RECT 0.675000 0.905000 0.845000 1.075000 ;
-      RECT 0.675000 1.075000 2.205000 1.275000 ;
-      RECT 0.675000 1.275000 0.845000 1.545000 ;
-      RECT 1.035000 0.260000 1.365000 0.735000 ;
-      RECT 1.035000 0.735000 2.545000 0.905000 ;
-      RECT 1.035000 1.445000 2.545000 1.615000 ;
-      RECT 1.035000 1.615000 1.365000 2.465000 ;
-      RECT 1.875000 0.260000 2.205000 0.735000 ;
-      RECT 1.875000 1.615000 2.205000 2.465000 ;
-      RECT 2.375000 0.905000 2.545000 1.075000 ;
-      RECT 2.375000 1.075000 5.760000 1.275000 ;
-      RECT 2.375000 1.275000 2.545000 1.445000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 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.845000 0.905000 ;
+      RECT 0.515000  1.545000 0.845000 2.465000 ;
+      RECT 0.675000  0.905000 0.845000 1.075000 ;
+      RECT 0.675000  1.075000 2.205000 1.275000 ;
+      RECT 0.675000  1.275000 0.845000 1.545000 ;
+      RECT 1.035000  0.260000 1.365000 0.735000 ;
+      RECT 1.035000  0.735000 2.545000 0.905000 ;
+      RECT 1.035000  1.445000 2.545000 1.615000 ;
+      RECT 1.035000  1.615000 1.365000 2.465000 ;
+      RECT 1.535000  0.085000 1.705000 0.565000 ;
+      RECT 1.535000  1.785000 1.705000 2.635000 ;
+      RECT 1.875000  0.260000 2.205000 0.735000 ;
+      RECT 1.875000  1.615000 2.205000 2.465000 ;
+      RECT 2.375000  0.085000 2.545000 0.565000 ;
+      RECT 2.375000  0.905000 2.545000 1.075000 ;
+      RECT 2.375000  1.075000 5.760000 1.275000 ;
+      RECT 2.375000  1.275000 2.545000 1.445000 ;
+      RECT 2.375000  1.785000 2.545000 2.635000 ;
+      RECT 3.215000  0.085000 3.385000 0.565000 ;
+      RECT 3.215000  1.835000 3.385000 2.635000 ;
+      RECT 4.055000  0.085000 4.225000 0.565000 ;
+      RECT 4.055000  1.835000 4.225000 2.635000 ;
+      RECT 4.895000  0.085000 5.065000 0.565000 ;
+      RECT 4.895000  1.835000 5.065000 2.635000 ;
+      RECT 5.735000  0.085000 5.905000 0.565000 ;
+      RECT 5.735000  1.835000 5.905000 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
 END sky130_fd_sc_hd__bufinv_8
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
index 2668884..71b9d93 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.magic.lef
@@ -55,13 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -71,25 +64,29 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.525000 1.875000 0.855000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 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.425000 1.060000 0.710000 1.390000 ;
-      RECT 0.540000 0.635000 1.205000 0.805000 ;
-      RECT 0.540000 0.805000 0.710000 1.060000 ;
-      RECT 0.540000 1.390000 0.710000 1.535000 ;
-      RECT 0.540000 1.535000 1.205000 1.705000 ;
-      RECT 1.035000 0.255000 1.205000 0.635000 ;
-      RECT 1.035000 1.705000 1.205000 2.465000 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.425000  1.060000 0.710000 1.390000 ;
+      RECT 0.525000  0.085000 0.855000 0.465000 ;
+      RECT 0.525000  1.875000 0.855000 2.635000 ;
+      RECT 0.540000  0.635000 1.205000 0.805000 ;
+      RECT 0.540000  0.805000 0.710000 1.060000 ;
+      RECT 0.540000  1.390000 0.710000 1.535000 ;
+      RECT 0.540000  1.535000 1.205000 1.705000 ;
+      RECT 1.035000  0.255000 1.205000 0.635000 ;
+      RECT 1.035000  1.705000 1.205000 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 ;
   END
 END sky130_fd_sc_hd__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
index 1f52191..696327d 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.magic.lef
@@ -72,40 +72,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.085000  0.085000 0.390000 0.595000 ;
-        RECT 0.990000  0.085000 1.250000 0.610000 ;
-        RECT 1.850000  0.085000 2.110000 0.645000 ;
-        RECT 2.710000  0.085000 2.970000 0.565000 ;
-        RECT 3.570000  0.085000 3.830000 0.565000 ;
-        RECT 4.430000  0.085000 4.675000 0.565000 ;
-        RECT 5.290000  0.085000 5.535000 0.565000 ;
-        RECT 6.145000  0.085000 6.395000 0.565000 ;
-        RECT 7.005000  0.085000 7.255000 0.565000 ;
-        RECT 7.865000  0.085000 8.125000 0.565000 ;
-        RECT 8.725000  0.085000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -115,51 +81,82 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.095000 1.825000 0.390000 2.635000 ;
-        RECT 0.990000 1.825000 1.250000 2.635000 ;
-        RECT 1.850000 1.835000 2.110000 2.630000 ;
-        RECT 1.850000 2.630000 8.125000 2.635000 ;
-        RECT 2.710000 1.905000 2.970000 2.630000 ;
-        RECT 3.570000 1.905000 3.830000 2.630000 ;
-        RECT 4.430000 1.905000 4.690000 2.630000 ;
-        RECT 5.290000 1.905000 5.535000 2.630000 ;
-        RECT 6.150000 1.905000 6.395000 2.630000 ;
-        RECT 7.010000 1.905000 7.255000 2.630000 ;
-        RECT 7.870000 1.905000 8.125000 2.630000 ;
-        RECT 8.755000 1.890000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 0.265000 0.820000 1.075000 ;
-      RECT 0.570000 1.075000 7.690000 1.325000 ;
-      RECT 0.570000 1.325000 0.815000 2.465000 ;
-      RECT 1.430000 0.265000 1.680000 1.075000 ;
-      RECT 1.430000 1.325000 1.680000 2.460000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.085000  0.085000 0.390000 0.595000 ;
+      RECT 0.095000  1.825000 0.390000 2.635000 ;
+      RECT 0.570000  0.265000 0.820000 1.075000 ;
+      RECT 0.570000  1.075000 7.690000 1.325000 ;
+      RECT 0.570000  1.325000 0.815000 2.465000 ;
+      RECT 0.990000  0.085000 1.250000 0.610000 ;
+      RECT 0.990000  1.825000 1.250000 2.635000 ;
+      RECT 1.430000  0.265000 1.680000 1.075000 ;
+      RECT 1.430000  1.325000 1.680000 2.460000 ;
+      RECT 1.850000  0.085000 2.110000 0.645000 ;
+      RECT 1.850000  1.835000 2.110000 2.630000 ;
+      RECT 1.850000  2.630000 8.125000 2.635000 ;
+      RECT 2.710000  0.085000 2.970000 0.565000 ;
+      RECT 2.710000  1.905000 2.970000 2.630000 ;
+      RECT 3.570000  0.085000 3.830000 0.565000 ;
+      RECT 3.570000  1.905000 3.830000 2.630000 ;
+      RECT 4.430000  0.085000 4.675000 0.565000 ;
+      RECT 4.430000  1.905000 4.690000 2.630000 ;
+      RECT 5.290000  0.085000 5.535000 0.565000 ;
+      RECT 5.290000  1.905000 5.535000 2.630000 ;
+      RECT 6.145000  0.085000 6.395000 0.565000 ;
+      RECT 6.150000  1.905000 6.395000 2.630000 ;
+      RECT 7.005000  0.085000 7.255000 0.565000 ;
+      RECT 7.010000  1.905000 7.255000 2.630000 ;
+      RECT 7.865000  0.085000 8.125000 0.565000 ;
+      RECT 7.870000  1.905000 8.125000 2.630000 ;
+      RECT 8.725000  0.085000 9.025000 0.565000 ;
+      RECT 8.755000  1.890000 9.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 ;
   END
 END sky130_fd_sc_hd__clkbuf_16
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
index 60a58b6..ded135a 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.magic.lef
@@ -57,15 +57,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.555000  0.085000 0.830000 0.565000 ;
-        RECT 1.415000  0.085000 1.750000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -75,25 +66,31 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.525000 1.855000 0.855000 2.635000 ;
-        RECT 1.415000 2.210000 1.750000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.495000 ;
-      RECT 0.085000 1.495000 1.215000 1.665000 ;
-      RECT 0.085000 1.665000 0.355000 2.435000 ;
-      RECT 0.965000 0.995000 1.215000 1.495000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 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.215000 1.665000 ;
+      RECT 0.085000  1.665000 0.355000 2.435000 ;
+      RECT 0.525000  1.855000 0.855000 2.635000 ;
+      RECT 0.555000  0.085000 0.830000 0.565000 ;
+      RECT 0.965000  0.995000 1.215000 1.495000 ;
+      RECT 1.415000  0.085000 1.750000 0.485000 ;
+      RECT 1.415000  2.210000 1.750000 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
 END sky130_fd_sc_hd__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
index 564d6f3..e3271c3 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.magic.lef
@@ -61,18 +61,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.555000  0.085000 0.830000 0.565000 ;
-        RECT 1.475000  0.085000 1.730000 0.565000 ;
-        RECT 2.335000  0.085000 2.615000 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
@@ -82,29 +70,38 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.565000 1.835000 0.875000 2.635000 ;
-        RECT 1.475000 2.175000 1.730000 2.635000 ;
-        RECT 2.335000 1.765000 2.620000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.385000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.495000 ;
-      RECT 0.085000 1.495000 1.115000 1.665000 ;
-      RECT 0.085000 1.665000 0.395000 2.465000 ;
-      RECT 0.945000 1.075000 2.085000 1.245000 ;
-      RECT 0.945000 1.245000 1.115000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 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.115000 1.665000 ;
+      RECT 0.085000  1.665000 0.395000 2.465000 ;
+      RECT 0.555000  0.085000 0.830000 0.565000 ;
+      RECT 0.565000  1.835000 0.875000 2.635000 ;
+      RECT 0.945000  1.075000 2.085000 1.245000 ;
+      RECT 0.945000  1.245000 1.115000 1.495000 ;
+      RECT 1.475000  0.085000 1.730000 0.565000 ;
+      RECT 1.475000  2.175000 1.730000 2.635000 ;
+      RECT 2.335000  0.085000 2.615000 0.565000 ;
+      RECT 2.335000  1.765000 2.620000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
index bb26585..451aec3 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.magic.lef
@@ -63,26 +63,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.145000  0.085000 0.390000 0.545000 ;
-        RECT 0.990000  0.085000 1.250000 0.610000 ;
-        RECT 1.850000  0.085000 2.110000 0.565000 ;
-        RECT 2.710000  0.085000 2.970000 0.565000 ;
-        RECT 3.570000  0.085000 3.830000 0.565000 ;
-        RECT 4.430000  0.085000 4.730000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -92,34 +72,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.095000 1.525000 0.390000 2.635000 ;
-        RECT 0.990000 1.525000 1.250000 2.635000 ;
-        RECT 1.850000 1.905000 2.110000 2.635000 ;
-        RECT 2.710000 1.905000 2.970000 2.635000 ;
-        RECT 3.570000 1.905000 3.830000 2.635000 ;
-        RECT 4.430000 1.905000 4.725000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 0.265000 0.820000 1.075000 ;
-      RECT 0.570000 1.075000 3.590000 1.325000 ;
-      RECT 0.570000 1.325000 0.820000 2.460000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.095000  1.525000 0.390000 2.635000 ;
+      RECT 0.145000  0.085000 0.390000 0.545000 ;
+      RECT 0.570000  0.265000 0.820000 1.075000 ;
+      RECT 0.570000  1.075000 3.590000 1.325000 ;
+      RECT 0.570000  1.325000 0.820000 2.460000 ;
+      RECT 0.990000  0.085000 1.250000 0.610000 ;
+      RECT 0.990000  1.525000 1.250000 2.635000 ;
+      RECT 1.850000  0.085000 2.110000 0.565000 ;
+      RECT 1.850000  1.905000 2.110000 2.635000 ;
+      RECT 2.710000  0.085000 2.970000 0.565000 ;
+      RECT 2.710000  1.905000 2.970000 2.635000 ;
+      RECT 3.570000  0.085000 3.830000 0.565000 ;
+      RECT 3.570000  1.905000 3.830000 2.635000 ;
+      RECT 4.430000  0.085000 4.730000 0.565000 ;
+      RECT 4.430000  1.905000 4.725000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__clkbuf_8
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
index 5f9a846..46f2e8f 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.magic.lef
@@ -55,19 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.595000  0.085000 0.910000 0.545000 ;
-        RECT 2.710000  0.085000 3.040000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -77,39 +64,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.595000 1.835000 0.925000 2.635000 ;
-        RECT 2.640000 1.760000 3.040000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 0.715000 ;
-      RECT 0.085000 0.715000 1.215000 0.885000 ;
-      RECT 0.085000 1.495000 1.215000 1.665000 ;
-      RECT 0.085000 1.665000 0.425000 2.465000 ;
-      RECT 0.730000 0.885000 1.215000 1.495000 ;
-      RECT 1.385000 0.255000 1.760000 0.825000 ;
-      RECT 1.385000 1.835000 1.760000 2.465000 ;
-      RECT 1.590000 0.825000 1.760000 1.055000 ;
-      RECT 1.590000 1.055000 2.685000 1.250000 ;
-      RECT 1.590000 1.250000 1.760000 1.835000 ;
-      RECT 1.930000 0.255000 2.260000 0.715000 ;
-      RECT 1.930000 0.715000 3.195000 0.885000 ;
-      RECT 1.930000 1.420000 3.195000 1.590000 ;
-      RECT 1.930000 1.590000 2.410000 2.465000 ;
-      RECT 2.855000 0.885000 3.195000 1.420000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.255000 0.425000 0.715000 ;
+      RECT 0.085000  0.715000 1.215000 0.885000 ;
+      RECT 0.085000  1.495000 1.215000 1.665000 ;
+      RECT 0.085000  1.665000 0.425000 2.465000 ;
+      RECT 0.595000  0.085000 0.910000 0.545000 ;
+      RECT 0.595000  1.835000 0.925000 2.635000 ;
+      RECT 0.730000  0.885000 1.215000 1.495000 ;
+      RECT 1.385000  0.255000 1.760000 0.825000 ;
+      RECT 1.385000  1.835000 1.760000 2.465000 ;
+      RECT 1.590000  0.825000 1.760000 1.055000 ;
+      RECT 1.590000  1.055000 2.685000 1.250000 ;
+      RECT 1.590000  1.250000 1.760000 1.835000 ;
+      RECT 1.930000  0.255000 2.260000 0.715000 ;
+      RECT 1.930000  0.715000 3.195000 0.885000 ;
+      RECT 1.930000  1.420000 3.195000 1.590000 ;
+      RECT 1.930000  1.590000 2.410000 2.465000 ;
+      RECT 2.640000  1.760000 3.040000 2.635000 ;
+      RECT 2.710000  0.085000 3.040000 0.545000 ;
+      RECT 2.855000  0.885000 3.195000 1.420000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__clkdlybuf4s15_1
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
index 9a2d67c..f3cd78d 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.magic.lef
@@ -55,21 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.550000 ;
-        RECT 2.550000  0.085000 2.880000 0.565000 ;
-        RECT 3.720000  0.085000 4.055000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -79,45 +64,57 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.600000 2.135000 0.930000 2.635000 ;
-        RECT 2.550000 2.135000 2.880000 2.635000 ;
-        RECT 3.720000 1.485000 4.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.415000 0.720000 ;
-      RECT 0.085000 0.720000 1.060000 0.890000 ;
-      RECT 0.085000 1.795000 1.060000 1.965000 ;
-      RECT 0.085000 1.965000 0.430000 2.465000 ;
-      RECT 0.890000 0.890000 1.060000 1.075000 ;
-      RECT 0.890000 1.075000 1.320000 1.245000 ;
-      RECT 0.890000 1.245000 1.060000 1.795000 ;
-      RECT 1.230000 1.785000 1.660000 2.465000 ;
-      RECT 1.280000 0.255000 1.660000 0.905000 ;
-      RECT 1.490000 0.905000 1.660000 1.075000 ;
-      RECT 1.490000 1.075000 2.415000 1.485000 ;
-      RECT 1.490000 1.485000 1.660000 1.785000 ;
-      RECT 1.830000 0.255000 2.100000 0.735000 ;
-      RECT 1.830000 0.735000 2.900000 0.905000 ;
-      RECT 1.830000 1.790000 2.900000 1.965000 ;
-      RECT 1.830000 1.965000 2.100000 2.465000 ;
-      RECT 2.730000 0.905000 2.900000 1.075000 ;
-      RECT 2.730000 1.075000 3.185000 1.245000 ;
-      RECT 2.730000 1.245000 2.900000 1.790000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.255000 0.415000 0.720000 ;
+      RECT 0.085000  0.720000 1.060000 0.890000 ;
+      RECT 0.085000  1.795000 1.060000 1.965000 ;
+      RECT 0.085000  1.965000 0.430000 2.465000 ;
+      RECT 0.585000  0.085000 0.915000 0.550000 ;
+      RECT 0.600000  2.135000 0.930000 2.635000 ;
+      RECT 0.890000  0.890000 1.060000 1.075000 ;
+      RECT 0.890000  1.075000 1.320000 1.245000 ;
+      RECT 0.890000  1.245000 1.060000 1.795000 ;
+      RECT 1.230000  1.785000 1.660000 2.465000 ;
+      RECT 1.280000  0.255000 1.660000 0.905000 ;
+      RECT 1.490000  0.905000 1.660000 1.075000 ;
+      RECT 1.490000  1.075000 2.415000 1.485000 ;
+      RECT 1.490000  1.485000 1.660000 1.785000 ;
+      RECT 1.830000  0.255000 2.100000 0.735000 ;
+      RECT 1.830000  0.735000 2.900000 0.905000 ;
+      RECT 1.830000  1.790000 2.900000 1.965000 ;
+      RECT 1.830000  1.965000 2.100000 2.465000 ;
+      RECT 2.550000  0.085000 2.880000 0.565000 ;
+      RECT 2.550000  2.135000 2.880000 2.635000 ;
+      RECT 2.730000  0.905000 2.900000 1.075000 ;
+      RECT 2.730000  1.075000 3.185000 1.245000 ;
+      RECT 2.730000  1.245000 2.900000 1.790000 ;
+      RECT 3.720000  0.085000 4.055000 0.645000 ;
+      RECT 3.720000  1.485000 4.055000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__clkdlybuf4s15_2
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
index 8cce58e..02be9ab 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.magic.lef
@@ -55,19 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.595000  0.085000 0.910000 0.545000 ;
-        RECT 2.710000  0.085000 3.040000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -77,39 +64,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.595000 1.835000 0.925000 2.635000 ;
-        RECT 2.710000 1.760000 3.040000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.425000 0.715000 ;
-      RECT 0.095000 0.715000 1.215000 0.885000 ;
-      RECT 0.095000 1.495000 1.215000 1.665000 ;
-      RECT 0.095000 1.665000 0.425000 2.465000 ;
-      RECT 0.720000 0.885000 1.215000 1.495000 ;
-      RECT 1.385000 0.255000 1.760000 0.825000 ;
-      RECT 1.385000 1.835000 1.760000 2.465000 ;
-      RECT 1.590000 0.825000 1.760000 1.055000 ;
-      RECT 1.590000 1.055000 2.685000 1.250000 ;
-      RECT 1.590000 1.250000 1.760000 1.835000 ;
-      RECT 1.930000 0.255000 2.260000 0.715000 ;
-      RECT 1.930000 0.715000 3.195000 0.885000 ;
-      RECT 1.930000 1.420000 3.195000 1.590000 ;
-      RECT 1.930000 1.590000 2.260000 2.465000 ;
-      RECT 2.855000 0.885000 3.195000 1.420000 ;
+      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.715000 ;
+      RECT 0.095000  0.715000 1.215000 0.885000 ;
+      RECT 0.095000  1.495000 1.215000 1.665000 ;
+      RECT 0.095000  1.665000 0.425000 2.465000 ;
+      RECT 0.595000  0.085000 0.910000 0.545000 ;
+      RECT 0.595000  1.835000 0.925000 2.635000 ;
+      RECT 0.720000  0.885000 1.215000 1.495000 ;
+      RECT 1.385000  0.255000 1.760000 0.825000 ;
+      RECT 1.385000  1.835000 1.760000 2.465000 ;
+      RECT 1.590000  0.825000 1.760000 1.055000 ;
+      RECT 1.590000  1.055000 2.685000 1.250000 ;
+      RECT 1.590000  1.250000 1.760000 1.835000 ;
+      RECT 1.930000  0.255000 2.260000 0.715000 ;
+      RECT 1.930000  0.715000 3.195000 0.885000 ;
+      RECT 1.930000  1.420000 3.195000 1.590000 ;
+      RECT 1.930000  1.590000 2.260000 2.465000 ;
+      RECT 2.710000  0.085000 3.040000 0.545000 ;
+      RECT 2.710000  1.760000 3.040000 2.635000 ;
+      RECT 2.855000  0.885000 3.195000 1.420000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__clkdlybuf4s18_1
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
index c1a9fc7..388b316 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.magic.lef
@@ -58,20 +58,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.565000 ;
-        RECT 2.165000  0.085000 2.535000 0.565000 ;
-        RECT 3.320000  0.085000 3.595000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -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
@@ -81,42 +67,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.600000 1.800000 0.930000 2.635000 ;
-        RECT 2.130000 1.800000 2.545000 2.635000 ;
-        RECT 3.320000 1.625000 3.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.270000 0.415000 0.735000 ;
-      RECT 0.085000 0.735000 1.055000 0.905000 ;
-      RECT 0.085000 1.460000 1.055000 1.630000 ;
-      RECT 0.085000 1.630000 0.430000 2.465000 ;
-      RECT 0.730000 0.905000 1.055000 1.460000 ;
-      RECT 1.110000 1.800000 1.440000 2.465000 ;
-      RECT 1.160000 0.270000 1.440000 0.600000 ;
-      RECT 1.270000 0.600000 1.440000 1.075000 ;
-      RECT 1.270000 1.075000 2.205000 1.255000 ;
-      RECT 1.270000 1.255000 1.440000 1.800000 ;
-      RECT 1.630000 0.270000 1.960000 0.735000 ;
-      RECT 1.630000 0.735000 2.545000 0.905000 ;
-      RECT 1.630000 1.460000 2.545000 1.630000 ;
-      RECT 1.630000 1.630000 1.960000 2.465000 ;
-      RECT 2.375000 0.905000 2.545000 1.075000 ;
-      RECT 2.375000 1.075000 2.840000 1.245000 ;
-      RECT 2.375000 1.245000 2.545000 1.460000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.270000 0.415000 0.735000 ;
+      RECT 0.085000  0.735000 1.055000 0.905000 ;
+      RECT 0.085000  1.460000 1.055000 1.630000 ;
+      RECT 0.085000  1.630000 0.430000 2.465000 ;
+      RECT 0.585000  0.085000 0.915000 0.565000 ;
+      RECT 0.600000  1.800000 0.930000 2.635000 ;
+      RECT 0.730000  0.905000 1.055000 1.460000 ;
+      RECT 1.110000  1.800000 1.440000 2.465000 ;
+      RECT 1.160000  0.270000 1.440000 0.600000 ;
+      RECT 1.270000  0.600000 1.440000 1.075000 ;
+      RECT 1.270000  1.075000 2.205000 1.255000 ;
+      RECT 1.270000  1.255000 1.440000 1.800000 ;
+      RECT 1.630000  0.270000 1.960000 0.735000 ;
+      RECT 1.630000  0.735000 2.545000 0.905000 ;
+      RECT 1.630000  1.460000 2.545000 1.630000 ;
+      RECT 1.630000  1.630000 1.960000 2.465000 ;
+      RECT 2.130000  1.800000 2.545000 2.635000 ;
+      RECT 2.165000  0.085000 2.535000 0.565000 ;
+      RECT 2.375000  0.905000 2.545000 1.075000 ;
+      RECT 2.375000  1.075000 2.840000 1.245000 ;
+      RECT 2.375000  1.245000 2.545000 1.460000 ;
+      RECT 3.320000  0.085000 3.595000 0.645000 ;
+      RECT 3.320000  1.625000 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
 END sky130_fd_sc_hd__clkdlybuf4s18_2
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
index 1b10e39..a374ba3 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.magic.lef
@@ -55,19 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.565000 ;
-        RECT 2.240000  0.085000 2.845000 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
@@ -77,43 +64,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.600000 1.830000 0.925000 2.635000 ;
-        RECT 2.235000 1.835000 2.845000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.410000 0.735000 ;
-      RECT 0.085000 0.735000 1.005000 0.905000 ;
-      RECT 0.085000 1.490000 1.005000 1.660000 ;
-      RECT 0.085000 1.660000 0.430000 2.465000 ;
-      RECT 0.655000 0.905000 1.005000 1.025000 ;
-      RECT 0.655000 1.025000 1.105000 1.295000 ;
-      RECT 0.655000 1.295000 1.005000 1.490000 ;
-      RECT 1.175000 0.255000 1.645000 0.855000 ;
-      RECT 1.195000 1.790000 1.645000 2.465000 ;
-      RECT 1.470000 0.855000 1.645000 1.075000 ;
-      RECT 1.470000 1.075000 2.420000 1.250000 ;
-      RECT 1.470000 1.250000 1.645000 1.790000 ;
-      RECT 1.815000 0.255000 2.065000 0.735000 ;
-      RECT 1.815000 0.735000 2.765000 0.905000 ;
-      RECT 1.815000 1.495000 2.765000 1.665000 ;
-      RECT 1.815000 1.665000 2.065000 2.465000 ;
-      RECT 2.595000 0.905000 2.765000 0.990000 ;
-      RECT 2.595000 0.990000 3.050000 1.325000 ;
-      RECT 2.595000 1.325000 2.765000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.255000 0.410000 0.735000 ;
+      RECT 0.085000  0.735000 1.005000 0.905000 ;
+      RECT 0.085000  1.490000 1.005000 1.660000 ;
+      RECT 0.085000  1.660000 0.430000 2.465000 ;
+      RECT 0.580000  0.085000 0.910000 0.565000 ;
+      RECT 0.600000  1.830000 0.925000 2.635000 ;
+      RECT 0.655000  0.905000 1.005000 1.025000 ;
+      RECT 0.655000  1.025000 1.105000 1.295000 ;
+      RECT 0.655000  1.295000 1.005000 1.490000 ;
+      RECT 1.175000  0.255000 1.645000 0.855000 ;
+      RECT 1.195000  1.790000 1.645000 2.465000 ;
+      RECT 1.470000  0.855000 1.645000 1.075000 ;
+      RECT 1.470000  1.075000 2.420000 1.250000 ;
+      RECT 1.470000  1.250000 1.645000 1.790000 ;
+      RECT 1.815000  0.255000 2.065000 0.735000 ;
+      RECT 1.815000  0.735000 2.765000 0.905000 ;
+      RECT 1.815000  1.495000 2.765000 1.665000 ;
+      RECT 1.815000  1.665000 2.065000 2.465000 ;
+      RECT 2.235000  1.835000 2.845000 2.635000 ;
+      RECT 2.240000  0.085000 2.845000 0.565000 ;
+      RECT 2.595000  0.905000 2.765000 0.990000 ;
+      RECT 2.595000  0.990000 3.050000 1.325000 ;
+      RECT 2.595000  1.325000 2.765000 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
 END sky130_fd_sc_hd__clkdlybuf4s25_1
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
index 15d12a3..d70e01d 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.magic.lef
@@ -57,20 +57,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 0.470000 ;
-        RECT 2.135000  0.085000 2.465000 0.465000 ;
-        RECT 3.265000  0.085000 3.595000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -80,43 +66,54 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.575000 2.125000 0.905000 2.635000 ;
-        RECT 2.135000 1.915000 2.465000 2.635000 ;
-        RECT 3.265000 1.635000 3.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.345000 0.640000 ;
-      RECT 0.095000 0.640000 0.840000 0.810000 ;
-      RECT 0.095000 1.785000 0.835000 1.955000 ;
-      RECT 0.095000 1.955000 0.345000 2.465000 ;
-      RECT 0.665000 0.810000 0.840000 0.995000 ;
-      RECT 0.665000 0.995000 1.035000 1.325000 ;
-      RECT 0.665000 1.325000 1.005000 1.750000 ;
-      RECT 0.665000 1.750000 0.835000 1.785000 ;
-      RECT 1.095000 0.255000 1.425000 0.780000 ;
-      RECT 1.175000 1.425000 1.440000 2.465000 ;
-      RECT 1.205000 0.780000 1.425000 0.995000 ;
-      RECT 1.205000 0.995000 2.165000 1.325000 ;
-      RECT 1.205000 1.325000 1.440000 1.425000 ;
-      RECT 1.615000 0.255000 1.945000 0.635000 ;
-      RECT 1.615000 0.635000 2.595000 0.805000 ;
-      RECT 1.695000 1.500000 2.595000 1.745000 ;
-      RECT 1.695000 1.745000 1.945000 2.465000 ;
-      RECT 2.335000 0.805000 2.595000 1.500000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.095000  0.305000 0.345000 0.640000 ;
+      RECT 0.095000  0.640000 0.840000 0.810000 ;
+      RECT 0.095000  1.785000 0.835000 1.955000 ;
+      RECT 0.095000  1.955000 0.345000 2.465000 ;
+      RECT 0.575000  0.085000 0.905000 0.470000 ;
+      RECT 0.575000  2.125000 0.905000 2.635000 ;
+      RECT 0.665000  0.810000 0.840000 0.995000 ;
+      RECT 0.665000  0.995000 1.035000 1.325000 ;
+      RECT 0.665000  1.325000 1.005000 1.750000 ;
+      RECT 0.665000  1.750000 0.835000 1.785000 ;
+      RECT 1.095000  0.255000 1.425000 0.780000 ;
+      RECT 1.175000  1.425000 1.440000 2.465000 ;
+      RECT 1.205000  0.780000 1.425000 0.995000 ;
+      RECT 1.205000  0.995000 2.165000 1.325000 ;
+      RECT 1.205000  1.325000 1.440000 1.425000 ;
+      RECT 1.615000  0.255000 1.945000 0.635000 ;
+      RECT 1.615000  0.635000 2.595000 0.805000 ;
+      RECT 1.695000  1.500000 2.595000 1.745000 ;
+      RECT 1.695000  1.745000 1.945000 2.465000 ;
+      RECT 2.135000  0.085000 2.465000 0.465000 ;
+      RECT 2.135000  1.915000 2.465000 2.635000 ;
+      RECT 2.335000  0.805000 2.595000 1.500000 ;
+      RECT 3.265000  0.085000 3.595000 0.550000 ;
+      RECT 3.265000  1.635000 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
 END sky130_fd_sc_hd__clkdlybuf4s25_2
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
index adfb18f..27d86b1 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.magic.lef
@@ -55,19 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.565000 ;
-        RECT 2.690000  0.085000 3.020000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -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
@@ -77,41 +64,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.600000 1.800000 0.930000 2.635000 ;
-        RECT 2.690000 1.835000 3.020000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.415000 0.735000 ;
-      RECT 0.085000 0.735000 1.055000 0.905000 ;
-      RECT 0.085000 1.460000 1.055000 1.630000 ;
-      RECT 0.085000 1.630000 0.430000 2.465000 ;
-      RECT 0.705000 0.905000 1.055000 1.025000 ;
-      RECT 0.705000 1.025000 1.135000 1.315000 ;
-      RECT 0.705000 1.315000 1.055000 1.460000 ;
-      RECT 1.380000 0.255000 1.730000 1.070000 ;
-      RECT 1.380000 1.070000 2.240000 1.320000 ;
-      RECT 1.380000 1.320000 1.730000 2.465000 ;
-      RECT 1.990000 0.255000 2.240000 0.730000 ;
-      RECT 1.990000 0.730000 2.580000 0.900000 ;
-      RECT 1.990000 1.495000 2.580000 1.665000 ;
-      RECT 1.990000 1.665000 2.240000 2.465000 ;
-      RECT 2.410000 0.900000 2.580000 0.995000 ;
-      RECT 2.410000 0.995000 3.175000 1.325000 ;
-      RECT 2.410000 1.325000 2.580000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.255000 0.415000 0.735000 ;
+      RECT 0.085000  0.735000 1.055000 0.905000 ;
+      RECT 0.085000  1.460000 1.055000 1.630000 ;
+      RECT 0.085000  1.630000 0.430000 2.465000 ;
+      RECT 0.585000  0.085000 0.915000 0.565000 ;
+      RECT 0.600000  1.800000 0.930000 2.635000 ;
+      RECT 0.705000  0.905000 1.055000 1.025000 ;
+      RECT 0.705000  1.025000 1.135000 1.315000 ;
+      RECT 0.705000  1.315000 1.055000 1.460000 ;
+      RECT 1.380000  0.255000 1.730000 1.070000 ;
+      RECT 1.380000  1.070000 2.240000 1.320000 ;
+      RECT 1.380000  1.320000 1.730000 2.465000 ;
+      RECT 1.990000  0.255000 2.240000 0.730000 ;
+      RECT 1.990000  0.730000 2.580000 0.900000 ;
+      RECT 1.990000  1.495000 2.580000 1.665000 ;
+      RECT 1.990000  1.665000 2.240000 2.465000 ;
+      RECT 2.410000  0.900000 2.580000 0.995000 ;
+      RECT 2.410000  0.995000 3.175000 1.325000 ;
+      RECT 2.410000  1.325000 2.580000 1.495000 ;
+      RECT 2.690000  0.085000 3.020000 0.600000 ;
+      RECT 2.690000  1.835000 3.020000 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
 END sky130_fd_sc_hd__clkdlybuf4s50_1
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
index 4475af5..700c561 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.magic.lef
@@ -55,21 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.565000 ;
-        RECT 2.685000  0.085000 3.015000 0.565000 ;
-        RECT 3.795000  0.085000 4.055000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -79,45 +64,57 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.600000 1.800000 0.930000 2.635000 ;
-        RECT 2.685000 1.800000 3.015000 2.635000 ;
-        RECT 3.795000 1.800000 4.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.270000 0.415000 0.735000 ;
-      RECT 0.085000 0.735000 1.270000 0.905000 ;
-      RECT 0.085000 1.455000 1.270000 1.630000 ;
-      RECT 0.085000 1.630000 0.430000 2.465000 ;
-      RECT 0.765000 1.075000 1.435000 1.245000 ;
-      RECT 0.850000 0.905000 1.270000 1.075000 ;
-      RECT 0.850000 1.245000 1.270000 1.455000 ;
-      RECT 1.390000 1.785000 1.795000 2.465000 ;
-      RECT 1.440000 0.270000 1.795000 0.900000 ;
-      RECT 1.625000 0.900000 1.795000 1.075000 ;
-      RECT 1.625000 1.075000 2.305000 1.245000 ;
-      RECT 1.625000 1.245000 1.795000 1.785000 ;
-      RECT 1.985000 0.270000 2.235000 0.735000 ;
-      RECT 1.985000 0.735000 2.645000 0.905000 ;
-      RECT 1.985000 1.460000 2.645000 1.630000 ;
-      RECT 1.985000 1.630000 2.235000 2.465000 ;
-      RECT 2.475000 0.905000 2.645000 0.995000 ;
-      RECT 2.475000 0.995000 3.175000 1.325000 ;
-      RECT 2.475000 1.325000 2.645000 1.460000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.270000 0.415000 0.735000 ;
+      RECT 0.085000  0.735000 1.270000 0.905000 ;
+      RECT 0.085000  1.455000 1.270000 1.630000 ;
+      RECT 0.085000  1.630000 0.430000 2.465000 ;
+      RECT 0.585000  0.085000 0.915000 0.565000 ;
+      RECT 0.600000  1.800000 0.930000 2.635000 ;
+      RECT 0.765000  1.075000 1.435000 1.245000 ;
+      RECT 0.850000  0.905000 1.270000 1.075000 ;
+      RECT 0.850000  1.245000 1.270000 1.455000 ;
+      RECT 1.390000  1.785000 1.795000 2.465000 ;
+      RECT 1.440000  0.270000 1.795000 0.900000 ;
+      RECT 1.625000  0.900000 1.795000 1.075000 ;
+      RECT 1.625000  1.075000 2.305000 1.245000 ;
+      RECT 1.625000  1.245000 1.795000 1.785000 ;
+      RECT 1.985000  0.270000 2.235000 0.735000 ;
+      RECT 1.985000  0.735000 2.645000 0.905000 ;
+      RECT 1.985000  1.460000 2.645000 1.630000 ;
+      RECT 1.985000  1.630000 2.235000 2.465000 ;
+      RECT 2.475000  0.905000 2.645000 0.995000 ;
+      RECT 2.475000  0.995000 3.175000 1.325000 ;
+      RECT 2.475000  1.325000 2.645000 1.460000 ;
+      RECT 2.685000  0.085000 3.015000 0.565000 ;
+      RECT 2.685000  1.800000 3.015000 2.635000 ;
+      RECT 3.795000  0.085000 4.055000 0.635000 ;
+      RECT 3.795000  1.800000 4.055000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__clkdlybuf4s50_2
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
index 5a7619c..cce3599 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.magic.lef
@@ -55,13 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 1.010000  0.085000 1.295000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -71,16 +64,23 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.085000 1.665000 0.345000 2.635000 ;
-        RECT 1.015000 1.665000 1.295000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       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  1.665000 0.345000 2.635000 ;
+      RECT 1.010000  0.085000 1.295000 0.590000 ;
+      RECT 1.015000  1.665000 1.295000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
 END sky130_fd_sc_hd__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
index c95ba28..9caf7dc 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.magic.lef
@@ -43,6 +43,8 @@
         RECT 1.985000 1.105000 2.155000 1.275000 ;
         RECT 9.345000 1.105000 9.515000 1.275000 ;
         RECT 9.805000 1.105000 9.975000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.465000 1.075000  2.215000 1.120000 ;
         RECT 1.465000 1.120000 10.035000 1.260000 ;
@@ -86,42 +88,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.040000 0.085000 ;
-        RECT 1.855000  0.085000  2.125000 0.610000 ;
-        RECT 2.720000  0.085000  2.985000 0.610000 ;
-        RECT 3.580000  0.085000  3.845000 0.610000 ;
-        RECT 4.465000  0.085000  4.730000 0.610000 ;
-        RECT 5.490000  0.085000  5.755000 0.610000 ;
-        RECT 6.350000  0.085000  6.575000 0.610000 ;
-        RECT 7.210000  0.085000  7.475000 0.610000 ;
-        RECT 8.070000  0.085000  8.335000 0.610000 ;
-        RECT 8.930000  0.085000  9.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -131,49 +97,85 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.140000 1.495000  0.405000 2.635000 ;
-        RECT  1.000000 1.835000  1.260000 2.635000 ;
-        RECT  1.865000 1.835000  2.120000 2.635000 ;
-        RECT  2.720000 1.835000  2.980000 2.635000 ;
-        RECT  3.585000 1.835000  3.840000 2.635000 ;
-        RECT  4.465000 1.835000  4.720000 2.635000 ;
-        RECT  5.490000 1.835000  5.745000 2.120000 ;
-        RECT  5.490000 2.120000  5.750000 2.635000 ;
-        RECT  6.355000 1.835000  6.610000 2.635000 ;
-        RECT  7.215000 1.835000  7.470000 2.635000 ;
-        RECT  8.075000 1.835000  8.330000 2.635000 ;
-        RECT  8.935000 1.835000  9.190000 2.635000 ;
-        RECT  9.795000 1.835000 10.050000 2.635000 ;
-        RECT 10.650000 1.835000 10.910000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.140000  1.495000  0.405000 2.635000 ;
+      RECT  1.000000  1.835000  1.260000 2.635000 ;
+      RECT  1.855000  0.085000  2.125000 0.610000 ;
+      RECT  1.865000  1.835000  2.120000 2.635000 ;
+      RECT  2.720000  0.085000  2.985000 0.610000 ;
+      RECT  2.720000  1.835000  2.980000 2.635000 ;
+      RECT  3.580000  0.085000  3.845000 0.610000 ;
+      RECT  3.585000  1.835000  3.840000 2.635000 ;
+      RECT  4.465000  0.085000  4.730000 0.610000 ;
+      RECT  4.465000  1.835000  4.720000 2.635000 ;
+      RECT  5.490000  0.085000  5.755000 0.610000 ;
+      RECT  5.490000  1.835000  5.745000 2.120000 ;
+      RECT  5.490000  2.120000  5.750000 2.635000 ;
+      RECT  6.350000  0.085000  6.575000 0.610000 ;
+      RECT  6.355000  1.835000  6.610000 2.635000 ;
+      RECT  7.210000  0.085000  7.475000 0.610000 ;
+      RECT  7.215000  1.835000  7.470000 2.635000 ;
+      RECT  8.070000  0.085000  8.335000 0.610000 ;
+      RECT  8.075000  1.835000  8.330000 2.635000 ;
+      RECT  8.930000  0.085000  9.195000 0.610000 ;
+      RECT  8.935000  1.835000  9.190000 2.635000 ;
+      RECT  9.795000  1.835000 10.050000 2.635000 ;
+      RECT 10.650000  1.835000 10.910000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+  END
 END sky130_fd_sc_hd__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
index 4ee5f8e..ddf919f 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.magic.lef
@@ -58,15 +58,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.560000  0.085000 0.855000 0.610000 ;
-        RECT 1.420000  0.085000 1.750000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -76,17 +67,26 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.580000 1.800000 0.840000 2.635000 ;
-        RECT 1.440000 1.800000 1.695000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       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.560000  0.085000 0.855000 0.610000 ;
+      RECT 0.580000  1.800000 0.840000 2.635000 ;
+      RECT 1.420000  0.085000 1.750000 0.555000 ;
+      RECT 1.440000  1.800000 1.695000 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
 END sky130_fd_sc_hd__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
index 0f0b64b..dea1d9c 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.magic.lef
@@ -61,19 +61,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.565000  0.085000 0.860000 0.555000 ;
-        RECT 1.460000  0.085000 1.720000 0.555000 ;
-        RECT 2.315000  0.085000 2.615000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -83,22 +70,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 1.800000 0.430000 2.635000 ;
-        RECT 1.030000 1.800000 1.290000 2.635000 ;
-        RECT 1.890000 1.800000 2.150000 2.635000 ;
-        RECT 2.750000 1.800000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.800000 0.430000 2.635000 ;
+      RECT 0.565000  0.085000 0.860000 0.555000 ;
+      RECT 1.030000  1.800000 1.290000 2.635000 ;
+      RECT 1.460000  0.085000 1.720000 0.555000 ;
+      RECT 1.890000  1.800000 2.150000 2.635000 ;
+      RECT 2.315000  0.085000 2.615000 0.555000 ;
+      RECT 2.750000  1.800000 3.135000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+  END
 END sky130_fd_sc_hd__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
index af15f70..7670a46 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.magic.lef
@@ -66,27 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 1.035000  0.085000 1.365000 0.525000 ;
-        RECT 1.895000  0.085000 2.225000 0.525000 ;
-        RECT 2.755000  0.085000 3.085000 0.525000 ;
-        RECT 3.615000  0.085000 3.945000 0.525000 ;
-        RECT 4.475000  0.085000 4.805000 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
@@ -96,31 +75,52 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.135000 1.800000 0.395000 2.635000 ;
-        RECT 0.975000 1.800000 1.235000 2.635000 ;
-        RECT 1.815000 1.800000 2.075000 2.635000 ;
-        RECT 2.665000 1.800000 2.910000 2.635000 ;
-        RECT 3.495000 1.800000 3.750000 2.635000 ;
-        RECT 4.345000 1.800000 4.595000 2.635000 ;
-        RECT 5.175000 1.800000 5.430000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.135000  1.800000 0.395000 2.635000 ;
+      RECT 0.975000  1.800000 1.235000 2.635000 ;
+      RECT 1.035000  0.085000 1.365000 0.525000 ;
+      RECT 1.815000  1.800000 2.075000 2.635000 ;
+      RECT 1.895000  0.085000 2.225000 0.525000 ;
+      RECT 2.665000  1.800000 2.910000 2.635000 ;
+      RECT 2.755000  0.085000 3.085000 0.525000 ;
+      RECT 3.495000  1.800000 3.750000 2.635000 ;
+      RECT 3.615000  0.085000 3.945000 0.525000 ;
+      RECT 4.345000  1.800000 4.595000 2.635000 ;
+      RECT 4.475000  0.085000 4.805000 0.525000 ;
+      RECT 5.175000  1.800000 5.430000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+  END
 END sky130_fd_sc_hd__clkinv_8
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
index 60cefb7..c18a4f4 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.magic.lef
@@ -54,14 +54,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.295000  0.085000 0.625000 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
@@ -71,18 +63,26 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.225000 1.835000 0.555000 2.625000 ;
-        RECT 0.225000 2.625000 1.740000 2.635000 ;
-        RECT 1.440000 1.455000 1.740000 2.625000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.225000  1.835000 0.555000 2.625000 ;
+      RECT 0.225000  2.625000 1.740000 2.635000 ;
+      RECT 0.295000  0.085000 0.625000 0.745000 ;
+      RECT 1.440000  1.455000 1.740000 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
 END sky130_fd_sc_hd__clkinvlp_2
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
index fc27b88..16fc988 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.magic.lef
@@ -57,17 +57,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.575000 ;
-        RECT 1.675000  0.085000 2.005000 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
@@ -77,20 +66,31 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.095000 1.495000 0.425000 2.635000 ;
-        RECT 1.155000 1.465000 1.485000 2.635000 ;
-        RECT 2.215000 1.465000 2.545000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.575000 ;
+      RECT 0.095000  1.495000 0.425000 2.635000 ;
+      RECT 1.155000  1.465000 1.485000 2.635000 ;
+      RECT 1.675000  0.085000 2.005000 0.775000 ;
+      RECT 2.215000  1.465000 2.545000 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
 END sky130_fd_sc_hd__clkinvlp_4
diff --git a/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
index 867674e..dc76ef2 100644
--- a/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hd__conb_1.magic.lef
@@ -51,13 +51,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.775000  0.085000 1.115000 0.745000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -67,15 +60,22 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.275000 1.910000 0.605000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.275000  1.910000 0.605000 2.635000 ;
+      RECT 0.775000  0.085000 1.115000 0.745000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
 END sky130_fd_sc_hd__conb_1
diff --git a/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
index e348e83..9740727 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_12.magic.lef
@@ -35,23 +35,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.085000  0.085000 5.430000 0.855000 ;
-        RECT 0.085000  0.855000 2.665000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -61,25 +44,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.085000 1.545000 5.430000 2.635000 ;
-        RECT 2.835000 1.025000 5.430000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.085000 5.430000 0.855000 ;
+      RECT 0.085000  0.855000 2.665000 1.375000 ;
+      RECT 0.085000  1.545000 5.430000 2.635000 ;
+      RECT 2.835000  1.025000 5.430000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+  END
 END sky130_fd_sc_hd__decap_12
diff --git a/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
index 3927a00..609a8d8 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_3.magic.lef
@@ -35,14 +35,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.085000  0.085000 1.295000 0.835000 ;
-        RECT 0.085000  0.835000 0.605000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -52,16 +44,24 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.085000 1.545000 1.295000 2.635000 ;
-        RECT 0.775000 1.005000 1.295000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.085000  0.085000 1.295000 0.835000 ;
+      RECT 0.085000  0.835000 0.605000 1.375000 ;
+      RECT 0.085000  1.545000 1.295000 2.635000 ;
+      RECT 0.775000  1.005000 1.295000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
 END sky130_fd_sc_hd__decap_3
diff --git a/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
index 489f400..647b832 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_4.magic.lef
@@ -35,15 +35,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.085000  0.085000 1.755000 0.855000 ;
-        RECT 0.085000  0.855000 0.835000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -53,17 +44,26 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.085000 1.545000 1.755000 2.635000 ;
-        RECT 1.005000 1.025000 1.755000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.085000  0.085000 1.755000 0.855000 ;
+      RECT 0.085000  0.855000 0.835000 1.375000 ;
+      RECT 0.085000  1.545000 1.755000 2.635000 ;
+      RECT 1.005000  1.025000 1.755000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
 END sky130_fd_sc_hd__decap_4
diff --git a/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
index dac2dfa..f44cdfc 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_6.magic.lef
@@ -35,17 +35,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.085000  0.085000 2.675000 0.855000 ;
-        RECT 0.085000  0.855000 1.295000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -55,19 +44,30 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.085000 1.545000 2.675000 2.635000 ;
-        RECT 1.465000 1.025000 2.675000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.085000 2.675000 0.855000 ;
+      RECT 0.085000  0.855000 1.295000 1.375000 ;
+      RECT 0.085000  1.545000 2.675000 2.635000 ;
+      RECT 1.465000  1.025000 2.675000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+  END
 END sky130_fd_sc_hd__decap_6
diff --git a/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
index 9174de6..361d469 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hd__decap_8.magic.lef
@@ -35,19 +35,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 3.595000 0.855000 ;
-        RECT 0.085000  0.855000 1.735000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -57,21 +44,34 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.545000 3.595000 2.635000 ;
-        RECT 1.905000 1.025000 3.595000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 3.595000 0.855000 ;
+      RECT 0.085000  0.855000 1.735000 1.375000 ;
+      RECT 0.085000  1.545000 3.595000 2.635000 ;
+      RECT 1.905000  1.025000 3.595000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+  END
 END sky130_fd_sc_hd__decap_8
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
index 5fd04e5..0b285ea 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.magic.lef
@@ -78,10 +78,16 @@
       LAYER li1 ;
         RECT 3.585000 0.735000 3.995000 0.965000 ;
         RECT 3.585000 0.965000 3.915000 1.065000 ;
-        RECT 7.280000 0.735000 7.825000 1.065000 ;
       LAYER mcon ;
         RECT 3.825000 0.765000 3.995000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.280000 0.735000 7.825000 1.065000 ;
+      LAYER mcon ;
         RECT 7.575000 0.765000 7.745000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.765000 0.735000 4.055000 0.780000 ;
         RECT 3.765000 0.780000 7.805000 0.920000 ;
@@ -104,42 +110,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.430000  0.085000  1.785000 0.465000 ;
-        RECT  3.585000  0.085000  3.755000 0.525000 ;
-        RECT  5.325000  0.085000  5.675000 0.465000 ;
-        RECT  7.250000  0.085000  7.575000 0.525000 ;
-        RECT  9.725000  0.085000 10.030000 0.805000 ;
-        RECT 11.150000  0.085000 11.445000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -149,122 +119,154 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.430000 2.135000  1.785000 2.635000 ;
-        RECT  3.405000 2.205000  3.785000 2.635000 ;
-        RECT  4.875000 1.915000  5.205000 2.635000 ;
-        RECT  7.320000 2.255000  7.700000 2.635000 ;
-        RECT  8.640000 2.255000 10.030000 2.635000 ;
-        RECT 11.155000 1.765000 11.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 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.840000 0.805000 ;
-      RECT  0.175000 1.795000  0.840000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.610000 0.805000  0.840000 1.795000 ;
-      RECT  1.015000 0.345000  1.235000 2.465000 ;
-      RECT  1.405000 0.635000  2.125000 0.825000 ;
-      RECT  1.405000 0.825000  1.575000 1.795000 ;
-      RECT  1.405000 1.795000  2.125000 1.965000 ;
-      RECT  1.955000 0.305000  2.125000 0.635000 ;
-      RECT  1.955000 1.965000  2.125000 2.465000 ;
-      RECT  2.325000 0.705000  2.545000 1.575000 ;
-      RECT  2.325000 1.575000  2.825000 1.955000 ;
-      RECT  2.335000 2.250000  3.165000 2.420000 ;
-      RECT  2.400000 0.265000  3.415000 0.465000 ;
-      RECT  2.725000 0.645000  3.075000 1.015000 ;
-      RECT  2.995000 1.195000  3.415000 1.235000 ;
-      RECT  2.995000 1.235000  4.345000 1.405000 ;
-      RECT  2.995000 1.405000  3.165000 2.250000 ;
-      RECT  3.245000 0.465000  3.415000 1.195000 ;
-      RECT  3.335000 1.575000  3.585000 1.785000 ;
-      RECT  3.335000 1.785000  4.685000 2.035000 ;
-      RECT  3.925000 0.255000  5.075000 0.425000 ;
-      RECT  3.925000 0.425000  4.255000 0.505000 ;
-      RECT  4.085000 2.035000  4.255000 2.375000 ;
-      RECT  4.095000 1.405000  4.345000 1.485000 ;
-      RECT  4.125000 1.155000  4.345000 1.235000 ;
-      RECT  4.405000 0.595000  4.735000 0.765000 ;
-      RECT  4.515000 0.765000  4.735000 0.895000 ;
-      RECT  4.515000 0.895000  5.825000 1.065000 ;
-      RECT  4.515000 1.065000  4.685000 1.785000 ;
-      RECT  4.855000 1.235000  5.185000 1.415000 ;
-      RECT  4.855000 1.415000  5.860000 1.655000 ;
-      RECT  4.905000 0.425000  5.075000 0.715000 ;
-      RECT  5.495000 1.065000  5.825000 1.235000 ;
-      RECT  6.060000 1.575000  6.295000 1.985000 ;
-      RECT  6.065000 1.060000  6.405000 1.125000 ;
-      RECT  6.065000 1.125000  6.740000 1.305000 ;
-      RECT  6.185000 0.705000  6.405000 1.060000 ;
-      RECT  6.250000 2.250000  7.080000 2.420000 ;
-      RECT  6.300000 0.265000  7.080000 0.465000 ;
-      RECT  6.535000 1.305000  6.740000 1.905000 ;
-      RECT  6.910000 0.465000  7.080000 1.235000 ;
-      RECT  6.910000 1.235000  8.260000 1.405000 ;
-      RECT  6.910000 1.405000  7.080000 2.250000 ;
-      RECT  7.250000 1.575000  7.500000 1.915000 ;
-      RECT  7.250000 1.915000 10.030000 2.085000 ;
-      RECT  7.745000 0.255000  8.955000 0.425000 ;
-      RECT  7.745000 0.425000  8.075000 0.545000 ;
-      RECT  7.940000 2.085000  8.110000 2.375000 ;
-      RECT  8.040000 1.075000  8.260000 1.235000 ;
-      RECT  8.215000 0.665000  8.615000 0.835000 ;
-      RECT  8.430000 0.835000  8.615000 0.840000 ;
-      RECT  8.430000 0.840000  8.600000 1.915000 ;
-      RECT  8.770000 1.110000  9.055000 1.575000 ;
-      RECT  8.770000 1.575000  9.555000 1.745000 ;
-      RECT  8.785000 0.425000  8.955000 0.585000 ;
-      RECT  8.835000 0.755000  9.475000 0.925000 ;
-      RECT  8.835000 0.925000  9.055000 1.110000 ;
-      RECT  9.265000 0.265000  9.475000 0.755000 ;
-      RECT  9.860000 0.995000 10.125000 1.325000 ;
-      RECT  9.860000 1.325000 10.030000 1.915000 ;
-      RECT 10.660000 0.255000 10.975000 0.995000 ;
-      RECT 10.660000 0.995000 11.495000 1.325000 ;
-      RECT 10.660000 1.325000 10.975000 2.415000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.840000 0.805000 ;
+      RECT  0.175000  1.795000  0.840000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.610000  0.805000  0.840000 1.795000 ;
+      RECT  1.015000  0.345000  1.235000 2.465000 ;
+      RECT  1.405000  0.635000  2.125000 0.825000 ;
+      RECT  1.405000  0.825000  1.575000 1.795000 ;
+      RECT  1.405000  1.795000  2.125000 1.965000 ;
+      RECT  1.430000  0.085000  1.785000 0.465000 ;
+      RECT  1.430000  2.135000  1.785000 2.635000 ;
+      RECT  1.955000  0.305000  2.125000 0.635000 ;
+      RECT  1.955000  1.965000  2.125000 2.465000 ;
+      RECT  2.325000  0.705000  2.545000 1.575000 ;
+      RECT  2.325000  1.575000  2.825000 1.955000 ;
+      RECT  2.335000  2.250000  3.165000 2.420000 ;
+      RECT  2.400000  0.265000  3.415000 0.465000 ;
+      RECT  2.725000  0.645000  3.075000 1.015000 ;
+      RECT  2.995000  1.195000  3.415000 1.235000 ;
+      RECT  2.995000  1.235000  4.345000 1.405000 ;
+      RECT  2.995000  1.405000  3.165000 2.250000 ;
+      RECT  3.245000  0.465000  3.415000 1.195000 ;
+      RECT  3.335000  1.575000  3.585000 1.785000 ;
+      RECT  3.335000  1.785000  4.685000 2.035000 ;
+      RECT  3.405000  2.205000  3.785000 2.635000 ;
+      RECT  3.585000  0.085000  3.755000 0.525000 ;
+      RECT  3.925000  0.255000  5.075000 0.425000 ;
+      RECT  3.925000  0.425000  4.255000 0.505000 ;
+      RECT  4.085000  2.035000  4.255000 2.375000 ;
+      RECT  4.095000  1.405000  4.345000 1.485000 ;
+      RECT  4.125000  1.155000  4.345000 1.235000 ;
+      RECT  4.405000  0.595000  4.735000 0.765000 ;
+      RECT  4.515000  0.765000  4.735000 0.895000 ;
+      RECT  4.515000  0.895000  5.825000 1.065000 ;
+      RECT  4.515000  1.065000  4.685000 1.785000 ;
+      RECT  4.855000  1.235000  5.185000 1.415000 ;
+      RECT  4.855000  1.415000  5.860000 1.655000 ;
+      RECT  4.875000  1.915000  5.205000 2.635000 ;
+      RECT  4.905000  0.425000  5.075000 0.715000 ;
+      RECT  5.325000  0.085000  5.675000 0.465000 ;
+      RECT  5.495000  1.065000  5.825000 1.235000 ;
+      RECT  6.060000  1.575000  6.295000 1.985000 ;
+      RECT  6.065000  1.060000  6.405000 1.125000 ;
+      RECT  6.065000  1.125000  6.740000 1.305000 ;
+      RECT  6.185000  0.705000  6.405000 1.060000 ;
+      RECT  6.250000  2.250000  7.080000 2.420000 ;
+      RECT  6.300000  0.265000  7.080000 0.465000 ;
+      RECT  6.535000  1.305000  6.740000 1.905000 ;
+      RECT  6.910000  0.465000  7.080000 1.235000 ;
+      RECT  6.910000  1.235000  8.260000 1.405000 ;
+      RECT  6.910000  1.405000  7.080000 2.250000 ;
+      RECT  7.250000  0.085000  7.575000 0.525000 ;
+      RECT  7.250000  1.575000  7.500000 1.915000 ;
+      RECT  7.250000  1.915000 10.030000 2.085000 ;
+      RECT  7.320000  2.255000  7.700000 2.635000 ;
+      RECT  7.745000  0.255000  8.955000 0.425000 ;
+      RECT  7.745000  0.425000  8.075000 0.545000 ;
+      RECT  7.940000  2.085000  8.110000 2.375000 ;
+      RECT  8.040000  1.075000  8.260000 1.235000 ;
+      RECT  8.215000  0.665000  8.615000 0.835000 ;
+      RECT  8.430000  0.835000  8.615000 0.840000 ;
+      RECT  8.430000  0.840000  8.600000 1.915000 ;
+      RECT  8.640000  2.255000 10.030000 2.635000 ;
+      RECT  8.770000  1.110000  9.055000 1.575000 ;
+      RECT  8.770000  1.575000  9.555000 1.745000 ;
+      RECT  8.785000  0.425000  8.955000 0.585000 ;
+      RECT  8.835000  0.755000  9.475000 0.925000 ;
+      RECT  8.835000  0.925000  9.055000 1.110000 ;
+      RECT  9.265000  0.265000  9.475000 0.755000 ;
+      RECT  9.725000  0.085000 10.030000 0.805000 ;
+      RECT  9.860000  0.995000 10.125000 1.325000 ;
+      RECT  9.860000  1.325000 10.030000 1.915000 ;
+      RECT 10.660000  0.255000 10.975000 0.995000 ;
+      RECT 10.660000  0.995000 11.495000 1.325000 ;
+      RECT 10.660000  1.325000 10.975000 2.415000 ;
+      RECT 11.150000  0.085000 11.445000 0.545000 ;
+      RECT 11.155000  1.765000 11.445000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 0.765000 0.780000 0.935000 ;
-      RECT 1.065000 1.785000 1.235000 1.955000 ;
-      RECT 2.445000 1.785000 2.615000 1.955000 ;
-      RECT 2.905000 0.765000 3.075000 0.935000 ;
-      RECT 5.665000 1.445000 5.835000 1.615000 ;
-      RECT 6.125000 1.105000 6.295000 1.275000 ;
-      RECT 6.125000 1.785000 6.295000 1.955000 ;
-      RECT 8.855000 1.445000 9.025000 1.615000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.610000  0.765000  0.780000 0.935000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  1.785000  1.235000 1.955000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  1.785000  2.615000 1.955000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  0.765000  3.075000 0.935000 ;
+      RECT  2.905000  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  1.445000  5.835000 1.615000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  1.105000  6.295000 1.275000 ;
+      RECT  6.125000  1.785000  6.295000 1.955000 ;
+      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.855000  1.445000  9.025000 1.615000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 0.735000 0.840000 0.780000 ;
       RECT 0.550000 0.780000 3.135000 0.920000 ;
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
index 3502935..96ef58c 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.magic.lef
@@ -78,10 +78,16 @@
       LAYER li1 ;
         RECT 3.600000 0.735000 4.010000 0.965000 ;
         RECT 3.600000 0.965000 3.930000 1.065000 ;
-        RECT 7.470000 0.735000 7.845000 1.065000 ;
       LAYER mcon ;
         RECT 3.840000 0.765000 4.010000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.470000 0.735000 7.845000 1.065000 ;
+      LAYER mcon ;
         RECT 7.520000 0.765000 7.690000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.780000 0.735000 4.070000 0.780000 ;
         RECT 3.780000 0.780000 7.750000 0.920000 ;
@@ -104,46 +110,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.880000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.445000  0.085000  1.785000 0.465000 ;
-        RECT  3.580000  0.085000  3.750000 0.525000 ;
-        RECT  5.360000  0.085000  5.690000 0.465000 ;
-        RECT  7.275000  0.085000  7.535000 0.525000 ;
-        RECT  9.740000  0.085000 10.070000 0.805000 ;
-        RECT 10.680000  0.085000 10.910000 0.885000 ;
-        RECT 11.650000  0.085000 11.945000 0.545000 ;
-        RECT 12.515000  0.085000 12.795000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
@@ -153,123 +119,159 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.880000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.445000 2.135000  1.785000 2.635000 ;
-        RECT  3.420000 2.205000  3.800000 2.635000 ;
-        RECT  4.890000 1.915000  5.220000 2.635000 ;
-        RECT  7.335000 2.255000  7.715000 2.635000 ;
-        RECT  8.655000 2.255000 10.070000 2.635000 ;
-        RECT 10.680000 1.465000 10.910000 2.635000 ;
-        RECT 11.650000 1.765000 11.945000 2.635000 ;
-        RECT 12.515000 1.465000 12.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 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.345000  0.345000 0.635000 ;
-      RECT  0.085000 0.635000  0.840000 0.805000 ;
-      RECT  0.085000 1.795000  0.840000 1.965000 ;
-      RECT  0.085000 1.965000  0.345000 2.465000 ;
-      RECT  0.610000 0.805000  0.840000 1.795000 ;
-      RECT  1.015000 0.345000  1.240000 2.465000 ;
-      RECT  1.420000 0.635000  2.125000 0.825000 ;
-      RECT  1.420000 0.825000  1.590000 1.795000 ;
-      RECT  1.420000 1.795000  2.125000 1.965000 ;
-      RECT  1.955000 0.305000  2.125000 0.635000 ;
-      RECT  1.955000 1.965000  2.125000 2.465000 ;
-      RECT  2.340000 0.705000  2.560000 1.575000 ;
-      RECT  2.340000 1.575000  2.840000 1.955000 ;
-      RECT  2.350000 2.250000  3.180000 2.420000 ;
-      RECT  2.415000 0.265000  3.410000 0.465000 ;
-      RECT  2.740000 0.645000  3.070000 1.015000 ;
-      RECT  3.010000 1.195000  3.410000 1.235000 ;
-      RECT  3.010000 1.235000  4.360000 1.405000 ;
-      RECT  3.010000 1.405000  3.180000 2.250000 ;
-      RECT  3.240000 0.465000  3.410000 1.195000 ;
-      RECT  3.350000 1.575000  3.600000 1.785000 ;
-      RECT  3.350000 1.785000  4.700000 2.035000 ;
-      RECT  3.920000 0.255000  5.170000 0.425000 ;
-      RECT  3.920000 0.425000  4.250000 0.545000 ;
-      RECT  4.100000 2.035000  4.270000 2.375000 ;
-      RECT  4.110000 1.405000  4.360000 1.485000 ;
-      RECT  4.140000 1.155000  4.360000 1.235000 ;
-      RECT  4.420000 0.595000  4.750000 0.765000 ;
-      RECT  4.530000 0.765000  4.750000 0.895000 ;
-      RECT  4.530000 0.895000  5.840000 1.065000 ;
-      RECT  4.530000 1.065000  4.700000 1.785000 ;
-      RECT  4.870000 1.235000  5.200000 1.415000 ;
-      RECT  4.870000 1.415000  5.875000 1.655000 ;
-      RECT  4.920000 0.425000  5.170000 0.715000 ;
-      RECT  5.510000 1.065000  5.840000 1.235000 ;
-      RECT  6.075000 1.575000  6.310000 1.985000 ;
-      RECT  6.135000 0.705000  6.420000 1.125000 ;
-      RECT  6.135000 1.125000  6.755000 1.305000 ;
-      RECT  6.265000 2.250000  7.095000 2.420000 ;
-      RECT  6.330000 0.265000  7.095000 0.465000 ;
-      RECT  6.550000 1.305000  6.755000 1.905000 ;
-      RECT  6.925000 0.465000  7.095000 1.235000 ;
-      RECT  6.925000 1.235000  8.275000 1.405000 ;
-      RECT  6.925000 1.405000  7.095000 2.250000 ;
-      RECT  7.265000 1.575000  7.515000 1.915000 ;
-      RECT  7.265000 1.915000 10.070000 2.085000 ;
-      RECT  7.795000 0.255000  8.965000 0.425000 ;
-      RECT  7.795000 0.425000  8.125000 0.545000 ;
-      RECT  7.955000 2.085000  8.125000 2.375000 ;
-      RECT  8.055000 1.075000  8.275000 1.235000 ;
-      RECT  8.295000 0.595000  8.625000 0.780000 ;
-      RECT  8.445000 0.780000  8.625000 1.915000 ;
-      RECT  8.795000 0.425000  8.965000 0.585000 ;
-      RECT  8.795000 0.755000  9.500000 0.925000 ;
-      RECT  8.795000 0.925000  9.070000 1.575000 ;
-      RECT  8.795000 1.575000  9.570000 1.745000 ;
-      RECT  9.280000 0.265000  9.500000 0.755000 ;
-      RECT  9.900000 0.995000 10.140000 1.325000 ;
-      RECT  9.900000 1.325000 10.070000 1.915000 ;
-      RECT 11.215000 0.255000 11.470000 0.995000 ;
-      RECT 11.215000 0.995000 11.990000 1.325000 ;
-      RECT 11.215000 1.325000 11.470000 2.415000 ;
+      RECT  0.000000 -0.085000 12.880000 0.085000 ;
+      RECT  0.000000  2.635000 12.880000 2.805000 ;
+      RECT  0.085000  0.345000  0.345000 0.635000 ;
+      RECT  0.085000  0.635000  0.840000 0.805000 ;
+      RECT  0.085000  1.795000  0.840000 1.965000 ;
+      RECT  0.085000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.610000  0.805000  0.840000 1.795000 ;
+      RECT  1.015000  0.345000  1.240000 2.465000 ;
+      RECT  1.420000  0.635000  2.125000 0.825000 ;
+      RECT  1.420000  0.825000  1.590000 1.795000 ;
+      RECT  1.420000  1.795000  2.125000 1.965000 ;
+      RECT  1.445000  0.085000  1.785000 0.465000 ;
+      RECT  1.445000  2.135000  1.785000 2.635000 ;
+      RECT  1.955000  0.305000  2.125000 0.635000 ;
+      RECT  1.955000  1.965000  2.125000 2.465000 ;
+      RECT  2.340000  0.705000  2.560000 1.575000 ;
+      RECT  2.340000  1.575000  2.840000 1.955000 ;
+      RECT  2.350000  2.250000  3.180000 2.420000 ;
+      RECT  2.415000  0.265000  3.410000 0.465000 ;
+      RECT  2.740000  0.645000  3.070000 1.015000 ;
+      RECT  3.010000  1.195000  3.410000 1.235000 ;
+      RECT  3.010000  1.235000  4.360000 1.405000 ;
+      RECT  3.010000  1.405000  3.180000 2.250000 ;
+      RECT  3.240000  0.465000  3.410000 1.195000 ;
+      RECT  3.350000  1.575000  3.600000 1.785000 ;
+      RECT  3.350000  1.785000  4.700000 2.035000 ;
+      RECT  3.420000  2.205000  3.800000 2.635000 ;
+      RECT  3.580000  0.085000  3.750000 0.525000 ;
+      RECT  3.920000  0.255000  5.170000 0.425000 ;
+      RECT  3.920000  0.425000  4.250000 0.545000 ;
+      RECT  4.100000  2.035000  4.270000 2.375000 ;
+      RECT  4.110000  1.405000  4.360000 1.485000 ;
+      RECT  4.140000  1.155000  4.360000 1.235000 ;
+      RECT  4.420000  0.595000  4.750000 0.765000 ;
+      RECT  4.530000  0.765000  4.750000 0.895000 ;
+      RECT  4.530000  0.895000  5.840000 1.065000 ;
+      RECT  4.530000  1.065000  4.700000 1.785000 ;
+      RECT  4.870000  1.235000  5.200000 1.415000 ;
+      RECT  4.870000  1.415000  5.875000 1.655000 ;
+      RECT  4.890000  1.915000  5.220000 2.635000 ;
+      RECT  4.920000  0.425000  5.170000 0.715000 ;
+      RECT  5.360000  0.085000  5.690000 0.465000 ;
+      RECT  5.510000  1.065000  5.840000 1.235000 ;
+      RECT  6.075000  1.575000  6.310000 1.985000 ;
+      RECT  6.135000  0.705000  6.420000 1.125000 ;
+      RECT  6.135000  1.125000  6.755000 1.305000 ;
+      RECT  6.265000  2.250000  7.095000 2.420000 ;
+      RECT  6.330000  0.265000  7.095000 0.465000 ;
+      RECT  6.550000  1.305000  6.755000 1.905000 ;
+      RECT  6.925000  0.465000  7.095000 1.235000 ;
+      RECT  6.925000  1.235000  8.275000 1.405000 ;
+      RECT  6.925000  1.405000  7.095000 2.250000 ;
+      RECT  7.265000  1.575000  7.515000 1.915000 ;
+      RECT  7.265000  1.915000 10.070000 2.085000 ;
+      RECT  7.275000  0.085000  7.535000 0.525000 ;
+      RECT  7.335000  2.255000  7.715000 2.635000 ;
+      RECT  7.795000  0.255000  8.965000 0.425000 ;
+      RECT  7.795000  0.425000  8.125000 0.545000 ;
+      RECT  7.955000  2.085000  8.125000 2.375000 ;
+      RECT  8.055000  1.075000  8.275000 1.235000 ;
+      RECT  8.295000  0.595000  8.625000 0.780000 ;
+      RECT  8.445000  0.780000  8.625000 1.915000 ;
+      RECT  8.655000  2.255000 10.070000 2.635000 ;
+      RECT  8.795000  0.425000  8.965000 0.585000 ;
+      RECT  8.795000  0.755000  9.500000 0.925000 ;
+      RECT  8.795000  0.925000  9.070000 1.575000 ;
+      RECT  8.795000  1.575000  9.570000 1.745000 ;
+      RECT  9.280000  0.265000  9.500000 0.755000 ;
+      RECT  9.740000  0.085000 10.070000 0.805000 ;
+      RECT  9.900000  0.995000 10.140000 1.325000 ;
+      RECT  9.900000  1.325000 10.070000 1.915000 ;
+      RECT 10.680000  0.085000 10.910000 0.885000 ;
+      RECT 10.680000  1.465000 10.910000 2.635000 ;
+      RECT 11.215000  0.255000 11.470000 0.995000 ;
+      RECT 11.215000  0.995000 11.990000 1.325000 ;
+      RECT 11.215000  1.325000 11.470000 2.415000 ;
+      RECT 11.650000  0.085000 11.945000 0.545000 ;
+      RECT 11.650000  1.765000 11.945000 2.635000 ;
+      RECT 12.515000  0.085000 12.795000 0.885000 ;
+      RECT 12.515000  1.465000 12.795000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 0.765000 0.780000 0.935000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.460000 1.785000 2.630000 1.955000 ;
-      RECT 2.900000 0.765000 3.070000 0.935000 ;
-      RECT 5.680000 1.445000 5.850000 1.615000 ;
-      RECT 6.140000 1.105000 6.310000 1.275000 ;
-      RECT 6.140000 1.785000 6.310000 1.955000 ;
-      RECT 8.900000 1.445000 9.070000 1.615000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.610000  0.765000  0.780000 0.935000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.070000  1.785000  1.240000 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.460000  1.785000  2.630000 1.955000 ;
+      RECT  2.900000  0.765000  3.070000 0.935000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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.680000  1.445000  5.850000 1.615000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.140000  1.105000  6.310000 1.275000 ;
+      RECT  6.140000  1.785000  6.310000 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.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  8.900000  1.445000  9.070000 1.615000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.550000 0.735000 0.840000 0.780000 ;
       RECT 0.550000 0.780000 3.130000 0.920000 ;
diff --git a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
index 8646c6a..1de4226 100644
--- a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.magic.lef
@@ -78,10 +78,16 @@
       LAYER li1 ;
         RECT 3.590000 0.735000 4.000000 0.965000 ;
         RECT 3.590000 0.965000 3.920000 1.065000 ;
-        RECT 7.460000 0.735000 7.835000 1.065000 ;
       LAYER mcon ;
         RECT 3.830000 0.765000 4.000000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.460000 0.735000 7.835000 1.065000 ;
+      LAYER mcon ;
         RECT 7.510000 0.765000 7.680000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.770000 0.735000 4.060000 0.780000 ;
         RECT 3.770000 0.780000 7.740000 0.920000 ;
@@ -104,42 +110,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.435000  0.085000  1.785000 0.465000 ;
-        RECT  3.570000  0.085000  3.740000 0.525000 ;
-        RECT  5.350000  0.085000  5.680000 0.465000 ;
-        RECT  7.265000  0.085000  7.525000 0.525000 ;
-        RECT  9.700000  0.085000 10.030000 0.805000 ;
-        RECT 11.150000  0.085000 11.445000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -149,119 +119,151 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.435000 2.135000  1.785000 2.635000 ;
-        RECT  3.410000 2.205000  3.790000 2.635000 ;
-        RECT  4.880000 1.915000  5.210000 2.635000 ;
-        RECT  7.325000 2.255000  7.705000 2.635000 ;
-        RECT  8.645000 2.255000 10.030000 2.635000 ;
-        RECT 11.150000 1.765000 11.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 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.345000  0.345000 0.635000 ;
-      RECT  0.085000 0.635000  0.840000 0.805000 ;
-      RECT  0.085000 1.795000  0.840000 1.965000 ;
-      RECT  0.085000 1.965000  0.345000 2.465000 ;
-      RECT  0.610000 0.805000  0.840000 1.795000 ;
-      RECT  1.015000 0.345000  1.240000 2.465000 ;
-      RECT  1.410000 0.635000  2.125000 0.825000 ;
-      RECT  1.410000 0.825000  1.580000 1.795000 ;
-      RECT  1.410000 1.795000  2.125000 1.965000 ;
-      RECT  1.955000 0.305000  2.125000 0.635000 ;
-      RECT  1.955000 1.965000  2.125000 2.465000 ;
-      RECT  2.330000 0.705000  2.550000 1.575000 ;
-      RECT  2.330000 1.575000  2.830000 1.955000 ;
-      RECT  2.340000 2.250000  3.170000 2.420000 ;
-      RECT  2.405000 0.265000  3.400000 0.465000 ;
-      RECT  2.730000 0.645000  3.060000 1.015000 ;
-      RECT  3.000000 1.195000  3.400000 1.235000 ;
-      RECT  3.000000 1.235000  4.350000 1.405000 ;
-      RECT  3.000000 1.405000  3.170000 2.250000 ;
-      RECT  3.230000 0.465000  3.400000 1.195000 ;
-      RECT  3.340000 1.575000  3.590000 1.785000 ;
-      RECT  3.340000 1.785000  4.690000 2.035000 ;
-      RECT  3.910000 0.255000  5.080000 0.425000 ;
-      RECT  3.910000 0.425000  4.240000 0.545000 ;
-      RECT  4.090000 2.035000  4.260000 2.375000 ;
-      RECT  4.100000 1.405000  4.350000 1.485000 ;
-      RECT  4.130000 1.155000  4.350000 1.235000 ;
-      RECT  4.410000 0.595000  4.740000 0.765000 ;
-      RECT  4.520000 0.765000  4.740000 0.895000 ;
-      RECT  4.520000 0.895000  5.830000 1.065000 ;
-      RECT  4.520000 1.065000  4.690000 1.785000 ;
-      RECT  4.860000 1.235000  5.190000 1.415000 ;
-      RECT  4.860000 1.415000  5.865000 1.655000 ;
-      RECT  4.910000 0.425000  5.080000 0.715000 ;
-      RECT  5.500000 1.065000  5.830000 1.235000 ;
-      RECT  6.065000 1.575000  6.300000 1.985000 ;
-      RECT  6.125000 0.705000  6.410000 1.125000 ;
-      RECT  6.125000 1.125000  6.745000 1.305000 ;
-      RECT  6.255000 2.250000  7.085000 2.420000 ;
-      RECT  6.320000 0.265000  7.085000 0.465000 ;
-      RECT  6.540000 1.305000  6.745000 1.905000 ;
-      RECT  6.915000 0.465000  7.085000 1.235000 ;
-      RECT  6.915000 1.235000  8.265000 1.405000 ;
-      RECT  6.915000 1.405000  7.085000 2.250000 ;
-      RECT  7.255000 1.575000  7.505000 1.915000 ;
-      RECT  7.255000 1.915000 10.030000 2.085000 ;
-      RECT  7.785000 0.255000  8.955000 0.425000 ;
-      RECT  7.785000 0.425000  8.115000 0.545000 ;
-      RECT  7.945000 2.085000  8.115000 2.375000 ;
-      RECT  8.045000 1.075000  8.265000 1.235000 ;
-      RECT  8.285000 0.595000  8.615000 0.780000 ;
-      RECT  8.435000 0.780000  8.615000 1.915000 ;
-      RECT  8.785000 0.425000  8.955000 0.585000 ;
-      RECT  8.785000 0.755000  9.475000 0.925000 ;
-      RECT  8.785000 0.925000  9.060000 1.575000 ;
-      RECT  8.785000 1.575000  9.545000 1.745000 ;
-      RECT  9.240000 0.265000  9.475000 0.755000 ;
-      RECT  9.860000 0.995000 10.110000 1.325000 ;
-      RECT  9.860000 1.325000 10.030000 1.915000 ;
-      RECT 10.655000 0.255000 10.970000 0.995000 ;
-      RECT 10.655000 0.995000 11.490000 1.325000 ;
-      RECT 10.655000 1.325000 10.970000 2.415000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.085000  0.345000  0.345000 0.635000 ;
+      RECT  0.085000  0.635000  0.840000 0.805000 ;
+      RECT  0.085000  1.795000  0.840000 1.965000 ;
+      RECT  0.085000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.610000  0.805000  0.840000 1.795000 ;
+      RECT  1.015000  0.345000  1.240000 2.465000 ;
+      RECT  1.410000  0.635000  2.125000 0.825000 ;
+      RECT  1.410000  0.825000  1.580000 1.795000 ;
+      RECT  1.410000  1.795000  2.125000 1.965000 ;
+      RECT  1.435000  0.085000  1.785000 0.465000 ;
+      RECT  1.435000  2.135000  1.785000 2.635000 ;
+      RECT  1.955000  0.305000  2.125000 0.635000 ;
+      RECT  1.955000  1.965000  2.125000 2.465000 ;
+      RECT  2.330000  0.705000  2.550000 1.575000 ;
+      RECT  2.330000  1.575000  2.830000 1.955000 ;
+      RECT  2.340000  2.250000  3.170000 2.420000 ;
+      RECT  2.405000  0.265000  3.400000 0.465000 ;
+      RECT  2.730000  0.645000  3.060000 1.015000 ;
+      RECT  3.000000  1.195000  3.400000 1.235000 ;
+      RECT  3.000000  1.235000  4.350000 1.405000 ;
+      RECT  3.000000  1.405000  3.170000 2.250000 ;
+      RECT  3.230000  0.465000  3.400000 1.195000 ;
+      RECT  3.340000  1.575000  3.590000 1.785000 ;
+      RECT  3.340000  1.785000  4.690000 2.035000 ;
+      RECT  3.410000  2.205000  3.790000 2.635000 ;
+      RECT  3.570000  0.085000  3.740000 0.525000 ;
+      RECT  3.910000  0.255000  5.080000 0.425000 ;
+      RECT  3.910000  0.425000  4.240000 0.545000 ;
+      RECT  4.090000  2.035000  4.260000 2.375000 ;
+      RECT  4.100000  1.405000  4.350000 1.485000 ;
+      RECT  4.130000  1.155000  4.350000 1.235000 ;
+      RECT  4.410000  0.595000  4.740000 0.765000 ;
+      RECT  4.520000  0.765000  4.740000 0.895000 ;
+      RECT  4.520000  0.895000  5.830000 1.065000 ;
+      RECT  4.520000  1.065000  4.690000 1.785000 ;
+      RECT  4.860000  1.235000  5.190000 1.415000 ;
+      RECT  4.860000  1.415000  5.865000 1.655000 ;
+      RECT  4.880000  1.915000  5.210000 2.635000 ;
+      RECT  4.910000  0.425000  5.080000 0.715000 ;
+      RECT  5.350000  0.085000  5.680000 0.465000 ;
+      RECT  5.500000  1.065000  5.830000 1.235000 ;
+      RECT  6.065000  1.575000  6.300000 1.985000 ;
+      RECT  6.125000  0.705000  6.410000 1.125000 ;
+      RECT  6.125000  1.125000  6.745000 1.305000 ;
+      RECT  6.255000  2.250000  7.085000 2.420000 ;
+      RECT  6.320000  0.265000  7.085000 0.465000 ;
+      RECT  6.540000  1.305000  6.745000 1.905000 ;
+      RECT  6.915000  0.465000  7.085000 1.235000 ;
+      RECT  6.915000  1.235000  8.265000 1.405000 ;
+      RECT  6.915000  1.405000  7.085000 2.250000 ;
+      RECT  7.255000  1.575000  7.505000 1.915000 ;
+      RECT  7.255000  1.915000 10.030000 2.085000 ;
+      RECT  7.265000  0.085000  7.525000 0.525000 ;
+      RECT  7.325000  2.255000  7.705000 2.635000 ;
+      RECT  7.785000  0.255000  8.955000 0.425000 ;
+      RECT  7.785000  0.425000  8.115000 0.545000 ;
+      RECT  7.945000  2.085000  8.115000 2.375000 ;
+      RECT  8.045000  1.075000  8.265000 1.235000 ;
+      RECT  8.285000  0.595000  8.615000 0.780000 ;
+      RECT  8.435000  0.780000  8.615000 1.915000 ;
+      RECT  8.645000  2.255000 10.030000 2.635000 ;
+      RECT  8.785000  0.425000  8.955000 0.585000 ;
+      RECT  8.785000  0.755000  9.475000 0.925000 ;
+      RECT  8.785000  0.925000  9.060000 1.575000 ;
+      RECT  8.785000  1.575000  9.545000 1.745000 ;
+      RECT  9.240000  0.265000  9.475000 0.755000 ;
+      RECT  9.700000  0.085000 10.030000 0.805000 ;
+      RECT  9.860000  0.995000 10.110000 1.325000 ;
+      RECT  9.860000  1.325000 10.030000 1.915000 ;
+      RECT 10.655000  0.255000 10.970000 0.995000 ;
+      RECT 10.655000  0.995000 11.490000 1.325000 ;
+      RECT 10.655000  1.325000 10.970000 2.415000 ;
+      RECT 11.150000  0.085000 11.445000 0.545000 ;
+      RECT 11.150000  1.765000 11.445000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.785000 0.780000 1.955000 ;
-      RECT 1.070000 0.765000 1.240000 0.935000 ;
-      RECT 2.450000 1.785000 2.620000 1.955000 ;
-      RECT 2.890000 0.765000 3.060000 0.935000 ;
-      RECT 5.670000 1.445000 5.840000 1.615000 ;
-      RECT 6.130000 1.105000 6.300000 1.275000 ;
-      RECT 6.130000 1.785000 6.300000 1.955000 ;
-      RECT 8.890000 1.445000 9.060000 1.615000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.610000  1.785000  0.780000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.070000  0.765000  1.240000 0.935000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.450000  1.785000  2.620000 1.955000 ;
+      RECT  2.890000  0.765000  3.060000 0.935000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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.670000  1.445000  5.840000 1.615000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.130000  1.105000  6.300000 1.275000 ;
+      RECT  6.130000  1.785000  6.300000 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.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  8.890000  1.445000  9.060000 1.615000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.755000 0.840000 1.800000 ;
       RECT 0.550000 1.800000 6.360000 1.940000 ;
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
index eb96a65..62331a2 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.magic.lef
@@ -68,12 +68,18 @@
     PORT
       LAYER li1 ;
         RECT 3.805000 0.765000 4.595000 1.015000 ;
+      LAYER mcon ;
+        RECT 4.165000 0.765000 4.335000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 7.105000 1.035000 7.645000 1.405000 ;
         RECT 7.405000 0.635000 7.645000 1.035000 ;
       LAYER mcon ;
-        RECT 4.165000 0.765000 4.335000 0.935000 ;
         RECT 7.105000 1.080000 7.275000 1.250000 ;
         RECT 7.405000 0.765000 7.575000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.745000 0.735000 4.395000 0.780000 ;
         RECT 3.745000 0.780000 7.635000 0.920000 ;
@@ -97,38 +103,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 0.515000  0.085000  0.845000 0.465000 ;
-        RECT 1.545000  0.085000  1.875000 0.445000 ;
-        RECT 4.475000  0.085000  4.805000 0.545000 ;
-        RECT 6.705000  0.085000  6.895000 0.525000 ;
-        RECT 8.335000  0.085000  8.505000 0.770000 ;
-        RECT 9.760000  0.085000  9.930000 0.680000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -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
@@ -138,109 +112,137 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 0.515000 2.135000  0.845000 2.635000 ;
-        RECT 1.850000 2.175000  2.100000 2.635000 ;
-        RECT 3.990000 2.205000  4.320000 2.635000 ;
-        RECT 4.955000 2.175000  5.325000 2.635000 ;
-        RECT 6.940000 2.175000  7.190000 2.635000 ;
-        RECT 7.710000 2.255000  8.430000 2.635000 ;
-        RECT 9.760000 1.495000  9.930000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000  0.345000 0.635000 ;
-      RECT 0.090000 0.635000  0.840000 0.805000 ;
-      RECT 0.090000 1.795000  0.840000 1.965000 ;
-      RECT 0.090000 1.965000  0.345000 2.465000 ;
-      RECT 0.610000 0.805000  0.840000 1.795000 ;
-      RECT 1.015000 0.345000  1.185000 2.465000 ;
-      RECT 2.045000 0.305000  2.540000 0.475000 ;
-      RECT 2.045000 0.475000  2.215000 1.835000 ;
-      RECT 2.045000 1.835000  2.440000 2.005000 ;
-      RECT 2.270000 2.005000  2.440000 2.135000 ;
-      RECT 2.270000 2.135000  2.520000 2.465000 ;
-      RECT 2.385000 0.765000  2.735000 1.385000 ;
-      RECT 2.610000 1.575000  3.075000 1.965000 ;
-      RECT 2.735000 2.135000  3.415000 2.465000 ;
-      RECT 2.745000 0.305000  3.600000 0.475000 ;
-      RECT 2.905000 0.765000  3.260000 0.985000 ;
-      RECT 2.905000 0.985000  3.075000 1.575000 ;
-      RECT 3.245000 1.185000  4.935000 1.355000 ;
-      RECT 3.245000 1.355000  3.415000 2.135000 ;
-      RECT 3.430000 0.475000  3.600000 1.185000 ;
-      RECT 3.585000 1.865000  4.660000 2.035000 ;
-      RECT 3.585000 2.035000  3.755000 2.375000 ;
-      RECT 3.775000 1.525000  5.275000 1.695000 ;
-      RECT 4.490000 2.035000  4.660000 2.375000 ;
-      RECT 4.765000 1.005000  4.935000 1.185000 ;
-      RECT 5.015000 0.275000  5.365000 0.445000 ;
-      RECT 5.015000 0.445000  5.275000 0.835000 ;
-      RECT 5.105000 0.835000  5.275000 1.525000 ;
-      RECT 5.105000 1.695000  5.275000 1.835000 ;
-      RECT 5.105000 1.835000  5.665000 2.005000 ;
-      RECT 5.465000 0.705000  5.675000 1.495000 ;
-      RECT 5.465000 1.495000  6.140000 1.655000 ;
-      RECT 5.465000 1.655000  6.430000 1.665000 ;
-      RECT 5.495000 2.005000  5.665000 2.465000 ;
-      RECT 5.585000 0.255000  6.535000 0.535000 ;
-      RECT 5.845000 0.705000  6.195000 1.325000 ;
-      RECT 5.900000 2.125000  6.770000 2.465000 ;
-      RECT 5.970000 1.665000  6.430000 1.955000 ;
-      RECT 6.365000 0.535000  6.535000 1.315000 ;
-      RECT 6.365000 1.315000  6.770000 1.485000 ;
-      RECT 6.600000 1.485000  6.770000 1.575000 ;
-      RECT 6.600000 1.575000  7.820000 1.745000 ;
-      RECT 6.600000 1.745000  6.770000 2.125000 ;
-      RECT 6.705000 0.695000  7.235000 0.865000 ;
-      RECT 6.705000 0.865000  6.925000 1.145000 ;
-      RECT 7.065000 0.295000  8.135000 0.465000 ;
-      RECT 7.065000 0.465000  7.235000 0.695000 ;
-      RECT 7.360000 1.915000  8.160000 2.085000 ;
-      RECT 7.360000 2.085000  7.530000 2.375000 ;
-      RECT 7.815000 0.465000  8.135000 0.820000 ;
-      RECT 7.815000 0.820000  8.140000 0.995000 ;
-      RECT 7.815000 0.995000  8.435000 1.295000 ;
-      RECT 7.990000 1.295000  8.435000 1.325000 ;
-      RECT 7.990000 1.325000  8.160000 1.915000 ;
-      RECT 9.195000 0.345000  9.445000 0.995000 ;
-      RECT 9.195000 0.995000 10.055000 1.325000 ;
-      RECT 9.195000 1.325000  9.525000 2.425000 ;
+      RECT 0.000000 -0.085000 10.580000 0.085000 ;
+      RECT 0.000000  2.635000 10.580000 2.805000 ;
+      RECT 0.090000  0.345000  0.345000 0.635000 ;
+      RECT 0.090000  0.635000  0.840000 0.805000 ;
+      RECT 0.090000  1.795000  0.840000 1.965000 ;
+      RECT 0.090000  1.965000  0.345000 2.465000 ;
+      RECT 0.515000  0.085000  0.845000 0.465000 ;
+      RECT 0.515000  2.135000  0.845000 2.635000 ;
+      RECT 0.610000  0.805000  0.840000 1.795000 ;
+      RECT 1.015000  0.345000  1.185000 2.465000 ;
+      RECT 1.545000  0.085000  1.875000 0.445000 ;
+      RECT 1.850000  2.175000  2.100000 2.635000 ;
+      RECT 2.045000  0.305000  2.540000 0.475000 ;
+      RECT 2.045000  0.475000  2.215000 1.835000 ;
+      RECT 2.045000  1.835000  2.440000 2.005000 ;
+      RECT 2.270000  2.005000  2.440000 2.135000 ;
+      RECT 2.270000  2.135000  2.520000 2.465000 ;
+      RECT 2.385000  0.765000  2.735000 1.385000 ;
+      RECT 2.610000  1.575000  3.075000 1.965000 ;
+      RECT 2.735000  2.135000  3.415000 2.465000 ;
+      RECT 2.745000  0.305000  3.600000 0.475000 ;
+      RECT 2.905000  0.765000  3.260000 0.985000 ;
+      RECT 2.905000  0.985000  3.075000 1.575000 ;
+      RECT 3.245000  1.185000  4.935000 1.355000 ;
+      RECT 3.245000  1.355000  3.415000 2.135000 ;
+      RECT 3.430000  0.475000  3.600000 1.185000 ;
+      RECT 3.585000  1.865000  4.660000 2.035000 ;
+      RECT 3.585000  2.035000  3.755000 2.375000 ;
+      RECT 3.775000  1.525000  5.275000 1.695000 ;
+      RECT 3.990000  2.205000  4.320000 2.635000 ;
+      RECT 4.475000  0.085000  4.805000 0.545000 ;
+      RECT 4.490000  2.035000  4.660000 2.375000 ;
+      RECT 4.765000  1.005000  4.935000 1.185000 ;
+      RECT 4.955000  2.175000  5.325000 2.635000 ;
+      RECT 5.015000  0.275000  5.365000 0.445000 ;
+      RECT 5.015000  0.445000  5.275000 0.835000 ;
+      RECT 5.105000  0.835000  5.275000 1.525000 ;
+      RECT 5.105000  1.695000  5.275000 1.835000 ;
+      RECT 5.105000  1.835000  5.665000 2.005000 ;
+      RECT 5.465000  0.705000  5.675000 1.495000 ;
+      RECT 5.465000  1.495000  6.140000 1.655000 ;
+      RECT 5.465000  1.655000  6.430000 1.665000 ;
+      RECT 5.495000  2.005000  5.665000 2.465000 ;
+      RECT 5.585000  0.255000  6.535000 0.535000 ;
+      RECT 5.845000  0.705000  6.195000 1.325000 ;
+      RECT 5.900000  2.125000  6.770000 2.465000 ;
+      RECT 5.970000  1.665000  6.430000 1.955000 ;
+      RECT 6.365000  0.535000  6.535000 1.315000 ;
+      RECT 6.365000  1.315000  6.770000 1.485000 ;
+      RECT 6.600000  1.485000  6.770000 1.575000 ;
+      RECT 6.600000  1.575000  7.820000 1.745000 ;
+      RECT 6.600000  1.745000  6.770000 2.125000 ;
+      RECT 6.705000  0.085000  6.895000 0.525000 ;
+      RECT 6.705000  0.695000  7.235000 0.865000 ;
+      RECT 6.705000  0.865000  6.925000 1.145000 ;
+      RECT 6.940000  2.175000  7.190000 2.635000 ;
+      RECT 7.065000  0.295000  8.135000 0.465000 ;
+      RECT 7.065000  0.465000  7.235000 0.695000 ;
+      RECT 7.360000  1.915000  8.160000 2.085000 ;
+      RECT 7.360000  2.085000  7.530000 2.375000 ;
+      RECT 7.710000  2.255000  8.430000 2.635000 ;
+      RECT 7.815000  0.465000  8.135000 0.820000 ;
+      RECT 7.815000  0.820000  8.140000 0.995000 ;
+      RECT 7.815000  0.995000  8.435000 1.295000 ;
+      RECT 7.990000  1.295000  8.435000 1.325000 ;
+      RECT 7.990000  1.325000  8.160000 1.915000 ;
+      RECT 8.335000  0.085000  8.505000 0.770000 ;
+      RECT 9.195000  0.345000  9.445000 0.995000 ;
+      RECT 9.195000  0.995000 10.055000 1.325000 ;
+      RECT 9.195000  1.325000  9.525000 2.425000 ;
+      RECT 9.760000  0.085000  9.930000 0.680000 ;
+      RECT 9.760000  1.495000  9.930000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.105000 0.780000 1.275000 ;
-      RECT 1.015000 1.785000 1.185000 1.955000 ;
-      RECT 2.445000 1.105000 2.615000 1.275000 ;
-      RECT 2.905000 1.785000 3.075000 1.955000 ;
-      RECT 6.025000 1.105000 6.195000 1.275000 ;
-      RECT 6.025000 1.785000 6.195000 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.610000  1.105000  0.780000 1.275000 ;
+      RECT  1.015000  1.785000  1.185000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  1.105000  2.615000 1.275000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  1.785000  3.075000 1.955000 ;
+      RECT  2.905000  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.025000  1.105000  6.195000 1.275000 ;
+      RECT  6.025000  1.785000  6.195000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.075000 0.840000 1.120000 ;
       RECT 0.550000 1.120000 6.255000 1.260000 ;
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
index cf0315e..d41df73 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.magic.lef
@@ -68,12 +68,18 @@
     PORT
       LAYER li1 ;
         RECT 3.805000 0.765000 4.595000 1.015000 ;
+      LAYER mcon ;
+        RECT 4.165000 0.765000 4.335000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 7.105000 1.035000 7.645000 1.405000 ;
         RECT 7.405000 0.635000 7.645000 1.035000 ;
       LAYER mcon ;
-        RECT 4.165000 0.765000 4.335000 0.935000 ;
         RECT 7.105000 1.080000 7.275000 1.250000 ;
         RECT 7.405000 0.765000 7.575000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.745000 0.735000 4.395000 0.780000 ;
         RECT 3.745000 0.780000 7.635000 0.920000 ;
@@ -97,40 +103,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.545000  0.085000  1.875000 0.445000 ;
-        RECT  4.475000  0.085000  4.805000 0.545000 ;
-        RECT  6.705000  0.085000  6.895000 0.525000 ;
-        RECT  8.755000  0.085000  8.990000 0.545000 ;
-        RECT  9.700000  0.085000  9.870000 0.825000 ;
-        RECT 10.590000  0.085000 10.760000 0.930000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -140,117 +112,147 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.850000 2.175000  2.100000 2.635000 ;
-        RECT  3.990000 2.205000  4.320000 2.635000 ;
-        RECT  4.955000 2.175000  5.325000 2.635000 ;
-        RECT  6.940000 2.175000  7.190000 2.635000 ;
-        RECT  7.710000 2.255000  8.055000 2.635000 ;
-        RECT  8.730000 2.205000  9.070000 2.635000 ;
-        RECT  9.620000 2.255000  9.950000 2.635000 ;
-        RECT 10.590000 1.445000 10.760000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000  0.345000 0.635000 ;
-      RECT 0.090000 0.635000  0.840000 0.805000 ;
-      RECT 0.090000 1.795000  0.840000 1.965000 ;
-      RECT 0.090000 1.965000  0.345000 2.465000 ;
-      RECT 0.610000 0.805000  0.840000 1.795000 ;
-      RECT 1.015000 0.345000  1.185000 2.465000 ;
-      RECT 2.045000 0.305000  2.540000 0.475000 ;
-      RECT 2.045000 0.475000  2.215000 1.835000 ;
-      RECT 2.045000 1.835000  2.440000 2.005000 ;
-      RECT 2.270000 2.005000  2.440000 2.135000 ;
-      RECT 2.270000 2.135000  2.520000 2.465000 ;
-      RECT 2.385000 0.765000  2.735000 1.385000 ;
-      RECT 2.610000 1.575000  3.075000 1.965000 ;
-      RECT 2.735000 2.135000  3.415000 2.465000 ;
-      RECT 2.745000 0.305000  3.600000 0.475000 ;
-      RECT 2.905000 0.765000  3.260000 0.985000 ;
-      RECT 2.905000 0.985000  3.075000 1.575000 ;
-      RECT 3.245000 1.185000  4.935000 1.355000 ;
-      RECT 3.245000 1.355000  3.415000 2.135000 ;
-      RECT 3.430000 0.475000  3.600000 1.185000 ;
-      RECT 3.585000 1.865000  4.660000 2.035000 ;
-      RECT 3.585000 2.035000  3.755000 2.375000 ;
-      RECT 3.775000 1.525000  5.275000 1.695000 ;
-      RECT 4.490000 2.035000  4.660000 2.375000 ;
-      RECT 4.765000 1.005000  4.935000 1.185000 ;
-      RECT 5.015000 0.275000  5.365000 0.445000 ;
-      RECT 5.015000 0.445000  5.275000 0.835000 ;
-      RECT 5.105000 0.835000  5.275000 1.525000 ;
-      RECT 5.105000 1.695000  5.275000 1.835000 ;
-      RECT 5.105000 1.835000  5.665000 2.005000 ;
-      RECT 5.465000 0.705000  5.675000 1.495000 ;
-      RECT 5.465000 1.495000  6.140000 1.655000 ;
-      RECT 5.465000 1.655000  6.430000 1.665000 ;
-      RECT 5.495000 2.005000  5.665000 2.465000 ;
-      RECT 5.585000 0.255000  6.535000 0.535000 ;
-      RECT 5.845000 0.705000  6.195000 1.325000 ;
-      RECT 5.900000 2.125000  6.770000 2.465000 ;
-      RECT 5.970000 1.665000  6.430000 1.955000 ;
-      RECT 6.365000 0.535000  6.535000 1.315000 ;
-      RECT 6.365000 1.315000  6.770000 1.485000 ;
-      RECT 6.600000 1.485000  6.770000 1.575000 ;
-      RECT 6.600000 1.575000  7.820000 1.745000 ;
-      RECT 6.600000 1.745000  6.770000 2.125000 ;
-      RECT 6.705000 0.695000  7.235000 0.865000 ;
-      RECT 6.705000 0.865000  6.925000 1.145000 ;
-      RECT 7.065000 0.295000  7.985000 0.465000 ;
-      RECT 7.065000 0.465000  7.235000 0.695000 ;
-      RECT 7.360000 1.915000  8.160000 2.085000 ;
-      RECT 7.360000 2.085000  7.530000 2.375000 ;
-      RECT 7.815000 0.465000  7.985000 0.995000 ;
-      RECT 7.815000 0.995000  8.160000 1.075000 ;
-      RECT 7.815000 1.075000  8.650000 1.295000 ;
-      RECT 7.990000 1.295000  8.650000 1.325000 ;
-      RECT 7.990000 1.325000  8.160000 1.915000 ;
-      RECT 8.335000 0.345000  8.585000 0.715000 ;
-      RECT 8.335000 0.715000  8.990000 0.885000 ;
-      RECT 8.335000 1.795000  8.990000 1.865000 ;
-      RECT 8.335000 1.865000  9.835000 2.035000 ;
-      RECT 8.335000 2.035000  8.560000 2.465000 ;
-      RECT 8.820000 0.885000  8.990000 1.795000 ;
-      RECT 9.665000 0.995000 10.080000 1.325000 ;
-      RECT 9.665000 1.325000  9.835000 1.865000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.090000  0.345000  0.345000 0.635000 ;
+      RECT  0.090000  0.635000  0.840000 0.805000 ;
+      RECT  0.090000  1.795000  0.840000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.610000  0.805000  0.840000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.545000  0.085000  1.875000 0.445000 ;
+      RECT  1.850000  2.175000  2.100000 2.635000 ;
+      RECT  2.045000  0.305000  2.540000 0.475000 ;
+      RECT  2.045000  0.475000  2.215000 1.835000 ;
+      RECT  2.045000  1.835000  2.440000 2.005000 ;
+      RECT  2.270000  2.005000  2.440000 2.135000 ;
+      RECT  2.270000  2.135000  2.520000 2.465000 ;
+      RECT  2.385000  0.765000  2.735000 1.385000 ;
+      RECT  2.610000  1.575000  3.075000 1.965000 ;
+      RECT  2.735000  2.135000  3.415000 2.465000 ;
+      RECT  2.745000  0.305000  3.600000 0.475000 ;
+      RECT  2.905000  0.765000  3.260000 0.985000 ;
+      RECT  2.905000  0.985000  3.075000 1.575000 ;
+      RECT  3.245000  1.185000  4.935000 1.355000 ;
+      RECT  3.245000  1.355000  3.415000 2.135000 ;
+      RECT  3.430000  0.475000  3.600000 1.185000 ;
+      RECT  3.585000  1.865000  4.660000 2.035000 ;
+      RECT  3.585000  2.035000  3.755000 2.375000 ;
+      RECT  3.775000  1.525000  5.275000 1.695000 ;
+      RECT  3.990000  2.205000  4.320000 2.635000 ;
+      RECT  4.475000  0.085000  4.805000 0.545000 ;
+      RECT  4.490000  2.035000  4.660000 2.375000 ;
+      RECT  4.765000  1.005000  4.935000 1.185000 ;
+      RECT  4.955000  2.175000  5.325000 2.635000 ;
+      RECT  5.015000  0.275000  5.365000 0.445000 ;
+      RECT  5.015000  0.445000  5.275000 0.835000 ;
+      RECT  5.105000  0.835000  5.275000 1.525000 ;
+      RECT  5.105000  1.695000  5.275000 1.835000 ;
+      RECT  5.105000  1.835000  5.665000 2.005000 ;
+      RECT  5.465000  0.705000  5.675000 1.495000 ;
+      RECT  5.465000  1.495000  6.140000 1.655000 ;
+      RECT  5.465000  1.655000  6.430000 1.665000 ;
+      RECT  5.495000  2.005000  5.665000 2.465000 ;
+      RECT  5.585000  0.255000  6.535000 0.535000 ;
+      RECT  5.845000  0.705000  6.195000 1.325000 ;
+      RECT  5.900000  2.125000  6.770000 2.465000 ;
+      RECT  5.970000  1.665000  6.430000 1.955000 ;
+      RECT  6.365000  0.535000  6.535000 1.315000 ;
+      RECT  6.365000  1.315000  6.770000 1.485000 ;
+      RECT  6.600000  1.485000  6.770000 1.575000 ;
+      RECT  6.600000  1.575000  7.820000 1.745000 ;
+      RECT  6.600000  1.745000  6.770000 2.125000 ;
+      RECT  6.705000  0.085000  6.895000 0.525000 ;
+      RECT  6.705000  0.695000  7.235000 0.865000 ;
+      RECT  6.705000  0.865000  6.925000 1.145000 ;
+      RECT  6.940000  2.175000  7.190000 2.635000 ;
+      RECT  7.065000  0.295000  7.985000 0.465000 ;
+      RECT  7.065000  0.465000  7.235000 0.695000 ;
+      RECT  7.360000  1.915000  8.160000 2.085000 ;
+      RECT  7.360000  2.085000  7.530000 2.375000 ;
+      RECT  7.710000  2.255000  8.055000 2.635000 ;
+      RECT  7.815000  0.465000  7.985000 0.995000 ;
+      RECT  7.815000  0.995000  8.160000 1.075000 ;
+      RECT  7.815000  1.075000  8.650000 1.295000 ;
+      RECT  7.990000  1.295000  8.650000 1.325000 ;
+      RECT  7.990000  1.325000  8.160000 1.915000 ;
+      RECT  8.335000  0.345000  8.585000 0.715000 ;
+      RECT  8.335000  0.715000  8.990000 0.885000 ;
+      RECT  8.335000  1.795000  8.990000 1.865000 ;
+      RECT  8.335000  1.865000  9.835000 2.035000 ;
+      RECT  8.335000  2.035000  8.560000 2.465000 ;
+      RECT  8.730000  2.205000  9.070000 2.635000 ;
+      RECT  8.755000  0.085000  8.990000 0.545000 ;
+      RECT  8.820000  0.885000  8.990000 1.795000 ;
+      RECT  9.620000  2.255000  9.950000 2.635000 ;
+      RECT  9.665000  0.995000 10.080000 1.325000 ;
+      RECT  9.665000  1.325000  9.835000 1.865000 ;
+      RECT  9.700000  0.085000  9.870000 0.825000 ;
+      RECT 10.590000  0.085000 10.760000 0.930000 ;
+      RECT 10.590000  1.445000 10.760000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.105000 0.780000 1.275000 ;
-      RECT 1.015000 1.785000 1.185000 1.955000 ;
-      RECT 2.445000 1.105000 2.615000 1.275000 ;
-      RECT 2.905000 1.785000 3.075000 1.955000 ;
-      RECT 6.025000 1.105000 6.195000 1.275000 ;
-      RECT 6.025000 1.785000 6.195000 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.610000  1.105000  0.780000 1.275000 ;
+      RECT  1.015000  1.785000  1.185000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  1.105000  2.615000 1.275000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  1.785000  3.075000 1.955000 ;
+      RECT  2.905000  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.025000  1.105000  6.195000 1.275000 ;
+      RECT  6.025000  1.785000  6.195000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.075000 0.840000 1.120000 ;
       RECT 0.550000 1.120000 6.255000 1.260000 ;
diff --git a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
index 10e417c..be6df9b 100644
--- a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.magic.lef
@@ -58,12 +58,18 @@
     PORT
       LAYER li1 ;
         RECT 3.805000 0.765000 4.595000 1.015000 ;
+      LAYER mcon ;
+        RECT 4.165000 0.765000 4.335000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 7.105000 1.035000 7.645000 1.405000 ;
         RECT 7.405000 0.635000 7.645000 1.035000 ;
       LAYER mcon ;
-        RECT 4.165000 0.765000 4.335000 0.935000 ;
         RECT 7.105000 1.080000 7.275000 1.250000 ;
         RECT 7.405000 0.765000 7.575000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.745000 0.735000 4.395000 0.780000 ;
         RECT 3.745000 0.780000 7.635000 0.920000 ;
@@ -87,34 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.545000  0.085000 1.875000 0.445000 ;
-        RECT 4.475000  0.085000 4.805000 0.545000 ;
-        RECT 6.705000  0.085000 6.895000 0.525000 ;
-        RECT 8.380000  0.085000 8.685000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -124,103 +102,127 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.850000 2.175000 2.100000 2.635000 ;
-        RECT 3.990000 2.205000 4.320000 2.635000 ;
-        RECT 4.955000 2.175000 5.325000 2.635000 ;
-        RECT 6.940000 2.175000 7.190000 2.635000 ;
-        RECT 7.710000 2.255000 8.040000 2.635000 ;
-        RECT 8.380000 1.495000 8.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000 0.345000 0.635000 ;
-      RECT 0.090000 0.635000 0.840000 0.805000 ;
-      RECT 0.090000 1.795000 0.840000 1.965000 ;
-      RECT 0.090000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 2.465000 ;
-      RECT 2.045000 0.305000 2.540000 0.475000 ;
-      RECT 2.045000 0.475000 2.215000 1.835000 ;
-      RECT 2.045000 1.835000 2.440000 2.005000 ;
-      RECT 2.270000 2.005000 2.440000 2.135000 ;
-      RECT 2.270000 2.135000 2.520000 2.465000 ;
-      RECT 2.385000 0.765000 2.735000 1.385000 ;
-      RECT 2.610000 1.575000 3.075000 1.965000 ;
-      RECT 2.735000 2.135000 3.415000 2.465000 ;
-      RECT 2.745000 0.305000 3.600000 0.475000 ;
-      RECT 2.905000 0.765000 3.260000 0.985000 ;
-      RECT 2.905000 0.985000 3.075000 1.575000 ;
-      RECT 3.245000 1.185000 4.935000 1.355000 ;
-      RECT 3.245000 1.355000 3.415000 2.135000 ;
-      RECT 3.430000 0.475000 3.600000 1.185000 ;
-      RECT 3.585000 1.865000 4.660000 2.035000 ;
-      RECT 3.585000 2.035000 3.755000 2.375000 ;
-      RECT 3.775000 1.525000 5.275000 1.695000 ;
-      RECT 4.490000 2.035000 4.660000 2.375000 ;
-      RECT 4.765000 1.005000 4.935000 1.185000 ;
-      RECT 5.015000 0.275000 5.365000 0.445000 ;
-      RECT 5.015000 0.445000 5.275000 0.835000 ;
-      RECT 5.105000 0.835000 5.275000 1.525000 ;
-      RECT 5.105000 1.695000 5.275000 1.835000 ;
-      RECT 5.105000 1.835000 5.665000 2.005000 ;
-      RECT 5.465000 0.705000 5.675000 1.495000 ;
-      RECT 5.465000 1.495000 6.140000 1.655000 ;
-      RECT 5.465000 1.655000 6.430000 1.665000 ;
-      RECT 5.495000 2.005000 5.665000 2.465000 ;
-      RECT 5.585000 0.255000 6.535000 0.535000 ;
-      RECT 5.845000 0.705000 6.195000 1.325000 ;
-      RECT 5.900000 2.125000 6.770000 2.465000 ;
-      RECT 5.970000 1.665000 6.430000 1.955000 ;
-      RECT 6.365000 0.535000 6.535000 1.315000 ;
-      RECT 6.365000 1.315000 6.770000 1.485000 ;
-      RECT 6.600000 1.485000 6.770000 1.575000 ;
-      RECT 6.600000 1.575000 7.820000 1.745000 ;
-      RECT 6.600000 1.745000 6.770000 2.125000 ;
-      RECT 6.705000 0.695000 7.235000 0.865000 ;
-      RECT 6.705000 0.865000 6.925000 1.145000 ;
-      RECT 7.065000 0.295000 8.135000 0.465000 ;
-      RECT 7.065000 0.465000 7.235000 0.695000 ;
-      RECT 7.360000 1.915000 8.160000 2.085000 ;
-      RECT 7.360000 2.085000 7.530000 2.375000 ;
-      RECT 7.815000 0.465000 8.135000 0.820000 ;
-      RECT 7.815000 0.820000 8.140000 0.995000 ;
-      RECT 7.815000 0.995000 8.730000 1.295000 ;
-      RECT 7.990000 1.295000 8.730000 1.325000 ;
-      RECT 7.990000 1.325000 8.160000 1.915000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.090000  0.345000 0.345000 0.635000 ;
+      RECT 0.090000  0.635000 0.840000 0.805000 ;
+      RECT 0.090000  1.795000 0.840000 1.965000 ;
+      RECT 0.090000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 2.465000 ;
+      RECT 1.545000  0.085000 1.875000 0.445000 ;
+      RECT 1.850000  2.175000 2.100000 2.635000 ;
+      RECT 2.045000  0.305000 2.540000 0.475000 ;
+      RECT 2.045000  0.475000 2.215000 1.835000 ;
+      RECT 2.045000  1.835000 2.440000 2.005000 ;
+      RECT 2.270000  2.005000 2.440000 2.135000 ;
+      RECT 2.270000  2.135000 2.520000 2.465000 ;
+      RECT 2.385000  0.765000 2.735000 1.385000 ;
+      RECT 2.610000  1.575000 3.075000 1.965000 ;
+      RECT 2.735000  2.135000 3.415000 2.465000 ;
+      RECT 2.745000  0.305000 3.600000 0.475000 ;
+      RECT 2.905000  0.765000 3.260000 0.985000 ;
+      RECT 2.905000  0.985000 3.075000 1.575000 ;
+      RECT 3.245000  1.185000 4.935000 1.355000 ;
+      RECT 3.245000  1.355000 3.415000 2.135000 ;
+      RECT 3.430000  0.475000 3.600000 1.185000 ;
+      RECT 3.585000  1.865000 4.660000 2.035000 ;
+      RECT 3.585000  2.035000 3.755000 2.375000 ;
+      RECT 3.775000  1.525000 5.275000 1.695000 ;
+      RECT 3.990000  2.205000 4.320000 2.635000 ;
+      RECT 4.475000  0.085000 4.805000 0.545000 ;
+      RECT 4.490000  2.035000 4.660000 2.375000 ;
+      RECT 4.765000  1.005000 4.935000 1.185000 ;
+      RECT 4.955000  2.175000 5.325000 2.635000 ;
+      RECT 5.015000  0.275000 5.365000 0.445000 ;
+      RECT 5.015000  0.445000 5.275000 0.835000 ;
+      RECT 5.105000  0.835000 5.275000 1.525000 ;
+      RECT 5.105000  1.695000 5.275000 1.835000 ;
+      RECT 5.105000  1.835000 5.665000 2.005000 ;
+      RECT 5.465000  0.705000 5.675000 1.495000 ;
+      RECT 5.465000  1.495000 6.140000 1.655000 ;
+      RECT 5.465000  1.655000 6.430000 1.665000 ;
+      RECT 5.495000  2.005000 5.665000 2.465000 ;
+      RECT 5.585000  0.255000 6.535000 0.535000 ;
+      RECT 5.845000  0.705000 6.195000 1.325000 ;
+      RECT 5.900000  2.125000 6.770000 2.465000 ;
+      RECT 5.970000  1.665000 6.430000 1.955000 ;
+      RECT 6.365000  0.535000 6.535000 1.315000 ;
+      RECT 6.365000  1.315000 6.770000 1.485000 ;
+      RECT 6.600000  1.485000 6.770000 1.575000 ;
+      RECT 6.600000  1.575000 7.820000 1.745000 ;
+      RECT 6.600000  1.745000 6.770000 2.125000 ;
+      RECT 6.705000  0.085000 6.895000 0.525000 ;
+      RECT 6.705000  0.695000 7.235000 0.865000 ;
+      RECT 6.705000  0.865000 6.925000 1.145000 ;
+      RECT 6.940000  2.175000 7.190000 2.635000 ;
+      RECT 7.065000  0.295000 8.135000 0.465000 ;
+      RECT 7.065000  0.465000 7.235000 0.695000 ;
+      RECT 7.360000  1.915000 8.160000 2.085000 ;
+      RECT 7.360000  2.085000 7.530000 2.375000 ;
+      RECT 7.710000  2.255000 8.040000 2.635000 ;
+      RECT 7.815000  0.465000 8.135000 0.820000 ;
+      RECT 7.815000  0.820000 8.140000 0.995000 ;
+      RECT 7.815000  0.995000 8.730000 1.295000 ;
+      RECT 7.990000  1.295000 8.730000 1.325000 ;
+      RECT 7.990000  1.325000 8.160000 1.915000 ;
+      RECT 8.380000  0.085000 8.685000 0.545000 ;
+      RECT 8.380000  1.495000 8.685000 2.635000 ;
     LAYER mcon ;
-      RECT 0.655000 1.785000 0.825000 1.955000 ;
-      RECT 1.015000 1.105000 1.185000 1.275000 ;
-      RECT 2.445000 1.105000 2.615000 1.275000 ;
-      RECT 2.905000 1.785000 3.075000 1.955000 ;
-      RECT 6.025000 1.105000 6.195000 1.275000 ;
-      RECT 6.025000 1.785000 6.195000 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.655000  1.785000 0.825000 1.955000 ;
+      RECT 1.015000  1.105000 1.185000 1.275000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  1.105000 2.615000 1.275000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  1.785000 3.075000 1.955000 ;
+      RECT 2.905000  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.025000  1.105000 6.195000 1.275000 ;
+      RECT 6.025000  1.785000 6.195000 1.955000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
     LAYER met1 ;
       RECT 0.595000 1.755000 0.885000 1.800000 ;
       RECT 0.595000 1.800000 6.255000 1.940000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
index 7bb72f7..540f894 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.magic.lef
@@ -58,12 +58,18 @@
     PORT
       LAYER li1 ;
         RECT 3.805000 0.765000 4.595000 1.015000 ;
+      LAYER mcon ;
+        RECT 4.165000 0.765000 4.335000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 7.105000 1.035000 7.645000 1.405000 ;
         RECT 7.405000 0.635000 7.645000 1.035000 ;
       LAYER mcon ;
-        RECT 4.165000 0.765000 4.335000 0.935000 ;
         RECT 7.105000 1.080000 7.275000 1.250000 ;
         RECT 7.405000 0.765000 7.575000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.745000 0.735000 4.395000 0.780000 ;
         RECT 3.745000 0.780000 7.635000 0.920000 ;
@@ -87,34 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.545000  0.085000 1.875000 0.445000 ;
-        RECT 4.475000  0.085000 4.805000 0.545000 ;
-        RECT 6.705000  0.085000 6.895000 0.525000 ;
-        RECT 8.380000  0.085000 8.685000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -124,103 +102,127 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.850000 2.175000 2.100000 2.635000 ;
-        RECT 3.990000 2.205000 4.320000 2.635000 ;
-        RECT 4.955000 2.175000 5.325000 2.635000 ;
-        RECT 6.940000 2.175000 7.190000 2.635000 ;
-        RECT 7.710000 2.255000 8.040000 2.635000 ;
-        RECT 8.380000 1.495000 8.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000 0.345000 0.635000 ;
-      RECT 0.090000 0.635000 0.840000 0.805000 ;
-      RECT 0.090000 1.795000 0.840000 1.965000 ;
-      RECT 0.090000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 2.465000 ;
-      RECT 2.045000 0.305000 2.540000 0.475000 ;
-      RECT 2.045000 0.475000 2.215000 1.835000 ;
-      RECT 2.045000 1.835000 2.440000 2.005000 ;
-      RECT 2.270000 2.005000 2.440000 2.135000 ;
-      RECT 2.270000 2.135000 2.520000 2.465000 ;
-      RECT 2.385000 0.765000 2.735000 1.385000 ;
-      RECT 2.610000 1.575000 3.075000 1.965000 ;
-      RECT 2.735000 2.135000 3.415000 2.465000 ;
-      RECT 2.745000 0.305000 3.600000 0.475000 ;
-      RECT 2.905000 0.765000 3.260000 0.985000 ;
-      RECT 2.905000 0.985000 3.075000 1.575000 ;
-      RECT 3.245000 1.185000 4.935000 1.355000 ;
-      RECT 3.245000 1.355000 3.415000 2.135000 ;
-      RECT 3.430000 0.475000 3.600000 1.185000 ;
-      RECT 3.585000 1.865000 4.660000 2.035000 ;
-      RECT 3.585000 2.035000 3.755000 2.375000 ;
-      RECT 3.775000 1.525000 5.275000 1.695000 ;
-      RECT 4.490000 2.035000 4.660000 2.375000 ;
-      RECT 4.765000 1.005000 4.935000 1.185000 ;
-      RECT 5.015000 0.275000 5.365000 0.445000 ;
-      RECT 5.015000 0.445000 5.275000 0.835000 ;
-      RECT 5.105000 0.835000 5.275000 1.525000 ;
-      RECT 5.105000 1.695000 5.275000 1.835000 ;
-      RECT 5.105000 1.835000 5.665000 2.005000 ;
-      RECT 5.465000 0.705000 5.675000 1.495000 ;
-      RECT 5.465000 1.495000 6.140000 1.655000 ;
-      RECT 5.465000 1.655000 6.430000 1.665000 ;
-      RECT 5.495000 2.005000 5.665000 2.465000 ;
-      RECT 5.585000 0.255000 6.535000 0.535000 ;
-      RECT 5.845000 0.705000 6.195000 1.325000 ;
-      RECT 5.900000 2.125000 6.770000 2.465000 ;
-      RECT 5.970000 1.665000 6.430000 1.955000 ;
-      RECT 6.365000 0.535000 6.535000 1.315000 ;
-      RECT 6.365000 1.315000 6.770000 1.485000 ;
-      RECT 6.600000 1.485000 6.770000 1.575000 ;
-      RECT 6.600000 1.575000 7.820000 1.745000 ;
-      RECT 6.600000 1.745000 6.770000 2.125000 ;
-      RECT 6.705000 0.695000 7.235000 0.865000 ;
-      RECT 6.705000 0.865000 6.925000 1.145000 ;
-      RECT 7.065000 0.295000 8.135000 0.465000 ;
-      RECT 7.065000 0.465000 7.235000 0.695000 ;
-      RECT 7.360000 1.915000 8.160000 2.085000 ;
-      RECT 7.360000 2.085000 7.530000 2.375000 ;
-      RECT 7.815000 0.465000 8.135000 0.820000 ;
-      RECT 7.815000 0.820000 8.140000 0.995000 ;
-      RECT 7.815000 0.995000 8.730000 1.295000 ;
-      RECT 7.990000 1.295000 8.730000 1.325000 ;
-      RECT 7.990000 1.325000 8.160000 1.915000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.090000  0.345000 0.345000 0.635000 ;
+      RECT 0.090000  0.635000 0.840000 0.805000 ;
+      RECT 0.090000  1.795000 0.840000 1.965000 ;
+      RECT 0.090000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 2.465000 ;
+      RECT 1.545000  0.085000 1.875000 0.445000 ;
+      RECT 1.850000  2.175000 2.100000 2.635000 ;
+      RECT 2.045000  0.305000 2.540000 0.475000 ;
+      RECT 2.045000  0.475000 2.215000 1.835000 ;
+      RECT 2.045000  1.835000 2.440000 2.005000 ;
+      RECT 2.270000  2.005000 2.440000 2.135000 ;
+      RECT 2.270000  2.135000 2.520000 2.465000 ;
+      RECT 2.385000  0.765000 2.735000 1.385000 ;
+      RECT 2.610000  1.575000 3.075000 1.965000 ;
+      RECT 2.735000  2.135000 3.415000 2.465000 ;
+      RECT 2.745000  0.305000 3.600000 0.475000 ;
+      RECT 2.905000  0.765000 3.260000 0.985000 ;
+      RECT 2.905000  0.985000 3.075000 1.575000 ;
+      RECT 3.245000  1.185000 4.935000 1.355000 ;
+      RECT 3.245000  1.355000 3.415000 2.135000 ;
+      RECT 3.430000  0.475000 3.600000 1.185000 ;
+      RECT 3.585000  1.865000 4.660000 2.035000 ;
+      RECT 3.585000  2.035000 3.755000 2.375000 ;
+      RECT 3.775000  1.525000 5.275000 1.695000 ;
+      RECT 3.990000  2.205000 4.320000 2.635000 ;
+      RECT 4.475000  0.085000 4.805000 0.545000 ;
+      RECT 4.490000  2.035000 4.660000 2.375000 ;
+      RECT 4.765000  1.005000 4.935000 1.185000 ;
+      RECT 4.955000  2.175000 5.325000 2.635000 ;
+      RECT 5.015000  0.275000 5.365000 0.445000 ;
+      RECT 5.015000  0.445000 5.275000 0.835000 ;
+      RECT 5.105000  0.835000 5.275000 1.525000 ;
+      RECT 5.105000  1.695000 5.275000 1.835000 ;
+      RECT 5.105000  1.835000 5.665000 2.005000 ;
+      RECT 5.465000  0.705000 5.675000 1.495000 ;
+      RECT 5.465000  1.495000 6.140000 1.655000 ;
+      RECT 5.465000  1.655000 6.430000 1.665000 ;
+      RECT 5.495000  2.005000 5.665000 2.465000 ;
+      RECT 5.585000  0.255000 6.535000 0.535000 ;
+      RECT 5.845000  0.705000 6.195000 1.325000 ;
+      RECT 5.900000  2.125000 6.770000 2.465000 ;
+      RECT 5.970000  1.665000 6.430000 1.955000 ;
+      RECT 6.365000  0.535000 6.535000 1.315000 ;
+      RECT 6.365000  1.315000 6.770000 1.485000 ;
+      RECT 6.600000  1.485000 6.770000 1.575000 ;
+      RECT 6.600000  1.575000 7.820000 1.745000 ;
+      RECT 6.600000  1.745000 6.770000 2.125000 ;
+      RECT 6.705000  0.085000 6.895000 0.525000 ;
+      RECT 6.705000  0.695000 7.235000 0.865000 ;
+      RECT 6.705000  0.865000 6.925000 1.145000 ;
+      RECT 6.940000  2.175000 7.190000 2.635000 ;
+      RECT 7.065000  0.295000 8.135000 0.465000 ;
+      RECT 7.065000  0.465000 7.235000 0.695000 ;
+      RECT 7.360000  1.915000 8.160000 2.085000 ;
+      RECT 7.360000  2.085000 7.530000 2.375000 ;
+      RECT 7.710000  2.255000 8.040000 2.635000 ;
+      RECT 7.815000  0.465000 8.135000 0.820000 ;
+      RECT 7.815000  0.820000 8.140000 0.995000 ;
+      RECT 7.815000  0.995000 8.730000 1.295000 ;
+      RECT 7.990000  1.295000 8.730000 1.325000 ;
+      RECT 7.990000  1.325000 8.160000 1.915000 ;
+      RECT 8.380000  0.085000 8.685000 0.545000 ;
+      RECT 8.380000  1.495000 8.685000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.105000 0.780000 1.275000 ;
-      RECT 1.015000 1.785000 1.185000 1.955000 ;
-      RECT 2.445000 1.105000 2.615000 1.275000 ;
-      RECT 2.905000 1.785000 3.075000 1.955000 ;
-      RECT 6.025000 1.105000 6.195000 1.275000 ;
-      RECT 6.025000 1.785000 6.195000 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.610000  1.105000 0.780000 1.275000 ;
+      RECT 1.015000  1.785000 1.185000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  1.105000 2.615000 1.275000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  1.785000 3.075000 1.955000 ;
+      RECT 2.905000  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.025000  1.105000 6.195000 1.275000 ;
+      RECT 6.025000  1.785000 6.195000 1.955000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.075000 0.840000 1.120000 ;
       RECT 0.550000 1.120000 6.255000 1.260000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
index 7be77b5..9e3c859 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.magic.lef
@@ -58,12 +58,18 @@
     PORT
       LAYER li1 ;
         RECT 3.805000 0.765000 4.595000 1.015000 ;
+      LAYER mcon ;
+        RECT 4.165000 0.765000 4.335000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 7.105000 1.035000 7.645000 1.405000 ;
         RECT 7.405000 0.635000 7.645000 1.035000 ;
       LAYER mcon ;
-        RECT 4.165000 0.765000 4.335000 0.935000 ;
         RECT 7.105000 1.080000 7.275000 1.250000 ;
         RECT 7.405000 0.765000 7.575000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.745000 0.735000 4.395000 0.780000 ;
         RECT 3.745000 0.780000 7.635000 0.920000 ;
@@ -87,36 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.545000  0.085000 1.875000 0.445000 ;
-        RECT 4.475000  0.085000 4.805000 0.545000 ;
-        RECT 6.705000  0.085000 6.895000 0.525000 ;
-        RECT 8.380000  0.085000 8.685000 0.545000 ;
-        RECT 9.275000  0.085000 9.525000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -126,105 +102,131 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.850000 2.175000 2.100000 2.635000 ;
-        RECT 3.990000 2.205000 4.320000 2.635000 ;
-        RECT 4.955000 2.175000 5.325000 2.635000 ;
-        RECT 6.940000 2.175000 7.190000 2.635000 ;
-        RECT 7.710000 2.255000 8.040000 2.635000 ;
-        RECT 8.380000 1.495000 8.685000 2.635000 ;
-        RECT 9.275000 1.495000 9.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 ;
-        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.840000 0.805000 ;
-      RECT 0.090000 1.795000 0.840000 1.965000 ;
-      RECT 0.090000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 2.465000 ;
-      RECT 2.045000 0.305000 2.540000 0.475000 ;
-      RECT 2.045000 0.475000 2.215000 1.835000 ;
-      RECT 2.045000 1.835000 2.440000 2.005000 ;
-      RECT 2.270000 2.005000 2.440000 2.135000 ;
-      RECT 2.270000 2.135000 2.520000 2.465000 ;
-      RECT 2.385000 0.765000 2.735000 1.385000 ;
-      RECT 2.610000 1.575000 3.075000 1.965000 ;
-      RECT 2.735000 2.135000 3.415000 2.465000 ;
-      RECT 2.745000 0.305000 3.600000 0.475000 ;
-      RECT 2.905000 0.765000 3.260000 0.985000 ;
-      RECT 2.905000 0.985000 3.075000 1.575000 ;
-      RECT 3.245000 1.185000 4.935000 1.355000 ;
-      RECT 3.245000 1.355000 3.415000 2.135000 ;
-      RECT 3.430000 0.475000 3.600000 1.185000 ;
-      RECT 3.585000 1.865000 4.660000 2.035000 ;
-      RECT 3.585000 2.035000 3.755000 2.375000 ;
-      RECT 3.775000 1.525000 5.275000 1.695000 ;
-      RECT 4.490000 2.035000 4.660000 2.375000 ;
-      RECT 4.765000 1.005000 4.935000 1.185000 ;
-      RECT 5.015000 0.275000 5.365000 0.445000 ;
-      RECT 5.015000 0.445000 5.275000 0.835000 ;
-      RECT 5.105000 0.835000 5.275000 1.525000 ;
-      RECT 5.105000 1.695000 5.275000 1.835000 ;
-      RECT 5.105000 1.835000 5.665000 2.005000 ;
-      RECT 5.465000 0.705000 5.675000 1.495000 ;
-      RECT 5.465000 1.495000 6.140000 1.655000 ;
-      RECT 5.465000 1.655000 6.430000 1.665000 ;
-      RECT 5.495000 2.005000 5.665000 2.465000 ;
-      RECT 5.585000 0.255000 6.535000 0.535000 ;
-      RECT 5.845000 0.705000 6.195000 1.325000 ;
-      RECT 5.900000 2.125000 6.770000 2.465000 ;
-      RECT 5.970000 1.665000 6.430000 1.955000 ;
-      RECT 6.365000 0.535000 6.535000 1.315000 ;
-      RECT 6.365000 1.315000 6.770000 1.485000 ;
-      RECT 6.600000 1.485000 6.770000 1.575000 ;
-      RECT 6.600000 1.575000 7.820000 1.745000 ;
-      RECT 6.600000 1.745000 6.770000 2.125000 ;
-      RECT 6.705000 0.695000 7.235000 0.865000 ;
-      RECT 6.705000 0.865000 6.925000 1.145000 ;
-      RECT 7.065000 0.295000 8.135000 0.465000 ;
-      RECT 7.065000 0.465000 7.235000 0.695000 ;
-      RECT 7.360000 1.915000 8.160000 2.085000 ;
-      RECT 7.360000 2.085000 7.530000 2.375000 ;
-      RECT 7.815000 0.465000 8.135000 0.820000 ;
-      RECT 7.815000 0.820000 8.140000 0.995000 ;
-      RECT 7.815000 0.995000 8.730000 1.295000 ;
-      RECT 7.990000 1.295000 8.730000 1.325000 ;
-      RECT 7.990000 1.325000 8.160000 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.840000 0.805000 ;
+      RECT 0.090000  1.795000 0.840000 1.965000 ;
+      RECT 0.090000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 2.465000 ;
+      RECT 1.545000  0.085000 1.875000 0.445000 ;
+      RECT 1.850000  2.175000 2.100000 2.635000 ;
+      RECT 2.045000  0.305000 2.540000 0.475000 ;
+      RECT 2.045000  0.475000 2.215000 1.835000 ;
+      RECT 2.045000  1.835000 2.440000 2.005000 ;
+      RECT 2.270000  2.005000 2.440000 2.135000 ;
+      RECT 2.270000  2.135000 2.520000 2.465000 ;
+      RECT 2.385000  0.765000 2.735000 1.385000 ;
+      RECT 2.610000  1.575000 3.075000 1.965000 ;
+      RECT 2.735000  2.135000 3.415000 2.465000 ;
+      RECT 2.745000  0.305000 3.600000 0.475000 ;
+      RECT 2.905000  0.765000 3.260000 0.985000 ;
+      RECT 2.905000  0.985000 3.075000 1.575000 ;
+      RECT 3.245000  1.185000 4.935000 1.355000 ;
+      RECT 3.245000  1.355000 3.415000 2.135000 ;
+      RECT 3.430000  0.475000 3.600000 1.185000 ;
+      RECT 3.585000  1.865000 4.660000 2.035000 ;
+      RECT 3.585000  2.035000 3.755000 2.375000 ;
+      RECT 3.775000  1.525000 5.275000 1.695000 ;
+      RECT 3.990000  2.205000 4.320000 2.635000 ;
+      RECT 4.475000  0.085000 4.805000 0.545000 ;
+      RECT 4.490000  2.035000 4.660000 2.375000 ;
+      RECT 4.765000  1.005000 4.935000 1.185000 ;
+      RECT 4.955000  2.175000 5.325000 2.635000 ;
+      RECT 5.015000  0.275000 5.365000 0.445000 ;
+      RECT 5.015000  0.445000 5.275000 0.835000 ;
+      RECT 5.105000  0.835000 5.275000 1.525000 ;
+      RECT 5.105000  1.695000 5.275000 1.835000 ;
+      RECT 5.105000  1.835000 5.665000 2.005000 ;
+      RECT 5.465000  0.705000 5.675000 1.495000 ;
+      RECT 5.465000  1.495000 6.140000 1.655000 ;
+      RECT 5.465000  1.655000 6.430000 1.665000 ;
+      RECT 5.495000  2.005000 5.665000 2.465000 ;
+      RECT 5.585000  0.255000 6.535000 0.535000 ;
+      RECT 5.845000  0.705000 6.195000 1.325000 ;
+      RECT 5.900000  2.125000 6.770000 2.465000 ;
+      RECT 5.970000  1.665000 6.430000 1.955000 ;
+      RECT 6.365000  0.535000 6.535000 1.315000 ;
+      RECT 6.365000  1.315000 6.770000 1.485000 ;
+      RECT 6.600000  1.485000 6.770000 1.575000 ;
+      RECT 6.600000  1.575000 7.820000 1.745000 ;
+      RECT 6.600000  1.745000 6.770000 2.125000 ;
+      RECT 6.705000  0.085000 6.895000 0.525000 ;
+      RECT 6.705000  0.695000 7.235000 0.865000 ;
+      RECT 6.705000  0.865000 6.925000 1.145000 ;
+      RECT 6.940000  2.175000 7.190000 2.635000 ;
+      RECT 7.065000  0.295000 8.135000 0.465000 ;
+      RECT 7.065000  0.465000 7.235000 0.695000 ;
+      RECT 7.360000  1.915000 8.160000 2.085000 ;
+      RECT 7.360000  2.085000 7.530000 2.375000 ;
+      RECT 7.710000  2.255000 8.040000 2.635000 ;
+      RECT 7.815000  0.465000 8.135000 0.820000 ;
+      RECT 7.815000  0.820000 8.140000 0.995000 ;
+      RECT 7.815000  0.995000 8.730000 1.295000 ;
+      RECT 7.990000  1.295000 8.730000 1.325000 ;
+      RECT 7.990000  1.325000 8.160000 1.915000 ;
+      RECT 8.380000  0.085000 8.685000 0.545000 ;
+      RECT 8.380000  1.495000 8.685000 2.635000 ;
+      RECT 9.275000  0.085000 9.525000 0.840000 ;
+      RECT 9.275000  1.495000 9.525000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.105000 0.780000 1.275000 ;
-      RECT 1.015000 1.785000 1.185000 1.955000 ;
-      RECT 2.445000 1.105000 2.615000 1.275000 ;
-      RECT 2.905000 1.785000 3.075000 1.955000 ;
-      RECT 6.025000 1.105000 6.195000 1.275000 ;
-      RECT 6.025000 1.785000 6.195000 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.610000  1.105000 0.780000 1.275000 ;
+      RECT 1.015000  1.785000 1.185000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  1.105000 2.615000 1.275000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  1.785000 3.075000 1.955000 ;
+      RECT 2.905000  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.025000  1.105000 6.195000 1.275000 ;
+      RECT 6.025000  1.785000 6.195000 1.955000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.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 ;
     LAYER met1 ;
       RECT 0.550000 1.075000 0.840000 1.120000 ;
       RECT 0.550000 1.120000 6.255000 1.260000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
index 0e35794..cbb6fdf 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.magic.lef
@@ -62,12 +62,18 @@
     PORT
       LAYER li1 ;
         RECT 3.805000 0.765000 4.595000 1.015000 ;
+      LAYER mcon ;
+        RECT 4.165000 0.765000 4.335000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 7.105000 1.035000 7.645000 1.405000 ;
         RECT 7.405000 0.635000 7.645000 1.035000 ;
       LAYER mcon ;
-        RECT 4.165000 0.765000 4.335000 0.935000 ;
         RECT 7.105000 1.080000 7.275000 1.250000 ;
         RECT 7.405000 0.765000 7.575000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.745000 0.735000 4.395000 0.780000 ;
         RECT 3.745000 0.780000 7.635000 0.920000 ;
@@ -91,39 +97,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.580000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.545000  0.085000  1.875000 0.445000 ;
-        RECT  4.475000  0.085000  4.805000 0.545000 ;
-        RECT  6.705000  0.085000  6.895000 0.525000 ;
-        RECT  8.335000  0.085000  8.505000 0.895000 ;
-        RECT  9.175000  0.085000  9.345000 0.555000 ;
-        RECT 10.015000  0.085000 10.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -133,108 +106,137 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 10.580000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.850000 2.175000  2.100000 2.635000 ;
-        RECT  3.990000 2.205000  4.320000 2.635000 ;
-        RECT  4.955000 2.175000  5.325000 2.635000 ;
-        RECT  6.940000 2.175000  7.190000 2.635000 ;
-        RECT  7.710000 2.255000  8.040000 2.635000 ;
-        RECT  8.335000 1.575000  8.505000 2.635000 ;
-        RECT  9.175000 1.795000  9.345000 2.635000 ;
-        RECT 10.015000 1.795000 10.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000 0.345000 0.635000 ;
-      RECT 0.090000 0.635000 0.840000 0.805000 ;
-      RECT 0.090000 1.795000 0.840000 1.965000 ;
-      RECT 0.090000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 2.465000 ;
-      RECT 2.045000 0.305000 2.540000 0.475000 ;
-      RECT 2.045000 0.475000 2.215000 1.835000 ;
-      RECT 2.045000 1.835000 2.440000 2.005000 ;
-      RECT 2.270000 2.005000 2.440000 2.135000 ;
-      RECT 2.270000 2.135000 2.520000 2.465000 ;
-      RECT 2.385000 0.765000 2.735000 1.385000 ;
-      RECT 2.610000 1.575000 3.075000 1.965000 ;
-      RECT 2.735000 2.135000 3.415000 2.465000 ;
-      RECT 2.745000 0.305000 3.600000 0.475000 ;
-      RECT 2.905000 0.765000 3.260000 0.985000 ;
-      RECT 2.905000 0.985000 3.075000 1.575000 ;
-      RECT 3.245000 1.185000 4.935000 1.355000 ;
-      RECT 3.245000 1.355000 3.415000 2.135000 ;
-      RECT 3.430000 0.475000 3.600000 1.185000 ;
-      RECT 3.585000 1.865000 4.660000 2.035000 ;
-      RECT 3.585000 2.035000 3.755000 2.375000 ;
-      RECT 3.775000 1.525000 5.275000 1.695000 ;
-      RECT 4.490000 2.035000 4.660000 2.375000 ;
-      RECT 4.765000 1.005000 4.935000 1.185000 ;
-      RECT 5.015000 0.275000 5.365000 0.445000 ;
-      RECT 5.015000 0.445000 5.275000 0.835000 ;
-      RECT 5.105000 0.835000 5.275000 1.525000 ;
-      RECT 5.105000 1.695000 5.275000 1.835000 ;
-      RECT 5.105000 1.835000 5.665000 2.005000 ;
-      RECT 5.465000 0.705000 5.675000 1.495000 ;
-      RECT 5.465000 1.495000 6.140000 1.655000 ;
-      RECT 5.465000 1.655000 6.430000 1.665000 ;
-      RECT 5.495000 2.005000 5.665000 2.465000 ;
-      RECT 5.585000 0.255000 6.535000 0.535000 ;
-      RECT 5.845000 0.705000 6.195000 1.325000 ;
-      RECT 5.900000 2.125000 6.770000 2.465000 ;
-      RECT 5.970000 1.665000 6.430000 1.955000 ;
-      RECT 6.365000 0.535000 6.535000 1.315000 ;
-      RECT 6.365000 1.315000 6.770000 1.485000 ;
-      RECT 6.600000 1.485000 6.770000 1.575000 ;
-      RECT 6.600000 1.575000 7.820000 1.745000 ;
-      RECT 6.600000 1.745000 6.770000 2.125000 ;
-      RECT 6.705000 0.695000 7.235000 0.865000 ;
-      RECT 6.705000 0.865000 6.925000 1.145000 ;
-      RECT 7.065000 0.295000 8.135000 0.465000 ;
-      RECT 7.065000 0.465000 7.235000 0.695000 ;
-      RECT 7.360000 1.915000 8.160000 2.085000 ;
-      RECT 7.360000 2.085000 7.530000 2.375000 ;
-      RECT 7.815000 0.465000 8.135000 0.820000 ;
-      RECT 7.815000 0.820000 8.140000 1.075000 ;
-      RECT 7.815000 1.075000 9.845000 1.285000 ;
-      RECT 7.815000 1.285000 8.160000 1.295000 ;
-      RECT 7.990000 1.295000 8.160000 1.915000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.090000  0.345000  0.345000 0.635000 ;
+      RECT  0.090000  0.635000  0.840000 0.805000 ;
+      RECT  0.090000  1.795000  0.840000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.610000  0.805000  0.840000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.545000  0.085000  1.875000 0.445000 ;
+      RECT  1.850000  2.175000  2.100000 2.635000 ;
+      RECT  2.045000  0.305000  2.540000 0.475000 ;
+      RECT  2.045000  0.475000  2.215000 1.835000 ;
+      RECT  2.045000  1.835000  2.440000 2.005000 ;
+      RECT  2.270000  2.005000  2.440000 2.135000 ;
+      RECT  2.270000  2.135000  2.520000 2.465000 ;
+      RECT  2.385000  0.765000  2.735000 1.385000 ;
+      RECT  2.610000  1.575000  3.075000 1.965000 ;
+      RECT  2.735000  2.135000  3.415000 2.465000 ;
+      RECT  2.745000  0.305000  3.600000 0.475000 ;
+      RECT  2.905000  0.765000  3.260000 0.985000 ;
+      RECT  2.905000  0.985000  3.075000 1.575000 ;
+      RECT  3.245000  1.185000  4.935000 1.355000 ;
+      RECT  3.245000  1.355000  3.415000 2.135000 ;
+      RECT  3.430000  0.475000  3.600000 1.185000 ;
+      RECT  3.585000  1.865000  4.660000 2.035000 ;
+      RECT  3.585000  2.035000  3.755000 2.375000 ;
+      RECT  3.775000  1.525000  5.275000 1.695000 ;
+      RECT  3.990000  2.205000  4.320000 2.635000 ;
+      RECT  4.475000  0.085000  4.805000 0.545000 ;
+      RECT  4.490000  2.035000  4.660000 2.375000 ;
+      RECT  4.765000  1.005000  4.935000 1.185000 ;
+      RECT  4.955000  2.175000  5.325000 2.635000 ;
+      RECT  5.015000  0.275000  5.365000 0.445000 ;
+      RECT  5.015000  0.445000  5.275000 0.835000 ;
+      RECT  5.105000  0.835000  5.275000 1.525000 ;
+      RECT  5.105000  1.695000  5.275000 1.835000 ;
+      RECT  5.105000  1.835000  5.665000 2.005000 ;
+      RECT  5.465000  0.705000  5.675000 1.495000 ;
+      RECT  5.465000  1.495000  6.140000 1.655000 ;
+      RECT  5.465000  1.655000  6.430000 1.665000 ;
+      RECT  5.495000  2.005000  5.665000 2.465000 ;
+      RECT  5.585000  0.255000  6.535000 0.535000 ;
+      RECT  5.845000  0.705000  6.195000 1.325000 ;
+      RECT  5.900000  2.125000  6.770000 2.465000 ;
+      RECT  5.970000  1.665000  6.430000 1.955000 ;
+      RECT  6.365000  0.535000  6.535000 1.315000 ;
+      RECT  6.365000  1.315000  6.770000 1.485000 ;
+      RECT  6.600000  1.485000  6.770000 1.575000 ;
+      RECT  6.600000  1.575000  7.820000 1.745000 ;
+      RECT  6.600000  1.745000  6.770000 2.125000 ;
+      RECT  6.705000  0.085000  6.895000 0.525000 ;
+      RECT  6.705000  0.695000  7.235000 0.865000 ;
+      RECT  6.705000  0.865000  6.925000 1.145000 ;
+      RECT  6.940000  2.175000  7.190000 2.635000 ;
+      RECT  7.065000  0.295000  8.135000 0.465000 ;
+      RECT  7.065000  0.465000  7.235000 0.695000 ;
+      RECT  7.360000  1.915000  8.160000 2.085000 ;
+      RECT  7.360000  2.085000  7.530000 2.375000 ;
+      RECT  7.710000  2.255000  8.040000 2.635000 ;
+      RECT  7.815000  0.465000  8.135000 0.820000 ;
+      RECT  7.815000  0.820000  8.140000 1.075000 ;
+      RECT  7.815000  1.075000  9.845000 1.285000 ;
+      RECT  7.815000  1.285000  8.160000 1.295000 ;
+      RECT  7.990000  1.295000  8.160000 1.915000 ;
+      RECT  8.335000  0.085000  8.505000 0.895000 ;
+      RECT  8.335000  1.575000  8.505000 2.635000 ;
+      RECT  9.175000  0.085000  9.345000 0.555000 ;
+      RECT  9.175000  1.795000  9.345000 2.635000 ;
+      RECT 10.015000  0.085000 10.185000 0.555000 ;
+      RECT 10.015000  1.795000 10.185000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.105000 0.780000 1.275000 ;
-      RECT 1.015000 1.785000 1.185000 1.955000 ;
-      RECT 2.445000 1.105000 2.615000 1.275000 ;
-      RECT 2.905000 1.785000 3.075000 1.955000 ;
-      RECT 6.025000 1.105000 6.195000 1.275000 ;
-      RECT 6.025000 1.785000 6.195000 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.610000  1.105000  0.780000 1.275000 ;
+      RECT  1.015000  1.785000  1.185000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  1.105000  2.615000 1.275000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  1.785000  3.075000 1.955000 ;
+      RECT  2.905000  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.025000  1.105000  6.195000 1.275000 ;
+      RECT  6.025000  1.785000  6.195000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.075000 0.840000 1.120000 ;
       RECT 0.550000 1.120000 6.255000 1.260000 ;
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
index 9925c8b..a1514c0 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.magic.lef
@@ -66,11 +66,17 @@
     PORT
       LAYER li1 ;
         RECT 3.610000 0.735000 4.020000 1.065000 ;
+      LAYER mcon ;
+        RECT 3.825000 0.765000 3.995000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 6.660000 0.735000 7.320000 1.005000 ;
         RECT 6.660000 1.005000 6.990000 1.065000 ;
       LAYER mcon ;
-        RECT 3.825000 0.765000 3.995000 0.935000 ;
         RECT 7.045000 0.765000 7.215000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.765000 0.735000 4.055000 0.780000 ;
         RECT 3.765000 0.780000 7.275000 0.920000 ;
@@ -93,39 +99,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 0.515000  0.085000  0.845000 0.465000 ;
-        RECT 1.455000  0.085000  1.785000 0.465000 ;
-        RECT 3.610000  0.085000  4.020000 0.525000 ;
-        RECT 4.740000  0.085000  5.080000 0.545000 ;
-        RECT 6.670000  0.085000  7.330000 0.565000 ;
-        RECT 8.020000  0.085000  8.200000 0.905000 ;
-        RECT 9.445000  0.085000  9.615000 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 ;
-        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
@@ -135,102 +108,131 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 0.515000 2.135000  0.845000 2.635000 ;
-        RECT 1.455000 2.135000  1.785000 2.635000 ;
-        RECT 3.430000 2.255000  3.810000 2.635000 ;
-        RECT 4.330000 2.255000  4.660000 2.635000 ;
-        RECT 5.930000 2.255000  6.340000 2.635000 ;
-        RECT 7.010000 1.945000  7.340000 2.635000 ;
-        RECT 8.020000 1.480000  8.200000 2.635000 ;
-        RECT 9.445000 1.825000  9.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 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.175000 1.795000 0.840000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.240000 2.465000 ;
-      RECT 1.430000 0.635000 2.125000 0.825000 ;
-      RECT 1.430000 0.825000 1.600000 1.795000 ;
-      RECT 1.430000 1.795000 2.125000 1.965000 ;
-      RECT 1.955000 0.305000 2.125000 0.635000 ;
-      RECT 1.955000 1.965000 2.125000 2.465000 ;
-      RECT 2.350000 0.705000 2.570000 1.575000 ;
-      RECT 2.350000 1.575000 2.850000 1.955000 ;
-      RECT 2.360000 2.250000 3.190000 2.420000 ;
-      RECT 2.425000 0.265000 3.440000 0.465000 ;
-      RECT 2.750000 0.645000 3.100000 1.015000 ;
-      RECT 3.020000 1.195000 3.440000 1.235000 ;
-      RECT 3.020000 1.235000 4.370000 1.405000 ;
-      RECT 3.020000 1.405000 3.190000 2.250000 ;
-      RECT 3.270000 0.465000 3.440000 1.195000 ;
-      RECT 3.360000 1.575000 3.610000 1.835000 ;
-      RECT 3.360000 1.835000 4.710000 2.085000 ;
-      RECT 3.990000 2.085000 4.160000 2.375000 ;
-      RECT 4.120000 1.405000 4.370000 1.565000 ;
-      RECT 4.310000 0.295000 4.560000 0.725000 ;
-      RECT 4.310000 0.725000 4.710000 1.065000 ;
-      RECT 4.540000 1.065000 4.710000 1.835000 ;
-      RECT 4.900000 0.725000 6.150000 0.895000 ;
-      RECT 4.900000 0.895000 5.070000 1.655000 ;
-      RECT 4.900000 1.655000 5.400000 1.965000 ;
-      RECT 5.110000 2.165000 5.760000 2.415000 ;
-      RECT 5.240000 1.065000 5.420000 1.475000 ;
-      RECT 5.590000 1.235000 7.470000 1.405000 ;
-      RECT 5.590000 1.405000 5.760000 1.915000 ;
-      RECT 5.590000 1.915000 6.780000 2.085000 ;
-      RECT 5.590000 2.085000 5.760000 2.165000 ;
-      RECT 5.640000 0.305000 6.490000 0.475000 ;
-      RECT 5.820000 0.895000 6.150000 1.015000 ;
-      RECT 5.930000 1.575000 7.830000 1.745000 ;
-      RECT 6.320000 0.475000 6.490000 1.235000 ;
-      RECT 6.540000 2.085000 6.780000 2.375000 ;
-      RECT 7.140000 1.175000 7.470000 1.235000 ;
-      RECT 7.510000 0.350000 7.830000 0.680000 ;
-      RECT 7.510000 1.745000 7.830000 1.765000 ;
-      RECT 7.510000 1.765000 7.680000 2.375000 ;
-      RECT 7.640000 0.680000 7.830000 1.575000 ;
-      RECT 8.890000 0.255000 9.220000 0.995000 ;
-      RECT 8.890000 0.995000 9.740000 1.325000 ;
-      RECT 8.890000 1.325000 9.220000 2.465000 ;
+      RECT 0.000000 -0.085000 10.580000 0.085000 ;
+      RECT 0.000000  2.635000 10.580000 2.805000 ;
+      RECT 0.175000  0.345000  0.345000 0.635000 ;
+      RECT 0.175000  0.635000  0.840000 0.805000 ;
+      RECT 0.175000  1.795000  0.840000 1.965000 ;
+      RECT 0.175000  1.965000  0.345000 2.465000 ;
+      RECT 0.515000  0.085000  0.845000 0.465000 ;
+      RECT 0.515000  2.135000  0.845000 2.635000 ;
+      RECT 0.610000  0.805000  0.840000 1.795000 ;
+      RECT 1.015000  0.345000  1.240000 2.465000 ;
+      RECT 1.430000  0.635000  2.125000 0.825000 ;
+      RECT 1.430000  0.825000  1.600000 1.795000 ;
+      RECT 1.430000  1.795000  2.125000 1.965000 ;
+      RECT 1.455000  0.085000  1.785000 0.465000 ;
+      RECT 1.455000  2.135000  1.785000 2.635000 ;
+      RECT 1.955000  0.305000  2.125000 0.635000 ;
+      RECT 1.955000  1.965000  2.125000 2.465000 ;
+      RECT 2.350000  0.705000  2.570000 1.575000 ;
+      RECT 2.350000  1.575000  2.850000 1.955000 ;
+      RECT 2.360000  2.250000  3.190000 2.420000 ;
+      RECT 2.425000  0.265000  3.440000 0.465000 ;
+      RECT 2.750000  0.645000  3.100000 1.015000 ;
+      RECT 3.020000  1.195000  3.440000 1.235000 ;
+      RECT 3.020000  1.235000  4.370000 1.405000 ;
+      RECT 3.020000  1.405000  3.190000 2.250000 ;
+      RECT 3.270000  0.465000  3.440000 1.195000 ;
+      RECT 3.360000  1.575000  3.610000 1.835000 ;
+      RECT 3.360000  1.835000  4.710000 2.085000 ;
+      RECT 3.430000  2.255000  3.810000 2.635000 ;
+      RECT 3.610000  0.085000  4.020000 0.525000 ;
+      RECT 3.990000  2.085000  4.160000 2.375000 ;
+      RECT 4.120000  1.405000  4.370000 1.565000 ;
+      RECT 4.310000  0.295000  4.560000 0.725000 ;
+      RECT 4.310000  0.725000  4.710000 1.065000 ;
+      RECT 4.330000  2.255000  4.660000 2.635000 ;
+      RECT 4.540000  1.065000  4.710000 1.835000 ;
+      RECT 4.740000  0.085000  5.080000 0.545000 ;
+      RECT 4.900000  0.725000  6.150000 0.895000 ;
+      RECT 4.900000  0.895000  5.070000 1.655000 ;
+      RECT 4.900000  1.655000  5.400000 1.965000 ;
+      RECT 5.110000  2.165000  5.760000 2.415000 ;
+      RECT 5.240000  1.065000  5.420000 1.475000 ;
+      RECT 5.590000  1.235000  7.470000 1.405000 ;
+      RECT 5.590000  1.405000  5.760000 1.915000 ;
+      RECT 5.590000  1.915000  6.780000 2.085000 ;
+      RECT 5.590000  2.085000  5.760000 2.165000 ;
+      RECT 5.640000  0.305000  6.490000 0.475000 ;
+      RECT 5.820000  0.895000  6.150000 1.015000 ;
+      RECT 5.930000  1.575000  7.830000 1.745000 ;
+      RECT 5.930000  2.255000  6.340000 2.635000 ;
+      RECT 6.320000  0.475000  6.490000 1.235000 ;
+      RECT 6.540000  2.085000  6.780000 2.375000 ;
+      RECT 6.670000  0.085000  7.330000 0.565000 ;
+      RECT 7.010000  1.945000  7.340000 2.635000 ;
+      RECT 7.140000  1.175000  7.470000 1.235000 ;
+      RECT 7.510000  0.350000  7.830000 0.680000 ;
+      RECT 7.510000  1.745000  7.830000 1.765000 ;
+      RECT 7.510000  1.765000  7.680000 2.375000 ;
+      RECT 7.640000  0.680000  7.830000 1.575000 ;
+      RECT 8.020000  0.085000  8.200000 0.905000 ;
+      RECT 8.020000  1.480000  8.200000 2.635000 ;
+      RECT 8.890000  0.255000  9.220000 0.995000 ;
+      RECT 8.890000  0.995000  9.740000 1.325000 ;
+      RECT 8.890000  1.325000  9.220000 2.465000 ;
+      RECT 9.445000  0.085000  9.615000 0.585000 ;
+      RECT 9.445000  1.825000  9.615000 2.635000 ;
     LAYER mcon ;
-      RECT 0.645000 1.785000 0.815000 1.955000 ;
-      RECT 1.065000 0.765000 1.235000 0.935000 ;
-      RECT 2.445000 1.785000 2.615000 1.955000 ;
-      RECT 2.905000 0.765000 3.075000 0.935000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 5.245000 1.105000 5.415000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.645000  1.785000  0.815000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  0.765000  1.235000 0.935000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  1.785000  2.615000 1.955000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  0.765000  3.075000 0.935000 ;
+      RECT  2.905000  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  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.245000  1.105000  5.415000 1.275000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 0.585000 1.755000 0.875000 1.800000 ;
       RECT 0.585000 1.800000 5.435000 1.940000 ;
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
index eb6fcc3..5748d58 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.magic.lef
@@ -69,11 +69,17 @@
     PORT
       LAYER li1 ;
         RECT 3.610000 0.735000 4.020000 1.065000 ;
+      LAYER mcon ;
+        RECT 3.825000 0.765000 3.995000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 6.660000 0.735000 7.320000 1.005000 ;
         RECT 6.660000 1.005000 6.990000 1.065000 ;
       LAYER mcon ;
-        RECT 3.825000 0.765000 3.995000 0.935000 ;
         RECT 7.045000 0.765000 7.215000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.765000 0.735000 4.055000 0.780000 ;
         RECT 3.765000 0.780000 7.275000 0.920000 ;
@@ -96,42 +102,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.455000  0.085000  1.785000 0.465000 ;
-        RECT  3.610000  0.085000  4.020000 0.525000 ;
-        RECT  4.740000  0.085000  5.080000 0.545000 ;
-        RECT  6.670000  0.085000  7.330000 0.565000 ;
-        RECT  8.020000  0.085000  8.200000 0.905000 ;
-        RECT  8.870000  0.085000  9.120000 0.905000 ;
-        RECT  9.730000  0.085000 10.060000 0.825000 ;
-        RECT 10.650000  0.085000 10.915000 0.550000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -141,105 +111,137 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.455000 2.135000  1.785000 2.635000 ;
-        RECT  3.430000 2.255000  3.810000 2.635000 ;
-        RECT  4.330000 2.255000  4.660000 2.635000 ;
-        RECT  5.930000 2.255000  6.340000 2.635000 ;
-        RECT  7.010000 1.945000  7.340000 2.635000 ;
-        RECT  8.020000 1.480000  8.200000 2.635000 ;
-        RECT  8.870000 1.480000  9.120000 2.635000 ;
-        RECT  9.810000 1.495000  9.980000 2.635000 ;
-        RECT 10.650000 1.835000 10.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 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000  0.345000 0.635000 ;
-      RECT 0.175000 0.635000  0.840000 0.805000 ;
-      RECT 0.175000 1.795000  0.840000 1.965000 ;
-      RECT 0.175000 1.965000  0.345000 2.465000 ;
-      RECT 0.610000 0.805000  0.840000 1.795000 ;
-      RECT 1.015000 0.345000  1.240000 2.465000 ;
-      RECT 1.430000 0.635000  2.125000 0.825000 ;
-      RECT 1.430000 0.825000  1.600000 1.795000 ;
-      RECT 1.430000 1.795000  2.125000 1.965000 ;
-      RECT 1.955000 0.305000  2.125000 0.635000 ;
-      RECT 1.955000 1.965000  2.125000 2.465000 ;
-      RECT 2.350000 0.705000  2.570000 1.575000 ;
-      RECT 2.350000 1.575000  2.850000 1.955000 ;
-      RECT 2.360000 2.250000  3.190000 2.420000 ;
-      RECT 2.425000 0.265000  3.440000 0.465000 ;
-      RECT 2.750000 0.645000  3.100000 1.015000 ;
-      RECT 3.020000 1.195000  3.440000 1.235000 ;
-      RECT 3.020000 1.235000  4.370000 1.405000 ;
-      RECT 3.020000 1.405000  3.190000 2.250000 ;
-      RECT 3.270000 0.465000  3.440000 1.195000 ;
-      RECT 3.360000 1.575000  3.610000 1.835000 ;
-      RECT 3.360000 1.835000  4.710000 2.085000 ;
-      RECT 3.990000 2.085000  4.160000 2.375000 ;
-      RECT 4.120000 1.405000  4.370000 1.565000 ;
-      RECT 4.310000 0.295000  4.560000 0.725000 ;
-      RECT 4.310000 0.725000  4.710000 1.065000 ;
-      RECT 4.540000 1.065000  4.710000 1.835000 ;
-      RECT 4.900000 0.725000  6.150000 0.895000 ;
-      RECT 4.900000 0.895000  5.070000 1.655000 ;
-      RECT 4.900000 1.655000  5.400000 1.965000 ;
-      RECT 5.110000 2.165000  5.760000 2.415000 ;
-      RECT 5.240000 1.065000  5.420000 1.475000 ;
-      RECT 5.590000 1.235000  7.470000 1.405000 ;
-      RECT 5.590000 1.405000  5.760000 1.915000 ;
-      RECT 5.590000 1.915000  6.780000 2.085000 ;
-      RECT 5.590000 2.085000  5.760000 2.165000 ;
-      RECT 5.640000 0.305000  6.490000 0.475000 ;
-      RECT 5.820000 0.895000  6.150000 1.015000 ;
-      RECT 5.930000 1.575000  7.830000 1.745000 ;
-      RECT 6.320000 0.475000  6.490000 1.235000 ;
-      RECT 6.540000 2.085000  6.780000 2.375000 ;
-      RECT 7.140000 1.175000  7.470000 1.235000 ;
-      RECT 7.510000 0.350000  7.830000 0.680000 ;
-      RECT 7.510000 1.745000  7.830000 1.765000 ;
-      RECT 7.510000 1.765000  7.680000 2.375000 ;
-      RECT 7.640000 0.680000  7.830000 1.575000 ;
-      RECT 9.310000 0.255000  9.560000 0.995000 ;
-      RECT 9.310000 0.995000 10.190000 1.325000 ;
-      RECT 9.310000 1.325000  9.640000 2.465000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.840000 0.805000 ;
+      RECT  0.175000  1.795000  0.840000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.610000  0.805000  0.840000 1.795000 ;
+      RECT  1.015000  0.345000  1.240000 2.465000 ;
+      RECT  1.430000  0.635000  2.125000 0.825000 ;
+      RECT  1.430000  0.825000  1.600000 1.795000 ;
+      RECT  1.430000  1.795000  2.125000 1.965000 ;
+      RECT  1.455000  0.085000  1.785000 0.465000 ;
+      RECT  1.455000  2.135000  1.785000 2.635000 ;
+      RECT  1.955000  0.305000  2.125000 0.635000 ;
+      RECT  1.955000  1.965000  2.125000 2.465000 ;
+      RECT  2.350000  0.705000  2.570000 1.575000 ;
+      RECT  2.350000  1.575000  2.850000 1.955000 ;
+      RECT  2.360000  2.250000  3.190000 2.420000 ;
+      RECT  2.425000  0.265000  3.440000 0.465000 ;
+      RECT  2.750000  0.645000  3.100000 1.015000 ;
+      RECT  3.020000  1.195000  3.440000 1.235000 ;
+      RECT  3.020000  1.235000  4.370000 1.405000 ;
+      RECT  3.020000  1.405000  3.190000 2.250000 ;
+      RECT  3.270000  0.465000  3.440000 1.195000 ;
+      RECT  3.360000  1.575000  3.610000 1.835000 ;
+      RECT  3.360000  1.835000  4.710000 2.085000 ;
+      RECT  3.430000  2.255000  3.810000 2.635000 ;
+      RECT  3.610000  0.085000  4.020000 0.525000 ;
+      RECT  3.990000  2.085000  4.160000 2.375000 ;
+      RECT  4.120000  1.405000  4.370000 1.565000 ;
+      RECT  4.310000  0.295000  4.560000 0.725000 ;
+      RECT  4.310000  0.725000  4.710000 1.065000 ;
+      RECT  4.330000  2.255000  4.660000 2.635000 ;
+      RECT  4.540000  1.065000  4.710000 1.835000 ;
+      RECT  4.740000  0.085000  5.080000 0.545000 ;
+      RECT  4.900000  0.725000  6.150000 0.895000 ;
+      RECT  4.900000  0.895000  5.070000 1.655000 ;
+      RECT  4.900000  1.655000  5.400000 1.965000 ;
+      RECT  5.110000  2.165000  5.760000 2.415000 ;
+      RECT  5.240000  1.065000  5.420000 1.475000 ;
+      RECT  5.590000  1.235000  7.470000 1.405000 ;
+      RECT  5.590000  1.405000  5.760000 1.915000 ;
+      RECT  5.590000  1.915000  6.780000 2.085000 ;
+      RECT  5.590000  2.085000  5.760000 2.165000 ;
+      RECT  5.640000  0.305000  6.490000 0.475000 ;
+      RECT  5.820000  0.895000  6.150000 1.015000 ;
+      RECT  5.930000  1.575000  7.830000 1.745000 ;
+      RECT  5.930000  2.255000  6.340000 2.635000 ;
+      RECT  6.320000  0.475000  6.490000 1.235000 ;
+      RECT  6.540000  2.085000  6.780000 2.375000 ;
+      RECT  6.670000  0.085000  7.330000 0.565000 ;
+      RECT  7.010000  1.945000  7.340000 2.635000 ;
+      RECT  7.140000  1.175000  7.470000 1.235000 ;
+      RECT  7.510000  0.350000  7.830000 0.680000 ;
+      RECT  7.510000  1.745000  7.830000 1.765000 ;
+      RECT  7.510000  1.765000  7.680000 2.375000 ;
+      RECT  7.640000  0.680000  7.830000 1.575000 ;
+      RECT  8.020000  0.085000  8.200000 0.905000 ;
+      RECT  8.020000  1.480000  8.200000 2.635000 ;
+      RECT  8.870000  0.085000  9.120000 0.905000 ;
+      RECT  8.870000  1.480000  9.120000 2.635000 ;
+      RECT  9.310000  0.255000  9.560000 0.995000 ;
+      RECT  9.310000  0.995000 10.190000 1.325000 ;
+      RECT  9.310000  1.325000  9.640000 2.465000 ;
+      RECT  9.730000  0.085000 10.060000 0.825000 ;
+      RECT  9.810000  1.495000  9.980000 2.635000 ;
+      RECT 10.650000  0.085000 10.915000 0.550000 ;
+      RECT 10.650000  1.835000 10.915000 2.635000 ;
     LAYER mcon ;
-      RECT 0.645000 1.785000 0.815000 1.955000 ;
-      RECT 1.065000 0.765000 1.235000 0.935000 ;
-      RECT 2.445000 1.785000 2.615000 1.955000 ;
-      RECT 2.905000 0.765000 3.075000 0.935000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 5.245000 1.105000 5.415000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.645000  1.785000  0.815000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  0.765000  1.235000 0.935000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  1.785000  2.615000 1.955000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  0.765000  3.075000 0.935000 ;
+      RECT  2.905000  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  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.245000  1.105000  5.415000 1.275000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.585000 1.755000 0.875000 1.800000 ;
       RECT 0.585000 1.800000 5.435000 1.940000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
index 5eeb11d..8eea630 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.magic.lef
@@ -57,11 +57,17 @@
     PORT
       LAYER li1 ;
         RECT 3.610000 0.735000 4.020000 1.065000 ;
+      LAYER mcon ;
+        RECT 3.850000 0.765000 4.020000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 6.680000 0.735000 7.340000 1.005000 ;
         RECT 6.680000 1.005000 7.010000 1.065000 ;
       LAYER mcon ;
-        RECT 3.850000 0.765000 4.020000 0.935000 ;
         RECT 7.110000 0.765000 7.280000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.790000 0.735000 4.080000 0.780000 ;
         RECT 3.790000 0.780000 7.340000 0.920000 ;
@@ -84,36 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.785000 0.465000 ;
-        RECT 3.610000  0.085000 4.020000 0.525000 ;
-        RECT 4.760000  0.085000 5.080000 0.545000 ;
-        RECT 6.690000  0.085000 7.350000 0.565000 ;
-        RECT 8.480000  0.085000 8.765000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -123,100 +99,126 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.455000 2.135000 1.785000 2.635000 ;
-        RECT 3.430000 2.255000 3.810000 2.635000 ;
-        RECT 4.330000 2.255000 4.660000 2.635000 ;
-        RECT 5.940000 2.255000 6.360000 2.635000 ;
-        RECT 7.030000 1.945000 7.360000 2.635000 ;
-        RECT 8.480000 1.835000 8.765000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.175000 1.795000 0.840000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.240000 2.465000 ;
-      RECT 1.430000 0.635000 2.125000 0.825000 ;
-      RECT 1.430000 0.825000 1.600000 1.795000 ;
-      RECT 1.430000 1.795000 2.125000 1.965000 ;
-      RECT 1.955000 0.305000 2.125000 0.635000 ;
-      RECT 1.955000 1.965000 2.125000 2.465000 ;
-      RECT 2.350000 0.705000 2.570000 1.575000 ;
-      RECT 2.350000 1.575000 2.850000 1.955000 ;
-      RECT 2.360000 2.250000 3.190000 2.420000 ;
-      RECT 2.425000 0.265000 3.440000 0.465000 ;
-      RECT 2.750000 0.645000 3.100000 1.015000 ;
-      RECT 3.020000 1.195000 3.440000 1.235000 ;
-      RECT 3.020000 1.235000 4.370000 1.405000 ;
-      RECT 3.020000 1.405000 3.190000 2.250000 ;
-      RECT 3.270000 0.465000 3.440000 1.195000 ;
-      RECT 3.360000 1.575000 3.610000 1.835000 ;
-      RECT 3.360000 1.835000 4.730000 2.085000 ;
-      RECT 3.990000 2.085000 4.160000 2.375000 ;
-      RECT 4.120000 1.405000 4.370000 1.565000 ;
-      RECT 4.310000 0.295000 4.560000 0.725000 ;
-      RECT 4.310000 0.725000 4.730000 1.065000 ;
-      RECT 4.540000 1.065000 4.730000 1.835000 ;
-      RECT 4.900000 0.725000 6.150000 0.895000 ;
-      RECT 4.900000 0.895000 5.070000 1.655000 ;
-      RECT 4.900000 1.655000 5.420000 1.965000 ;
-      RECT 5.130000 2.165000 5.760000 2.415000 ;
-      RECT 5.240000 1.065000 5.420000 1.475000 ;
-      RECT 5.590000 1.235000 7.490000 1.405000 ;
-      RECT 5.590000 1.405000 5.760000 1.915000 ;
-      RECT 5.590000 1.915000 6.800000 2.085000 ;
-      RECT 5.590000 2.085000 5.760000 2.165000 ;
-      RECT 5.640000 0.305000 6.490000 0.475000 ;
-      RECT 5.820000 0.895000 6.150000 1.015000 ;
-      RECT 5.930000 1.575000 7.850000 1.745000 ;
-      RECT 6.320000 0.475000 6.490000 1.235000 ;
-      RECT 6.560000 2.085000 6.800000 2.375000 ;
-      RECT 7.160000 1.175000 7.490000 1.235000 ;
-      RECT 7.530000 0.350000 7.850000 0.680000 ;
-      RECT 7.530000 1.745000 7.850000 1.765000 ;
-      RECT 7.530000 1.765000 7.700000 2.375000 ;
-      RECT 7.660000 0.680000 7.850000 1.575000 ;
-      RECT 7.970000 1.915000 8.300000 2.425000 ;
-      RECT 8.050000 0.345000 8.300000 0.995000 ;
-      RECT 8.050000 0.995000 8.850000 1.325000 ;
-      RECT 8.050000 1.325000 8.300000 1.915000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.840000 0.805000 ;
+      RECT 0.175000  1.795000 0.840000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.240000 2.465000 ;
+      RECT 1.430000  0.635000 2.125000 0.825000 ;
+      RECT 1.430000  0.825000 1.600000 1.795000 ;
+      RECT 1.430000  1.795000 2.125000 1.965000 ;
+      RECT 1.455000  0.085000 1.785000 0.465000 ;
+      RECT 1.455000  2.135000 1.785000 2.635000 ;
+      RECT 1.955000  0.305000 2.125000 0.635000 ;
+      RECT 1.955000  1.965000 2.125000 2.465000 ;
+      RECT 2.350000  0.705000 2.570000 1.575000 ;
+      RECT 2.350000  1.575000 2.850000 1.955000 ;
+      RECT 2.360000  2.250000 3.190000 2.420000 ;
+      RECT 2.425000  0.265000 3.440000 0.465000 ;
+      RECT 2.750000  0.645000 3.100000 1.015000 ;
+      RECT 3.020000  1.195000 3.440000 1.235000 ;
+      RECT 3.020000  1.235000 4.370000 1.405000 ;
+      RECT 3.020000  1.405000 3.190000 2.250000 ;
+      RECT 3.270000  0.465000 3.440000 1.195000 ;
+      RECT 3.360000  1.575000 3.610000 1.835000 ;
+      RECT 3.360000  1.835000 4.730000 2.085000 ;
+      RECT 3.430000  2.255000 3.810000 2.635000 ;
+      RECT 3.610000  0.085000 4.020000 0.525000 ;
+      RECT 3.990000  2.085000 4.160000 2.375000 ;
+      RECT 4.120000  1.405000 4.370000 1.565000 ;
+      RECT 4.310000  0.295000 4.560000 0.725000 ;
+      RECT 4.310000  0.725000 4.730000 1.065000 ;
+      RECT 4.330000  2.255000 4.660000 2.635000 ;
+      RECT 4.540000  1.065000 4.730000 1.835000 ;
+      RECT 4.760000  0.085000 5.080000 0.545000 ;
+      RECT 4.900000  0.725000 6.150000 0.895000 ;
+      RECT 4.900000  0.895000 5.070000 1.655000 ;
+      RECT 4.900000  1.655000 5.420000 1.965000 ;
+      RECT 5.130000  2.165000 5.760000 2.415000 ;
+      RECT 5.240000  1.065000 5.420000 1.475000 ;
+      RECT 5.590000  1.235000 7.490000 1.405000 ;
+      RECT 5.590000  1.405000 5.760000 1.915000 ;
+      RECT 5.590000  1.915000 6.800000 2.085000 ;
+      RECT 5.590000  2.085000 5.760000 2.165000 ;
+      RECT 5.640000  0.305000 6.490000 0.475000 ;
+      RECT 5.820000  0.895000 6.150000 1.015000 ;
+      RECT 5.930000  1.575000 7.850000 1.745000 ;
+      RECT 5.940000  2.255000 6.360000 2.635000 ;
+      RECT 6.320000  0.475000 6.490000 1.235000 ;
+      RECT 6.560000  2.085000 6.800000 2.375000 ;
+      RECT 6.690000  0.085000 7.350000 0.565000 ;
+      RECT 7.030000  1.945000 7.360000 2.635000 ;
+      RECT 7.160000  1.175000 7.490000 1.235000 ;
+      RECT 7.530000  0.350000 7.850000 0.680000 ;
+      RECT 7.530000  1.745000 7.850000 1.765000 ;
+      RECT 7.530000  1.765000 7.700000 2.375000 ;
+      RECT 7.660000  0.680000 7.850000 1.575000 ;
+      RECT 7.970000  1.915000 8.300000 2.425000 ;
+      RECT 8.050000  0.345000 8.300000 0.995000 ;
+      RECT 8.050000  0.995000 8.850000 1.325000 ;
+      RECT 8.050000  1.325000 8.300000 1.915000 ;
+      RECT 8.480000  0.085000 8.765000 0.545000 ;
+      RECT 8.480000  1.835000 8.765000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.785000 0.780000 1.955000 ;
-      RECT 1.070000 0.765000 1.240000 0.935000 ;
-      RECT 2.470000 1.785000 2.640000 1.955000 ;
-      RECT 2.930000 0.765000 3.100000 0.935000 ;
-      RECT 5.250000 1.105000 5.420000 1.275000 ;
-      RECT 5.250000 1.785000 5.420000 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.610000  1.785000 0.780000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  0.765000 1.240000 0.935000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.470000  1.785000 2.640000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  0.765000 3.100000 0.935000 ;
+      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.250000  1.105000 5.420000 1.275000 ;
+      RECT 5.250000  1.785000 5.420000 1.955000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.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 ;
     LAYER met1 ;
       RECT 0.550000 1.755000 0.840000 1.800000 ;
       RECT 0.550000 1.800000 5.480000 1.940000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
index 5cc1c99..2da6678 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.magic.lef
@@ -62,11 +62,17 @@
     PORT
       LAYER li1 ;
         RECT 3.610000 0.735000 4.020000 1.065000 ;
+      LAYER mcon ;
+        RECT 3.825000 0.765000 3.995000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 6.660000 0.735000 7.340000 1.005000 ;
         RECT 6.660000 1.005000 7.010000 1.065000 ;
       LAYER mcon ;
-        RECT 3.825000 0.765000 3.995000 0.935000 ;
         RECT 7.045000 0.765000 7.215000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.765000 0.735000 4.055000 0.780000 ;
         RECT 3.765000 0.780000 7.275000 0.920000 ;
@@ -89,37 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.785000 0.465000 ;
-        RECT 3.610000  0.085000 4.020000 0.525000 ;
-        RECT 4.760000  0.085000 5.080000 0.545000 ;
-        RECT 6.690000  0.085000 7.330000 0.565000 ;
-        RECT 8.390000  0.085000 8.720000 0.825000 ;
-        RECT 9.305000  0.085000 9.575000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -129,103 +104,130 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.455000 2.135000 1.785000 2.635000 ;
-        RECT 3.430000 2.255000 3.810000 2.635000 ;
-        RECT 4.330000 2.255000 4.660000 2.635000 ;
-        RECT 5.920000 2.255000 6.340000 2.635000 ;
-        RECT 7.010000 1.945000 7.340000 2.635000 ;
-        RECT 8.470000 1.495000 8.640000 2.635000 ;
-        RECT 9.310000 1.785000 9.575000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        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.085000 0.345000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 0.835000 0.805000 ;
-      RECT 0.085000 1.795000 0.835000 1.965000 ;
-      RECT 0.085000 1.965000 0.345000 2.465000 ;
-      RECT 0.605000 0.805000 0.835000 1.795000 ;
-      RECT 1.005000 0.565000 1.235000 2.045000 ;
-      RECT 1.015000 0.345000 1.235000 0.565000 ;
-      RECT 1.015000 2.045000 1.235000 2.465000 ;
-      RECT 1.430000 0.635000 2.125000 0.825000 ;
-      RECT 1.430000 0.825000 1.600000 1.795000 ;
-      RECT 1.430000 1.795000 2.125000 1.965000 ;
-      RECT 1.955000 0.305000 2.125000 0.635000 ;
-      RECT 1.955000 1.965000 2.125000 2.465000 ;
-      RECT 2.350000 0.705000 2.570000 1.575000 ;
-      RECT 2.350000 1.575000 2.850000 1.955000 ;
-      RECT 2.360000 2.250000 3.190000 2.420000 ;
-      RECT 2.425000 0.265000 3.440000 0.465000 ;
-      RECT 2.750000 0.645000 3.100000 1.015000 ;
-      RECT 3.020000 1.195000 3.440000 1.235000 ;
-      RECT 3.020000 1.235000 4.370000 1.405000 ;
-      RECT 3.020000 1.405000 3.190000 2.250000 ;
-      RECT 3.270000 0.465000 3.440000 1.195000 ;
-      RECT 3.360000 1.575000 3.610000 1.835000 ;
-      RECT 3.360000 1.835000 4.710000 2.085000 ;
-      RECT 3.990000 2.085000 4.160000 2.375000 ;
-      RECT 4.120000 1.405000 4.370000 1.565000 ;
-      RECT 4.310000 0.295000 4.560000 0.725000 ;
-      RECT 4.310000 0.725000 4.710000 1.065000 ;
-      RECT 4.540000 1.065000 4.710000 1.835000 ;
-      RECT 4.880000 0.725000 6.150000 0.895000 ;
-      RECT 4.880000 0.895000 5.050000 1.655000 ;
-      RECT 4.880000 1.655000 5.400000 1.965000 ;
-      RECT 5.110000 2.165000 5.740000 2.415000 ;
-      RECT 5.220000 1.065000 5.400000 1.475000 ;
-      RECT 5.570000 1.235000 7.490000 1.405000 ;
-      RECT 5.570000 1.405000 5.740000 1.915000 ;
-      RECT 5.570000 1.915000 6.780000 2.085000 ;
-      RECT 5.570000 2.085000 5.740000 2.165000 ;
-      RECT 5.640000 0.305000 6.490000 0.475000 ;
-      RECT 5.800000 0.895000 6.150000 1.015000 ;
-      RECT 5.910000 1.575000 7.880000 1.745000 ;
-      RECT 6.320000 0.475000 6.490000 1.235000 ;
-      RECT 6.540000 2.085000 6.780000 2.375000 ;
-      RECT 7.140000 1.175000 7.490000 1.235000 ;
-      RECT 7.510000 1.745000 7.880000 1.765000 ;
-      RECT 7.510000 1.765000 7.680000 2.375000 ;
-      RECT 7.530000 0.350000 7.880000 0.680000 ;
-      RECT 7.690000 0.680000 7.880000 1.575000 ;
-      RECT 7.970000 1.915000 8.300000 2.425000 ;
-      RECT 8.050000 0.345000 8.220000 0.995000 ;
-      RECT 8.050000 0.995000 8.850000 1.325000 ;
-      RECT 8.050000 1.325000 8.300000 1.915000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 0.835000 0.805000 ;
+      RECT 0.085000  1.795000 0.835000 1.965000 ;
+      RECT 0.085000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.605000  0.805000 0.835000 1.795000 ;
+      RECT 1.005000  0.565000 1.235000 2.045000 ;
+      RECT 1.015000  0.345000 1.235000 0.565000 ;
+      RECT 1.015000  2.045000 1.235000 2.465000 ;
+      RECT 1.430000  0.635000 2.125000 0.825000 ;
+      RECT 1.430000  0.825000 1.600000 1.795000 ;
+      RECT 1.430000  1.795000 2.125000 1.965000 ;
+      RECT 1.455000  0.085000 1.785000 0.465000 ;
+      RECT 1.455000  2.135000 1.785000 2.635000 ;
+      RECT 1.955000  0.305000 2.125000 0.635000 ;
+      RECT 1.955000  1.965000 2.125000 2.465000 ;
+      RECT 2.350000  0.705000 2.570000 1.575000 ;
+      RECT 2.350000  1.575000 2.850000 1.955000 ;
+      RECT 2.360000  2.250000 3.190000 2.420000 ;
+      RECT 2.425000  0.265000 3.440000 0.465000 ;
+      RECT 2.750000  0.645000 3.100000 1.015000 ;
+      RECT 3.020000  1.195000 3.440000 1.235000 ;
+      RECT 3.020000  1.235000 4.370000 1.405000 ;
+      RECT 3.020000  1.405000 3.190000 2.250000 ;
+      RECT 3.270000  0.465000 3.440000 1.195000 ;
+      RECT 3.360000  1.575000 3.610000 1.835000 ;
+      RECT 3.360000  1.835000 4.710000 2.085000 ;
+      RECT 3.430000  2.255000 3.810000 2.635000 ;
+      RECT 3.610000  0.085000 4.020000 0.525000 ;
+      RECT 3.990000  2.085000 4.160000 2.375000 ;
+      RECT 4.120000  1.405000 4.370000 1.565000 ;
+      RECT 4.310000  0.295000 4.560000 0.725000 ;
+      RECT 4.310000  0.725000 4.710000 1.065000 ;
+      RECT 4.330000  2.255000 4.660000 2.635000 ;
+      RECT 4.540000  1.065000 4.710000 1.835000 ;
+      RECT 4.760000  0.085000 5.080000 0.545000 ;
+      RECT 4.880000  0.725000 6.150000 0.895000 ;
+      RECT 4.880000  0.895000 5.050000 1.655000 ;
+      RECT 4.880000  1.655000 5.400000 1.965000 ;
+      RECT 5.110000  2.165000 5.740000 2.415000 ;
+      RECT 5.220000  1.065000 5.400000 1.475000 ;
+      RECT 5.570000  1.235000 7.490000 1.405000 ;
+      RECT 5.570000  1.405000 5.740000 1.915000 ;
+      RECT 5.570000  1.915000 6.780000 2.085000 ;
+      RECT 5.570000  2.085000 5.740000 2.165000 ;
+      RECT 5.640000  0.305000 6.490000 0.475000 ;
+      RECT 5.800000  0.895000 6.150000 1.015000 ;
+      RECT 5.910000  1.575000 7.880000 1.745000 ;
+      RECT 5.920000  2.255000 6.340000 2.635000 ;
+      RECT 6.320000  0.475000 6.490000 1.235000 ;
+      RECT 6.540000  2.085000 6.780000 2.375000 ;
+      RECT 6.690000  0.085000 7.330000 0.565000 ;
+      RECT 7.010000  1.945000 7.340000 2.635000 ;
+      RECT 7.140000  1.175000 7.490000 1.235000 ;
+      RECT 7.510000  1.745000 7.880000 1.765000 ;
+      RECT 7.510000  1.765000 7.680000 2.375000 ;
+      RECT 7.530000  0.350000 7.880000 0.680000 ;
+      RECT 7.690000  0.680000 7.880000 1.575000 ;
+      RECT 7.970000  1.915000 8.300000 2.425000 ;
+      RECT 8.050000  0.345000 8.220000 0.995000 ;
+      RECT 8.050000  0.995000 8.850000 1.325000 ;
+      RECT 8.050000  1.325000 8.300000 1.915000 ;
+      RECT 8.390000  0.085000 8.720000 0.825000 ;
+      RECT 8.470000  1.495000 8.640000 2.635000 ;
+      RECT 9.305000  0.085000 9.575000 0.595000 ;
+      RECT 9.310000  1.785000 9.575000 2.635000 ;
     LAYER mcon ;
-      RECT 0.605000 1.785000 0.775000 1.955000 ;
-      RECT 1.065000 0.765000 1.235000 0.935000 ;
-      RECT 2.445000 1.785000 2.615000 1.955000 ;
-      RECT 2.905000 0.765000 3.075000 0.935000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 5.225000 1.105000 5.395000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  1.785000 0.775000 1.955000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  0.765000 1.235000 0.935000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  1.785000 2.615000 1.955000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  0.765000 3.075000 0.935000 ;
+      RECT 2.905000  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  1.785000 5.375000 1.955000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.225000  1.105000 5.395000 1.275000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.545000 1.755000 0.835000 1.800000 ;
       RECT 0.545000 1.800000 5.435000 1.940000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
index 4370cbc..e37c924 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.magic.lef
@@ -63,11 +63,17 @@
     PORT
       LAYER li1 ;
         RECT 3.610000 0.735000 4.020000 1.065000 ;
+      LAYER mcon ;
+        RECT 3.825000 0.765000 3.995000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 6.660000 0.735000 7.320000 1.005000 ;
         RECT 6.660000 1.005000 6.990000 1.065000 ;
       LAYER mcon ;
-        RECT 3.825000 0.765000 3.995000 0.935000 ;
         RECT 7.045000 0.765000 7.215000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.765000 0.735000 4.055000 0.780000 ;
         RECT 3.765000 0.780000 7.275000 0.920000 ;
@@ -90,41 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.455000  0.085000  1.785000 0.465000 ;
-        RECT  3.610000  0.085000  4.020000 0.525000 ;
-        RECT  4.740000  0.085000  5.080000 0.545000 ;
-        RECT  6.670000  0.085000  7.330000 0.565000 ;
-        RECT  8.460000  0.085000  8.745000 0.545000 ;
-        RECT  9.340000  0.085000  9.595000 0.545000 ;
-        RECT 10.105000  0.085000 10.435000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -134,105 +105,136 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.455000 2.135000  1.785000 2.635000 ;
-        RECT  3.430000 2.255000  3.810000 2.635000 ;
-        RECT  4.330000 2.255000  4.660000 2.635000 ;
-        RECT  5.920000 2.255000  6.340000 2.635000 ;
-        RECT  7.010000 1.945000  7.340000 2.635000 ;
-        RECT  8.460000 1.835000  8.745000 2.635000 ;
-        RECT  9.340000 1.810000  9.595000 2.635000 ;
-        RECT 10.105000 1.810000 10.435000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000  0.345000 0.635000 ;
-      RECT 0.175000 0.635000  0.840000 0.805000 ;
-      RECT 0.175000 1.795000  0.840000 1.965000 ;
-      RECT 0.175000 1.965000  0.345000 2.465000 ;
-      RECT 0.610000 0.805000  0.840000 1.795000 ;
-      RECT 1.015000 0.345000  1.240000 2.465000 ;
-      RECT 1.430000 0.635000  2.125000 0.825000 ;
-      RECT 1.430000 0.825000  1.600000 1.795000 ;
-      RECT 1.430000 1.795000  2.125000 1.965000 ;
-      RECT 1.955000 0.305000  2.125000 0.635000 ;
-      RECT 1.955000 1.965000  2.125000 2.465000 ;
-      RECT 2.350000 0.705000  2.570000 1.575000 ;
-      RECT 2.350000 1.575000  2.850000 1.955000 ;
-      RECT 2.360000 2.250000  3.190000 2.420000 ;
-      RECT 2.425000 0.265000  3.440000 0.465000 ;
-      RECT 2.750000 0.645000  3.100000 1.015000 ;
-      RECT 3.020000 1.195000  3.440000 1.235000 ;
-      RECT 3.020000 1.235000  4.370000 1.405000 ;
-      RECT 3.020000 1.405000  3.190000 2.250000 ;
-      RECT 3.270000 0.465000  3.440000 1.195000 ;
-      RECT 3.360000 1.575000  3.610000 1.835000 ;
-      RECT 3.360000 1.835000  4.710000 2.085000 ;
-      RECT 3.990000 2.085000  4.160000 2.375000 ;
-      RECT 4.120000 1.405000  4.370000 1.565000 ;
-      RECT 4.310000 0.295000  4.560000 0.725000 ;
-      RECT 4.310000 0.725000  4.710000 1.065000 ;
-      RECT 4.540000 1.065000  4.710000 1.835000 ;
-      RECT 4.880000 0.725000  6.150000 0.895000 ;
-      RECT 4.880000 0.895000  5.050000 1.655000 ;
-      RECT 4.880000 1.655000  5.400000 1.965000 ;
-      RECT 5.110000 2.165000  5.740000 2.415000 ;
-      RECT 5.220000 1.065000  5.400000 1.475000 ;
-      RECT 5.570000 1.235000  7.470000 1.405000 ;
-      RECT 5.570000 1.405000  5.740000 1.915000 ;
-      RECT 5.570000 1.915000  6.780000 2.085000 ;
-      RECT 5.570000 2.085000  5.740000 2.165000 ;
-      RECT 5.640000 0.305000  6.490000 0.475000 ;
-      RECT 5.820000 0.895000  6.150000 1.015000 ;
-      RECT 5.910000 1.575000  7.850000 1.745000 ;
-      RECT 6.320000 0.475000  6.490000 1.235000 ;
-      RECT 6.540000 2.085000  6.780000 2.375000 ;
-      RECT 7.140000 1.175000  7.470000 1.235000 ;
-      RECT 7.510000 0.350000  7.850000 0.680000 ;
-      RECT 7.510000 1.745000  7.850000 1.765000 ;
-      RECT 7.510000 1.765000  7.680000 2.375000 ;
-      RECT 7.640000 0.680000  7.850000 1.575000 ;
-      RECT 7.950000 1.915000  8.280000 2.425000 ;
-      RECT 8.030000 0.345000  8.280000 1.055000 ;
-      RECT 8.030000 1.055000 10.555000 1.275000 ;
-      RECT 8.030000 1.275000  8.280000 1.915000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.840000 0.805000 ;
+      RECT  0.175000  1.795000  0.840000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.610000  0.805000  0.840000 1.795000 ;
+      RECT  1.015000  0.345000  1.240000 2.465000 ;
+      RECT  1.430000  0.635000  2.125000 0.825000 ;
+      RECT  1.430000  0.825000  1.600000 1.795000 ;
+      RECT  1.430000  1.795000  2.125000 1.965000 ;
+      RECT  1.455000  0.085000  1.785000 0.465000 ;
+      RECT  1.455000  2.135000  1.785000 2.635000 ;
+      RECT  1.955000  0.305000  2.125000 0.635000 ;
+      RECT  1.955000  1.965000  2.125000 2.465000 ;
+      RECT  2.350000  0.705000  2.570000 1.575000 ;
+      RECT  2.350000  1.575000  2.850000 1.955000 ;
+      RECT  2.360000  2.250000  3.190000 2.420000 ;
+      RECT  2.425000  0.265000  3.440000 0.465000 ;
+      RECT  2.750000  0.645000  3.100000 1.015000 ;
+      RECT  3.020000  1.195000  3.440000 1.235000 ;
+      RECT  3.020000  1.235000  4.370000 1.405000 ;
+      RECT  3.020000  1.405000  3.190000 2.250000 ;
+      RECT  3.270000  0.465000  3.440000 1.195000 ;
+      RECT  3.360000  1.575000  3.610000 1.835000 ;
+      RECT  3.360000  1.835000  4.710000 2.085000 ;
+      RECT  3.430000  2.255000  3.810000 2.635000 ;
+      RECT  3.610000  0.085000  4.020000 0.525000 ;
+      RECT  3.990000  2.085000  4.160000 2.375000 ;
+      RECT  4.120000  1.405000  4.370000 1.565000 ;
+      RECT  4.310000  0.295000  4.560000 0.725000 ;
+      RECT  4.310000  0.725000  4.710000 1.065000 ;
+      RECT  4.330000  2.255000  4.660000 2.635000 ;
+      RECT  4.540000  1.065000  4.710000 1.835000 ;
+      RECT  4.740000  0.085000  5.080000 0.545000 ;
+      RECT  4.880000  0.725000  6.150000 0.895000 ;
+      RECT  4.880000  0.895000  5.050000 1.655000 ;
+      RECT  4.880000  1.655000  5.400000 1.965000 ;
+      RECT  5.110000  2.165000  5.740000 2.415000 ;
+      RECT  5.220000  1.065000  5.400000 1.475000 ;
+      RECT  5.570000  1.235000  7.470000 1.405000 ;
+      RECT  5.570000  1.405000  5.740000 1.915000 ;
+      RECT  5.570000  1.915000  6.780000 2.085000 ;
+      RECT  5.570000  2.085000  5.740000 2.165000 ;
+      RECT  5.640000  0.305000  6.490000 0.475000 ;
+      RECT  5.820000  0.895000  6.150000 1.015000 ;
+      RECT  5.910000  1.575000  7.850000 1.745000 ;
+      RECT  5.920000  2.255000  6.340000 2.635000 ;
+      RECT  6.320000  0.475000  6.490000 1.235000 ;
+      RECT  6.540000  2.085000  6.780000 2.375000 ;
+      RECT  6.670000  0.085000  7.330000 0.565000 ;
+      RECT  7.010000  1.945000  7.340000 2.635000 ;
+      RECT  7.140000  1.175000  7.470000 1.235000 ;
+      RECT  7.510000  0.350000  7.850000 0.680000 ;
+      RECT  7.510000  1.745000  7.850000 1.765000 ;
+      RECT  7.510000  1.765000  7.680000 2.375000 ;
+      RECT  7.640000  0.680000  7.850000 1.575000 ;
+      RECT  7.950000  1.915000  8.280000 2.425000 ;
+      RECT  8.030000  0.345000  8.280000 1.055000 ;
+      RECT  8.030000  1.055000 10.555000 1.275000 ;
+      RECT  8.030000  1.275000  8.280000 1.915000 ;
+      RECT  8.460000  0.085000  8.745000 0.545000 ;
+      RECT  8.460000  1.835000  8.745000 2.635000 ;
+      RECT  9.340000  0.085000  9.595000 0.545000 ;
+      RECT  9.340000  1.810000  9.595000 2.635000 ;
+      RECT 10.105000  0.085000 10.435000 0.545000 ;
+      RECT 10.105000  1.810000 10.435000 2.635000 ;
     LAYER mcon ;
-      RECT 0.615000 1.785000 0.785000 1.955000 ;
-      RECT 1.065000 0.765000 1.235000 0.935000 ;
-      RECT 2.445000 1.785000 2.615000 1.955000 ;
-      RECT 2.905000 0.765000 3.075000 0.935000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 5.225000 1.105000 5.395000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.615000  1.785000  0.785000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  0.765000  1.235000 0.935000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  1.785000  2.615000 1.955000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  0.765000  3.075000 0.935000 ;
+      RECT  2.905000  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  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.225000  1.105000  5.395000 1.275000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.555000 1.755000 0.845000 1.800000 ;
       RECT 0.555000 1.800000 5.435000 1.940000 ;
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
index 105bf94..8a482fe 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.magic.lef
@@ -79,34 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.705000 0.545000 ;
-        RECT 3.400000  0.085000 3.770000 0.585000 ;
-        RECT 5.585000  0.085000 5.795000 0.615000 ;
-        RECT 6.560000  0.085000 6.730000 0.695000 ;
-        RECT 7.905000  0.085000 8.225000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -116,95 +88,119 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.440000 2.175000 1.705000 2.635000 ;
-        RECT 3.610000 1.835000 3.780000 2.635000 ;
-        RECT 5.490000 2.135000 5.805000 2.635000 ;
-        RECT 6.550000 1.625000 6.720000 2.635000 ;
-        RECT 7.930000 1.495000 8.145000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.175000 1.795000 0.840000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.200000 2.465000 ;
-      RECT 1.820000 0.675000 2.045000 0.805000 ;
-      RECT 1.820000 0.805000 1.990000 1.910000 ;
-      RECT 1.820000 1.910000 2.125000 2.040000 ;
-      RECT 1.875000 0.365000 2.210000 0.535000 ;
-      RECT 1.875000 0.535000 2.045000 0.675000 ;
-      RECT 1.875000 2.040000 2.125000 2.465000 ;
-      RECT 2.160000 1.125000 2.400000 1.720000 ;
-      RECT 2.215000 0.735000 2.740000 0.955000 ;
-      RECT 2.335000 2.190000 3.440000 2.360000 ;
-      RECT 2.405000 0.365000 3.080000 0.535000 ;
-      RECT 2.570000 0.955000 2.740000 1.655000 ;
-      RECT 2.570000 1.655000 3.100000 2.020000 ;
-      RECT 2.910000 0.535000 3.080000 1.315000 ;
-      RECT 2.910000 1.315000 3.780000 1.485000 ;
-      RECT 3.270000 1.485000 3.780000 1.575000 ;
-      RECT 3.270000 1.575000 3.440000 2.190000 ;
-      RECT 3.290000 0.765000 4.120000 1.065000 ;
-      RECT 3.290000 1.065000 3.490000 1.095000 ;
-      RECT 3.610000 1.245000 3.780000 1.315000 ;
-      RECT 3.950000 0.365000 4.355000 0.535000 ;
-      RECT 3.950000 0.535000 4.120000 0.765000 ;
-      RECT 3.950000 1.065000 4.120000 2.135000 ;
-      RECT 3.950000 2.135000 4.200000 2.465000 ;
-      RECT 4.290000 1.245000 4.480000 1.965000 ;
-      RECT 4.425000 2.165000 5.310000 2.335000 ;
-      RECT 4.505000 0.705000 4.970000 1.035000 ;
-      RECT 4.525000 0.365000 5.310000 0.535000 ;
-      RECT 4.650000 1.035000 4.970000 1.995000 ;
-      RECT 5.140000 0.535000 5.310000 0.995000 ;
-      RECT 5.140000 0.995000 6.020000 1.325000 ;
-      RECT 5.140000 1.325000 5.310000 2.165000 ;
-      RECT 5.480000 1.530000 6.380000 1.905000 ;
-      RECT 6.040000 1.905000 6.380000 2.465000 ;
-      RECT 6.060000 0.300000 6.390000 0.825000 ;
-      RECT 6.190000 0.825000 6.390000 0.995000 ;
-      RECT 6.190000 0.995000 6.940000 1.325000 ;
-      RECT 6.190000 1.325000 6.380000 1.530000 ;
-      RECT 7.410000 1.715000 7.740000 2.445000 ;
-      RECT 7.420000 0.345000 7.670000 0.615000 ;
-      RECT 7.470000 0.615000 7.670000 0.995000 ;
-      RECT 7.470000 0.995000 8.245000 1.325000 ;
-      RECT 7.470000 1.325000 7.740000 1.715000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.840000 0.805000 ;
+      RECT 0.175000  1.795000 0.840000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.200000 2.465000 ;
+      RECT 1.440000  2.175000 1.705000 2.635000 ;
+      RECT 1.455000  0.085000 1.705000 0.545000 ;
+      RECT 1.820000  0.675000 2.045000 0.805000 ;
+      RECT 1.820000  0.805000 1.990000 1.910000 ;
+      RECT 1.820000  1.910000 2.125000 2.040000 ;
+      RECT 1.875000  0.365000 2.210000 0.535000 ;
+      RECT 1.875000  0.535000 2.045000 0.675000 ;
+      RECT 1.875000  2.040000 2.125000 2.465000 ;
+      RECT 2.160000  1.125000 2.400000 1.720000 ;
+      RECT 2.215000  0.735000 2.740000 0.955000 ;
+      RECT 2.335000  2.190000 3.440000 2.360000 ;
+      RECT 2.405000  0.365000 3.080000 0.535000 ;
+      RECT 2.570000  0.955000 2.740000 1.655000 ;
+      RECT 2.570000  1.655000 3.100000 2.020000 ;
+      RECT 2.910000  0.535000 3.080000 1.315000 ;
+      RECT 2.910000  1.315000 3.780000 1.485000 ;
+      RECT 3.270000  1.485000 3.780000 1.575000 ;
+      RECT 3.270000  1.575000 3.440000 2.190000 ;
+      RECT 3.290000  0.765000 4.120000 1.065000 ;
+      RECT 3.290000  1.065000 3.490000 1.095000 ;
+      RECT 3.400000  0.085000 3.770000 0.585000 ;
+      RECT 3.610000  1.245000 3.780000 1.315000 ;
+      RECT 3.610000  1.835000 3.780000 2.635000 ;
+      RECT 3.950000  0.365000 4.355000 0.535000 ;
+      RECT 3.950000  0.535000 4.120000 0.765000 ;
+      RECT 3.950000  1.065000 4.120000 2.135000 ;
+      RECT 3.950000  2.135000 4.200000 2.465000 ;
+      RECT 4.290000  1.245000 4.480000 1.965000 ;
+      RECT 4.425000  2.165000 5.310000 2.335000 ;
+      RECT 4.505000  0.705000 4.970000 1.035000 ;
+      RECT 4.525000  0.365000 5.310000 0.535000 ;
+      RECT 4.650000  1.035000 4.970000 1.995000 ;
+      RECT 5.140000  0.535000 5.310000 0.995000 ;
+      RECT 5.140000  0.995000 6.020000 1.325000 ;
+      RECT 5.140000  1.325000 5.310000 2.165000 ;
+      RECT 5.480000  1.530000 6.380000 1.905000 ;
+      RECT 5.490000  2.135000 5.805000 2.635000 ;
+      RECT 5.585000  0.085000 5.795000 0.615000 ;
+      RECT 6.040000  1.905000 6.380000 2.465000 ;
+      RECT 6.060000  0.300000 6.390000 0.825000 ;
+      RECT 6.190000  0.825000 6.390000 0.995000 ;
+      RECT 6.190000  0.995000 6.940000 1.325000 ;
+      RECT 6.190000  1.325000 6.380000 1.530000 ;
+      RECT 6.550000  1.625000 6.720000 2.635000 ;
+      RECT 6.560000  0.085000 6.730000 0.695000 ;
+      RECT 7.410000  1.715000 7.740000 2.445000 ;
+      RECT 7.420000  0.345000 7.670000 0.615000 ;
+      RECT 7.470000  0.615000 7.670000 0.995000 ;
+      RECT 7.470000  0.995000 8.245000 1.325000 ;
+      RECT 7.470000  1.325000 7.740000 1.715000 ;
+      RECT 7.905000  0.085000 8.225000 0.545000 ;
+      RECT 7.930000  1.495000 8.145000 2.635000 ;
     LAYER mcon ;
-      RECT 0.630000 1.785000 0.800000 1.955000 ;
-      RECT 1.025000 1.445000 1.195000 1.615000 ;
-      RECT 2.215000 1.445000 2.385000 1.615000 ;
-      RECT 2.730000 1.785000 2.900000 1.955000 ;
-      RECT 4.300000 1.785000 4.470000 1.955000 ;
-      RECT 4.735000 1.445000 4.905000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.630000  1.785000 0.800000 1.955000 ;
+      RECT 1.025000  1.445000 1.195000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.215000  1.445000 2.385000 1.615000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.730000  1.785000 2.900000 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.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.300000  1.785000 4.470000 1.955000 ;
+      RECT 4.735000  1.445000 4.905000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 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 ;
     LAYER met1 ;
       RECT 0.570000 1.755000 0.860000 1.800000 ;
       RECT 0.570000 1.800000 4.530000 1.940000 ;
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
index 555771f..447ab07 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.magic.lef
@@ -79,38 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.705000 0.545000 ;
-        RECT 3.400000  0.085000 3.770000 0.585000 ;
-        RECT 5.585000  0.085000 5.795000 0.615000 ;
-        RECT 6.560000  0.085000 6.730000 0.695000 ;
-        RECT 7.400000  0.085000 7.570000 0.600000 ;
-        RECT 8.390000  0.085000 8.720000 0.825000 ;
-        RECT 9.315000  0.085000 9.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 ;
-        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
@@ -120,99 +88,127 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.440000 2.175000 1.705000 2.635000 ;
-        RECT 3.610000 1.835000 3.780000 2.635000 ;
-        RECT 5.490000 2.135000 5.805000 2.635000 ;
-        RECT 6.550000 1.625000 6.720000 2.635000 ;
-        RECT 7.390000 1.720000 7.565000 2.635000 ;
-        RECT 8.425000 1.495000 8.640000 2.635000 ;
-        RECT 9.315000 1.495000 9.565000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        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.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.175000 1.795000 0.840000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.200000 2.465000 ;
-      RECT 1.820000 0.675000 2.045000 0.805000 ;
-      RECT 1.820000 0.805000 1.990000 1.910000 ;
-      RECT 1.820000 1.910000 2.125000 2.040000 ;
-      RECT 1.875000 0.365000 2.210000 0.535000 ;
-      RECT 1.875000 0.535000 2.045000 0.675000 ;
-      RECT 1.875000 2.040000 2.125000 2.465000 ;
-      RECT 2.160000 1.125000 2.400000 1.720000 ;
-      RECT 2.215000 0.735000 2.740000 0.955000 ;
-      RECT 2.335000 2.190000 3.440000 2.360000 ;
-      RECT 2.405000 0.365000 3.080000 0.535000 ;
-      RECT 2.570000 0.955000 2.740000 1.655000 ;
-      RECT 2.570000 1.655000 3.100000 2.020000 ;
-      RECT 2.910000 0.535000 3.080000 1.315000 ;
-      RECT 2.910000 1.315000 3.780000 1.485000 ;
-      RECT 3.270000 1.485000 3.780000 1.575000 ;
-      RECT 3.270000 1.575000 3.440000 2.190000 ;
-      RECT 3.290000 0.765000 4.120000 1.065000 ;
-      RECT 3.290000 1.065000 3.490000 1.095000 ;
-      RECT 3.610000 1.245000 3.780000 1.315000 ;
-      RECT 3.950000 0.365000 4.355000 0.535000 ;
-      RECT 3.950000 0.535000 4.120000 0.765000 ;
-      RECT 3.950000 1.065000 4.120000 2.135000 ;
-      RECT 3.950000 2.135000 4.200000 2.465000 ;
-      RECT 4.290000 1.245000 4.480000 1.965000 ;
-      RECT 4.425000 2.165000 5.310000 2.335000 ;
-      RECT 4.505000 0.705000 4.970000 1.035000 ;
-      RECT 4.525000 0.365000 5.310000 0.535000 ;
-      RECT 4.650000 1.035000 4.970000 1.995000 ;
-      RECT 5.140000 0.535000 5.310000 0.995000 ;
-      RECT 5.140000 0.995000 6.020000 1.325000 ;
-      RECT 5.140000 1.325000 5.310000 2.165000 ;
-      RECT 5.480000 1.530000 6.380000 1.905000 ;
-      RECT 6.040000 1.905000 6.380000 2.465000 ;
-      RECT 6.060000 0.300000 6.390000 0.825000 ;
-      RECT 6.190000 0.825000 6.390000 0.995000 ;
-      RECT 6.190000 0.995000 6.940000 1.325000 ;
-      RECT 6.190000 1.325000 6.380000 1.530000 ;
-      RECT 7.905000 0.345000 8.165000 0.615000 ;
-      RECT 7.905000 1.715000 8.235000 2.445000 ;
-      RECT 7.965000 0.615000 8.165000 0.995000 ;
-      RECT 7.965000 0.995000 8.760000 1.325000 ;
-      RECT 7.965000 1.325000 8.235000 1.715000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.840000 0.805000 ;
+      RECT 0.175000  1.795000 0.840000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.200000 2.465000 ;
+      RECT 1.440000  2.175000 1.705000 2.635000 ;
+      RECT 1.455000  0.085000 1.705000 0.545000 ;
+      RECT 1.820000  0.675000 2.045000 0.805000 ;
+      RECT 1.820000  0.805000 1.990000 1.910000 ;
+      RECT 1.820000  1.910000 2.125000 2.040000 ;
+      RECT 1.875000  0.365000 2.210000 0.535000 ;
+      RECT 1.875000  0.535000 2.045000 0.675000 ;
+      RECT 1.875000  2.040000 2.125000 2.465000 ;
+      RECT 2.160000  1.125000 2.400000 1.720000 ;
+      RECT 2.215000  0.735000 2.740000 0.955000 ;
+      RECT 2.335000  2.190000 3.440000 2.360000 ;
+      RECT 2.405000  0.365000 3.080000 0.535000 ;
+      RECT 2.570000  0.955000 2.740000 1.655000 ;
+      RECT 2.570000  1.655000 3.100000 2.020000 ;
+      RECT 2.910000  0.535000 3.080000 1.315000 ;
+      RECT 2.910000  1.315000 3.780000 1.485000 ;
+      RECT 3.270000  1.485000 3.780000 1.575000 ;
+      RECT 3.270000  1.575000 3.440000 2.190000 ;
+      RECT 3.290000  0.765000 4.120000 1.065000 ;
+      RECT 3.290000  1.065000 3.490000 1.095000 ;
+      RECT 3.400000  0.085000 3.770000 0.585000 ;
+      RECT 3.610000  1.245000 3.780000 1.315000 ;
+      RECT 3.610000  1.835000 3.780000 2.635000 ;
+      RECT 3.950000  0.365000 4.355000 0.535000 ;
+      RECT 3.950000  0.535000 4.120000 0.765000 ;
+      RECT 3.950000  1.065000 4.120000 2.135000 ;
+      RECT 3.950000  2.135000 4.200000 2.465000 ;
+      RECT 4.290000  1.245000 4.480000 1.965000 ;
+      RECT 4.425000  2.165000 5.310000 2.335000 ;
+      RECT 4.505000  0.705000 4.970000 1.035000 ;
+      RECT 4.525000  0.365000 5.310000 0.535000 ;
+      RECT 4.650000  1.035000 4.970000 1.995000 ;
+      RECT 5.140000  0.535000 5.310000 0.995000 ;
+      RECT 5.140000  0.995000 6.020000 1.325000 ;
+      RECT 5.140000  1.325000 5.310000 2.165000 ;
+      RECT 5.480000  1.530000 6.380000 1.905000 ;
+      RECT 5.490000  2.135000 5.805000 2.635000 ;
+      RECT 5.585000  0.085000 5.795000 0.615000 ;
+      RECT 6.040000  1.905000 6.380000 2.465000 ;
+      RECT 6.060000  0.300000 6.390000 0.825000 ;
+      RECT 6.190000  0.825000 6.390000 0.995000 ;
+      RECT 6.190000  0.995000 6.940000 1.325000 ;
+      RECT 6.190000  1.325000 6.380000 1.530000 ;
+      RECT 6.550000  1.625000 6.720000 2.635000 ;
+      RECT 6.560000  0.085000 6.730000 0.695000 ;
+      RECT 7.390000  1.720000 7.565000 2.635000 ;
+      RECT 7.400000  0.085000 7.570000 0.600000 ;
+      RECT 7.905000  0.345000 8.165000 0.615000 ;
+      RECT 7.905000  1.715000 8.235000 2.445000 ;
+      RECT 7.965000  0.615000 8.165000 0.995000 ;
+      RECT 7.965000  0.995000 8.760000 1.325000 ;
+      RECT 7.965000  1.325000 8.235000 1.715000 ;
+      RECT 8.390000  0.085000 8.720000 0.825000 ;
+      RECT 8.425000  1.495000 8.640000 2.635000 ;
+      RECT 9.315000  0.085000 9.565000 0.905000 ;
+      RECT 9.315000  1.495000 9.565000 2.635000 ;
     LAYER mcon ;
-      RECT 0.630000 1.785000 0.800000 1.955000 ;
-      RECT 1.025000 1.445000 1.195000 1.615000 ;
-      RECT 2.215000 1.445000 2.385000 1.615000 ;
-      RECT 2.730000 1.785000 2.900000 1.955000 ;
-      RECT 4.300000 1.785000 4.470000 1.955000 ;
-      RECT 4.735000 1.445000 4.905000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.630000  1.785000 0.800000 1.955000 ;
+      RECT 1.025000  1.445000 1.195000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.215000  1.445000 2.385000 1.615000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.730000  1.785000 2.900000 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.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.300000  1.785000 4.470000 1.955000 ;
+      RECT 4.735000  1.445000 4.905000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 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 ;
     LAYER met1 ;
       RECT 0.570000 1.755000 0.860000 1.800000 ;
       RECT 0.570000 1.800000 4.530000 1.940000 ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
index f4cd65b..6e90d03 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.magic.lef
@@ -68,30 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.705000 0.545000 ;
-        RECT 3.400000  0.085000 3.770000 0.585000 ;
-        RECT 5.585000  0.085000 5.795000 0.615000 ;
-        RECT 6.555000  0.085000 6.725000 0.695000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -101,86 +77,106 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.440000 2.175000 1.705000 2.635000 ;
-        RECT 3.610000 1.835000 3.780000 2.635000 ;
-        RECT 5.490000 2.135000 5.805000 2.635000 ;
-        RECT 6.545000 1.625000 6.715000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.175000 1.795000 0.840000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.200000 2.465000 ;
-      RECT 1.820000 0.675000 2.045000 0.805000 ;
-      RECT 1.820000 0.805000 1.990000 1.910000 ;
-      RECT 1.820000 1.910000 2.125000 2.040000 ;
-      RECT 1.875000 0.365000 2.210000 0.535000 ;
-      RECT 1.875000 0.535000 2.045000 0.675000 ;
-      RECT 1.875000 2.040000 2.125000 2.465000 ;
-      RECT 2.160000 1.125000 2.400000 1.720000 ;
-      RECT 2.215000 0.735000 2.740000 0.955000 ;
-      RECT 2.335000 2.190000 3.440000 2.360000 ;
-      RECT 2.405000 0.365000 3.080000 0.535000 ;
-      RECT 2.570000 0.955000 2.740000 1.655000 ;
-      RECT 2.570000 1.655000 3.100000 2.020000 ;
-      RECT 2.910000 0.535000 3.080000 1.315000 ;
-      RECT 2.910000 1.315000 3.780000 1.485000 ;
-      RECT 3.270000 1.485000 3.780000 1.575000 ;
-      RECT 3.270000 1.575000 3.440000 2.190000 ;
-      RECT 3.290000 0.765000 4.120000 1.065000 ;
-      RECT 3.290000 1.065000 3.490000 1.095000 ;
-      RECT 3.610000 1.245000 3.780000 1.315000 ;
-      RECT 3.950000 0.365000 4.355000 0.535000 ;
-      RECT 3.950000 0.535000 4.120000 0.765000 ;
-      RECT 3.950000 1.065000 4.120000 2.135000 ;
-      RECT 3.950000 2.135000 4.200000 2.465000 ;
-      RECT 4.290000 1.245000 4.480000 1.965000 ;
-      RECT 4.425000 2.165000 5.310000 2.335000 ;
-      RECT 4.505000 0.705000 4.970000 1.035000 ;
-      RECT 4.525000 0.365000 5.310000 0.535000 ;
-      RECT 4.650000 1.035000 4.970000 1.995000 ;
-      RECT 5.140000 0.535000 5.310000 0.995000 ;
-      RECT 5.140000 0.995000 6.015000 1.325000 ;
-      RECT 5.140000 1.325000 5.310000 2.165000 ;
-      RECT 5.480000 1.530000 6.375000 1.905000 ;
-      RECT 6.035000 1.905000 6.375000 2.465000 ;
-      RECT 6.055000 0.300000 6.385000 0.825000 ;
-      RECT 6.185000 0.825000 6.385000 0.995000 ;
-      RECT 6.185000 0.995000 6.935000 1.325000 ;
-      RECT 6.185000 1.325000 6.375000 1.530000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.840000 0.805000 ;
+      RECT 0.175000  1.795000 0.840000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.200000 2.465000 ;
+      RECT 1.440000  2.175000 1.705000 2.635000 ;
+      RECT 1.455000  0.085000 1.705000 0.545000 ;
+      RECT 1.820000  0.675000 2.045000 0.805000 ;
+      RECT 1.820000  0.805000 1.990000 1.910000 ;
+      RECT 1.820000  1.910000 2.125000 2.040000 ;
+      RECT 1.875000  0.365000 2.210000 0.535000 ;
+      RECT 1.875000  0.535000 2.045000 0.675000 ;
+      RECT 1.875000  2.040000 2.125000 2.465000 ;
+      RECT 2.160000  1.125000 2.400000 1.720000 ;
+      RECT 2.215000  0.735000 2.740000 0.955000 ;
+      RECT 2.335000  2.190000 3.440000 2.360000 ;
+      RECT 2.405000  0.365000 3.080000 0.535000 ;
+      RECT 2.570000  0.955000 2.740000 1.655000 ;
+      RECT 2.570000  1.655000 3.100000 2.020000 ;
+      RECT 2.910000  0.535000 3.080000 1.315000 ;
+      RECT 2.910000  1.315000 3.780000 1.485000 ;
+      RECT 3.270000  1.485000 3.780000 1.575000 ;
+      RECT 3.270000  1.575000 3.440000 2.190000 ;
+      RECT 3.290000  0.765000 4.120000 1.065000 ;
+      RECT 3.290000  1.065000 3.490000 1.095000 ;
+      RECT 3.400000  0.085000 3.770000 0.585000 ;
+      RECT 3.610000  1.245000 3.780000 1.315000 ;
+      RECT 3.610000  1.835000 3.780000 2.635000 ;
+      RECT 3.950000  0.365000 4.355000 0.535000 ;
+      RECT 3.950000  0.535000 4.120000 0.765000 ;
+      RECT 3.950000  1.065000 4.120000 2.135000 ;
+      RECT 3.950000  2.135000 4.200000 2.465000 ;
+      RECT 4.290000  1.245000 4.480000 1.965000 ;
+      RECT 4.425000  2.165000 5.310000 2.335000 ;
+      RECT 4.505000  0.705000 4.970000 1.035000 ;
+      RECT 4.525000  0.365000 5.310000 0.535000 ;
+      RECT 4.650000  1.035000 4.970000 1.995000 ;
+      RECT 5.140000  0.535000 5.310000 0.995000 ;
+      RECT 5.140000  0.995000 6.015000 1.325000 ;
+      RECT 5.140000  1.325000 5.310000 2.165000 ;
+      RECT 5.480000  1.530000 6.375000 1.905000 ;
+      RECT 5.490000  2.135000 5.805000 2.635000 ;
+      RECT 5.585000  0.085000 5.795000 0.615000 ;
+      RECT 6.035000  1.905000 6.375000 2.465000 ;
+      RECT 6.055000  0.300000 6.385000 0.825000 ;
+      RECT 6.185000  0.825000 6.385000 0.995000 ;
+      RECT 6.185000  0.995000 6.935000 1.325000 ;
+      RECT 6.185000  1.325000 6.375000 1.530000 ;
+      RECT 6.545000  1.625000 6.715000 2.635000 ;
+      RECT 6.555000  0.085000 6.725000 0.695000 ;
     LAYER mcon ;
-      RECT 0.630000 1.785000 0.800000 1.955000 ;
-      RECT 1.025000 1.445000 1.195000 1.615000 ;
-      RECT 2.215000 1.445000 2.385000 1.615000 ;
-      RECT 2.730000 1.785000 2.900000 1.955000 ;
-      RECT 4.300000 1.785000 4.470000 1.955000 ;
-      RECT 4.735000 1.445000 4.905000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.630000  1.785000 0.800000 1.955000 ;
+      RECT 1.025000  1.445000 1.195000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.215000  1.445000 2.385000 1.615000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.730000  1.785000 2.900000 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.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.300000  1.785000 4.470000 1.955000 ;
+      RECT 4.735000  1.445000 4.905000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
     LAYER met1 ;
       RECT 0.570000 1.755000 0.860000 1.800000 ;
       RECT 0.570000 1.800000 4.530000 1.940000 ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
index 91c47e0..4635284 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.magic.lef
@@ -68,32 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.705000 0.545000 ;
-        RECT 3.400000  0.085000 3.770000 0.585000 ;
-        RECT 5.585000  0.085000 5.795000 0.615000 ;
-        RECT 6.555000  0.085000 6.725000 0.695000 ;
-        RECT 7.395000  0.085000 7.565000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -103,88 +77,110 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.440000 2.175000 1.705000 2.635000 ;
-        RECT 3.610000 1.835000 3.780000 2.635000 ;
-        RECT 5.490000 2.135000 5.805000 2.635000 ;
-        RECT 6.545000 1.625000 6.715000 2.635000 ;
-        RECT 7.385000 1.720000 7.555000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.175000 1.795000 0.840000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.200000 2.465000 ;
-      RECT 1.820000 0.675000 2.045000 0.805000 ;
-      RECT 1.820000 0.805000 1.990000 1.910000 ;
-      RECT 1.820000 1.910000 2.125000 2.040000 ;
-      RECT 1.875000 0.365000 2.210000 0.535000 ;
-      RECT 1.875000 0.535000 2.045000 0.675000 ;
-      RECT 1.875000 2.040000 2.125000 2.465000 ;
-      RECT 2.160000 1.125000 2.400000 1.720000 ;
-      RECT 2.215000 0.735000 2.740000 0.955000 ;
-      RECT 2.335000 2.190000 3.440000 2.360000 ;
-      RECT 2.405000 0.365000 3.080000 0.535000 ;
-      RECT 2.570000 0.955000 2.740000 1.655000 ;
-      RECT 2.570000 1.655000 3.100000 2.020000 ;
-      RECT 2.910000 0.535000 3.080000 1.315000 ;
-      RECT 2.910000 1.315000 3.780000 1.485000 ;
-      RECT 3.270000 1.485000 3.780000 1.575000 ;
-      RECT 3.270000 1.575000 3.440000 2.190000 ;
-      RECT 3.290000 0.765000 4.120000 1.065000 ;
-      RECT 3.290000 1.065000 3.490000 1.095000 ;
-      RECT 3.610000 1.245000 3.780000 1.315000 ;
-      RECT 3.950000 0.365000 4.355000 0.535000 ;
-      RECT 3.950000 0.535000 4.120000 0.765000 ;
-      RECT 3.950000 1.065000 4.120000 2.135000 ;
-      RECT 3.950000 2.135000 4.200000 2.465000 ;
-      RECT 4.290000 1.245000 4.480000 1.965000 ;
-      RECT 4.425000 2.165000 5.310000 2.335000 ;
-      RECT 4.505000 0.705000 4.970000 1.035000 ;
-      RECT 4.525000 0.365000 5.310000 0.535000 ;
-      RECT 4.650000 1.035000 4.970000 1.995000 ;
-      RECT 5.140000 0.535000 5.310000 0.995000 ;
-      RECT 5.140000 0.995000 6.015000 1.325000 ;
-      RECT 5.140000 1.325000 5.310000 2.165000 ;
-      RECT 5.480000 1.530000 6.375000 1.905000 ;
-      RECT 6.035000 1.905000 6.375000 2.465000 ;
-      RECT 6.055000 0.300000 6.385000 0.825000 ;
-      RECT 6.185000 0.825000 6.385000 0.995000 ;
-      RECT 6.185000 0.995000 6.935000 1.325000 ;
-      RECT 6.185000 1.325000 6.375000 1.530000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.840000 0.805000 ;
+      RECT 0.175000  1.795000 0.840000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.200000 2.465000 ;
+      RECT 1.440000  2.175000 1.705000 2.635000 ;
+      RECT 1.455000  0.085000 1.705000 0.545000 ;
+      RECT 1.820000  0.675000 2.045000 0.805000 ;
+      RECT 1.820000  0.805000 1.990000 1.910000 ;
+      RECT 1.820000  1.910000 2.125000 2.040000 ;
+      RECT 1.875000  0.365000 2.210000 0.535000 ;
+      RECT 1.875000  0.535000 2.045000 0.675000 ;
+      RECT 1.875000  2.040000 2.125000 2.465000 ;
+      RECT 2.160000  1.125000 2.400000 1.720000 ;
+      RECT 2.215000  0.735000 2.740000 0.955000 ;
+      RECT 2.335000  2.190000 3.440000 2.360000 ;
+      RECT 2.405000  0.365000 3.080000 0.535000 ;
+      RECT 2.570000  0.955000 2.740000 1.655000 ;
+      RECT 2.570000  1.655000 3.100000 2.020000 ;
+      RECT 2.910000  0.535000 3.080000 1.315000 ;
+      RECT 2.910000  1.315000 3.780000 1.485000 ;
+      RECT 3.270000  1.485000 3.780000 1.575000 ;
+      RECT 3.270000  1.575000 3.440000 2.190000 ;
+      RECT 3.290000  0.765000 4.120000 1.065000 ;
+      RECT 3.290000  1.065000 3.490000 1.095000 ;
+      RECT 3.400000  0.085000 3.770000 0.585000 ;
+      RECT 3.610000  1.245000 3.780000 1.315000 ;
+      RECT 3.610000  1.835000 3.780000 2.635000 ;
+      RECT 3.950000  0.365000 4.355000 0.535000 ;
+      RECT 3.950000  0.535000 4.120000 0.765000 ;
+      RECT 3.950000  1.065000 4.120000 2.135000 ;
+      RECT 3.950000  2.135000 4.200000 2.465000 ;
+      RECT 4.290000  1.245000 4.480000 1.965000 ;
+      RECT 4.425000  2.165000 5.310000 2.335000 ;
+      RECT 4.505000  0.705000 4.970000 1.035000 ;
+      RECT 4.525000  0.365000 5.310000 0.535000 ;
+      RECT 4.650000  1.035000 4.970000 1.995000 ;
+      RECT 5.140000  0.535000 5.310000 0.995000 ;
+      RECT 5.140000  0.995000 6.015000 1.325000 ;
+      RECT 5.140000  1.325000 5.310000 2.165000 ;
+      RECT 5.480000  1.530000 6.375000 1.905000 ;
+      RECT 5.490000  2.135000 5.805000 2.635000 ;
+      RECT 5.585000  0.085000 5.795000 0.615000 ;
+      RECT 6.035000  1.905000 6.375000 2.465000 ;
+      RECT 6.055000  0.300000 6.385000 0.825000 ;
+      RECT 6.185000  0.825000 6.385000 0.995000 ;
+      RECT 6.185000  0.995000 6.935000 1.325000 ;
+      RECT 6.185000  1.325000 6.375000 1.530000 ;
+      RECT 6.545000  1.625000 6.715000 2.635000 ;
+      RECT 6.555000  0.085000 6.725000 0.695000 ;
+      RECT 7.385000  1.720000 7.555000 2.635000 ;
+      RECT 7.395000  0.085000 7.565000 0.600000 ;
     LAYER mcon ;
-      RECT 0.630000 1.785000 0.800000 1.955000 ;
-      RECT 1.025000 1.445000 1.195000 1.615000 ;
-      RECT 2.215000 1.445000 2.385000 1.615000 ;
-      RECT 2.730000 1.785000 2.900000 1.955000 ;
-      RECT 4.300000 1.785000 4.470000 1.955000 ;
-      RECT 4.735000 1.445000 4.905000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.630000  1.785000 0.800000 1.955000 ;
+      RECT 1.025000  1.445000 1.195000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.215000  1.445000 2.385000 1.615000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.730000  1.785000 2.900000 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.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.300000  1.785000 4.470000 1.955000 ;
+      RECT 4.735000  1.445000 4.905000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 0.570000 1.755000 0.860000 1.800000 ;
       RECT 0.570000 1.800000 4.530000 1.940000 ;
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
index 2a22f83..ffd0146 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.magic.lef
@@ -68,35 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.705000 0.545000 ;
-        RECT 3.400000  0.085000 3.770000 0.585000 ;
-        RECT 5.625000  0.085000 5.795000 0.615000 ;
-        RECT 6.625000  0.085000 6.795000 0.565000 ;
-        RECT 7.495000  0.085000 7.665000 0.560000 ;
-        RECT 8.345000  0.085000 8.515000 0.560000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -106,90 +77,115 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.440000 2.175000 1.705000 2.635000 ;
-        RECT 3.610000 1.835000 3.780000 2.635000 ;
-        RECT 5.490000 2.135000 5.705000 2.635000 ;
-        RECT 6.625000 1.855000 6.805000 2.635000 ;
-        RECT 7.500000 1.805000 7.670000 2.635000 ;
-        RECT 8.340000 1.805000 8.510000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.840000 0.805000 ;
-      RECT 0.175000 1.795000 0.840000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.840000 1.795000 ;
-      RECT 1.015000 0.345000 1.240000 2.465000 ;
-      RECT 1.890000 0.365000 2.220000 0.535000 ;
-      RECT 1.890000 0.535000 2.060000 2.065000 ;
-      RECT 1.890000 2.065000 2.125000 2.440000 ;
-      RECT 2.230000 0.705000 2.810000 1.035000 ;
-      RECT 2.230000 1.035000 2.470000 1.905000 ;
-      RECT 2.370000 2.190000 3.440000 2.360000 ;
-      RECT 2.400000 0.365000 3.150000 0.535000 ;
-      RECT 2.660000 1.655000 3.100000 2.010000 ;
-      RECT 2.980000 0.535000 3.150000 1.315000 ;
-      RECT 2.980000 1.315000 3.780000 1.485000 ;
-      RECT 3.270000 1.485000 3.780000 1.575000 ;
-      RECT 3.270000 1.575000 3.440000 2.190000 ;
-      RECT 3.320000 0.765000 4.120000 1.065000 ;
-      RECT 3.320000 1.065000 3.490000 1.095000 ;
-      RECT 3.610000 1.245000 3.780000 1.315000 ;
-      RECT 3.950000 0.365000 4.410000 0.535000 ;
-      RECT 3.950000 0.535000 4.120000 0.765000 ;
-      RECT 3.950000 1.065000 4.120000 2.135000 ;
-      RECT 3.950000 2.135000 4.200000 2.465000 ;
-      RECT 4.290000 0.705000 4.840000 1.035000 ;
-      RECT 4.290000 1.245000 4.480000 1.965000 ;
-      RECT 4.425000 2.165000 5.310000 2.335000 ;
-      RECT 4.640000 0.365000 5.310000 0.535000 ;
-      RECT 4.650000 1.035000 4.840000 1.575000 ;
-      RECT 4.650000 1.575000 4.970000 1.905000 ;
-      RECT 5.140000 0.535000 5.310000 1.075000 ;
-      RECT 5.140000 1.075000 6.230000 1.245000 ;
-      RECT 5.140000 1.245000 5.310000 2.165000 ;
-      RECT 5.480000 1.500000 6.590000 1.670000 ;
-      RECT 5.480000 1.670000 6.340000 1.830000 ;
-      RECT 6.090000 0.295000 6.450000 0.735000 ;
-      RECT 6.090000 0.735000 6.590000 0.905000 ;
-      RECT 6.170000 1.830000 6.340000 2.455000 ;
-      RECT 6.420000 0.905000 6.590000 1.075000 ;
-      RECT 6.420000 1.075000 8.240000 1.245000 ;
-      RECT 6.420000 1.245000 6.590000 1.500000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.840000 0.805000 ;
+      RECT 0.175000  1.795000 0.840000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.840000 1.795000 ;
+      RECT 1.015000  0.345000 1.240000 2.465000 ;
+      RECT 1.440000  2.175000 1.705000 2.635000 ;
+      RECT 1.455000  0.085000 1.705000 0.545000 ;
+      RECT 1.890000  0.365000 2.220000 0.535000 ;
+      RECT 1.890000  0.535000 2.060000 2.065000 ;
+      RECT 1.890000  2.065000 2.125000 2.440000 ;
+      RECT 2.230000  0.705000 2.810000 1.035000 ;
+      RECT 2.230000  1.035000 2.470000 1.905000 ;
+      RECT 2.370000  2.190000 3.440000 2.360000 ;
+      RECT 2.400000  0.365000 3.150000 0.535000 ;
+      RECT 2.660000  1.655000 3.100000 2.010000 ;
+      RECT 2.980000  0.535000 3.150000 1.315000 ;
+      RECT 2.980000  1.315000 3.780000 1.485000 ;
+      RECT 3.270000  1.485000 3.780000 1.575000 ;
+      RECT 3.270000  1.575000 3.440000 2.190000 ;
+      RECT 3.320000  0.765000 4.120000 1.065000 ;
+      RECT 3.320000  1.065000 3.490000 1.095000 ;
+      RECT 3.400000  0.085000 3.770000 0.585000 ;
+      RECT 3.610000  1.245000 3.780000 1.315000 ;
+      RECT 3.610000  1.835000 3.780000 2.635000 ;
+      RECT 3.950000  0.365000 4.410000 0.535000 ;
+      RECT 3.950000  0.535000 4.120000 0.765000 ;
+      RECT 3.950000  1.065000 4.120000 2.135000 ;
+      RECT 3.950000  2.135000 4.200000 2.465000 ;
+      RECT 4.290000  0.705000 4.840000 1.035000 ;
+      RECT 4.290000  1.245000 4.480000 1.965000 ;
+      RECT 4.425000  2.165000 5.310000 2.335000 ;
+      RECT 4.640000  0.365000 5.310000 0.535000 ;
+      RECT 4.650000  1.035000 4.840000 1.575000 ;
+      RECT 4.650000  1.575000 4.970000 1.905000 ;
+      RECT 5.140000  0.535000 5.310000 1.075000 ;
+      RECT 5.140000  1.075000 6.230000 1.245000 ;
+      RECT 5.140000  1.245000 5.310000 2.165000 ;
+      RECT 5.480000  1.500000 6.590000 1.670000 ;
+      RECT 5.480000  1.670000 6.340000 1.830000 ;
+      RECT 5.490000  2.135000 5.705000 2.635000 ;
+      RECT 5.625000  0.085000 5.795000 0.615000 ;
+      RECT 6.090000  0.295000 6.450000 0.735000 ;
+      RECT 6.090000  0.735000 6.590000 0.905000 ;
+      RECT 6.170000  1.830000 6.340000 2.455000 ;
+      RECT 6.420000  0.905000 6.590000 1.075000 ;
+      RECT 6.420000  1.075000 8.240000 1.245000 ;
+      RECT 6.420000  1.245000 6.590000 1.500000 ;
+      RECT 6.625000  0.085000 6.795000 0.565000 ;
+      RECT 6.625000  1.855000 6.805000 2.635000 ;
+      RECT 7.495000  0.085000 7.665000 0.560000 ;
+      RECT 7.500000  1.805000 7.670000 2.635000 ;
+      RECT 8.340000  1.805000 8.510000 2.635000 ;
+      RECT 8.345000  0.085000 8.515000 0.560000 ;
     LAYER mcon ;
-      RECT 0.610000 1.785000 0.780000 1.955000 ;
-      RECT 1.070000 0.765000 1.240000 0.935000 ;
-      RECT 2.470000 0.765000 2.640000 0.935000 ;
-      RECT 2.930000 1.785000 3.100000 1.955000 ;
-      RECT 4.310000 0.765000 4.480000 0.935000 ;
-      RECT 4.310000 1.785000 4.480000 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.610000  1.785000 0.780000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  0.765000 1.240000 0.935000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.470000  0.765000 2.640000 0.935000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.785000 3.100000 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.310000  0.765000 4.480000 0.935000 ;
+      RECT 4.310000  1.785000 4.480000 1.955000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.550000 1.755000 0.840000 1.800000 ;
       RECT 0.550000 1.800000 4.540000 1.940000 ;
diff --git a/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
index cc067c5..f72da21 100644
--- a/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hd__diode_2.magic.lef
@@ -44,11 +44,6 @@
     SHAPE ABUTMENT ;
     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,13 +53,18 @@
     SHAPE ABUTMENT ;
     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
 END sky130_fd_sc_hd__diode_2
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
index b3b2d40..412437a 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.magic.lef
@@ -58,10 +58,16 @@
     PORT
       LAYER li1 ;
         RECT 0.085000 0.985000 0.330000 1.625000 ;
-        RECT 5.190000 1.105000 5.510000 1.435000 ;
       LAYER mcon ;
         RECT 0.145000 1.105000 0.315000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.190000 1.105000 5.510000 1.435000 ;
+      LAYER mcon ;
         RECT 5.210000 1.105000 5.380000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.085000 1.075000 0.380000 1.120000 ;
         RECT 0.085000 1.120000 5.440000 1.260000 ;
@@ -75,27 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.445000 ;
-        RECT 1.480000  0.085000 1.810000 0.905000 ;
-        RECT 3.895000  0.085000 4.145000 0.610000 ;
-        RECT 5.670000  0.085000 5.840000 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
@@ -105,65 +90,83 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.450000 2.195000 1.815000 2.635000 ;
-        RECT 3.395000 2.135000 3.695000 2.635000 ;
-        RECT 4.310000 2.010000 4.595000 2.635000 ;
-        RECT 5.570000 2.130000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.260000 0.345000 0.615000 ;
-      RECT 0.175000 0.615000 0.780000 0.785000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.785000 0.780000 1.060000 ;
-      RECT 0.610000 1.060000 0.840000 1.390000 ;
-      RECT 0.610000 1.390000 0.780000 1.795000 ;
-      RECT 1.015000 0.260000 1.280000 1.855000 ;
-      RECT 1.015000 1.855000 2.590000 2.025000 ;
-      RECT 1.015000 2.025000 1.240000 2.465000 ;
-      RECT 2.390000 0.815000 3.220000 0.985000 ;
-      RECT 2.390000 0.985000 2.590000 1.855000 ;
-      RECT 2.475000 2.255000 3.225000 2.425000 ;
-      RECT 2.790000 0.390000 3.725000 0.560000 ;
-      RECT 3.055000 1.155000 4.175000 1.325000 ;
-      RECT 3.055000 1.325000 3.225000 2.255000 ;
-      RECT 3.430000 1.535000 4.710000 1.840000 ;
-      RECT 3.430000 1.840000 4.130000 1.865000 ;
-      RECT 3.555000 0.560000 3.725000 0.995000 ;
-      RECT 3.555000 0.995000 4.175000 1.155000 ;
-      RECT 3.910000 1.865000 4.130000 2.435000 ;
-      RECT 4.320000 0.255000 4.580000 0.615000 ;
-      RECT 4.345000 0.615000 4.580000 0.995000 ;
-      RECT 4.345000 0.995000 4.740000 1.325000 ;
-      RECT 4.345000 1.325000 4.710000 1.535000 ;
-      RECT 4.840000 0.290000 5.155000 0.620000 ;
-      RECT 4.935000 0.620000 5.155000 0.765000 ;
-      RECT 4.935000 0.765000 6.000000 0.935000 ;
-      RECT 5.005000 1.725000 5.920000 1.895000 ;
-      RECT 5.005000 1.895000 5.335000 2.465000 ;
-      RECT 5.750000 0.935000 6.000000 1.325000 ;
-      RECT 5.750000 1.325000 5.920000 1.725000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.175000  0.260000 0.345000 0.615000 ;
+      RECT 0.175000  0.615000 0.780000 0.785000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.445000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.785000 0.780000 1.060000 ;
+      RECT 0.610000  1.060000 0.840000 1.390000 ;
+      RECT 0.610000  1.390000 0.780000 1.795000 ;
+      RECT 1.015000  0.260000 1.280000 1.855000 ;
+      RECT 1.015000  1.855000 2.590000 2.025000 ;
+      RECT 1.015000  2.025000 1.240000 2.465000 ;
+      RECT 1.450000  2.195000 1.815000 2.635000 ;
+      RECT 1.480000  0.085000 1.810000 0.905000 ;
+      RECT 2.390000  0.815000 3.220000 0.985000 ;
+      RECT 2.390000  0.985000 2.590000 1.855000 ;
+      RECT 2.475000  2.255000 3.225000 2.425000 ;
+      RECT 2.790000  0.390000 3.725000 0.560000 ;
+      RECT 3.055000  1.155000 4.175000 1.325000 ;
+      RECT 3.055000  1.325000 3.225000 2.255000 ;
+      RECT 3.395000  2.135000 3.695000 2.635000 ;
+      RECT 3.430000  1.535000 4.710000 1.840000 ;
+      RECT 3.430000  1.840000 4.130000 1.865000 ;
+      RECT 3.555000  0.560000 3.725000 0.995000 ;
+      RECT 3.555000  0.995000 4.175000 1.155000 ;
+      RECT 3.895000  0.085000 4.145000 0.610000 ;
+      RECT 3.910000  1.865000 4.130000 2.435000 ;
+      RECT 4.310000  2.010000 4.595000 2.635000 ;
+      RECT 4.320000  0.255000 4.580000 0.615000 ;
+      RECT 4.345000  0.615000 4.580000 0.995000 ;
+      RECT 4.345000  0.995000 4.740000 1.325000 ;
+      RECT 4.345000  1.325000 4.710000 1.535000 ;
+      RECT 4.840000  0.290000 5.155000 0.620000 ;
+      RECT 4.935000  0.620000 5.155000 0.765000 ;
+      RECT 4.935000  0.765000 6.000000 0.935000 ;
+      RECT 5.005000  1.725000 5.920000 1.895000 ;
+      RECT 5.005000  1.895000 5.335000 2.465000 ;
+      RECT 5.570000  2.130000 5.920000 2.635000 ;
+      RECT 5.670000  0.085000 5.840000 0.545000 ;
+      RECT 5.750000  0.935000 6.000000 1.325000 ;
+      RECT 5.750000  1.325000 5.920000 1.725000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__dlclkp_1
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
index 4638e5e..e464394 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.magic.lef
@@ -58,9 +58,14 @@
     PORT
       LAYER li1 ;
         RECT 0.090000 0.985000 0.330000 1.625000 ;
-        RECT 5.210000 1.105000 5.485000 1.435000 ;
       LAYER mcon ;
         RECT 0.150000 1.105000 0.320000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.210000 1.105000 5.485000 1.435000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.090000 1.075000 0.380000 1.120000 ;
         RECT 0.090000 1.120000 5.440000 1.260000 ;
@@ -74,29 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.445000 ;
-        RECT 1.485000  0.085000 1.815000 0.905000 ;
-        RECT 3.895000  0.085000 4.145000 0.610000 ;
-        RECT 5.675000  0.085000 5.845000 0.545000 ;
-        RECT 6.530000  0.085000 6.810000 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
@@ -106,66 +88,86 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.455000 2.195000 1.820000 2.635000 ;
-        RECT 3.400000 2.135000 3.700000 2.635000 ;
-        RECT 4.315000 2.010000 4.600000 2.635000 ;
-        RECT 5.575000 2.130000 5.925000 2.635000 ;
-        RECT 6.530000 1.485000 6.810000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.260000 0.345000 0.615000 ;
-      RECT 0.175000 0.615000 0.780000 0.785000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.785000 0.780000 1.060000 ;
-      RECT 0.610000 1.060000 0.840000 1.390000 ;
-      RECT 0.610000 1.390000 0.780000 1.795000 ;
-      RECT 1.015000 0.260000 1.280000 1.855000 ;
-      RECT 1.015000 1.855000 2.645000 2.025000 ;
-      RECT 1.015000 2.025000 1.240000 2.465000 ;
-      RECT 2.395000 0.815000 3.225000 0.985000 ;
-      RECT 2.395000 0.985000 2.645000 1.855000 ;
-      RECT 2.480000 2.255000 3.230000 2.425000 ;
-      RECT 2.795000 0.390000 3.725000 0.560000 ;
-      RECT 3.060000 1.155000 4.180000 1.325000 ;
-      RECT 3.060000 1.325000 3.230000 2.255000 ;
-      RECT 3.435000 1.535000 4.735000 1.840000 ;
-      RECT 3.435000 1.840000 4.135000 1.865000 ;
-      RECT 3.555000 0.560000 3.725000 0.995000 ;
-      RECT 3.555000 0.995000 4.180000 1.155000 ;
-      RECT 3.915000 1.865000 4.135000 2.435000 ;
-      RECT 4.315000 0.255000 4.585000 0.615000 ;
-      RECT 4.350000 0.615000 4.585000 0.995000 ;
-      RECT 4.350000 0.995000 4.735000 1.535000 ;
-      RECT 4.835000 0.290000 5.150000 0.620000 ;
-      RECT 4.930000 0.620000 5.150000 0.765000 ;
-      RECT 4.930000 0.765000 5.995000 0.935000 ;
-      RECT 5.010000 1.725000 5.925000 1.895000 ;
-      RECT 5.010000 1.895000 5.340000 2.465000 ;
-      RECT 5.755000 0.935000 5.995000 1.325000 ;
-      RECT 5.755000 1.325000 5.925000 1.725000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.175000  0.260000 0.345000 0.615000 ;
+      RECT 0.175000  0.615000 0.780000 0.785000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.445000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.785000 0.780000 1.060000 ;
+      RECT 0.610000  1.060000 0.840000 1.390000 ;
+      RECT 0.610000  1.390000 0.780000 1.795000 ;
+      RECT 1.015000  0.260000 1.280000 1.855000 ;
+      RECT 1.015000  1.855000 2.645000 2.025000 ;
+      RECT 1.015000  2.025000 1.240000 2.465000 ;
+      RECT 1.455000  2.195000 1.820000 2.635000 ;
+      RECT 1.485000  0.085000 1.815000 0.905000 ;
+      RECT 2.395000  0.815000 3.225000 0.985000 ;
+      RECT 2.395000  0.985000 2.645000 1.855000 ;
+      RECT 2.480000  2.255000 3.230000 2.425000 ;
+      RECT 2.795000  0.390000 3.725000 0.560000 ;
+      RECT 3.060000  1.155000 4.180000 1.325000 ;
+      RECT 3.060000  1.325000 3.230000 2.255000 ;
+      RECT 3.400000  2.135000 3.700000 2.635000 ;
+      RECT 3.435000  1.535000 4.735000 1.840000 ;
+      RECT 3.435000  1.840000 4.135000 1.865000 ;
+      RECT 3.555000  0.560000 3.725000 0.995000 ;
+      RECT 3.555000  0.995000 4.180000 1.155000 ;
+      RECT 3.895000  0.085000 4.145000 0.610000 ;
+      RECT 3.915000  1.865000 4.135000 2.435000 ;
+      RECT 4.315000  0.255000 4.585000 0.615000 ;
+      RECT 4.315000  2.010000 4.600000 2.635000 ;
+      RECT 4.350000  0.615000 4.585000 0.995000 ;
+      RECT 4.350000  0.995000 4.735000 1.535000 ;
+      RECT 4.835000  0.290000 5.150000 0.620000 ;
+      RECT 4.930000  0.620000 5.150000 0.765000 ;
+      RECT 4.930000  0.765000 5.995000 0.935000 ;
+      RECT 5.010000  1.725000 5.925000 1.895000 ;
+      RECT 5.010000  1.895000 5.340000 2.465000 ;
+      RECT 5.575000  2.130000 5.925000 2.635000 ;
+      RECT 5.675000  0.085000 5.845000 0.545000 ;
+      RECT 5.755000  0.935000 5.995000 1.325000 ;
+      RECT 5.755000  1.325000 5.925000 1.725000 ;
+      RECT 6.530000  0.085000 6.810000 0.885000 ;
+      RECT 6.530000  1.485000 6.810000 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
 END sky130_fd_sc_hd__dlclkp_2
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
index 01600d7..93750b1 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.magic.lef
@@ -63,10 +63,16 @@
     PORT
       LAYER li1 ;
         RECT 0.090000 0.985000 0.330000 1.625000 ;
-        RECT 5.230000 1.055000 5.740000 1.325000 ;
       LAYER mcon ;
         RECT 0.150000 1.105000 0.320000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.230000 1.055000 5.740000 1.325000 ;
+      LAYER mcon ;
         RECT 5.230000 1.105000 5.400000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.090000 1.075000 0.380000 1.120000 ;
         RECT 0.090000 1.120000 5.460000 1.260000 ;
@@ -80,33 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.450000  0.085000 1.785000 0.465000 ;
-        RECT 3.315000  0.085000 3.650000 0.530000 ;
-        RECT 4.295000  0.085000 4.580000 0.715000 ;
-        RECT 5.590000  0.085000 5.870000 0.545000 ;
-        RECT 6.630000  0.085000 6.800000 0.545000 ;
-        RECT 7.470000  0.085000 7.735000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -116,83 +95,106 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.450000 2.195000 1.815000 2.635000 ;
-        RECT 3.335000 2.175000 3.695000 2.635000 ;
-        RECT 4.295000 2.010000 4.580000 2.635000 ;
-        RECT 5.575000 1.835000 5.840000 2.635000 ;
-        RECT 6.540000 2.175000 6.800000 2.635000 ;
-        RECT 7.470000 1.485000 7.735000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 0.780000 0.805000 ;
-      RECT 0.085000 1.795000 0.780000 1.965000 ;
-      RECT 0.085000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.280000 1.355000 ;
-      RECT 1.015000 1.355000 2.335000 1.585000 ;
-      RECT 1.015000 1.585000 1.240000 2.465000 ;
-      RECT 1.525000 1.785000 1.695000 1.855000 ;
-      RECT 1.525000 1.855000 2.845000 1.905000 ;
-      RECT 1.525000 1.905000 2.735000 2.025000 ;
-      RECT 2.045000 1.585000 2.335000 1.685000 ;
-      RECT 2.290000 0.705000 2.735000 1.035000 ;
-      RECT 2.415000 0.365000 3.075000 0.535000 ;
-      RECT 2.475000 2.195000 3.165000 2.425000 ;
-      RECT 2.505000 1.575000 2.845000 1.855000 ;
-      RECT 2.565000 1.035000 2.735000 1.575000 ;
-      RECT 2.905000 0.535000 3.075000 0.995000 ;
-      RECT 2.905000 0.995000 3.775000 1.165000 ;
-      RECT 2.915000 2.060000 3.185000 2.090000 ;
-      RECT 2.915000 2.090000 3.180000 2.105000 ;
-      RECT 2.915000 2.105000 3.165000 2.195000 ;
-      RECT 2.980000 2.015000 3.185000 2.060000 ;
-      RECT 3.015000 1.165000 3.775000 1.325000 ;
-      RECT 3.015000 1.325000 3.185000 2.015000 ;
-      RECT 3.355000 1.535000 4.115000 1.865000 ;
-      RECT 3.895000 0.415000 4.115000 0.745000 ;
-      RECT 3.895000 1.865000 4.115000 2.435000 ;
-      RECT 3.945000 0.745000 4.115000 0.995000 ;
-      RECT 3.945000 0.995000 4.720000 1.325000 ;
-      RECT 3.945000 1.325000 4.115000 1.535000 ;
-      RECT 4.750000 0.290000 5.060000 0.715000 ;
-      RECT 4.750000 0.715000 6.120000 0.825000 ;
-      RECT 4.750000 1.495000 6.140000 1.665000 ;
-      RECT 4.750000 1.665000 5.035000 2.465000 ;
-      RECT 4.890000 0.825000 6.120000 0.885000 ;
-      RECT 4.890000 0.885000 5.060000 1.495000 ;
-      RECT 5.910000 0.885000 6.120000 1.055000 ;
-      RECT 5.910000 1.055000 6.580000 1.290000 ;
-      RECT 5.910000 1.290000 6.140000 1.495000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 0.780000 0.805000 ;
+      RECT 0.085000  1.795000 0.780000 1.965000 ;
+      RECT 0.085000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.280000 1.355000 ;
+      RECT 1.015000  1.355000 2.335000 1.585000 ;
+      RECT 1.015000  1.585000 1.240000 2.465000 ;
+      RECT 1.450000  0.085000 1.785000 0.465000 ;
+      RECT 1.450000  2.195000 1.815000 2.635000 ;
+      RECT 1.525000  1.785000 1.695000 1.855000 ;
+      RECT 1.525000  1.855000 2.845000 1.905000 ;
+      RECT 1.525000  1.905000 2.735000 2.025000 ;
+      RECT 2.045000  1.585000 2.335000 1.685000 ;
+      RECT 2.290000  0.705000 2.735000 1.035000 ;
+      RECT 2.415000  0.365000 3.075000 0.535000 ;
+      RECT 2.475000  2.195000 3.165000 2.425000 ;
+      RECT 2.505000  1.575000 2.845000 1.855000 ;
+      RECT 2.565000  1.035000 2.735000 1.575000 ;
+      RECT 2.905000  0.535000 3.075000 0.995000 ;
+      RECT 2.905000  0.995000 3.775000 1.165000 ;
+      RECT 2.915000  2.060000 3.185000 2.090000 ;
+      RECT 2.915000  2.090000 3.180000 2.105000 ;
+      RECT 2.915000  2.105000 3.165000 2.195000 ;
+      RECT 2.980000  2.015000 3.185000 2.060000 ;
+      RECT 3.015000  1.165000 3.775000 1.325000 ;
+      RECT 3.015000  1.325000 3.185000 2.015000 ;
+      RECT 3.315000  0.085000 3.650000 0.530000 ;
+      RECT 3.335000  2.175000 3.695000 2.635000 ;
+      RECT 3.355000  1.535000 4.115000 1.865000 ;
+      RECT 3.895000  0.415000 4.115000 0.745000 ;
+      RECT 3.895000  1.865000 4.115000 2.435000 ;
+      RECT 3.945000  0.745000 4.115000 0.995000 ;
+      RECT 3.945000  0.995000 4.720000 1.325000 ;
+      RECT 3.945000  1.325000 4.115000 1.535000 ;
+      RECT 4.295000  0.085000 4.580000 0.715000 ;
+      RECT 4.295000  2.010000 4.580000 2.635000 ;
+      RECT 4.750000  0.290000 5.060000 0.715000 ;
+      RECT 4.750000  0.715000 6.120000 0.825000 ;
+      RECT 4.750000  1.495000 6.140000 1.665000 ;
+      RECT 4.750000  1.665000 5.035000 2.465000 ;
+      RECT 4.890000  0.825000 6.120000 0.885000 ;
+      RECT 4.890000  0.885000 5.060000 1.495000 ;
+      RECT 5.575000  1.835000 5.840000 2.635000 ;
+      RECT 5.590000  0.085000 5.870000 0.545000 ;
+      RECT 5.910000  0.885000 6.120000 1.055000 ;
+      RECT 5.910000  1.055000 6.580000 1.290000 ;
+      RECT 5.910000  1.290000 6.140000 1.495000 ;
+      RECT 6.540000  2.175000 6.800000 2.635000 ;
+      RECT 6.630000  0.085000 6.800000 0.545000 ;
+      RECT 7.470000  0.085000 7.735000 0.885000 ;
+      RECT 7.470000  1.485000 7.735000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.785000 0.780000 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.610000  1.785000 0.780000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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 ;
     LAYER met1 ;
       RECT 0.550000 1.755000 0.840000 1.800000 ;
       RECT 0.550000 1.800000 1.755000 1.940000 ;
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
index 49348fa..40ebf18 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.magic.lef
@@ -82,31 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.740000  0.085000 4.070000 0.530000 ;
-        RECT 5.135000  0.085000 5.875000 0.485000 ;
-        RECT 6.975000  0.085000 7.305000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -116,79 +91,100 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.820000 2.135000 4.090000 2.635000 ;
-        RECT 4.260000 2.135000 4.590000 2.635000 ;
-        RECT 5.150000 1.935000 5.890000 2.635000 ;
-        RECT 7.010000 1.835000 7.305000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 0.780000 0.805000 ;
-      RECT 0.085000 1.795000 0.780000 1.965000 ;
-      RECT 0.085000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.970000 0.785000 2.340000 1.095000 ;
-      RECT 1.970000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 2.005000 ;
-      RECT 2.715000 0.705000 3.095000 1.035000 ;
-      RECT 2.840000 0.365000 3.500000 0.535000 ;
-      RECT 2.900000 2.255000 3.650000 2.425000 ;
-      RECT 2.925000 1.035000 3.095000 1.415000 ;
-      RECT 2.925000 1.415000 3.265000 1.995000 ;
-      RECT 3.330000 0.535000 3.500000 0.995000 ;
-      RECT 3.330000 0.995000 4.300000 1.165000 ;
-      RECT 3.480000 1.165000 4.300000 1.325000 ;
-      RECT 3.480000 1.325000 3.650000 2.255000 ;
-      RECT 3.840000 1.535000 5.875000 1.765000 ;
-      RECT 3.840000 1.765000 4.970000 1.865000 ;
-      RECT 4.240000 0.255000 4.540000 0.655000 ;
-      RECT 4.240000 0.655000 5.875000 0.825000 ;
-      RECT 4.760000 1.865000 4.970000 2.435000 ;
-      RECT 5.625000 0.825000 5.875000 1.535000 ;
-      RECT 6.580000 0.255000 6.750000 0.985000 ;
-      RECT 6.580000 0.985000 6.830000 0.995000 ;
-      RECT 6.580000 0.995000 7.390000 1.325000 ;
-      RECT 6.580000 1.325000 6.830000 2.465000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 0.780000 0.805000 ;
+      RECT 0.085000  1.795000 0.780000 1.965000 ;
+      RECT 0.085000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.970000  0.785000 2.340000 1.095000 ;
+      RECT 1.970000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 2.005000 ;
+      RECT 2.715000  0.705000 3.095000 1.035000 ;
+      RECT 2.840000  0.365000 3.500000 0.535000 ;
+      RECT 2.900000  2.255000 3.650000 2.425000 ;
+      RECT 2.925000  1.035000 3.095000 1.415000 ;
+      RECT 2.925000  1.415000 3.265000 1.995000 ;
+      RECT 3.330000  0.535000 3.500000 0.995000 ;
+      RECT 3.330000  0.995000 4.300000 1.165000 ;
+      RECT 3.480000  1.165000 4.300000 1.325000 ;
+      RECT 3.480000  1.325000 3.650000 2.255000 ;
+      RECT 3.740000  0.085000 4.070000 0.530000 ;
+      RECT 3.820000  2.135000 4.090000 2.635000 ;
+      RECT 3.840000  1.535000 5.875000 1.765000 ;
+      RECT 3.840000  1.765000 4.970000 1.865000 ;
+      RECT 4.240000  0.255000 4.540000 0.655000 ;
+      RECT 4.240000  0.655000 5.875000 0.825000 ;
+      RECT 4.260000  2.135000 4.590000 2.635000 ;
+      RECT 4.760000  1.865000 4.970000 2.435000 ;
+      RECT 5.135000  0.085000 5.875000 0.485000 ;
+      RECT 5.150000  1.935000 5.890000 2.635000 ;
+      RECT 5.625000  0.825000 5.875000 1.535000 ;
+      RECT 6.580000  0.255000 6.750000 0.985000 ;
+      RECT 6.580000  0.985000 6.830000 0.995000 ;
+      RECT 6.580000  0.995000 7.390000 1.325000 ;
+      RECT 6.580000  1.325000 6.830000 2.465000 ;
+      RECT 6.975000  0.085000 7.305000 0.465000 ;
+      RECT 7.010000  1.835000 7.305000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.785000 2.640000 1.955000 ;
-      RECT 2.930000 1.445000 3.100000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.785000 2.640000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.445000 3.100000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.160000 1.600000 ;
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
index bf94158..8a67069 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.magic.lef
@@ -92,34 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.740000  0.085000 4.070000 0.825000 ;
-        RECT 5.100000  0.085000 5.480000 0.485000 ;
-        RECT 6.085000  0.085000 6.355000 0.545000 ;
-        RECT 7.025000  0.085000 7.330000 0.545000 ;
-        RECT 7.925000  0.085000 8.195000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -129,82 +101,106 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.820000 2.135000 4.590000 2.635000 ;
-        RECT 5.100000 1.855000 5.350000 2.635000 ;
-        RECT 6.085000 1.830000 6.355000 2.635000 ;
-        RECT 7.035000 1.835000 7.330000 2.635000 ;
-        RECT 7.925000 1.495000 8.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 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 0.780000 0.805000 ;
-      RECT 0.085000 1.795000 0.780000 1.965000 ;
-      RECT 0.085000 1.965000 0.345000 2.465000 ;
-      RECT 0.605000 0.805000 0.780000 1.070000 ;
-      RECT 0.605000 1.070000 0.840000 1.400000 ;
-      RECT 0.605000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.970000 0.785000 2.340000 1.095000 ;
-      RECT 1.970000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 2.005000 ;
-      RECT 2.715000 0.705000 3.095000 1.035000 ;
-      RECT 2.840000 0.365000 3.500000 0.535000 ;
-      RECT 2.900000 2.255000 3.650000 2.425000 ;
-      RECT 2.925000 1.035000 3.095000 1.415000 ;
-      RECT 2.925000 1.415000 3.265000 1.995000 ;
-      RECT 3.330000 0.535000 3.500000 0.995000 ;
-      RECT 3.330000 0.995000 4.200000 1.165000 ;
-      RECT 3.480000 1.165000 4.200000 1.325000 ;
-      RECT 3.480000 1.325000 3.650000 2.255000 ;
-      RECT 3.840000 1.495000 5.480000 1.665000 ;
-      RECT 3.840000 1.665000 4.930000 1.865000 ;
-      RECT 4.340000 0.415000 4.560000 0.655000 ;
-      RECT 4.340000 0.655000 5.480000 0.825000 ;
-      RECT 4.760000 1.865000 4.930000 2.435000 ;
-      RECT 5.310000 0.825000 5.480000 0.995000 ;
-      RECT 5.310000 0.995000 5.620000 1.325000 ;
-      RECT 5.310000 1.325000 5.480000 1.495000 ;
-      RECT 6.525000 0.255000 6.855000 0.995000 ;
-      RECT 6.525000 0.995000 7.375000 1.325000 ;
-      RECT 6.525000 1.325000 6.855000 2.465000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 0.780000 0.805000 ;
+      RECT 0.085000  1.795000 0.780000 1.965000 ;
+      RECT 0.085000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.605000  0.805000 0.780000 1.070000 ;
+      RECT 0.605000  1.070000 0.840000 1.400000 ;
+      RECT 0.605000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.970000  0.785000 2.340000 1.095000 ;
+      RECT 1.970000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 2.005000 ;
+      RECT 2.715000  0.705000 3.095000 1.035000 ;
+      RECT 2.840000  0.365000 3.500000 0.535000 ;
+      RECT 2.900000  2.255000 3.650000 2.425000 ;
+      RECT 2.925000  1.035000 3.095000 1.415000 ;
+      RECT 2.925000  1.415000 3.265000 1.995000 ;
+      RECT 3.330000  0.535000 3.500000 0.995000 ;
+      RECT 3.330000  0.995000 4.200000 1.165000 ;
+      RECT 3.480000  1.165000 4.200000 1.325000 ;
+      RECT 3.480000  1.325000 3.650000 2.255000 ;
+      RECT 3.740000  0.085000 4.070000 0.825000 ;
+      RECT 3.820000  2.135000 4.590000 2.635000 ;
+      RECT 3.840000  1.495000 5.480000 1.665000 ;
+      RECT 3.840000  1.665000 4.930000 1.865000 ;
+      RECT 4.340000  0.415000 4.560000 0.655000 ;
+      RECT 4.340000  0.655000 5.480000 0.825000 ;
+      RECT 4.760000  1.865000 4.930000 2.435000 ;
+      RECT 5.100000  0.085000 5.480000 0.485000 ;
+      RECT 5.100000  1.855000 5.350000 2.635000 ;
+      RECT 5.310000  0.825000 5.480000 0.995000 ;
+      RECT 5.310000  0.995000 5.620000 1.325000 ;
+      RECT 5.310000  1.325000 5.480000 1.495000 ;
+      RECT 6.085000  0.085000 6.355000 0.545000 ;
+      RECT 6.085000  1.830000 6.355000 2.635000 ;
+      RECT 6.525000  0.255000 6.855000 0.995000 ;
+      RECT 6.525000  0.995000 7.375000 1.325000 ;
+      RECT 6.525000  1.325000 6.855000 2.465000 ;
+      RECT 7.025000  0.085000 7.330000 0.545000 ;
+      RECT 7.035000  1.835000 7.330000 2.635000 ;
+      RECT 7.925000  0.085000 8.195000 0.885000 ;
+      RECT 7.925000  1.495000 8.195000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.785000 2.640000 1.955000 ;
-      RECT 2.930000 1.445000 3.100000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.785000 2.640000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.445000 3.100000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.160000 1.600000 ;
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
index f27aee1..bd28beb 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.magic.lef
@@ -82,31 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.735000  0.085000 4.070000 0.530000 ;
-        RECT 5.120000  0.085000 5.890000 0.485000 ;
-        RECT 6.975000  0.085000 7.305000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -116,85 +91,106 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.755000 2.135000 4.590000 2.635000 ;
-        RECT 5.120000 1.935000 5.890000 2.635000 ;
-        RECT 7.010000 1.835000 7.305000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 0.780000 0.805000 ;
-      RECT 0.085000 1.795000 0.780000 1.965000 ;
-      RECT 0.085000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.970000 0.785000 2.340000 1.095000 ;
-      RECT 1.970000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 1.685000 ;
-      RECT 2.600000 0.765000 3.095000 1.035000 ;
-      RECT 2.745000 2.255000 3.585000 2.425000 ;
-      RECT 2.770000 0.365000 3.500000 0.535000 ;
-      RECT 2.925000 1.035000 3.095000 1.575000 ;
-      RECT 2.925000 1.575000 3.265000 1.905000 ;
-      RECT 2.925000 1.905000 3.130000 1.995000 ;
-      RECT 3.270000 2.125000 3.585000 2.255000 ;
-      RECT 3.305000 2.075000 3.585000 2.125000 ;
-      RECT 3.330000 0.535000 3.500000 0.995000 ;
-      RECT 3.330000 0.995000 4.200000 1.165000 ;
-      RECT 3.395000 2.015000 3.605000 2.045000 ;
-      RECT 3.395000 2.045000 3.585000 2.075000 ;
-      RECT 3.415000 1.990000 3.605000 2.015000 ;
-      RECT 3.420000 1.975000 3.605000 1.990000 ;
-      RECT 3.430000 1.960000 3.605000 1.975000 ;
-      RECT 3.435000 1.165000 4.200000 1.325000 ;
-      RECT 3.435000 1.325000 3.605000 1.960000 ;
-      RECT 3.840000 1.535000 5.890000 1.765000 ;
-      RECT 3.840000 1.765000 4.950000 1.865000 ;
-      RECT 4.240000 0.255000 4.540000 0.655000 ;
-      RECT 4.240000 0.655000 5.890000 0.825000 ;
-      RECT 4.780000 1.865000 4.950000 2.435000 ;
-      RECT 5.655000 0.825000 5.890000 1.535000 ;
-      RECT 6.580000 0.255000 6.805000 0.995000 ;
-      RECT 6.580000 0.995000 7.395000 1.325000 ;
-      RECT 6.580000 1.325000 6.830000 2.465000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 0.780000 0.805000 ;
+      RECT 0.085000  1.795000 0.780000 1.965000 ;
+      RECT 0.085000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.970000  0.785000 2.340000 1.095000 ;
+      RECT 1.970000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 1.685000 ;
+      RECT 2.600000  0.765000 3.095000 1.035000 ;
+      RECT 2.745000  2.255000 3.585000 2.425000 ;
+      RECT 2.770000  0.365000 3.500000 0.535000 ;
+      RECT 2.925000  1.035000 3.095000 1.575000 ;
+      RECT 2.925000  1.575000 3.265000 1.905000 ;
+      RECT 2.925000  1.905000 3.130000 1.995000 ;
+      RECT 3.270000  2.125000 3.585000 2.255000 ;
+      RECT 3.305000  2.075000 3.585000 2.125000 ;
+      RECT 3.330000  0.535000 3.500000 0.995000 ;
+      RECT 3.330000  0.995000 4.200000 1.165000 ;
+      RECT 3.395000  2.015000 3.605000 2.045000 ;
+      RECT 3.395000  2.045000 3.585000 2.075000 ;
+      RECT 3.415000  1.990000 3.605000 2.015000 ;
+      RECT 3.420000  1.975000 3.605000 1.990000 ;
+      RECT 3.430000  1.960000 3.605000 1.975000 ;
+      RECT 3.435000  1.165000 4.200000 1.325000 ;
+      RECT 3.435000  1.325000 3.605000 1.960000 ;
+      RECT 3.735000  0.085000 4.070000 0.530000 ;
+      RECT 3.755000  2.135000 4.590000 2.635000 ;
+      RECT 3.840000  1.535000 5.890000 1.765000 ;
+      RECT 3.840000  1.765000 4.950000 1.865000 ;
+      RECT 4.240000  0.255000 4.540000 0.655000 ;
+      RECT 4.240000  0.655000 5.890000 0.825000 ;
+      RECT 4.780000  1.865000 4.950000 2.435000 ;
+      RECT 5.120000  0.085000 5.890000 0.485000 ;
+      RECT 5.120000  1.935000 5.890000 2.635000 ;
+      RECT 5.655000  0.825000 5.890000 1.535000 ;
+      RECT 6.580000  0.255000 6.805000 0.995000 ;
+      RECT 6.580000  0.995000 7.395000 1.325000 ;
+      RECT 6.580000  1.325000 6.830000 2.465000 ;
+      RECT 6.975000  0.085000 7.305000 0.465000 ;
+      RECT 7.010000  1.835000 7.305000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.445000 2.640000 1.615000 ;
-      RECT 2.925000 1.785000 3.095000 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.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.445000 2.640000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.925000  1.785000 3.095000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 2.700000 1.600000 ;
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
index 3ee9031..b9bb5de 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.magic.lef
@@ -90,34 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.740000  0.085000 4.070000 0.530000 ;
-        RECT 5.110000  0.085000 5.490000 0.485000 ;
-        RECT 6.020000  0.085000 6.360000 0.465000 ;
-        RECT 7.035000  0.085000 7.340000 0.545000 ;
-        RECT 7.935000  0.085000 8.195000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -127,90 +99,114 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.755000 2.135000 4.600000 2.635000 ;
-        RECT 5.110000 1.875000 5.490000 2.635000 ;
-        RECT 6.100000 1.830000 6.360000 2.635000 ;
-        RECT 7.045000 1.835000 7.340000 2.635000 ;
-        RECT 7.935000 1.495000 8.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 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 0.780000 0.805000 ;
-      RECT 0.085000 1.795000 0.780000 1.965000 ;
-      RECT 0.085000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.970000 0.785000 2.340000 1.095000 ;
-      RECT 1.970000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 1.685000 ;
-      RECT 2.715000 0.705000 3.095000 1.035000 ;
-      RECT 2.745000 2.255000 3.585000 2.425000 ;
-      RECT 2.770000 0.365000 3.500000 0.535000 ;
-      RECT 2.925000 1.035000 3.095000 1.575000 ;
-      RECT 2.925000 1.575000 3.265000 1.905000 ;
-      RECT 2.925000 1.905000 3.125000 1.995000 ;
-      RECT 3.270000 2.125000 3.585000 2.255000 ;
-      RECT 3.305000 2.075000 3.585000 2.125000 ;
-      RECT 3.330000 0.535000 3.500000 0.995000 ;
-      RECT 3.330000 0.995000 4.200000 1.165000 ;
-      RECT 3.395000 2.015000 3.605000 2.045000 ;
-      RECT 3.395000 2.045000 3.585000 2.075000 ;
-      RECT 3.415000 1.990000 3.605000 2.015000 ;
-      RECT 3.420000 1.975000 3.605000 1.990000 ;
-      RECT 3.430000 1.960000 3.605000 1.975000 ;
-      RECT 3.435000 1.165000 4.200000 1.325000 ;
-      RECT 3.435000 1.325000 3.605000 1.960000 ;
-      RECT 3.840000 1.535000 5.510000 1.705000 ;
-      RECT 3.840000 1.705000 4.940000 1.865000 ;
-      RECT 4.270000 0.415000 4.570000 0.655000 ;
-      RECT 4.270000 0.655000 5.510000 0.825000 ;
-      RECT 4.770000 1.865000 4.940000 2.435000 ;
-      RECT 5.320000 0.825000 5.510000 0.995000 ;
-      RECT 5.320000 0.995000 5.620000 1.325000 ;
-      RECT 5.320000 1.325000 5.510000 1.535000 ;
-      RECT 6.535000 0.255000 6.865000 0.995000 ;
-      RECT 6.535000 0.995000 7.425000 1.325000 ;
-      RECT 6.535000 1.325000 6.870000 2.465000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 0.780000 0.805000 ;
+      RECT 0.085000  1.795000 0.780000 1.965000 ;
+      RECT 0.085000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.970000  0.785000 2.340000 1.095000 ;
+      RECT 1.970000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 1.685000 ;
+      RECT 2.715000  0.705000 3.095000 1.035000 ;
+      RECT 2.745000  2.255000 3.585000 2.425000 ;
+      RECT 2.770000  0.365000 3.500000 0.535000 ;
+      RECT 2.925000  1.035000 3.095000 1.575000 ;
+      RECT 2.925000  1.575000 3.265000 1.905000 ;
+      RECT 2.925000  1.905000 3.125000 1.995000 ;
+      RECT 3.270000  2.125000 3.585000 2.255000 ;
+      RECT 3.305000  2.075000 3.585000 2.125000 ;
+      RECT 3.330000  0.535000 3.500000 0.995000 ;
+      RECT 3.330000  0.995000 4.200000 1.165000 ;
+      RECT 3.395000  2.015000 3.605000 2.045000 ;
+      RECT 3.395000  2.045000 3.585000 2.075000 ;
+      RECT 3.415000  1.990000 3.605000 2.015000 ;
+      RECT 3.420000  1.975000 3.605000 1.990000 ;
+      RECT 3.430000  1.960000 3.605000 1.975000 ;
+      RECT 3.435000  1.165000 4.200000 1.325000 ;
+      RECT 3.435000  1.325000 3.605000 1.960000 ;
+      RECT 3.740000  0.085000 4.070000 0.530000 ;
+      RECT 3.755000  2.135000 4.600000 2.635000 ;
+      RECT 3.840000  1.535000 5.510000 1.705000 ;
+      RECT 3.840000  1.705000 4.940000 1.865000 ;
+      RECT 4.270000  0.415000 4.570000 0.655000 ;
+      RECT 4.270000  0.655000 5.510000 0.825000 ;
+      RECT 4.770000  1.865000 4.940000 2.435000 ;
+      RECT 5.110000  0.085000 5.490000 0.485000 ;
+      RECT 5.110000  1.875000 5.490000 2.635000 ;
+      RECT 5.320000  0.825000 5.510000 0.995000 ;
+      RECT 5.320000  0.995000 5.620000 1.325000 ;
+      RECT 5.320000  1.325000 5.510000 1.535000 ;
+      RECT 6.020000  0.085000 6.360000 0.465000 ;
+      RECT 6.100000  1.830000 6.360000 2.635000 ;
+      RECT 6.535000  0.255000 6.865000 0.995000 ;
+      RECT 6.535000  0.995000 7.425000 1.325000 ;
+      RECT 6.535000  1.325000 6.870000 2.465000 ;
+      RECT 7.035000  0.085000 7.340000 0.545000 ;
+      RECT 7.045000  1.835000 7.340000 2.635000 ;
+      RECT 7.935000  0.085000 8.195000 0.885000 ;
+      RECT 7.935000  1.495000 8.195000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.445000 2.640000 1.615000 ;
-      RECT 2.930000 1.785000 3.100000 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.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.445000 2.640000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.785000 3.100000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 2.700000 1.600000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
index a292df0..32ff393 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.magic.lef
@@ -71,27 +71,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.740000  0.085000 4.070000 0.530000 ;
-        RECT 5.095000  0.085000 5.925000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -101,70 +80,87 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.820000 2.135000 4.110000 2.635000 ;
-        RECT 4.300000 2.135000 4.580000 2.635000 ;
-        RECT 5.110000 2.135000 5.925000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.970000 0.785000 2.340000 1.095000 ;
-      RECT 1.970000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 2.005000 ;
-      RECT 2.715000 0.705000 3.095000 1.035000 ;
-      RECT 2.840000 0.365000 3.500000 0.535000 ;
-      RECT 2.900000 2.255000 3.650000 2.425000 ;
-      RECT 2.925000 1.035000 3.095000 1.415000 ;
-      RECT 2.925000 1.415000 3.265000 1.995000 ;
-      RECT 3.330000 0.535000 3.500000 1.025000 ;
-      RECT 3.330000 1.025000 4.330000 1.245000 ;
-      RECT 3.480000 1.245000 4.330000 1.325000 ;
-      RECT 3.480000 1.325000 3.650000 2.255000 ;
-      RECT 3.820000 1.535000 5.925000 1.865000 ;
-      RECT 4.240000 0.255000 4.590000 0.655000 ;
-      RECT 4.240000 0.655000 5.925000 0.825000 ;
-      RECT 4.750000 1.865000 4.940000 2.465000 ;
-      RECT 5.605000 0.825000 5.925000 1.535000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.970000  0.785000 2.340000 1.095000 ;
+      RECT 1.970000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 2.005000 ;
+      RECT 2.715000  0.705000 3.095000 1.035000 ;
+      RECT 2.840000  0.365000 3.500000 0.535000 ;
+      RECT 2.900000  2.255000 3.650000 2.425000 ;
+      RECT 2.925000  1.035000 3.095000 1.415000 ;
+      RECT 2.925000  1.415000 3.265000 1.995000 ;
+      RECT 3.330000  0.535000 3.500000 1.025000 ;
+      RECT 3.330000  1.025000 4.330000 1.245000 ;
+      RECT 3.480000  1.245000 4.330000 1.325000 ;
+      RECT 3.480000  1.325000 3.650000 2.255000 ;
+      RECT 3.740000  0.085000 4.070000 0.530000 ;
+      RECT 3.820000  1.535000 5.925000 1.865000 ;
+      RECT 3.820000  2.135000 4.110000 2.635000 ;
+      RECT 4.240000  0.255000 4.590000 0.655000 ;
+      RECT 4.240000  0.655000 5.925000 0.825000 ;
+      RECT 4.300000  2.135000 4.580000 2.635000 ;
+      RECT 4.750000  1.865000 4.940000 2.465000 ;
+      RECT 5.095000  0.085000 5.925000 0.485000 ;
+      RECT 5.110000  2.135000 5.925000 2.635000 ;
+      RECT 5.605000  0.825000 5.925000 1.535000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.785000 2.640000 1.955000 ;
-      RECT 2.930000 1.445000 3.100000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.785000 2.640000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.445000 3.100000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.160000 1.600000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
index bc05727..d52215d 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.magic.lef
@@ -81,28 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.735000  0.085000 4.070000 0.530000 ;
-        RECT 5.095000  0.085000 5.425000 0.485000 ;
-        RECT 6.095000  0.085000 6.355000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -112,74 +90,92 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.800000 2.135000 4.110000 2.635000 ;
-        RECT 4.280000 2.135000 4.560000 2.635000 ;
-        RECT 5.090000 1.875000 5.460000 2.635000 ;
-        RECT 6.095000 1.670000 6.355000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.960000 0.785000 2.340000 1.095000 ;
-      RECT 1.960000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 2.005000 ;
-      RECT 2.675000 0.705000 3.095000 1.145000 ;
-      RECT 2.775000 2.255000 3.605000 2.425000 ;
-      RECT 2.810000 0.365000 3.500000 0.535000 ;
-      RECT 2.925000 1.145000 3.095000 1.415000 ;
-      RECT 2.925000 1.415000 3.265000 1.995000 ;
-      RECT 3.330000 0.535000 3.500000 1.025000 ;
-      RECT 3.330000 1.025000 4.310000 1.245000 ;
-      RECT 3.435000 1.245000 4.310000 1.325000 ;
-      RECT 3.435000 1.325000 3.605000 2.255000 ;
-      RECT 3.820000 1.535000 5.585000 1.705000 ;
-      RECT 3.820000 1.705000 4.920000 1.865000 ;
-      RECT 4.240000 0.255000 4.590000 0.655000 ;
-      RECT 4.240000 0.655000 5.585000 0.825000 ;
-      RECT 4.730000 1.865000 4.920000 2.465000 ;
-      RECT 5.350000 0.995000 5.615000 1.325000 ;
-      RECT 5.415000 0.825000 5.585000 0.995000 ;
-      RECT 5.415000 1.325000 5.585000 1.535000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.960000  0.785000 2.340000 1.095000 ;
+      RECT 1.960000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 2.005000 ;
+      RECT 2.675000  0.705000 3.095000 1.145000 ;
+      RECT 2.775000  2.255000 3.605000 2.425000 ;
+      RECT 2.810000  0.365000 3.500000 0.535000 ;
+      RECT 2.925000  1.145000 3.095000 1.415000 ;
+      RECT 2.925000  1.415000 3.265000 1.995000 ;
+      RECT 3.330000  0.535000 3.500000 1.025000 ;
+      RECT 3.330000  1.025000 4.310000 1.245000 ;
+      RECT 3.435000  1.245000 4.310000 1.325000 ;
+      RECT 3.435000  1.325000 3.605000 2.255000 ;
+      RECT 3.735000  0.085000 4.070000 0.530000 ;
+      RECT 3.800000  2.135000 4.110000 2.635000 ;
+      RECT 3.820000  1.535000 5.585000 1.705000 ;
+      RECT 3.820000  1.705000 4.920000 1.865000 ;
+      RECT 4.240000  0.255000 4.590000 0.655000 ;
+      RECT 4.240000  0.655000 5.585000 0.825000 ;
+      RECT 4.280000  2.135000 4.560000 2.635000 ;
+      RECT 4.730000  1.865000 4.920000 2.465000 ;
+      RECT 5.090000  1.875000 5.460000 2.635000 ;
+      RECT 5.095000  0.085000 5.425000 0.485000 ;
+      RECT 5.350000  0.995000 5.615000 1.325000 ;
+      RECT 5.415000  0.825000 5.585000 0.995000 ;
+      RECT 5.415000  1.325000 5.585000 1.535000 ;
+      RECT 6.095000  0.085000 6.355000 0.595000 ;
+      RECT 6.095000  1.670000 6.355000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.785000 2.640000 1.955000 ;
-      RECT 2.930000 1.445000 3.100000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.785000 2.640000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.445000 3.100000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.160000 1.600000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
index 2f27e1b..198ad3b 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.magic.lef
@@ -77,31 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.880000  0.085000 2.210000 0.445000 ;
-        RECT 3.745000  0.085000 4.075000 0.530000 ;
-        RECT 5.100000  0.085000 5.440000 0.485000 ;
-        RECT 6.135000  0.085000 6.405000 0.595000 ;
-        RECT 6.945000  0.085000 7.275000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -137,49 +112,74 @@
         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 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.460000 1.495000 2.145000 1.665000 ;
-      RECT 1.460000 1.665000 1.790000 2.415000 ;
-      RECT 1.540000 0.345000 1.710000 0.615000 ;
-      RECT 1.540000 0.615000 2.145000 0.765000 ;
-      RECT 1.540000 0.765000 2.345000 0.785000 ;
-      RECT 1.975000 0.785000 2.345000 1.095000 ;
-      RECT 1.975000 1.095000 2.145000 1.495000 ;
-      RECT 2.475000 1.355000 2.760000 2.005000 ;
-      RECT 2.720000 0.705000 3.100000 1.035000 ;
-      RECT 2.845000 0.365000 3.505000 0.535000 ;
-      RECT 2.905000 2.255000 3.655000 2.425000 ;
-      RECT 2.930000 1.035000 3.100000 1.415000 ;
-      RECT 2.930000 1.415000 3.270000 1.995000 ;
-      RECT 3.335000 0.535000 3.505000 1.025000 ;
-      RECT 3.335000 1.025000 4.315000 1.245000 ;
-      RECT 3.485000 1.245000 4.315000 1.325000 ;
-      RECT 3.485000 1.325000 3.655000 2.255000 ;
-      RECT 3.825000 1.535000 5.625000 1.705000 ;
-      RECT 3.825000 1.705000 4.945000 1.865000 ;
-      RECT 4.245000 0.255000 4.595000 0.655000 ;
-      RECT 4.245000 0.655000 5.625000 0.825000 ;
-      RECT 4.755000 1.865000 4.945000 2.465000 ;
-      RECT 5.455000 0.825000 5.625000 1.535000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.460000  1.495000 2.145000 1.665000 ;
+      RECT 1.460000  1.665000 1.790000 2.415000 ;
+      RECT 1.540000  0.345000 1.710000 0.615000 ;
+      RECT 1.540000  0.615000 2.145000 0.765000 ;
+      RECT 1.540000  0.765000 2.345000 0.785000 ;
+      RECT 1.880000  0.085000 2.210000 0.445000 ;
+      RECT 1.975000  0.785000 2.345000 1.095000 ;
+      RECT 1.975000  1.095000 2.145000 1.495000 ;
+      RECT 2.475000  1.355000 2.760000 2.005000 ;
+      RECT 2.720000  0.705000 3.100000 1.035000 ;
+      RECT 2.845000  0.365000 3.505000 0.535000 ;
+      RECT 2.905000  2.255000 3.655000 2.425000 ;
+      RECT 2.930000  1.035000 3.100000 1.415000 ;
+      RECT 2.930000  1.415000 3.270000 1.995000 ;
+      RECT 3.335000  0.535000 3.505000 1.025000 ;
+      RECT 3.335000  1.025000 4.315000 1.245000 ;
+      RECT 3.485000  1.245000 4.315000 1.325000 ;
+      RECT 3.485000  1.325000 3.655000 2.255000 ;
+      RECT 3.745000  0.085000 4.075000 0.530000 ;
+      RECT 3.825000  1.535000 5.625000 1.705000 ;
+      RECT 3.825000  1.705000 4.945000 1.865000 ;
+      RECT 4.245000  0.255000 4.595000 0.655000 ;
+      RECT 4.245000  0.655000 5.625000 0.825000 ;
+      RECT 4.755000  1.865000 4.945000 2.465000 ;
+      RECT 5.100000  0.085000 5.440000 0.485000 ;
+      RECT 5.455000  0.825000 5.625000 1.535000 ;
+      RECT 6.135000  0.085000 6.405000 0.595000 ;
+      RECT 6.945000  0.085000 7.275000 0.595000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.475000 1.785000 2.645000 1.955000 ;
-      RECT 2.935000 1.445000 3.105000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.070000  1.785000 1.240000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.475000  1.785000 2.645000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.935000  1.445000 3.105000 1.615000 ;
+      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.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.165000 1.600000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
index 8537bbb..9424bda 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.magic.lef
@@ -74,26 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.755000  0.085000 4.025000 0.610000 ;
-        RECT 5.155000  0.085000 5.440000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -103,73 +83,89 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.245000 2.635000 ;
-        RECT 3.930000 2.135000 4.445000 2.635000 ;
-        RECT 5.135000 1.915000 5.465000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.795000 0.775000 1.965000 ;
-      RECT 0.085000 1.965000 0.345000 2.465000 ;
-      RECT 0.170000 0.345000 0.345000 0.635000 ;
-      RECT 0.170000 0.635000 0.775000 0.805000 ;
-      RECT 0.605000 0.805000 0.775000 1.070000 ;
-      RECT 0.605000 1.070000 0.835000 1.400000 ;
-      RECT 0.605000 1.400000 0.775000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.235000 2.465000 ;
-      RECT 1.430000 1.495000 2.115000 1.665000 ;
-      RECT 1.430000 1.665000 1.785000 2.415000 ;
-      RECT 1.510000 0.345000 1.705000 0.615000 ;
-      RECT 1.510000 0.615000 2.115000 0.765000 ;
-      RECT 1.510000 0.765000 2.335000 0.785000 ;
-      RECT 1.945000 0.785000 2.335000 1.095000 ;
-      RECT 1.945000 1.095000 2.115000 1.495000 ;
-      RECT 2.445000 1.355000 2.835000 1.625000 ;
-      RECT 2.445000 1.625000 2.760000 1.685000 ;
-      RECT 2.690000 0.765000 3.245000 1.095000 ;
-      RECT 2.810000 2.255000 3.625000 2.425000 ;
-      RECT 2.815000 0.365000 3.585000 0.535000 ;
-      RECT 2.900000 1.785000 3.265000 1.995000 ;
-      RECT 3.005000 1.095000 3.245000 1.635000 ;
-      RECT 3.005000 1.635000 3.265000 1.785000 ;
-      RECT 3.415000 0.535000 3.585000 0.995000 ;
-      RECT 3.415000 0.995000 4.175000 1.165000 ;
-      RECT 3.455000 1.165000 4.175000 1.325000 ;
-      RECT 3.455000 1.325000 3.625000 2.255000 ;
-      RECT 3.815000 1.535000 5.465000 1.735000 ;
-      RECT 3.815000 1.735000 4.965000 1.865000 ;
-      RECT 4.195000 0.295000 4.575000 0.805000 ;
-      RECT 4.345000 0.805000 4.575000 1.505000 ;
-      RECT 4.345000 1.505000 5.465000 1.535000 ;
-      RECT 4.625000 1.865000 4.965000 2.435000 ;
-      RECT 5.245000 0.995000 5.555000 1.325000 ;
-      RECT 5.245000 1.325000 5.465000 1.505000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  1.795000 0.775000 1.965000 ;
+      RECT 0.085000  1.965000 0.345000 2.465000 ;
+      RECT 0.170000  0.345000 0.345000 0.635000 ;
+      RECT 0.170000  0.635000 0.775000 0.805000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.605000  0.805000 0.775000 1.070000 ;
+      RECT 0.605000  1.070000 0.835000 1.400000 ;
+      RECT 0.605000  1.400000 0.775000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.235000 2.465000 ;
+      RECT 1.430000  1.495000 2.115000 1.665000 ;
+      RECT 1.430000  1.665000 1.785000 2.415000 ;
+      RECT 1.510000  0.345000 1.705000 0.615000 ;
+      RECT 1.510000  0.615000 2.115000 0.765000 ;
+      RECT 1.510000  0.765000 2.335000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.945000  0.785000 2.335000 1.095000 ;
+      RECT 1.945000  1.095000 2.115000 1.495000 ;
+      RECT 1.955000  1.835000 2.245000 2.635000 ;
+      RECT 2.445000  1.355000 2.835000 1.625000 ;
+      RECT 2.445000  1.625000 2.760000 1.685000 ;
+      RECT 2.690000  0.765000 3.245000 1.095000 ;
+      RECT 2.810000  2.255000 3.625000 2.425000 ;
+      RECT 2.815000  0.365000 3.585000 0.535000 ;
+      RECT 2.900000  1.785000 3.265000 1.995000 ;
+      RECT 3.005000  1.095000 3.245000 1.635000 ;
+      RECT 3.005000  1.635000 3.265000 1.785000 ;
+      RECT 3.415000  0.535000 3.585000 0.995000 ;
+      RECT 3.415000  0.995000 4.175000 1.165000 ;
+      RECT 3.455000  1.165000 4.175000 1.325000 ;
+      RECT 3.455000  1.325000 3.625000 2.255000 ;
+      RECT 3.755000  0.085000 4.025000 0.610000 ;
+      RECT 3.815000  1.535000 5.465000 1.735000 ;
+      RECT 3.815000  1.735000 4.965000 1.865000 ;
+      RECT 3.930000  2.135000 4.445000 2.635000 ;
+      RECT 4.195000  0.295000 4.575000 0.805000 ;
+      RECT 4.345000  0.805000 4.575000 1.505000 ;
+      RECT 4.345000  1.505000 5.465000 1.535000 ;
+      RECT 4.625000  1.865000 4.965000 2.435000 ;
+      RECT 5.135000  1.915000 5.465000 2.635000 ;
+      RECT 5.155000  0.085000 5.440000 0.715000 ;
+      RECT 5.245000  0.995000 5.555000 1.325000 ;
+      RECT 5.245000  1.325000 5.465000 1.505000 ;
     LAYER mcon ;
-      RECT 0.605000 1.445000 0.775000 1.615000 ;
-      RECT 1.065000 1.785000 1.235000 1.955000 ;
-      RECT 2.445000 1.445000 2.615000 1.615000 ;
-      RECT 2.925000 1.785000 3.095000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  1.445000 0.775000 1.615000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  1.785000 1.235000 1.955000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  1.445000 2.615000 1.615000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.925000  1.785000 3.095000 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 ;
     LAYER met1 ;
       RECT 0.545000 1.415000 0.835000 1.460000 ;
       RECT 0.545000 1.460000 2.675000 1.600000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
index 8a2ec5a..eca12e4 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.magic.lef
@@ -82,28 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.720000  0.085000 4.060000 0.530000 ;
-        RECT 5.255000  0.085000 5.425000 0.525000 ;
-        RECT 6.095000  0.085000 6.355000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -113,81 +91,99 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.250000 2.635000 ;
-        RECT 3.750000 2.175000 4.090000 2.635000 ;
-        RECT 4.280000 2.135000 4.560000 2.635000 ;
-        RECT 5.140000 1.875000 5.485000 2.635000 ;
-        RECT 6.095000 1.670000 6.355000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.435000 1.495000 2.120000 1.665000 ;
-      RECT 1.435000 1.665000 1.785000 2.415000 ;
-      RECT 1.515000 0.345000 1.705000 0.615000 ;
-      RECT 1.515000 0.615000 2.120000 0.765000 ;
-      RECT 1.515000 0.765000 2.335000 0.785000 ;
-      RECT 1.950000 0.785000 2.335000 1.095000 ;
-      RECT 1.950000 1.095000 2.120000 1.495000 ;
-      RECT 2.450000 1.355000 2.755000 1.685000 ;
-      RECT 2.585000 0.735000 3.100000 1.040000 ;
-      RECT 2.770000 0.365000 3.445000 0.535000 ;
-      RECT 2.770000 2.255000 3.580000 2.425000 ;
-      RECT 2.905000 1.780000 3.265000 1.910000 ;
-      RECT 2.905000 1.910000 3.175000 1.995000 ;
-      RECT 2.930000 1.040000 3.100000 1.570000 ;
-      RECT 2.930000 1.570000 3.265000 1.780000 ;
-      RECT 3.270000 0.535000 3.445000 0.995000 ;
-      RECT 3.270000 0.995000 4.220000 1.325000 ;
-      RECT 3.410000 2.000000 3.605000 2.085000 ;
-      RECT 3.410000 2.085000 3.580000 2.255000 ;
-      RECT 3.415000 1.995000 3.605000 2.000000 ;
-      RECT 3.420000 1.985000 3.605000 1.995000 ;
-      RECT 3.435000 1.325000 3.605000 1.985000 ;
-      RECT 3.775000 1.535000 5.585000 1.705000 ;
-      RECT 3.775000 1.705000 4.970000 1.865000 ;
-      RECT 4.240000 0.255000 4.580000 0.655000 ;
-      RECT 4.240000 0.655000 5.095000 0.695000 ;
-      RECT 4.240000 0.695000 5.585000 0.825000 ;
-      RECT 4.800000 1.865000 4.970000 2.465000 ;
-      RECT 4.955000 0.825000 5.585000 0.865000 ;
-      RECT 5.415000 0.865000 5.585000 0.995000 ;
-      RECT 5.415000 0.995000 5.615000 1.325000 ;
-      RECT 5.415000 1.325000 5.585000 1.535000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.435000  1.495000 2.120000 1.665000 ;
+      RECT 1.435000  1.665000 1.785000 2.415000 ;
+      RECT 1.515000  0.345000 1.705000 0.615000 ;
+      RECT 1.515000  0.615000 2.120000 0.765000 ;
+      RECT 1.515000  0.765000 2.335000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.950000  0.785000 2.335000 1.095000 ;
+      RECT 1.950000  1.095000 2.120000 1.495000 ;
+      RECT 1.955000  1.835000 2.250000 2.635000 ;
+      RECT 2.450000  1.355000 2.755000 1.685000 ;
+      RECT 2.585000  0.735000 3.100000 1.040000 ;
+      RECT 2.770000  0.365000 3.445000 0.535000 ;
+      RECT 2.770000  2.255000 3.580000 2.425000 ;
+      RECT 2.905000  1.780000 3.265000 1.910000 ;
+      RECT 2.905000  1.910000 3.175000 1.995000 ;
+      RECT 2.930000  1.040000 3.100000 1.570000 ;
+      RECT 2.930000  1.570000 3.265000 1.780000 ;
+      RECT 3.270000  0.535000 3.445000 0.995000 ;
+      RECT 3.270000  0.995000 4.220000 1.325000 ;
+      RECT 3.410000  2.000000 3.605000 2.085000 ;
+      RECT 3.410000  2.085000 3.580000 2.255000 ;
+      RECT 3.415000  1.995000 3.605000 2.000000 ;
+      RECT 3.420000  1.985000 3.605000 1.995000 ;
+      RECT 3.435000  1.325000 3.605000 1.985000 ;
+      RECT 3.720000  0.085000 4.060000 0.530000 ;
+      RECT 3.750000  2.175000 4.090000 2.635000 ;
+      RECT 3.775000  1.535000 5.585000 1.705000 ;
+      RECT 3.775000  1.705000 4.970000 1.865000 ;
+      RECT 4.240000  0.255000 4.580000 0.655000 ;
+      RECT 4.240000  0.655000 5.095000 0.695000 ;
+      RECT 4.240000  0.695000 5.585000 0.825000 ;
+      RECT 4.280000  2.135000 4.560000 2.635000 ;
+      RECT 4.800000  1.865000 4.970000 2.465000 ;
+      RECT 4.955000  0.825000 5.585000 0.865000 ;
+      RECT 5.140000  1.875000 5.485000 2.635000 ;
+      RECT 5.255000  0.085000 5.425000 0.525000 ;
+      RECT 5.415000  0.865000 5.585000 0.995000 ;
+      RECT 5.415000  0.995000 5.615000 1.325000 ;
+      RECT 5.415000  1.325000 5.585000 1.535000 ;
+      RECT 6.095000  0.085000 6.355000 0.595000 ;
+      RECT 6.095000  1.670000 6.355000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.450000 1.445000 2.620000 1.615000 ;
-      RECT 2.925000 1.785000 3.095000 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.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.450000  1.445000 2.620000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.925000  1.785000 3.095000 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.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 2.680000 1.600000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
index f69d4c0..610a2cc 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.magic.lef
@@ -77,31 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.880000  0.085000 2.210000 0.445000 ;
-        RECT 3.745000  0.085000 4.075000 0.530000 ;
-        RECT 5.100000  0.085000 5.440000 0.485000 ;
-        RECT 6.135000  0.085000 6.405000 0.595000 ;
-        RECT 6.945000  0.085000 7.275000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -137,49 +112,74 @@
         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 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.460000 1.495000 2.145000 1.665000 ;
-      RECT 1.460000 1.665000 1.790000 2.415000 ;
-      RECT 1.540000 0.345000 1.710000 0.615000 ;
-      RECT 1.540000 0.615000 2.145000 0.765000 ;
-      RECT 1.540000 0.765000 2.345000 0.785000 ;
-      RECT 1.975000 0.785000 2.345000 1.095000 ;
-      RECT 1.975000 1.095000 2.145000 1.495000 ;
-      RECT 2.475000 1.355000 2.760000 1.685000 ;
-      RECT 2.720000 0.705000 3.100000 1.035000 ;
-      RECT 2.845000 0.365000 3.505000 0.535000 ;
-      RECT 2.905000 2.255000 3.655000 2.425000 ;
-      RECT 2.930000 1.035000 3.100000 1.575000 ;
-      RECT 2.930000 1.575000 3.270000 1.995000 ;
-      RECT 3.335000 0.535000 3.505000 0.995000 ;
-      RECT 3.335000 0.995000 4.235000 1.165000 ;
-      RECT 3.485000 1.165000 4.235000 1.325000 ;
-      RECT 3.485000 1.325000 3.655000 2.255000 ;
-      RECT 3.825000 1.535000 5.625000 1.705000 ;
-      RECT 3.825000 1.705000 4.945000 1.865000 ;
-      RECT 4.265000 0.255000 4.595000 0.655000 ;
-      RECT 4.265000 0.655000 5.625000 0.825000 ;
-      RECT 4.755000 1.865000 4.945000 2.465000 ;
-      RECT 5.455000 0.825000 5.625000 1.535000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.460000  1.495000 2.145000 1.665000 ;
+      RECT 1.460000  1.665000 1.790000 2.415000 ;
+      RECT 1.540000  0.345000 1.710000 0.615000 ;
+      RECT 1.540000  0.615000 2.145000 0.765000 ;
+      RECT 1.540000  0.765000 2.345000 0.785000 ;
+      RECT 1.880000  0.085000 2.210000 0.445000 ;
+      RECT 1.975000  0.785000 2.345000 1.095000 ;
+      RECT 1.975000  1.095000 2.145000 1.495000 ;
+      RECT 2.475000  1.355000 2.760000 1.685000 ;
+      RECT 2.720000  0.705000 3.100000 1.035000 ;
+      RECT 2.845000  0.365000 3.505000 0.535000 ;
+      RECT 2.905000  2.255000 3.655000 2.425000 ;
+      RECT 2.930000  1.035000 3.100000 1.575000 ;
+      RECT 2.930000  1.575000 3.270000 1.995000 ;
+      RECT 3.335000  0.535000 3.505000 0.995000 ;
+      RECT 3.335000  0.995000 4.235000 1.165000 ;
+      RECT 3.485000  1.165000 4.235000 1.325000 ;
+      RECT 3.485000  1.325000 3.655000 2.255000 ;
+      RECT 3.745000  0.085000 4.075000 0.530000 ;
+      RECT 3.825000  1.535000 5.625000 1.705000 ;
+      RECT 3.825000  1.705000 4.945000 1.865000 ;
+      RECT 4.265000  0.255000 4.595000 0.655000 ;
+      RECT 4.265000  0.655000 5.625000 0.825000 ;
+      RECT 4.755000  1.865000 4.945000 2.465000 ;
+      RECT 5.100000  0.085000 5.440000 0.485000 ;
+      RECT 5.455000  0.825000 5.625000 1.535000 ;
+      RECT 6.135000  0.085000 6.405000 0.595000 ;
+      RECT 6.945000  0.085000 7.275000 0.595000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.475000 1.445000 2.645000 1.615000 ;
-      RECT 2.935000 1.785000 3.105000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.070000  1.785000 1.240000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.475000  1.445000 2.645000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.935000  1.785000 3.105000 1.955000 ;
+      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.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 2.705000 1.600000 ;
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
index dadd878..7bcfbc6 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.magic.lef
@@ -75,29 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.230000 0.445000 ;
-        RECT 3.765000  0.085000 4.095000 0.610000 ;
-        RECT 4.640000  0.085000 4.970000 0.495000 ;
-        RECT 6.090000  0.085000 6.385000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -107,84 +84,103 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.980000 1.835000 2.295000 2.635000 ;
-        RECT 3.780000 2.175000 3.950000 2.635000 ;
-        RECT 4.720000 1.830000 4.970000 2.635000 ;
-        RECT 6.090000 1.835000 6.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 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.480000 1.495000 2.165000 1.665000 ;
-      RECT 1.480000 1.665000 1.810000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.165000 0.785000 ;
-      RECT 1.995000 0.785000 2.165000 0.905000 ;
-      RECT 1.995000 0.905000 2.365000 1.235000 ;
-      RECT 1.995000 1.235000 2.165000 1.495000 ;
-      RECT 2.495000 1.355000 2.780000 2.005000 ;
-      RECT 2.565000 0.705000 3.120000 1.035000 ;
-      RECT 2.790000 0.365000 3.525000 0.535000 ;
-      RECT 2.920000 2.105000 3.620000 2.115000 ;
-      RECT 2.920000 2.115000 3.615000 2.130000 ;
-      RECT 2.920000 2.130000 3.610000 2.275000 ;
-      RECT 2.950000 1.035000 3.120000 1.415000 ;
-      RECT 2.950000 1.415000 3.290000 1.910000 ;
-      RECT 3.355000 0.535000 3.525000 0.995000 ;
-      RECT 3.355000 0.995000 4.225000 1.165000 ;
-      RECT 3.360000 2.075000 3.630000 2.090000 ;
-      RECT 3.360000 2.090000 3.625000 2.105000 ;
-      RECT 3.375000 2.060000 3.630000 2.075000 ;
-      RECT 3.420000 2.030000 3.630000 2.060000 ;
-      RECT 3.430000 2.015000 3.630000 2.030000 ;
-      RECT 3.460000 1.165000 4.225000 1.325000 ;
-      RECT 3.460000 1.325000 3.630000 2.015000 ;
-      RECT 3.800000 1.535000 4.580000 1.620000 ;
-      RECT 3.800000 1.620000 4.550000 1.865000 ;
-      RECT 4.300000 0.415000 4.470000 0.660000 ;
-      RECT 4.300000 0.660000 4.580000 0.840000 ;
-      RECT 4.300000 1.865000 4.550000 2.435000 ;
-      RECT 4.395000 0.840000 4.580000 0.995000 ;
-      RECT 4.395000 0.995000 5.140000 1.325000 ;
-      RECT 4.395000 1.325000 4.580000 1.535000 ;
-      RECT 5.660000 0.255000 5.910000 0.995000 ;
-      RECT 5.660000 0.995000 6.455000 1.325000 ;
-      RECT 5.660000 1.325000 5.910000 2.465000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.480000  1.495000 2.165000 1.665000 ;
+      RECT 1.480000  1.665000 1.810000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.165000 0.785000 ;
+      RECT 1.875000  0.085000 2.230000 0.445000 ;
+      RECT 1.980000  1.835000 2.295000 2.635000 ;
+      RECT 1.995000  0.785000 2.165000 0.905000 ;
+      RECT 1.995000  0.905000 2.365000 1.235000 ;
+      RECT 1.995000  1.235000 2.165000 1.495000 ;
+      RECT 2.495000  1.355000 2.780000 2.005000 ;
+      RECT 2.565000  0.705000 3.120000 1.035000 ;
+      RECT 2.790000  0.365000 3.525000 0.535000 ;
+      RECT 2.920000  2.105000 3.620000 2.115000 ;
+      RECT 2.920000  2.115000 3.615000 2.130000 ;
+      RECT 2.920000  2.130000 3.610000 2.275000 ;
+      RECT 2.950000  1.035000 3.120000 1.415000 ;
+      RECT 2.950000  1.415000 3.290000 1.910000 ;
+      RECT 3.355000  0.535000 3.525000 0.995000 ;
+      RECT 3.355000  0.995000 4.225000 1.165000 ;
+      RECT 3.360000  2.075000 3.630000 2.090000 ;
+      RECT 3.360000  2.090000 3.625000 2.105000 ;
+      RECT 3.375000  2.060000 3.630000 2.075000 ;
+      RECT 3.420000  2.030000 3.630000 2.060000 ;
+      RECT 3.430000  2.015000 3.630000 2.030000 ;
+      RECT 3.460000  1.165000 4.225000 1.325000 ;
+      RECT 3.460000  1.325000 3.630000 2.015000 ;
+      RECT 3.765000  0.085000 4.095000 0.610000 ;
+      RECT 3.780000  2.175000 3.950000 2.635000 ;
+      RECT 3.800000  1.535000 4.580000 1.620000 ;
+      RECT 3.800000  1.620000 4.550000 1.865000 ;
+      RECT 4.300000  0.415000 4.470000 0.660000 ;
+      RECT 4.300000  0.660000 4.580000 0.840000 ;
+      RECT 4.300000  1.865000 4.550000 2.435000 ;
+      RECT 4.395000  0.840000 4.580000 0.995000 ;
+      RECT 4.395000  0.995000 5.140000 1.325000 ;
+      RECT 4.395000  1.325000 4.580000 1.535000 ;
+      RECT 4.640000  0.085000 4.970000 0.495000 ;
+      RECT 4.720000  1.830000 4.970000 2.635000 ;
+      RECT 5.660000  0.255000 5.910000 0.995000 ;
+      RECT 5.660000  0.995000 6.455000 1.325000 ;
+      RECT 5.660000  1.325000 5.910000 2.465000 ;
+      RECT 6.090000  0.085000 6.385000 0.545000 ;
+      RECT 6.090000  1.835000 6.385000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.495000 1.785000 2.665000 1.955000 ;
-      RECT 2.955000 1.445000 3.125000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.495000  1.785000 2.665000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.955000  1.445000 3.125000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.185000 1.600000 ;
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
index f1d3bf7..abf66bb 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.magic.lef
@@ -81,33 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.895000  0.085000 2.225000 0.445000 ;
-        RECT 3.760000  0.085000 4.090000 0.825000 ;
-        RECT 4.760000  0.085000 5.045000 0.825000 ;
-        RECT 5.635000  0.085000 5.905000 0.545000 ;
-        RECT 6.585000  0.085000 6.880000 0.545000 ;
-        RECT 7.475000  0.085000 7.735000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -117,79 +90,102 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.975000 1.835000 2.290000 2.635000 ;
-        RECT 3.840000 2.135000 4.140000 2.635000 ;
-        RECT 4.760000 1.495000 5.045000 2.635000 ;
-        RECT 5.635000 1.835000 5.905000 2.635000 ;
-        RECT 6.585000 1.835000 6.880000 2.635000 ;
-        RECT 7.475000 1.495000 7.735000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.475000 1.495000 2.160000 1.665000 ;
-      RECT 1.475000 1.665000 1.805000 2.415000 ;
-      RECT 1.555000 0.345000 1.725000 0.615000 ;
-      RECT 1.555000 0.615000 2.160000 0.765000 ;
-      RECT 1.555000 0.765000 2.360000 0.785000 ;
-      RECT 1.990000 0.785000 2.360000 1.095000 ;
-      RECT 1.990000 1.095000 2.160000 1.495000 ;
-      RECT 2.490000 1.355000 2.775000 2.005000 ;
-      RECT 2.735000 0.705000 3.115000 1.035000 ;
-      RECT 2.860000 0.365000 3.520000 0.535000 ;
-      RECT 2.920000 2.255000 3.670000 2.425000 ;
-      RECT 2.945000 1.035000 3.115000 1.415000 ;
-      RECT 2.945000 1.415000 3.285000 1.995000 ;
-      RECT 3.350000 0.535000 3.520000 0.995000 ;
-      RECT 3.350000 0.995000 4.220000 1.165000 ;
-      RECT 3.500000 1.165000 4.220000 1.325000 ;
-      RECT 3.500000 1.325000 3.670000 2.255000 ;
-      RECT 3.860000 1.535000 4.580000 1.865000 ;
-      RECT 4.360000 0.415000 4.580000 0.825000 ;
-      RECT 4.360000 1.865000 4.580000 2.435000 ;
-      RECT 4.410000 0.825000 4.580000 0.995000 ;
-      RECT 4.410000 0.995000 5.160000 1.325000 ;
-      RECT 4.410000 1.325000 4.580000 1.535000 ;
-      RECT 6.075000 0.255000 6.405000 0.995000 ;
-      RECT 6.075000 0.995000 6.925000 1.325000 ;
-      RECT 6.075000 1.325000 6.405000 2.465000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.475000  1.495000 2.160000 1.665000 ;
+      RECT 1.475000  1.665000 1.805000 2.415000 ;
+      RECT 1.555000  0.345000 1.725000 0.615000 ;
+      RECT 1.555000  0.615000 2.160000 0.765000 ;
+      RECT 1.555000  0.765000 2.360000 0.785000 ;
+      RECT 1.895000  0.085000 2.225000 0.445000 ;
+      RECT 1.975000  1.835000 2.290000 2.635000 ;
+      RECT 1.990000  0.785000 2.360000 1.095000 ;
+      RECT 1.990000  1.095000 2.160000 1.495000 ;
+      RECT 2.490000  1.355000 2.775000 2.005000 ;
+      RECT 2.735000  0.705000 3.115000 1.035000 ;
+      RECT 2.860000  0.365000 3.520000 0.535000 ;
+      RECT 2.920000  2.255000 3.670000 2.425000 ;
+      RECT 2.945000  1.035000 3.115000 1.415000 ;
+      RECT 2.945000  1.415000 3.285000 1.995000 ;
+      RECT 3.350000  0.535000 3.520000 0.995000 ;
+      RECT 3.350000  0.995000 4.220000 1.165000 ;
+      RECT 3.500000  1.165000 4.220000 1.325000 ;
+      RECT 3.500000  1.325000 3.670000 2.255000 ;
+      RECT 3.760000  0.085000 4.090000 0.825000 ;
+      RECT 3.840000  2.135000 4.140000 2.635000 ;
+      RECT 3.860000  1.535000 4.580000 1.865000 ;
+      RECT 4.360000  0.415000 4.580000 0.825000 ;
+      RECT 4.360000  1.865000 4.580000 2.435000 ;
+      RECT 4.410000  0.825000 4.580000 0.995000 ;
+      RECT 4.410000  0.995000 5.160000 1.325000 ;
+      RECT 4.410000  1.325000 4.580000 1.535000 ;
+      RECT 4.760000  0.085000 5.045000 0.825000 ;
+      RECT 4.760000  1.495000 5.045000 2.635000 ;
+      RECT 5.635000  0.085000 5.905000 0.545000 ;
+      RECT 5.635000  1.835000 5.905000 2.635000 ;
+      RECT 6.075000  0.255000 6.405000 0.995000 ;
+      RECT 6.075000  0.995000 6.925000 1.325000 ;
+      RECT 6.075000  1.325000 6.405000 2.465000 ;
+      RECT 6.585000  0.085000 6.880000 0.545000 ;
+      RECT 6.585000  1.835000 6.880000 2.635000 ;
+      RECT 7.475000  0.085000 7.735000 0.885000 ;
+      RECT 7.475000  1.495000 7.735000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.490000 1.785000 2.660000 1.955000 ;
-      RECT 2.950000 1.445000 3.120000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.490000  1.785000 2.660000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.950000  1.445000 3.120000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.180000 1.600000 ;
diff --git a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
index 53177d4..df0beeb 100644
--- a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.magic.lef
@@ -75,29 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.700000  0.085000 4.045000 0.530000 ;
-        RECT 4.720000  0.085000 4.970000 0.715000 ;
-        RECT 6.090000  0.085000 6.385000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -107,82 +84,101 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.965000 1.835000 2.245000 2.635000 ;
-        RECT 3.780000 2.175000 3.980000 2.635000 ;
-        RECT 4.685000 1.570000 4.970000 2.635000 ;
-        RECT 6.090000 1.835000 6.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 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.430000 1.495000 2.115000 1.665000 ;
-      RECT 1.430000 1.665000 1.795000 2.415000 ;
-      RECT 1.510000 0.345000 1.705000 0.615000 ;
-      RECT 1.510000 0.615000 2.135000 0.785000 ;
-      RECT 1.855000 0.785000 2.135000 0.875000 ;
-      RECT 1.855000 0.875000 2.335000 1.235000 ;
-      RECT 1.855000 1.235000 2.115000 1.495000 ;
-      RECT 2.465000 1.355000 2.795000 1.685000 ;
-      RECT 2.580000 0.705000 3.135000 1.065000 ;
-      RECT 2.750000 2.255000 3.610000 2.425000 ;
-      RECT 2.800000 0.365000 3.475000 0.535000 ;
-      RECT 2.965000 1.065000 3.135000 1.575000 ;
-      RECT 2.965000 1.575000 3.290000 1.910000 ;
-      RECT 2.965000 1.910000 3.195000 1.995000 ;
-      RECT 3.305000 0.535000 3.475000 0.995000 ;
-      RECT 3.305000 0.995000 4.175000 1.165000 ;
-      RECT 3.425000 2.035000 3.650000 2.065000 ;
-      RECT 3.425000 2.065000 3.630000 2.090000 ;
-      RECT 3.425000 2.090000 3.610000 2.255000 ;
-      RECT 3.430000 2.020000 3.650000 2.035000 ;
-      RECT 3.435000 2.010000 3.650000 2.020000 ;
-      RECT 3.440000 1.995000 3.650000 2.010000 ;
-      RECT 3.460000 1.165000 4.175000 1.325000 ;
-      RECT 3.460000 1.325000 3.650000 1.995000 ;
-      RECT 3.820000 1.535000 4.515000 1.865000 ;
-      RECT 4.285000 0.415000 4.550000 0.745000 ;
-      RECT 4.285000 1.865000 4.515000 2.435000 ;
-      RECT 4.345000 0.745000 4.550000 0.995000 ;
-      RECT 4.345000 0.995000 5.150000 1.325000 ;
-      RECT 4.345000 1.325000 4.515000 1.535000 ;
-      RECT 5.660000 0.255000 5.910000 0.995000 ;
-      RECT 5.660000 0.995000 6.430000 1.325000 ;
-      RECT 5.660000 1.325000 5.910000 2.465000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.430000  1.495000 2.115000 1.665000 ;
+      RECT 1.430000  1.665000 1.795000 2.415000 ;
+      RECT 1.510000  0.345000 1.705000 0.615000 ;
+      RECT 1.510000  0.615000 2.135000 0.785000 ;
+      RECT 1.855000  0.785000 2.135000 0.875000 ;
+      RECT 1.855000  0.875000 2.335000 1.235000 ;
+      RECT 1.855000  1.235000 2.115000 1.495000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.965000  1.835000 2.245000 2.635000 ;
+      RECT 2.465000  1.355000 2.795000 1.685000 ;
+      RECT 2.580000  0.705000 3.135000 1.065000 ;
+      RECT 2.750000  2.255000 3.610000 2.425000 ;
+      RECT 2.800000  0.365000 3.475000 0.535000 ;
+      RECT 2.965000  1.065000 3.135000 1.575000 ;
+      RECT 2.965000  1.575000 3.290000 1.910000 ;
+      RECT 2.965000  1.910000 3.195000 1.995000 ;
+      RECT 3.305000  0.535000 3.475000 0.995000 ;
+      RECT 3.305000  0.995000 4.175000 1.165000 ;
+      RECT 3.425000  2.035000 3.650000 2.065000 ;
+      RECT 3.425000  2.065000 3.630000 2.090000 ;
+      RECT 3.425000  2.090000 3.610000 2.255000 ;
+      RECT 3.430000  2.020000 3.650000 2.035000 ;
+      RECT 3.435000  2.010000 3.650000 2.020000 ;
+      RECT 3.440000  1.995000 3.650000 2.010000 ;
+      RECT 3.460000  1.165000 4.175000 1.325000 ;
+      RECT 3.460000  1.325000 3.650000 1.995000 ;
+      RECT 3.700000  0.085000 4.045000 0.530000 ;
+      RECT 3.780000  2.175000 3.980000 2.635000 ;
+      RECT 3.820000  1.535000 4.515000 1.865000 ;
+      RECT 4.285000  0.415000 4.550000 0.745000 ;
+      RECT 4.285000  1.865000 4.515000 2.435000 ;
+      RECT 4.345000  0.745000 4.550000 0.995000 ;
+      RECT 4.345000  0.995000 5.150000 1.325000 ;
+      RECT 4.345000  1.325000 4.515000 1.535000 ;
+      RECT 4.685000  1.570000 4.970000 2.635000 ;
+      RECT 4.720000  0.085000 4.970000 0.715000 ;
+      RECT 5.660000  0.255000 5.910000 0.995000 ;
+      RECT 5.660000  0.995000 6.430000 1.325000 ;
+      RECT 5.660000  1.325000 5.910000 2.465000 ;
+      RECT 6.090000  0.085000 6.385000 0.545000 ;
+      RECT 6.090000  1.835000 6.385000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.555000 1.445000 2.725000 1.615000 ;
-      RECT 2.965000 1.785000 3.135000 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.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.555000  1.445000 2.725000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.965000  1.785000 3.135000 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.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 2.785000 1.600000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
index 2339587..dbd1405 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.magic.lef
@@ -64,25 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.775000  0.085000 4.045000 0.545000 ;
-        RECT 4.755000  0.085000 4.980000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -92,75 +73,90 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.245000 2.635000 ;
-        RECT 3.775000 2.175000 4.095000 2.635000 ;
-        RECT 4.720000 1.570000 5.005000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.430000 1.495000 2.115000 1.665000 ;
-      RECT 1.430000 1.665000 1.785000 2.415000 ;
-      RECT 1.510000 0.345000 1.705000 0.615000 ;
-      RECT 1.510000 0.615000 2.115000 0.765000 ;
-      RECT 1.510000 0.765000 2.320000 0.785000 ;
-      RECT 1.945000 0.785000 2.320000 1.235000 ;
-      RECT 1.945000 1.235000 2.115000 1.495000 ;
-      RECT 2.445000 1.355000 2.780000 2.005000 ;
-      RECT 2.560000 0.735000 3.265000 1.040000 ;
-      RECT 2.745000 2.255000 3.605000 2.425000 ;
-      RECT 2.765000 0.365000 3.605000 0.535000 ;
-      RECT 2.950000 1.040000 3.265000 1.560000 ;
-      RECT 2.950000 1.560000 3.285000 1.910000 ;
-      RECT 3.295000 2.090000 3.620000 2.105000 ;
-      RECT 3.295000 2.105000 3.605000 2.255000 ;
-      RECT 3.390000 2.045000 3.645000 2.065000 ;
-      RECT 3.390000 2.065000 3.630000 2.085000 ;
-      RECT 3.390000 2.085000 3.620000 2.090000 ;
-      RECT 3.405000 2.035000 3.645000 2.045000 ;
-      RECT 3.430000 2.010000 3.645000 2.035000 ;
-      RECT 3.435000 0.535000 3.605000 0.995000 ;
-      RECT 3.435000 0.995000 4.200000 1.325000 ;
-      RECT 3.435000 1.325000 3.645000 1.450000 ;
-      RECT 3.455000 1.450000 3.645000 2.010000 ;
-      RECT 3.815000 1.535000 4.540000 1.865000 ;
-      RECT 4.295000 0.260000 4.540000 0.720000 ;
-      RECT 4.295000 1.865000 4.540000 2.435000 ;
-      RECT 4.370000 0.720000 4.540000 0.995000 ;
-      RECT 4.370000 0.995000 5.095000 1.325000 ;
-      RECT 4.370000 1.325000 4.540000 1.535000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.430000  1.495000 2.115000 1.665000 ;
+      RECT 1.430000  1.665000 1.785000 2.415000 ;
+      RECT 1.510000  0.345000 1.705000 0.615000 ;
+      RECT 1.510000  0.615000 2.115000 0.765000 ;
+      RECT 1.510000  0.765000 2.320000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.945000  0.785000 2.320000 1.235000 ;
+      RECT 1.945000  1.235000 2.115000 1.495000 ;
+      RECT 1.955000  1.835000 2.245000 2.635000 ;
+      RECT 2.445000  1.355000 2.780000 2.005000 ;
+      RECT 2.560000  0.735000 3.265000 1.040000 ;
+      RECT 2.745000  2.255000 3.605000 2.425000 ;
+      RECT 2.765000  0.365000 3.605000 0.535000 ;
+      RECT 2.950000  1.040000 3.265000 1.560000 ;
+      RECT 2.950000  1.560000 3.285000 1.910000 ;
+      RECT 3.295000  2.090000 3.620000 2.105000 ;
+      RECT 3.295000  2.105000 3.605000 2.255000 ;
+      RECT 3.390000  2.045000 3.645000 2.065000 ;
+      RECT 3.390000  2.065000 3.630000 2.085000 ;
+      RECT 3.390000  2.085000 3.620000 2.090000 ;
+      RECT 3.405000  2.035000 3.645000 2.045000 ;
+      RECT 3.430000  2.010000 3.645000 2.035000 ;
+      RECT 3.435000  0.535000 3.605000 0.995000 ;
+      RECT 3.435000  0.995000 4.200000 1.325000 ;
+      RECT 3.435000  1.325000 3.645000 1.450000 ;
+      RECT 3.455000  1.450000 3.645000 2.010000 ;
+      RECT 3.775000  0.085000 4.045000 0.545000 ;
+      RECT 3.775000  2.175000 4.095000 2.635000 ;
+      RECT 3.815000  1.535000 4.540000 1.865000 ;
+      RECT 4.295000  0.260000 4.540000 0.720000 ;
+      RECT 4.295000  1.865000 4.540000 2.435000 ;
+      RECT 4.370000  0.720000 4.540000 0.995000 ;
+      RECT 4.370000  0.995000 5.095000 1.325000 ;
+      RECT 4.370000  1.325000 4.540000 1.535000 ;
+      RECT 4.720000  1.570000 5.005000 2.635000 ;
+      RECT 4.755000  0.085000 4.980000 0.715000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.445000 1.785000 2.615000 1.955000 ;
-      RECT 2.950000 1.445000 3.120000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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  1.785000 2.615000 1.955000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.950000  1.445000 3.120000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.180000 1.600000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
index 4199e7c..eeb1a0f 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.magic.lef
@@ -68,27 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.895000  0.085000 2.225000 0.445000 ;
-        RECT 3.760000  0.085000 4.090000 0.825000 ;
-        RECT 4.760000  0.085000 5.045000 0.825000 ;
-        RECT 5.635000  0.085000 5.895000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -98,70 +77,87 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.975000 1.835000 2.290000 2.635000 ;
-        RECT 3.840000 2.135000 4.140000 2.635000 ;
-        RECT 4.760000 1.495000 5.045000 2.635000 ;
-        RECT 5.635000 1.755000 5.895000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.475000 1.495000 2.160000 1.665000 ;
-      RECT 1.475000 1.665000 1.805000 2.415000 ;
-      RECT 1.555000 0.345000 1.725000 0.615000 ;
-      RECT 1.555000 0.615000 2.160000 0.765000 ;
-      RECT 1.555000 0.765000 2.360000 0.785000 ;
-      RECT 1.990000 0.785000 2.360000 1.095000 ;
-      RECT 1.990000 1.095000 2.160000 1.495000 ;
-      RECT 2.490000 1.355000 2.775000 2.005000 ;
-      RECT 2.735000 0.705000 3.115000 1.035000 ;
-      RECT 2.860000 0.365000 3.520000 0.535000 ;
-      RECT 2.920000 2.255000 3.670000 2.425000 ;
-      RECT 2.945000 1.035000 3.115000 1.415000 ;
-      RECT 2.945000 1.415000 3.285000 1.995000 ;
-      RECT 3.350000 0.535000 3.520000 0.995000 ;
-      RECT 3.350000 0.995000 4.220000 1.165000 ;
-      RECT 3.500000 1.165000 4.220000 1.325000 ;
-      RECT 3.500000 1.325000 3.670000 2.255000 ;
-      RECT 3.860000 1.535000 4.580000 1.865000 ;
-      RECT 4.360000 0.415000 4.580000 0.825000 ;
-      RECT 4.360000 1.865000 4.580000 2.435000 ;
-      RECT 4.410000 0.825000 4.580000 0.995000 ;
-      RECT 4.410000 0.995000 5.160000 1.325000 ;
-      RECT 4.410000 1.325000 4.580000 1.535000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.475000  1.495000 2.160000 1.665000 ;
+      RECT 1.475000  1.665000 1.805000 2.415000 ;
+      RECT 1.555000  0.345000 1.725000 0.615000 ;
+      RECT 1.555000  0.615000 2.160000 0.765000 ;
+      RECT 1.555000  0.765000 2.360000 0.785000 ;
+      RECT 1.895000  0.085000 2.225000 0.445000 ;
+      RECT 1.975000  1.835000 2.290000 2.635000 ;
+      RECT 1.990000  0.785000 2.360000 1.095000 ;
+      RECT 1.990000  1.095000 2.160000 1.495000 ;
+      RECT 2.490000  1.355000 2.775000 2.005000 ;
+      RECT 2.735000  0.705000 3.115000 1.035000 ;
+      RECT 2.860000  0.365000 3.520000 0.535000 ;
+      RECT 2.920000  2.255000 3.670000 2.425000 ;
+      RECT 2.945000  1.035000 3.115000 1.415000 ;
+      RECT 2.945000  1.415000 3.285000 1.995000 ;
+      RECT 3.350000  0.535000 3.520000 0.995000 ;
+      RECT 3.350000  0.995000 4.220000 1.165000 ;
+      RECT 3.500000  1.165000 4.220000 1.325000 ;
+      RECT 3.500000  1.325000 3.670000 2.255000 ;
+      RECT 3.760000  0.085000 4.090000 0.825000 ;
+      RECT 3.840000  2.135000 4.140000 2.635000 ;
+      RECT 3.860000  1.535000 4.580000 1.865000 ;
+      RECT 4.360000  0.415000 4.580000 0.825000 ;
+      RECT 4.360000  1.865000 4.580000 2.435000 ;
+      RECT 4.410000  0.825000 4.580000 0.995000 ;
+      RECT 4.410000  0.995000 5.160000 1.325000 ;
+      RECT 4.410000  1.325000 4.580000 1.535000 ;
+      RECT 4.760000  0.085000 5.045000 0.825000 ;
+      RECT 4.760000  1.495000 5.045000 2.635000 ;
+      RECT 5.635000  0.085000 5.895000 0.550000 ;
+      RECT 5.635000  1.755000 5.895000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.490000 1.785000 2.660000 1.955000 ;
-      RECT 2.950000 1.445000 3.120000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.490000  1.785000 2.660000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.950000  1.445000 3.120000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.180000 1.600000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
index 21ae7f9..bd5764f 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.magic.lef
@@ -68,30 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.740000  0.085000 4.070000 0.530000 ;
-        RECT 4.785000  0.085000 5.070000 0.715000 ;
-        RECT 5.695000  0.085000 5.945000 0.825000 ;
-        RECT 6.555000  0.085000 6.815000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -101,73 +77,93 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.820000 2.135000 4.120000 2.635000 ;
-        RECT 4.785000 1.495000 5.070000 2.635000 ;
-        RECT 5.695000 1.495000 5.945000 2.635000 ;
-        RECT 6.555000 1.495000 6.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.970000 0.785000 2.340000 1.095000 ;
-      RECT 1.970000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 2.005000 ;
-      RECT 2.715000 0.705000 3.095000 1.035000 ;
-      RECT 2.840000 0.365000 3.500000 0.535000 ;
-      RECT 2.900000 2.255000 3.650000 2.425000 ;
-      RECT 2.925000 1.035000 3.095000 1.415000 ;
-      RECT 2.925000 1.415000 3.265000 1.995000 ;
-      RECT 3.330000 0.535000 3.500000 0.995000 ;
-      RECT 3.330000 0.995000 4.200000 1.165000 ;
-      RECT 3.480000 1.165000 4.200000 1.325000 ;
-      RECT 3.480000 1.325000 3.650000 2.255000 ;
-      RECT 3.840000 1.535000 4.605000 1.865000 ;
-      RECT 4.385000 0.415000 4.605000 0.745000 ;
-      RECT 4.385000 1.865000 4.605000 2.435000 ;
-      RECT 4.435000 0.745000 4.605000 0.995000 ;
-      RECT 4.435000 0.995000 5.185000 1.325000 ;
-      RECT 4.435000 1.325000 4.605000 1.535000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.970000  0.785000 2.340000 1.095000 ;
+      RECT 1.970000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 2.005000 ;
+      RECT 2.715000  0.705000 3.095000 1.035000 ;
+      RECT 2.840000  0.365000 3.500000 0.535000 ;
+      RECT 2.900000  2.255000 3.650000 2.425000 ;
+      RECT 2.925000  1.035000 3.095000 1.415000 ;
+      RECT 2.925000  1.415000 3.265000 1.995000 ;
+      RECT 3.330000  0.535000 3.500000 0.995000 ;
+      RECT 3.330000  0.995000 4.200000 1.165000 ;
+      RECT 3.480000  1.165000 4.200000 1.325000 ;
+      RECT 3.480000  1.325000 3.650000 2.255000 ;
+      RECT 3.740000  0.085000 4.070000 0.530000 ;
+      RECT 3.820000  2.135000 4.120000 2.635000 ;
+      RECT 3.840000  1.535000 4.605000 1.865000 ;
+      RECT 4.385000  0.415000 4.605000 0.745000 ;
+      RECT 4.385000  1.865000 4.605000 2.435000 ;
+      RECT 4.435000  0.745000 4.605000 0.995000 ;
+      RECT 4.435000  0.995000 5.185000 1.325000 ;
+      RECT 4.435000  1.325000 4.605000 1.535000 ;
+      RECT 4.785000  0.085000 5.070000 0.715000 ;
+      RECT 4.785000  1.495000 5.070000 2.635000 ;
+      RECT 5.695000  0.085000 5.945000 0.825000 ;
+      RECT 5.695000  1.495000 5.945000 2.635000 ;
+      RECT 6.555000  0.085000 6.815000 0.715000 ;
+      RECT 6.555000  1.495000 6.815000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.785000 2.640000 1.955000 ;
-      RECT 2.930000 1.445000 3.100000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.785000 2.640000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.445000 3.100000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 3.160000 1.600000 ;
diff --git a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
index 7e6289a..807826c 100644
--- a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.magic.lef
@@ -64,25 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.875000  0.085000 2.205000 0.445000 ;
-        RECT 3.685000  0.085000 4.015000 0.530000 ;
-        RECT 4.695000  0.085000 4.900000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -92,68 +73,83 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.955000 1.835000 2.270000 2.635000 ;
-        RECT 3.775000 2.135000 3.945000 2.635000 ;
-        RECT 4.695000 1.570000 4.900000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        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.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.070000 ;
-      RECT 0.610000 1.070000 0.840000 1.400000 ;
-      RECT 0.610000 1.400000 0.780000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 1.685000 ;
-      RECT 1.015000 1.685000 1.240000 2.465000 ;
-      RECT 1.455000 1.495000 2.140000 1.665000 ;
-      RECT 1.455000 1.665000 1.785000 2.415000 ;
-      RECT 1.535000 0.345000 1.705000 0.615000 ;
-      RECT 1.535000 0.615000 2.140000 0.765000 ;
-      RECT 1.535000 0.765000 2.340000 0.785000 ;
-      RECT 1.970000 0.785000 2.340000 1.095000 ;
-      RECT 1.970000 1.095000 2.140000 1.495000 ;
-      RECT 2.470000 1.355000 2.755000 1.685000 ;
-      RECT 2.715000 0.705000 3.095000 1.035000 ;
-      RECT 2.770000 2.255000 3.605000 2.425000 ;
-      RECT 2.840000 0.365000 3.500000 0.535000 ;
-      RECT 2.925000 1.035000 3.095000 1.575000 ;
-      RECT 2.925000 1.575000 3.265000 1.995000 ;
-      RECT 3.330000 0.535000 3.500000 0.995000 ;
-      RECT 3.330000 0.995000 4.175000 1.165000 ;
-      RECT 3.435000 1.165000 4.175000 1.325000 ;
-      RECT 3.435000 1.325000 3.605000 2.255000 ;
-      RECT 3.840000 1.535000 4.515000 1.865000 ;
-      RECT 4.295000 0.415000 4.515000 0.745000 ;
-      RECT 4.295000 1.865000 4.515000 2.435000 ;
-      RECT 4.345000 0.745000 4.515000 0.995000 ;
-      RECT 4.345000 0.995000 5.095000 1.325000 ;
-      RECT 4.345000 1.325000 4.515000 1.535000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.070000 ;
+      RECT 0.610000  1.070000 0.840000 1.400000 ;
+      RECT 0.610000  1.400000 0.780000 1.795000 ;
+      RECT 1.015000  0.345000 1.185000 1.685000 ;
+      RECT 1.015000  1.685000 1.240000 2.465000 ;
+      RECT 1.455000  1.495000 2.140000 1.665000 ;
+      RECT 1.455000  1.665000 1.785000 2.415000 ;
+      RECT 1.535000  0.345000 1.705000 0.615000 ;
+      RECT 1.535000  0.615000 2.140000 0.765000 ;
+      RECT 1.535000  0.765000 2.340000 0.785000 ;
+      RECT 1.875000  0.085000 2.205000 0.445000 ;
+      RECT 1.955000  1.835000 2.270000 2.635000 ;
+      RECT 1.970000  0.785000 2.340000 1.095000 ;
+      RECT 1.970000  1.095000 2.140000 1.495000 ;
+      RECT 2.470000  1.355000 2.755000 1.685000 ;
+      RECT 2.715000  0.705000 3.095000 1.035000 ;
+      RECT 2.770000  2.255000 3.605000 2.425000 ;
+      RECT 2.840000  0.365000 3.500000 0.535000 ;
+      RECT 2.925000  1.035000 3.095000 1.575000 ;
+      RECT 2.925000  1.575000 3.265000 1.995000 ;
+      RECT 3.330000  0.535000 3.500000 0.995000 ;
+      RECT 3.330000  0.995000 4.175000 1.165000 ;
+      RECT 3.435000  1.165000 4.175000 1.325000 ;
+      RECT 3.435000  1.325000 3.605000 2.255000 ;
+      RECT 3.685000  0.085000 4.015000 0.530000 ;
+      RECT 3.775000  2.135000 3.945000 2.635000 ;
+      RECT 3.840000  1.535000 4.515000 1.865000 ;
+      RECT 4.295000  0.415000 4.515000 0.745000 ;
+      RECT 4.295000  1.865000 4.515000 2.435000 ;
+      RECT 4.345000  0.745000 4.515000 0.995000 ;
+      RECT 4.345000  0.995000 5.095000 1.325000 ;
+      RECT 4.345000  1.325000 4.515000 1.535000 ;
+      RECT 4.695000  0.085000 4.900000 0.715000 ;
+      RECT 4.695000  1.570000 4.900000 2.635000 ;
     LAYER mcon ;
-      RECT 0.610000 1.445000 0.780000 1.615000 ;
-      RECT 1.070000 1.785000 1.240000 1.955000 ;
-      RECT 2.470000 1.445000 2.640000 1.615000 ;
-      RECT 2.930000 1.785000 3.100000 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.610000  1.445000 0.780000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  1.785000 1.240000 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.470000  1.445000 2.640000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.930000  1.785000 3.100000 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 ;
     LAYER met1 ;
       RECT 0.550000 1.415000 0.840000 1.460000 ;
       RECT 0.550000 1.460000 2.700000 1.600000 ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
index 7cce654..4e724c0 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.magic.lef
@@ -55,18 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.550000  0.085000 0.765000 0.545000 ;
-        RECT 1.910000  0.085000 2.240000 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
@@ -76,42 +64,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.550000 2.175000 0.765000 2.635000 ;
-        RECT 1.910000 1.915000 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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.785000 0.895000 2.005000 ;
-      RECT 0.085000 2.005000 0.380000 2.465000 ;
-      RECT 0.095000 0.255000 0.380000 0.715000 ;
-      RECT 0.095000 0.715000 0.895000 0.885000 ;
-      RECT 0.725000 0.885000 0.895000 0.995000 ;
-      RECT 0.725000 0.995000 0.980000 1.325000 ;
-      RECT 0.725000 1.325000 0.895000 1.785000 ;
-      RECT 0.935000 0.255000 1.320000 0.545000 ;
-      RECT 0.935000 2.175000 1.320000 2.465000 ;
-      RECT 1.150000 0.545000 1.320000 1.075000 ;
-      RECT 1.150000 1.075000 1.900000 1.275000 ;
-      RECT 1.150000 1.275000 1.320000 2.175000 ;
-      RECT 1.515000 0.255000 1.740000 0.735000 ;
-      RECT 1.515000 0.735000 2.240000 0.905000 ;
-      RECT 1.515000 1.575000 2.240000 1.745000 ;
-      RECT 1.515000 1.745000 1.740000 2.430000 ;
-      RECT 2.070000 0.905000 2.240000 0.995000 ;
-      RECT 2.070000 0.995000 2.360000 1.325000 ;
-      RECT 2.070000 1.325000 2.240000 1.575000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.785000 0.895000 2.005000 ;
+      RECT 0.085000  2.005000 0.380000 2.465000 ;
+      RECT 0.095000  0.255000 0.380000 0.715000 ;
+      RECT 0.095000  0.715000 0.895000 0.885000 ;
+      RECT 0.550000  0.085000 0.765000 0.545000 ;
+      RECT 0.550000  2.175000 0.765000 2.635000 ;
+      RECT 0.725000  0.885000 0.895000 0.995000 ;
+      RECT 0.725000  0.995000 0.980000 1.325000 ;
+      RECT 0.725000  1.325000 0.895000 1.785000 ;
+      RECT 0.935000  0.255000 1.320000 0.545000 ;
+      RECT 0.935000  2.175000 1.320000 2.465000 ;
+      RECT 1.150000  0.545000 1.320000 1.075000 ;
+      RECT 1.150000  1.075000 1.900000 1.275000 ;
+      RECT 1.150000  1.275000 1.320000 2.175000 ;
+      RECT 1.515000  0.255000 1.740000 0.735000 ;
+      RECT 1.515000  0.735000 2.240000 0.905000 ;
+      RECT 1.515000  1.575000 2.240000 1.745000 ;
+      RECT 1.515000  1.745000 1.740000 2.430000 ;
+      RECT 1.910000  0.085000 2.240000 0.565000 ;
+      RECT 1.910000  1.915000 2.270000 2.635000 ;
+      RECT 2.070000  0.905000 2.240000 0.995000 ;
+      RECT 2.070000  0.995000 2.360000 1.325000 ;
+      RECT 2.070000  1.325000 2.240000 1.575000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__dlygate4sd1_1
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
index f40a0fa..7774497 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.magic.lef
@@ -55,18 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.655000  0.085000 0.925000 0.545000 ;
-        RECT 2.075000  0.085000 2.400000 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
@@ -76,42 +64,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.655000 2.175000 0.925000 2.635000 ;
-        RECT 2.075000 2.175000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.485000 0.715000 ;
-      RECT 0.085000 0.715000 1.030000 0.885000 ;
-      RECT 0.085000 1.785000 1.030000 2.005000 ;
-      RECT 0.085000 2.005000 0.485000 2.465000 ;
-      RECT 0.795000 0.885000 1.030000 0.995000 ;
-      RECT 0.795000 0.995000 1.085000 1.325000 ;
-      RECT 0.795000 1.325000 1.030000 1.785000 ;
-      RECT 1.155000 0.255000 1.425000 0.585000 ;
-      RECT 1.155000 2.135000 1.425000 2.465000 ;
-      RECT 1.255000 0.585000 1.425000 1.055000 ;
-      RECT 1.255000 1.055000 2.030000 1.615000 ;
-      RECT 1.255000 1.615000 1.425000 2.135000 ;
-      RECT 1.615000 0.255000 1.875000 0.715000 ;
-      RECT 1.615000 0.715000 2.400000 0.885000 ;
-      RECT 1.615000 1.785000 2.400000 2.005000 ;
-      RECT 1.615000 2.005000 1.875000 2.465000 ;
-      RECT 2.200000 0.885000 2.400000 0.995000 ;
-      RECT 2.200000 0.995000 2.505000 1.325000 ;
-      RECT 2.200000 1.325000 2.400000 1.785000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.255000 0.485000 0.715000 ;
+      RECT 0.085000  0.715000 1.030000 0.885000 ;
+      RECT 0.085000  1.785000 1.030000 2.005000 ;
+      RECT 0.085000  2.005000 0.485000 2.465000 ;
+      RECT 0.655000  0.085000 0.925000 0.545000 ;
+      RECT 0.655000  2.175000 0.925000 2.635000 ;
+      RECT 0.795000  0.885000 1.030000 0.995000 ;
+      RECT 0.795000  0.995000 1.085000 1.325000 ;
+      RECT 0.795000  1.325000 1.030000 1.785000 ;
+      RECT 1.155000  0.255000 1.425000 0.585000 ;
+      RECT 1.155000  2.135000 1.425000 2.465000 ;
+      RECT 1.255000  0.585000 1.425000 1.055000 ;
+      RECT 1.255000  1.055000 2.030000 1.615000 ;
+      RECT 1.255000  1.615000 1.425000 2.135000 ;
+      RECT 1.615000  0.255000 1.875000 0.715000 ;
+      RECT 1.615000  0.715000 2.400000 0.885000 ;
+      RECT 1.615000  1.785000 2.400000 2.005000 ;
+      RECT 1.615000  2.005000 1.875000 2.465000 ;
+      RECT 2.075000  0.085000 2.400000 0.545000 ;
+      RECT 2.075000  2.175000 2.400000 2.635000 ;
+      RECT 2.200000  0.885000 2.400000 0.995000 ;
+      RECT 2.200000  0.995000 2.505000 1.325000 ;
+      RECT 2.200000  1.325000 2.400000 1.785000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__dlygate4sd2_1
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
index 88ba42c..839f392 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.magic.lef
@@ -55,19 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.655000  0.085000 0.925000 0.545000 ;
-        RECT 2.715000  0.085000 3.040000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -77,39 +64,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.655000 2.175000 0.925000 2.635000 ;
-        RECT 2.715000 2.175000 3.040000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 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.200000 0.255000 0.485000 0.715000 ;
-      RECT 0.200000 0.715000 1.155000 0.885000 ;
-      RECT 0.200000 1.785000 1.155000 2.005000 ;
-      RECT 0.200000 2.005000 0.485000 2.465000 ;
-      RECT 0.945000 0.885000 1.155000 1.785000 ;
-      RECT 1.325000 0.255000 1.725000 1.055000 ;
-      RECT 1.325000 1.055000 2.420000 1.615000 ;
-      RECT 1.325000 1.615000 1.725000 2.465000 ;
-      RECT 1.915000 0.255000 2.195000 0.715000 ;
-      RECT 1.915000 0.715000 3.040000 0.885000 ;
-      RECT 1.915000 1.785000 3.040000 2.005000 ;
-      RECT 1.915000 2.005000 2.195000 2.465000 ;
-      RECT 2.590000 0.885000 3.040000 0.995000 ;
-      RECT 2.590000 0.995000 3.145000 1.325000 ;
-      RECT 2.590000 1.325000 3.040000 1.785000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.200000  0.255000 0.485000 0.715000 ;
+      RECT 0.200000  0.715000 1.155000 0.885000 ;
+      RECT 0.200000  1.785000 1.155000 2.005000 ;
+      RECT 0.200000  2.005000 0.485000 2.465000 ;
+      RECT 0.655000  0.085000 0.925000 0.545000 ;
+      RECT 0.655000  2.175000 0.925000 2.635000 ;
+      RECT 0.945000  0.885000 1.155000 1.785000 ;
+      RECT 1.325000  0.255000 1.725000 1.055000 ;
+      RECT 1.325000  1.055000 2.420000 1.615000 ;
+      RECT 1.325000  1.615000 1.725000 2.465000 ;
+      RECT 1.915000  0.255000 2.195000 0.715000 ;
+      RECT 1.915000  0.715000 3.040000 0.885000 ;
+      RECT 1.915000  1.785000 3.040000 2.005000 ;
+      RECT 1.915000  2.005000 2.195000 2.465000 ;
+      RECT 2.590000  0.885000 3.040000 0.995000 ;
+      RECT 2.590000  0.995000 3.145000 1.325000 ;
+      RECT 2.590000  1.325000 3.040000 1.785000 ;
+      RECT 2.715000  0.085000 3.040000 0.545000 ;
+      RECT 2.715000  2.175000 3.040000 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
 END sky130_fd_sc_hd__dlygate4sd3_1
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
index 7ccc71f..ed1c1a8 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.magic.lef
@@ -58,22 +58,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.690000  0.085000 1.075000 0.485000 ;
-        RECT 2.285000  0.085000 2.670000 0.485000 ;
-        RECT 3.700000  0.085000 4.085000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -83,56 +67,69 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.690000 2.210000 1.075000 2.635000 ;
-        RECT 2.285000 2.210000 2.670000 2.635000 ;
-        RECT 3.700000 2.210000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.520000 0.655000 ;
-      RECT 0.085000 0.655000 1.075000 0.825000 ;
-      RECT 0.085000 1.870000 1.075000 2.040000 ;
-      RECT 0.085000 2.040000 0.520000 2.465000 ;
-      RECT 0.740000 0.825000 1.075000 0.995000 ;
-      RECT 0.740000 0.995000 1.150000 1.325000 ;
-      RECT 0.740000 1.325000 1.075000 1.870000 ;
-      RECT 1.840000 1.845000 2.670000 2.040000 ;
-      RECT 1.840000 2.040000 2.115000 2.465000 ;
-      RECT 1.860000 0.255000 2.115000 0.655000 ;
-      RECT 1.860000 0.655000 2.670000 0.825000 ;
-      RECT 2.320000 0.825000 2.670000 0.995000 ;
-      RECT 2.320000 0.995000 2.745000 1.325000 ;
-      RECT 2.320000 1.325000 2.670000 1.845000 ;
-      RECT 2.840000 0.255000 3.085000 0.825000 ;
-      RECT 2.840000 1.495000 3.565000 1.675000 ;
-      RECT 2.840000 1.675000 3.085000 2.465000 ;
-      RECT 2.915000 0.825000 3.085000 0.995000 ;
-      RECT 2.915000 0.995000 3.565000 1.495000 ;
-      RECT 3.275000 0.255000 3.530000 0.655000 ;
-      RECT 3.275000 0.655000 4.085000 0.825000 ;
-      RECT 3.275000 1.845000 4.085000 2.040000 ;
-      RECT 3.275000 2.040000 3.530000 2.465000 ;
-      RECT 3.735000 0.825000 4.085000 0.995000 ;
-      RECT 3.735000 0.995000 4.160000 1.325000 ;
-      RECT 3.735000 1.325000 4.085000 1.845000 ;
-      RECT 4.255000 0.255000 4.515000 0.825000 ;
-      RECT 4.255000 1.495000 4.515000 2.465000 ;
-      RECT 4.330000 0.825000 4.515000 1.495000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.255000 0.520000 0.655000 ;
+      RECT 0.085000  0.655000 1.075000 0.825000 ;
+      RECT 0.085000  1.870000 1.075000 2.040000 ;
+      RECT 0.085000  2.040000 0.520000 2.465000 ;
+      RECT 0.690000  0.085000 1.075000 0.485000 ;
+      RECT 0.690000  2.210000 1.075000 2.635000 ;
+      RECT 0.740000  0.825000 1.075000 0.995000 ;
+      RECT 0.740000  0.995000 1.150000 1.325000 ;
+      RECT 0.740000  1.325000 1.075000 1.870000 ;
+      RECT 1.840000  1.845000 2.670000 2.040000 ;
+      RECT 1.840000  2.040000 2.115000 2.465000 ;
+      RECT 1.860000  0.255000 2.115000 0.655000 ;
+      RECT 1.860000  0.655000 2.670000 0.825000 ;
+      RECT 2.285000  0.085000 2.670000 0.485000 ;
+      RECT 2.285000  2.210000 2.670000 2.635000 ;
+      RECT 2.320000  0.825000 2.670000 0.995000 ;
+      RECT 2.320000  0.995000 2.745000 1.325000 ;
+      RECT 2.320000  1.325000 2.670000 1.845000 ;
+      RECT 2.840000  0.255000 3.085000 0.825000 ;
+      RECT 2.840000  1.495000 3.565000 1.675000 ;
+      RECT 2.840000  1.675000 3.085000 2.465000 ;
+      RECT 2.915000  0.825000 3.085000 0.995000 ;
+      RECT 2.915000  0.995000 3.565000 1.495000 ;
+      RECT 3.275000  0.255000 3.530000 0.655000 ;
+      RECT 3.275000  0.655000 4.085000 0.825000 ;
+      RECT 3.275000  1.845000 4.085000 2.040000 ;
+      RECT 3.275000  2.040000 3.530000 2.465000 ;
+      RECT 3.700000  0.085000 4.085000 0.485000 ;
+      RECT 3.700000  2.210000 4.085000 2.635000 ;
+      RECT 3.735000  0.825000 4.085000 0.995000 ;
+      RECT 3.735000  0.995000 4.160000 1.325000 ;
+      RECT 3.735000  1.325000 4.085000 1.845000 ;
+      RECT 4.255000  0.255000 4.515000 0.825000 ;
+      RECT 4.255000  1.495000 4.515000 2.465000 ;
+      RECT 4.330000  0.825000 4.515000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
 END sky130_fd_sc_hd__dlymetal6s2s_1
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
index 96fb322..97e37d3 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.magic.lef
@@ -58,22 +58,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.690000  0.085000 1.075000 0.485000 ;
-        RECT 2.105000  0.085000 2.490000 0.485000 ;
-        RECT 3.700000  0.085000 4.085000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -83,56 +67,69 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.690000 2.210000 1.075000 2.635000 ;
-        RECT 2.105000 2.210000 2.490000 2.635000 ;
-        RECT 3.700000 2.210000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.520000 0.655000 ;
-      RECT 0.085000 0.655000 1.075000 0.825000 ;
-      RECT 0.085000 1.870000 1.075000 2.040000 ;
-      RECT 0.085000 2.040000 0.520000 2.465000 ;
-      RECT 0.740000 0.825000 1.075000 0.995000 ;
-      RECT 0.740000 0.995000 1.150000 1.325000 ;
-      RECT 0.740000 1.325000 1.075000 1.870000 ;
-      RECT 1.245000 0.255000 1.515000 0.825000 ;
-      RECT 1.245000 1.495000 1.970000 1.675000 ;
-      RECT 1.245000 1.675000 1.515000 2.465000 ;
-      RECT 1.320000 0.825000 1.515000 0.995000 ;
-      RECT 1.320000 0.995000 1.970000 1.495000 ;
-      RECT 1.685000 0.255000 1.935000 0.655000 ;
-      RECT 1.685000 0.655000 2.490000 0.825000 ;
-      RECT 1.685000 1.845000 2.490000 2.040000 ;
-      RECT 1.685000 2.040000 1.935000 2.465000 ;
-      RECT 2.140000 0.825000 2.490000 0.995000 ;
-      RECT 2.140000 0.995000 2.565000 1.325000 ;
-      RECT 2.140000 1.325000 2.490000 1.845000 ;
-      RECT 3.275000 0.255000 3.530000 0.655000 ;
-      RECT 3.275000 0.655000 4.085000 0.825000 ;
-      RECT 3.275000 1.845000 4.085000 2.040000 ;
-      RECT 3.275000 2.040000 3.530000 2.465000 ;
-      RECT 3.735000 0.825000 4.085000 0.995000 ;
-      RECT 3.735000 0.995000 4.160000 1.325000 ;
-      RECT 3.735000 1.325000 4.085000 1.845000 ;
-      RECT 4.255000 0.255000 4.515000 0.825000 ;
-      RECT 4.255000 1.495000 4.515000 2.465000 ;
-      RECT 4.330000 0.825000 4.515000 1.495000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.255000 0.520000 0.655000 ;
+      RECT 0.085000  0.655000 1.075000 0.825000 ;
+      RECT 0.085000  1.870000 1.075000 2.040000 ;
+      RECT 0.085000  2.040000 0.520000 2.465000 ;
+      RECT 0.690000  0.085000 1.075000 0.485000 ;
+      RECT 0.690000  2.210000 1.075000 2.635000 ;
+      RECT 0.740000  0.825000 1.075000 0.995000 ;
+      RECT 0.740000  0.995000 1.150000 1.325000 ;
+      RECT 0.740000  1.325000 1.075000 1.870000 ;
+      RECT 1.245000  0.255000 1.515000 0.825000 ;
+      RECT 1.245000  1.495000 1.970000 1.675000 ;
+      RECT 1.245000  1.675000 1.515000 2.465000 ;
+      RECT 1.320000  0.825000 1.515000 0.995000 ;
+      RECT 1.320000  0.995000 1.970000 1.495000 ;
+      RECT 1.685000  0.255000 1.935000 0.655000 ;
+      RECT 1.685000  0.655000 2.490000 0.825000 ;
+      RECT 1.685000  1.845000 2.490000 2.040000 ;
+      RECT 1.685000  2.040000 1.935000 2.465000 ;
+      RECT 2.105000  0.085000 2.490000 0.485000 ;
+      RECT 2.105000  2.210000 2.490000 2.635000 ;
+      RECT 2.140000  0.825000 2.490000 0.995000 ;
+      RECT 2.140000  0.995000 2.565000 1.325000 ;
+      RECT 2.140000  1.325000 2.490000 1.845000 ;
+      RECT 3.275000  0.255000 3.530000 0.655000 ;
+      RECT 3.275000  0.655000 4.085000 0.825000 ;
+      RECT 3.275000  1.845000 4.085000 2.040000 ;
+      RECT 3.275000  2.040000 3.530000 2.465000 ;
+      RECT 3.700000  0.085000 4.085000 0.485000 ;
+      RECT 3.700000  2.210000 4.085000 2.635000 ;
+      RECT 3.735000  0.825000 4.085000 0.995000 ;
+      RECT 3.735000  0.995000 4.160000 1.325000 ;
+      RECT 3.735000  1.325000 4.085000 1.845000 ;
+      RECT 4.255000  0.255000 4.515000 0.825000 ;
+      RECT 4.255000  1.495000 4.515000 2.465000 ;
+      RECT 4.330000  0.825000 4.515000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
 END sky130_fd_sc_hd__dlymetal6s4s_1
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
index 0ed010c..2adc089 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.magic.lef
@@ -55,22 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.695000  0.085000 1.080000 0.485000 ;
-        RECT 2.110000  0.085000 2.495000 0.485000 ;
-        RECT 3.525000  0.085000 3.910000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -80,58 +64,71 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.695000 2.210000 1.080000 2.635000 ;
-        RECT 2.110000 2.210000 2.495000 2.635000 ;
-        RECT 3.525000 2.210000 3.910000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.525000 0.655000 ;
-      RECT 0.085000 0.655000 1.080000 0.825000 ;
-      RECT 0.085000 1.870000 1.080000 2.040000 ;
-      RECT 0.085000 2.040000 0.525000 2.465000 ;
-      RECT 0.745000 0.825000 1.080000 0.995000 ;
-      RECT 0.745000 0.995000 1.155000 1.325000 ;
-      RECT 0.745000 1.325000 1.080000 1.870000 ;
-      RECT 1.250000 0.255000 1.520000 0.825000 ;
-      RECT 1.250000 1.495000 1.975000 1.675000 ;
-      RECT 1.250000 1.675000 1.520000 2.465000 ;
-      RECT 1.325000 0.825000 1.520000 0.995000 ;
-      RECT 1.325000 0.995000 1.975000 1.495000 ;
-      RECT 1.690000 0.255000 1.940000 0.655000 ;
-      RECT 1.690000 0.655000 2.495000 0.825000 ;
-      RECT 1.690000 1.845000 2.495000 2.040000 ;
-      RECT 1.690000 2.040000 1.940000 2.465000 ;
-      RECT 2.145000 0.825000 2.495000 0.995000 ;
-      RECT 2.145000 0.995000 2.570000 1.325000 ;
-      RECT 2.145000 1.325000 2.495000 1.845000 ;
-      RECT 2.665000 0.255000 2.915000 0.825000 ;
-      RECT 2.665000 1.495000 3.390000 1.675000 ;
-      RECT 2.665000 1.675000 2.915000 2.465000 ;
-      RECT 2.740000 0.825000 2.915000 0.995000 ;
-      RECT 2.740000 0.995000 3.390000 1.495000 ;
-      RECT 3.085000 0.255000 3.355000 0.655000 ;
-      RECT 3.085000 0.655000 3.910000 0.825000 ;
-      RECT 3.085000 1.845000 3.910000 2.040000 ;
-      RECT 3.085000 2.040000 3.355000 2.465000 ;
-      RECT 3.560000 0.825000 3.910000 0.995000 ;
-      RECT 3.560000 0.995000 3.985000 1.325000 ;
-      RECT 3.560000 1.325000 3.910000 1.845000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.255000 0.525000 0.655000 ;
+      RECT 0.085000  0.655000 1.080000 0.825000 ;
+      RECT 0.085000  1.870000 1.080000 2.040000 ;
+      RECT 0.085000  2.040000 0.525000 2.465000 ;
+      RECT 0.695000  0.085000 1.080000 0.485000 ;
+      RECT 0.695000  2.210000 1.080000 2.635000 ;
+      RECT 0.745000  0.825000 1.080000 0.995000 ;
+      RECT 0.745000  0.995000 1.155000 1.325000 ;
+      RECT 0.745000  1.325000 1.080000 1.870000 ;
+      RECT 1.250000  0.255000 1.520000 0.825000 ;
+      RECT 1.250000  1.495000 1.975000 1.675000 ;
+      RECT 1.250000  1.675000 1.520000 2.465000 ;
+      RECT 1.325000  0.825000 1.520000 0.995000 ;
+      RECT 1.325000  0.995000 1.975000 1.495000 ;
+      RECT 1.690000  0.255000 1.940000 0.655000 ;
+      RECT 1.690000  0.655000 2.495000 0.825000 ;
+      RECT 1.690000  1.845000 2.495000 2.040000 ;
+      RECT 1.690000  2.040000 1.940000 2.465000 ;
+      RECT 2.110000  0.085000 2.495000 0.485000 ;
+      RECT 2.110000  2.210000 2.495000 2.635000 ;
+      RECT 2.145000  0.825000 2.495000 0.995000 ;
+      RECT 2.145000  0.995000 2.570000 1.325000 ;
+      RECT 2.145000  1.325000 2.495000 1.845000 ;
+      RECT 2.665000  0.255000 2.915000 0.825000 ;
+      RECT 2.665000  1.495000 3.390000 1.675000 ;
+      RECT 2.665000  1.675000 2.915000 2.465000 ;
+      RECT 2.740000  0.825000 2.915000 0.995000 ;
+      RECT 2.740000  0.995000 3.390000 1.495000 ;
+      RECT 3.085000  0.255000 3.355000 0.655000 ;
+      RECT 3.085000  0.655000 3.910000 0.825000 ;
+      RECT 3.085000  1.845000 3.910000 2.040000 ;
+      RECT 3.085000  2.040000 3.355000 2.465000 ;
+      RECT 3.525000  0.085000 3.910000 0.485000 ;
+      RECT 3.525000  2.210000 3.910000 2.635000 ;
+      RECT 3.560000  0.825000 3.910000 0.995000 ;
+      RECT 3.560000  0.995000 3.985000 1.325000 ;
+      RECT 3.560000  1.325000 3.910000 1.845000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__dlymetal6s6s_1
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
index 6ff2962..18154c7 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.magic.lef
@@ -64,19 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.445000 ;
-        RECT 2.195000  0.085000 2.955000 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
@@ -86,41 +73,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.175000 0.845000 2.635000 ;
-        RECT 1.440000 2.175000 1.805000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.185000 0.825000 ;
-      RECT 0.085000 1.785000 0.740000 2.005000 ;
-      RECT 0.085000 2.005000 0.345000 2.465000 ;
-      RECT 0.525000 0.825000 0.740000 1.785000 ;
-      RECT 1.015000 0.255000 2.025000 0.465000 ;
-      RECT 1.015000 0.465000 1.185000 0.615000 ;
-      RECT 1.015000 1.800000 1.805000 2.005000 ;
-      RECT 1.015000 2.005000 1.270000 2.460000 ;
-      RECT 1.355000 0.635000 1.685000 0.885000 ;
-      RECT 1.410000 0.885000 1.685000 1.075000 ;
-      RECT 1.410000 1.075000 2.535000 1.325000 ;
-      RECT 1.410000 1.325000 1.805000 1.800000 ;
-      RECT 1.855000 0.465000 2.025000 0.735000 ;
-      RECT 1.855000 0.735000 2.955000 0.905000 ;
-      RECT 2.705000 0.905000 2.955000 0.995000 ;
-      RECT 2.705000 0.995000 3.085000 1.325000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.280000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 1.185000 0.825000 ;
+      RECT 0.085000  1.785000 0.740000 2.005000 ;
+      RECT 0.085000  2.005000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.445000 ;
+      RECT 0.515000  2.175000 0.845000 2.635000 ;
+      RECT 0.525000  0.825000 0.740000 1.785000 ;
+      RECT 1.015000  0.255000 2.025000 0.465000 ;
+      RECT 1.015000  0.465000 1.185000 0.615000 ;
+      RECT 1.015000  1.800000 1.805000 2.005000 ;
+      RECT 1.015000  2.005000 1.270000 2.460000 ;
+      RECT 1.355000  0.635000 1.685000 0.885000 ;
+      RECT 1.410000  0.885000 1.685000 1.075000 ;
+      RECT 1.410000  1.075000 2.535000 1.325000 ;
+      RECT 1.410000  1.325000 1.805000 1.800000 ;
+      RECT 1.440000  2.175000 1.805000 2.635000 ;
+      RECT 1.855000  0.465000 2.025000 0.735000 ;
+      RECT 1.855000  0.735000 2.955000 0.905000 ;
+      RECT 2.195000  0.085000 2.955000 0.565000 ;
+      RECT 2.705000  0.905000 2.955000 0.995000 ;
+      RECT 2.705000  0.995000 3.085000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
 END sky130_fd_sc_hd__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
index 3f6cf3c..9df13d4 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.magic.lef
@@ -66,20 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.515000  0.085000 0.850000 0.595000 ;
-        RECT 2.340000  0.085000 2.670000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -89,48 +75,58 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 1.845000 0.950000 2.635000 ;
-        RECT 1.980000 2.275000 2.310000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 0.320000 1.845000 ;
-      RECT 0.085000 1.845000 0.345000 2.465000 ;
-      RECT 1.020000 0.255000 1.730000 0.595000 ;
-      RECT 1.120000 1.445000 1.735000 1.765000 ;
-      RECT 1.120000 1.765000 1.410000 2.465000 ;
-      RECT 1.450000 0.595000 1.730000 1.025000 ;
-      RECT 1.450000 1.025000 2.965000 1.275000 ;
-      RECT 1.450000 1.275000 1.735000 1.445000 ;
-      RECT 1.600000 1.935000 3.125000 2.105000 ;
-      RECT 1.600000 2.105000 1.810000 2.465000 ;
-      RECT 1.900000 0.255000 2.170000 0.655000 ;
-      RECT 1.900000 0.655000 3.125000 0.855000 ;
-      RECT 2.480000 2.105000 3.125000 2.295000 ;
-      RECT 2.480000 2.295000 4.055000 2.465000 ;
-      RECT 2.840000 0.275000 4.050000 0.465000 ;
-      RECT 2.840000 0.465000 3.125000 0.655000 ;
-      RECT 3.245000 1.025000 3.655000 1.275000 ;
-      RECT 3.795000 1.795000 4.055000 2.295000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.280000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 0.320000 1.845000 ;
+      RECT 0.085000  1.845000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.850000 0.595000 ;
+      RECT 0.515000  1.845000 0.950000 2.635000 ;
+      RECT 1.020000  0.255000 1.730000 0.595000 ;
+      RECT 1.120000  1.445000 1.735000 1.765000 ;
+      RECT 1.120000  1.765000 1.410000 2.465000 ;
+      RECT 1.450000  0.595000 1.730000 1.025000 ;
+      RECT 1.450000  1.025000 2.965000 1.275000 ;
+      RECT 1.450000  1.275000 1.735000 1.445000 ;
+      RECT 1.600000  1.935000 3.125000 2.105000 ;
+      RECT 1.600000  2.105000 1.810000 2.465000 ;
+      RECT 1.900000  0.255000 2.170000 0.655000 ;
+      RECT 1.900000  0.655000 3.125000 0.855000 ;
+      RECT 1.980000  2.275000 2.310000 2.635000 ;
+      RECT 2.340000  0.085000 2.670000 0.485000 ;
+      RECT 2.480000  2.105000 3.125000 2.295000 ;
+      RECT 2.480000  2.295000 4.055000 2.465000 ;
+      RECT 2.840000  0.275000 4.050000 0.465000 ;
+      RECT 2.840000  0.465000 3.125000 0.655000 ;
+      RECT 3.245000  1.025000 3.655000 1.275000 ;
+      RECT 3.795000  1.795000 4.055000 2.295000 ;
     LAYER mcon ;
-      RECT 0.150000 1.105000 0.320000 1.275000 ;
-      RECT 3.380000 1.105000 3.550000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.150000  1.105000 0.320000 1.275000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.380000  1.105000 3.550000 1.275000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
     LAYER met1 ;
       RECT 0.085000 1.075000 0.380000 1.120000 ;
       RECT 0.085000 1.120000 3.610000 1.260000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
index 811cd49..c8ce2d8 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.magic.lef
@@ -64,25 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.930000 0.595000 ;
-        RECT 2.345000  0.085000 2.675000 0.485000 ;
-        RECT 3.185000  0.085000 3.515000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -92,54 +73,69 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 1.845000 0.930000 2.635000 ;
-        RECT 1.980000 2.275000 2.310000 2.635000 ;
-        RECT 2.820000 2.275000 3.150000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.345000 0.665000 ;
-      RECT 0.085000 0.665000 0.320000 1.765000 ;
-      RECT 0.085000 1.765000 0.345000 2.465000 ;
-      RECT 1.100000 0.255000 1.725000 0.595000 ;
-      RECT 1.100000 1.595000 1.725000 1.765000 ;
-      RECT 1.100000 1.765000 1.355000 2.465000 ;
-      RECT 1.450000 0.595000 1.725000 1.025000 ;
-      RECT 1.450000 1.025000 3.810000 1.275000 ;
-      RECT 1.450000 1.275000 1.725000 1.595000 ;
-      RECT 1.565000 1.935000 5.895000 2.105000 ;
-      RECT 1.565000 2.105000 1.810000 2.465000 ;
-      RECT 1.895000 0.255000 2.175000 0.655000 ;
-      RECT 1.895000 0.655000 3.975000 0.855000 ;
-      RECT 1.895000 1.895000 5.895000 1.935000 ;
-      RECT 2.480000 2.105000 2.650000 2.465000 ;
-      RECT 2.845000 0.275000 3.015000 0.655000 ;
-      RECT 3.320000 2.105000 5.895000 2.465000 ;
-      RECT 3.685000 0.255000 5.735000 0.445000 ;
-      RECT 3.685000 0.445000 3.975000 0.655000 ;
-      RECT 3.980000 1.025000 5.505000 1.275000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.280000 0.345000 0.665000 ;
+      RECT 0.085000  0.665000 0.320000 1.765000 ;
+      RECT 0.085000  1.765000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.930000 0.595000 ;
+      RECT 0.515000  1.845000 0.930000 2.635000 ;
+      RECT 1.100000  0.255000 1.725000 0.595000 ;
+      RECT 1.100000  1.595000 1.725000 1.765000 ;
+      RECT 1.100000  1.765000 1.355000 2.465000 ;
+      RECT 1.450000  0.595000 1.725000 1.025000 ;
+      RECT 1.450000  1.025000 3.810000 1.275000 ;
+      RECT 1.450000  1.275000 1.725000 1.595000 ;
+      RECT 1.565000  1.935000 5.895000 2.105000 ;
+      RECT 1.565000  2.105000 1.810000 2.465000 ;
+      RECT 1.895000  0.255000 2.175000 0.655000 ;
+      RECT 1.895000  0.655000 3.975000 0.855000 ;
+      RECT 1.895000  1.895000 5.895000 1.935000 ;
+      RECT 1.980000  2.275000 2.310000 2.635000 ;
+      RECT 2.345000  0.085000 2.675000 0.485000 ;
+      RECT 2.480000  2.105000 2.650000 2.465000 ;
+      RECT 2.820000  2.275000 3.150000 2.635000 ;
+      RECT 2.845000  0.275000 3.015000 0.655000 ;
+      RECT 3.185000  0.085000 3.515000 0.485000 ;
+      RECT 3.320000  2.105000 5.895000 2.465000 ;
+      RECT 3.685000  0.255000 5.735000 0.445000 ;
+      RECT 3.685000  0.445000 3.975000 0.655000 ;
+      RECT 3.980000  1.025000 5.505000 1.275000 ;
     LAYER mcon ;
-      RECT 0.150000 1.105000 0.320000 1.275000 ;
-      RECT 4.310000 1.105000 4.480000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.150000  1.105000 0.320000 1.275000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.310000  1.105000 4.480000 1.275000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
     LAYER met1 ;
       RECT 0.085000 1.075000 0.380000 1.120000 ;
       RECT 0.085000 1.120000 4.540000 1.260000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
index d9233d2..a351c8f 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.magic.lef
@@ -66,36 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.085000  0.085000 0.445000 0.825000 ;
-        RECT 0.970000  0.085000 1.305000 0.445000 ;
-        RECT 2.655000  0.085000 2.985000 0.485000 ;
-        RECT 3.495000  0.085000 3.825000 0.485000 ;
-        RECT 4.335000  0.085000 4.665000 0.485000 ;
-        RECT 5.175000  0.085000 5.505000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -105,67 +75,93 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.085000 1.785000 0.445000 2.635000 ;
-        RECT 0.970000 1.865000 1.305000 2.635000 ;
-        RECT 2.415000 2.235000 2.745000 2.635000 ;
-        RECT 3.255000 2.235000 3.585000 2.635000 ;
-        RECT 4.095000 2.235000 4.425000 2.635000 ;
-        RECT 4.935000 2.235000 5.265000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        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.600000 0.995000 0.800000 1.615000 ;
-      RECT 0.615000 0.280000 0.800000 0.995000 ;
-      RECT 0.615000 1.615000 0.800000 2.465000 ;
-      RECT 1.475000 0.255000 1.985000 0.825000 ;
-      RECT 1.475000 1.495000 1.825000 2.465000 ;
-      RECT 1.600000 0.825000 1.985000 1.025000 ;
-      RECT 1.600000 1.025000 5.925000 1.275000 ;
-      RECT 1.600000 1.275000 1.825000 1.495000 ;
-      RECT 1.995000 1.895000 9.575000 2.065000 ;
-      RECT 1.995000 2.065000 2.245000 2.465000 ;
-      RECT 2.155000 0.255000 2.485000 0.655000 ;
-      RECT 2.155000 0.655000 6.105000 0.855000 ;
-      RECT 2.915000 2.065000 3.085000 2.465000 ;
-      RECT 3.155000 0.275000 3.325000 0.655000 ;
-      RECT 3.755000 2.065000 3.925000 2.465000 ;
-      RECT 3.995000 0.255000 4.165000 0.655000 ;
-      RECT 4.595000 2.065000 4.765000 2.465000 ;
-      RECT 4.835000 0.275000 5.005000 0.655000 ;
-      RECT 5.435000 2.065000 9.575000 2.465000 ;
-      RECT 5.675000 0.255000 9.575000 0.445000 ;
-      RECT 5.675000 0.445000 6.105000 0.655000 ;
-      RECT 6.175000 1.025000 9.155000 1.275000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.085000  0.085000 0.445000 0.825000 ;
+      RECT 0.085000  1.785000 0.445000 2.635000 ;
+      RECT 0.600000  0.995000 0.800000 1.615000 ;
+      RECT 0.615000  0.280000 0.800000 0.995000 ;
+      RECT 0.615000  1.615000 0.800000 2.465000 ;
+      RECT 0.970000  0.085000 1.305000 0.445000 ;
+      RECT 0.970000  1.865000 1.305000 2.635000 ;
+      RECT 1.475000  0.255000 1.985000 0.825000 ;
+      RECT 1.475000  1.495000 1.825000 2.465000 ;
+      RECT 1.600000  0.825000 1.985000 1.025000 ;
+      RECT 1.600000  1.025000 5.925000 1.275000 ;
+      RECT 1.600000  1.275000 1.825000 1.495000 ;
+      RECT 1.995000  1.895000 9.575000 2.065000 ;
+      RECT 1.995000  2.065000 2.245000 2.465000 ;
+      RECT 2.155000  0.255000 2.485000 0.655000 ;
+      RECT 2.155000  0.655000 6.105000 0.855000 ;
+      RECT 2.415000  2.235000 2.745000 2.635000 ;
+      RECT 2.655000  0.085000 2.985000 0.485000 ;
+      RECT 2.915000  2.065000 3.085000 2.465000 ;
+      RECT 3.155000  0.275000 3.325000 0.655000 ;
+      RECT 3.255000  2.235000 3.585000 2.635000 ;
+      RECT 3.495000  0.085000 3.825000 0.485000 ;
+      RECT 3.755000  2.065000 3.925000 2.465000 ;
+      RECT 3.995000  0.255000 4.165000 0.655000 ;
+      RECT 4.095000  2.235000 4.425000 2.635000 ;
+      RECT 4.335000  0.085000 4.665000 0.485000 ;
+      RECT 4.595000  2.065000 4.765000 2.465000 ;
+      RECT 4.835000  0.275000 5.005000 0.655000 ;
+      RECT 4.935000  2.235000 5.265000 2.635000 ;
+      RECT 5.175000  0.085000 5.505000 0.485000 ;
+      RECT 5.435000  2.065000 9.575000 2.465000 ;
+      RECT 5.675000  0.255000 9.575000 0.445000 ;
+      RECT 5.675000  0.445000 6.105000 0.655000 ;
+      RECT 6.175000  1.025000 9.155000 1.275000 ;
     LAYER mcon ;
-      RECT 0.605000 1.105000 0.775000 1.275000 ;
-      RECT 6.580000 1.105000 6.750000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  1.105000 0.775000 1.275000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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.580000  1.105000 6.750000 1.275000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
     LAYER met1 ;
       RECT 0.545000 1.075000 0.835000 1.120000 ;
       RECT 0.545000 1.120000 6.810000 1.260000 ;
diff --git a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
index 6bbc1cf..1f7d3e0 100644
--- a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.magic.lef
@@ -83,42 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  2.235000  0.085000  2.565000 0.515000 ;
-        RECT  3.185000  0.085000  3.515000 0.610000 ;
-        RECT  5.945000  0.085000  6.340000 0.560000 ;
-        RECT  7.165000  0.085000  7.440000 0.615000 ;
-        RECT  9.095000  0.085000  9.345000 0.900000 ;
-        RECT 10.810000  0.085000 11.055000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -128,109 +92,141 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  2.235000 1.890000  2.565000 2.635000 ;
-        RECT  3.265000 1.825000  3.460000 2.635000 ;
-        RECT  6.125000 1.835000  6.360000 2.635000 ;
-        RECT  7.070000 2.105000  7.360000 2.635000 ;
-        RECT  9.060000 1.495000  9.230000 2.635000 ;
-        RECT 10.810000 1.465000 11.055000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.845000 0.805000 ;
-      RECT  0.175000 1.795000  0.845000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.615000 0.805000  0.845000 1.795000 ;
-      RECT  1.015000 0.345000  1.185000 2.465000 ;
-      RECT  1.355000 0.255000  1.785000 0.515000 ;
-      RECT  1.355000 0.515000  1.525000 1.890000 ;
-      RECT  1.355000 1.890000  1.785000 2.465000 ;
-      RECT  2.495000 1.355000  3.085000 1.720000 ;
-      RECT  2.755000 1.720000  3.085000 2.425000 ;
-      RECT  2.780000 0.255000  3.005000 0.845000 ;
-      RECT  2.780000 0.845000  3.635000 1.175000 ;
-      RECT  2.780000 1.175000  3.085000 1.355000 ;
-      RECT  3.805000 0.685000  3.975000 1.320000 ;
-      RECT  3.805000 1.320000  4.175000 1.650000 ;
-      RECT  4.125000 1.820000  4.515000 2.020000 ;
-      RECT  4.125000 2.020000  4.455000 2.465000 ;
-      RECT  4.145000 0.255000  4.415000 0.980000 ;
-      RECT  4.145000 0.980000  4.515000 1.150000 ;
-      RECT  4.345000 1.150000  4.515000 1.820000 ;
-      RECT  4.795000 1.125000  4.980000 1.720000 ;
-      RECT  4.815000 0.735000  5.320000 0.955000 ;
-      RECT  4.915000 2.175000  5.955000 2.375000 ;
-      RECT  5.005000 0.255000  5.680000 0.565000 ;
-      RECT  5.150000 0.955000  5.320000 1.655000 ;
-      RECT  5.150000 1.655000  5.615000 2.005000 ;
-      RECT  5.510000 0.565000  5.680000 1.315000 ;
-      RECT  5.510000 1.315000  6.360000 1.485000 ;
-      RECT  5.785000 1.485000  6.360000 1.575000 ;
-      RECT  5.785000 1.575000  5.955000 2.175000 ;
-      RECT  5.870000 0.765000  6.935000 1.045000 ;
-      RECT  5.870000 1.045000  7.445000 1.065000 ;
-      RECT  5.870000 1.065000  6.070000 1.095000 ;
-      RECT  6.190000 1.245000  6.360000 1.315000 ;
-      RECT  6.530000 0.255000  6.935000 0.765000 ;
-      RECT  6.530000 1.065000  7.445000 1.375000 ;
-      RECT  6.530000 1.375000  6.860000 2.465000 ;
-      RECT  7.790000 1.245000  7.980000 1.965000 ;
-      RECT  7.925000 2.165000  8.890000 2.355000 ;
-      RECT  8.005000 0.705000  8.470000 1.035000 ;
-      RECT  8.025000 0.330000  8.890000 0.535000 ;
-      RECT  8.150000 1.035000  8.470000 1.995000 ;
-      RECT  8.640000 0.535000  8.890000 2.165000 ;
-      RECT  9.900000 1.575000 10.130000 2.010000 ;
-      RECT 10.015000 0.890000 10.640000 1.220000 ;
-      RECT 10.300000 0.255000 10.640000 0.890000 ;
-      RECT 10.300000 1.220000 10.640000 2.465000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.845000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.355000  0.255000  1.785000 0.515000 ;
+      RECT  1.355000  0.515000  1.525000 1.890000 ;
+      RECT  1.355000  1.890000  1.785000 2.465000 ;
+      RECT  2.235000  0.085000  2.565000 0.515000 ;
+      RECT  2.235000  1.890000  2.565000 2.635000 ;
+      RECT  2.495000  1.355000  3.085000 1.720000 ;
+      RECT  2.755000  1.720000  3.085000 2.425000 ;
+      RECT  2.780000  0.255000  3.005000 0.845000 ;
+      RECT  2.780000  0.845000  3.635000 1.175000 ;
+      RECT  2.780000  1.175000  3.085000 1.355000 ;
+      RECT  3.185000  0.085000  3.515000 0.610000 ;
+      RECT  3.265000  1.825000  3.460000 2.635000 ;
+      RECT  3.805000  0.685000  3.975000 1.320000 ;
+      RECT  3.805000  1.320000  4.175000 1.650000 ;
+      RECT  4.125000  1.820000  4.515000 2.020000 ;
+      RECT  4.125000  2.020000  4.455000 2.465000 ;
+      RECT  4.145000  0.255000  4.415000 0.980000 ;
+      RECT  4.145000  0.980000  4.515000 1.150000 ;
+      RECT  4.345000  1.150000  4.515000 1.820000 ;
+      RECT  4.795000  1.125000  4.980000 1.720000 ;
+      RECT  4.815000  0.735000  5.320000 0.955000 ;
+      RECT  4.915000  2.175000  5.955000 2.375000 ;
+      RECT  5.005000  0.255000  5.680000 0.565000 ;
+      RECT  5.150000  0.955000  5.320000 1.655000 ;
+      RECT  5.150000  1.655000  5.615000 2.005000 ;
+      RECT  5.510000  0.565000  5.680000 1.315000 ;
+      RECT  5.510000  1.315000  6.360000 1.485000 ;
+      RECT  5.785000  1.485000  6.360000 1.575000 ;
+      RECT  5.785000  1.575000  5.955000 2.175000 ;
+      RECT  5.870000  0.765000  6.935000 1.045000 ;
+      RECT  5.870000  1.045000  7.445000 1.065000 ;
+      RECT  5.870000  1.065000  6.070000 1.095000 ;
+      RECT  5.945000  0.085000  6.340000 0.560000 ;
+      RECT  6.125000  1.835000  6.360000 2.635000 ;
+      RECT  6.190000  1.245000  6.360000 1.315000 ;
+      RECT  6.530000  0.255000  6.935000 0.765000 ;
+      RECT  6.530000  1.065000  7.445000 1.375000 ;
+      RECT  6.530000  1.375000  6.860000 2.465000 ;
+      RECT  7.070000  2.105000  7.360000 2.635000 ;
+      RECT  7.165000  0.085000  7.440000 0.615000 ;
+      RECT  7.790000  1.245000  7.980000 1.965000 ;
+      RECT  7.925000  2.165000  8.890000 2.355000 ;
+      RECT  8.005000  0.705000  8.470000 1.035000 ;
+      RECT  8.025000  0.330000  8.890000 0.535000 ;
+      RECT  8.150000  1.035000  8.470000 1.995000 ;
+      RECT  8.640000  0.535000  8.890000 2.165000 ;
+      RECT  9.060000  1.495000  9.230000 2.635000 ;
+      RECT  9.095000  0.085000  9.345000 0.900000 ;
+      RECT  9.900000  1.575000 10.130000 2.010000 ;
+      RECT 10.015000  0.890000 10.640000 1.220000 ;
+      RECT 10.300000  0.255000 10.640000 0.890000 ;
+      RECT 10.300000  1.220000 10.640000 2.465000 ;
+      RECT 10.810000  0.085000 11.055000 0.900000 ;
+      RECT 10.810000  1.465000 11.055000 2.635000 ;
     LAYER mcon ;
-      RECT  0.635000 1.785000  0.805000 1.955000 ;
-      RECT  1.015000 1.445000  1.185000 1.615000 ;
-      RECT  1.355000 0.425000  1.525000 0.595000 ;
-      RECT  3.805000 0.765000  3.975000 0.935000 ;
-      RECT  4.185000 0.425000  4.355000 0.595000 ;
-      RECT  4.800000 1.445000  4.970000 1.615000 ;
-      RECT  5.210000 1.785000  5.380000 1.955000 ;
-      RECT  7.800000 1.785000  7.970000 1.955000 ;
-      RECT  8.220000 1.445000  8.390000 1.615000 ;
-      RECT  8.680000 1.785000  8.850000 1.955000 ;
-      RECT  9.930000 1.785000 10.100000 1.955000 ;
-      RECT 10.390000 0.765000 10.560000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.635000  1.785000  0.805000 1.955000 ;
+      RECT  1.015000  1.445000  1.185000 1.615000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.355000  0.425000  1.525000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.805000  0.765000  3.975000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.185000  0.425000  4.355000 0.595000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  4.800000  1.445000  4.970000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.210000  1.785000  5.380000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.800000  1.785000  7.970000 1.955000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.220000  1.445000  8.390000 1.615000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.680000  1.785000  8.850000 1.955000 ;
+      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  9.930000  1.785000 10.100000 1.955000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.390000  0.765000 10.560000 0.935000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
     LAYER met1 ;
       RECT  0.575000 1.755000  0.865000 1.800000 ;
       RECT  0.575000 1.800000  8.030000 1.940000 ;
diff --git a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
index bd79dce..08ab773 100644
--- a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
+++ b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.magic.lef
@@ -72,40 +72,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  2.235000  0.085000  2.565000 0.515000 ;
-        RECT  3.185000  0.085000  3.515000 0.610000 ;
-        RECT  5.945000  0.085000  6.340000 0.560000 ;
-        RECT  7.165000  0.085000  7.440000 0.615000 ;
-        RECT  9.050000  0.085000  9.365000 0.615000 ;
-        RECT 10.050000  0.085000 10.295000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -115,107 +81,137 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  2.235000 1.890000  2.565000 2.635000 ;
-        RECT  3.265000 1.825000  3.460000 2.635000 ;
-        RECT  6.125000 1.835000  6.360000 2.635000 ;
-        RECT  7.070000 2.105000  7.360000 2.635000 ;
-        RECT  8.980000 2.135000  9.240000 2.635000 ;
-        RECT 10.050000 1.465000 10.295000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.845000 0.805000 ;
-      RECT 0.175000 1.795000 0.845000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.615000 0.805000 0.845000 1.795000 ;
-      RECT 1.015000 0.345000 1.185000 2.465000 ;
-      RECT 1.355000 0.255000 1.785000 0.515000 ;
-      RECT 1.355000 0.515000 1.525000 1.890000 ;
-      RECT 1.355000 1.890000 1.785000 2.465000 ;
-      RECT 2.495000 1.355000 3.085000 1.720000 ;
-      RECT 2.755000 1.720000 3.085000 2.425000 ;
-      RECT 2.780000 0.255000 3.005000 0.845000 ;
-      RECT 2.780000 0.845000 3.635000 1.175000 ;
-      RECT 2.780000 1.175000 3.085000 1.355000 ;
-      RECT 3.805000 0.685000 3.975000 1.320000 ;
-      RECT 3.805000 1.320000 4.175000 1.650000 ;
-      RECT 4.125000 1.820000 4.515000 2.020000 ;
-      RECT 4.125000 2.020000 4.455000 2.465000 ;
-      RECT 4.145000 0.255000 4.415000 0.980000 ;
-      RECT 4.145000 0.980000 4.515000 1.150000 ;
-      RECT 4.345000 1.150000 4.515000 1.820000 ;
-      RECT 4.795000 1.125000 4.980000 1.720000 ;
-      RECT 4.815000 0.735000 5.320000 0.955000 ;
-      RECT 4.915000 2.175000 5.955000 2.375000 ;
-      RECT 5.005000 0.255000 5.680000 0.565000 ;
-      RECT 5.150000 0.955000 5.320000 1.655000 ;
-      RECT 5.150000 1.655000 5.615000 2.005000 ;
-      RECT 5.510000 0.565000 5.680000 1.315000 ;
-      RECT 5.510000 1.315000 6.360000 1.485000 ;
-      RECT 5.785000 1.485000 6.360000 1.575000 ;
-      RECT 5.785000 1.575000 5.955000 2.175000 ;
-      RECT 5.870000 0.765000 6.935000 1.045000 ;
-      RECT 5.870000 1.045000 7.445000 1.065000 ;
-      RECT 5.870000 1.065000 6.070000 1.095000 ;
-      RECT 6.190000 1.245000 6.360000 1.315000 ;
-      RECT 6.530000 0.255000 6.935000 0.765000 ;
-      RECT 6.530000 1.065000 7.445000 1.375000 ;
-      RECT 6.530000 1.375000 6.860000 2.465000 ;
-      RECT 7.790000 1.245000 7.980000 1.965000 ;
-      RECT 7.925000 2.165000 8.810000 2.355000 ;
-      RECT 8.005000 0.705000 8.470000 1.035000 ;
-      RECT 8.025000 0.330000 8.810000 0.535000 ;
-      RECT 8.150000 1.035000 8.470000 1.995000 ;
-      RECT 8.640000 0.535000 8.810000 0.995000 ;
-      RECT 8.640000 0.995000 9.510000 1.325000 ;
-      RECT 8.640000 1.325000 8.810000 2.165000 ;
-      RECT 8.980000 1.530000 9.880000 1.905000 ;
-      RECT 9.540000 1.905000 9.880000 2.465000 ;
-      RECT 9.550000 0.300000 9.880000 0.825000 ;
-      RECT 9.690000 0.825000 9.880000 1.530000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.845000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.355000  0.255000  1.785000 0.515000 ;
+      RECT  1.355000  0.515000  1.525000 1.890000 ;
+      RECT  1.355000  1.890000  1.785000 2.465000 ;
+      RECT  2.235000  0.085000  2.565000 0.515000 ;
+      RECT  2.235000  1.890000  2.565000 2.635000 ;
+      RECT  2.495000  1.355000  3.085000 1.720000 ;
+      RECT  2.755000  1.720000  3.085000 2.425000 ;
+      RECT  2.780000  0.255000  3.005000 0.845000 ;
+      RECT  2.780000  0.845000  3.635000 1.175000 ;
+      RECT  2.780000  1.175000  3.085000 1.355000 ;
+      RECT  3.185000  0.085000  3.515000 0.610000 ;
+      RECT  3.265000  1.825000  3.460000 2.635000 ;
+      RECT  3.805000  0.685000  3.975000 1.320000 ;
+      RECT  3.805000  1.320000  4.175000 1.650000 ;
+      RECT  4.125000  1.820000  4.515000 2.020000 ;
+      RECT  4.125000  2.020000  4.455000 2.465000 ;
+      RECT  4.145000  0.255000  4.415000 0.980000 ;
+      RECT  4.145000  0.980000  4.515000 1.150000 ;
+      RECT  4.345000  1.150000  4.515000 1.820000 ;
+      RECT  4.795000  1.125000  4.980000 1.720000 ;
+      RECT  4.815000  0.735000  5.320000 0.955000 ;
+      RECT  4.915000  2.175000  5.955000 2.375000 ;
+      RECT  5.005000  0.255000  5.680000 0.565000 ;
+      RECT  5.150000  0.955000  5.320000 1.655000 ;
+      RECT  5.150000  1.655000  5.615000 2.005000 ;
+      RECT  5.510000  0.565000  5.680000 1.315000 ;
+      RECT  5.510000  1.315000  6.360000 1.485000 ;
+      RECT  5.785000  1.485000  6.360000 1.575000 ;
+      RECT  5.785000  1.575000  5.955000 2.175000 ;
+      RECT  5.870000  0.765000  6.935000 1.045000 ;
+      RECT  5.870000  1.045000  7.445000 1.065000 ;
+      RECT  5.870000  1.065000  6.070000 1.095000 ;
+      RECT  5.945000  0.085000  6.340000 0.560000 ;
+      RECT  6.125000  1.835000  6.360000 2.635000 ;
+      RECT  6.190000  1.245000  6.360000 1.315000 ;
+      RECT  6.530000  0.255000  6.935000 0.765000 ;
+      RECT  6.530000  1.065000  7.445000 1.375000 ;
+      RECT  6.530000  1.375000  6.860000 2.465000 ;
+      RECT  7.070000  2.105000  7.360000 2.635000 ;
+      RECT  7.165000  0.085000  7.440000 0.615000 ;
+      RECT  7.790000  1.245000  7.980000 1.965000 ;
+      RECT  7.925000  2.165000  8.810000 2.355000 ;
+      RECT  8.005000  0.705000  8.470000 1.035000 ;
+      RECT  8.025000  0.330000  8.810000 0.535000 ;
+      RECT  8.150000  1.035000  8.470000 1.995000 ;
+      RECT  8.640000  0.535000  8.810000 0.995000 ;
+      RECT  8.640000  0.995000  9.510000 1.325000 ;
+      RECT  8.640000  1.325000  8.810000 2.165000 ;
+      RECT  8.980000  1.530000  9.880000 1.905000 ;
+      RECT  8.980000  2.135000  9.240000 2.635000 ;
+      RECT  9.050000  0.085000  9.365000 0.615000 ;
+      RECT  9.540000  1.905000  9.880000 2.465000 ;
+      RECT  9.550000  0.300000  9.880000 0.825000 ;
+      RECT  9.690000  0.825000  9.880000 1.530000 ;
+      RECT 10.050000  0.085000 10.295000 0.900000 ;
+      RECT 10.050000  1.465000 10.295000 2.635000 ;
     LAYER mcon ;
-      RECT 0.635000 1.785000 0.805000 1.955000 ;
-      RECT 1.015000 1.445000 1.185000 1.615000 ;
-      RECT 1.355000 0.425000 1.525000 0.595000 ;
-      RECT 3.805000 0.765000 3.975000 0.935000 ;
-      RECT 4.185000 0.425000 4.355000 0.595000 ;
-      RECT 4.800000 1.445000 4.970000 1.615000 ;
-      RECT 5.210000 1.785000 5.380000 1.955000 ;
-      RECT 7.800000 1.785000 7.970000 1.955000 ;
-      RECT 8.220000 1.445000 8.390000 1.615000 ;
-      RECT 9.700000 0.765000 9.870000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.635000  1.785000  0.805000 1.955000 ;
+      RECT  1.015000  1.445000  1.185000 1.615000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.355000  0.425000  1.525000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.805000  0.765000  3.975000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.185000  0.425000  4.355000 0.595000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  4.800000  1.445000  4.970000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.210000  1.785000  5.380000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.800000  1.785000  7.970000 1.955000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.220000  1.445000  8.390000 1.615000 ;
+      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.700000  0.765000  9.870000 0.935000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
     LAYER met1 ;
       RECT 0.575000 1.755000 0.865000 1.800000 ;
       RECT 0.575000 1.800000 8.030000 1.940000 ;
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
index 8c69990..9a89b0f 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_0.magic.lef
@@ -64,14 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.530000  0.085000 0.990000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -81,24 +73,29 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.570000 2.235000 0.990000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.360000 0.655000 ;
-      RECT 0.085000 0.655000 0.990000 0.825000 ;
-      RECT 0.085000 1.895000 0.990000 2.065000 ;
-      RECT 0.085000 2.065000 0.400000 2.465000 ;
-      RECT 0.820000 0.825000 0.990000 1.895000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.085000  0.255000 0.360000 0.655000 ;
+      RECT 0.085000  0.655000 0.990000 0.825000 ;
+      RECT 0.085000  1.895000 0.990000 2.065000 ;
+      RECT 0.085000  2.065000 0.400000 2.465000 ;
+      RECT 0.530000  0.085000 0.990000 0.485000 ;
+      RECT 0.570000  2.235000 0.990000 2.635000 ;
+      RECT 0.820000  0.825000 0.990000 1.895000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
   END
 END sky130_fd_sc_hd__einvn_0
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
index 999c257..79d7452 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_1.magic.lef
@@ -64,15 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.540000  0.085000 1.440000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -82,26 +73,32 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.540000 2.235000 0.870000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.370000 0.615000 ;
-      RECT 0.085000 0.615000 1.450000 0.785000 ;
-      RECT 0.085000 1.895000 0.870000 2.065000 ;
-      RECT 0.085000 2.065000 0.370000 2.465000 ;
-      RECT 0.685000 0.785000 1.450000 1.615000 ;
-      RECT 0.685000 1.615000 0.870000 1.895000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.085000  0.255000 0.370000 0.615000 ;
+      RECT 0.085000  0.615000 1.450000 0.785000 ;
+      RECT 0.085000  1.895000 0.870000 2.065000 ;
+      RECT 0.085000  2.065000 0.370000 2.465000 ;
+      RECT 0.540000  0.085000 1.440000 0.445000 ;
+      RECT 0.540000  2.235000 0.870000 2.635000 ;
+      RECT 0.685000  0.785000 1.450000 1.615000 ;
+      RECT 0.685000  1.615000 0.870000 1.895000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
index 15203aa..9a4ee8e 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_2.magic.lef
@@ -65,18 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 1.450000  0.085000 1.780000 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
@@ -86,39 +74,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.515000 1.895000 0.895000 2.635000 ;
-        RECT 1.410000 2.255000 2.275000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.840000 0.825000 ;
-      RECT 0.085000 1.555000 0.895000 1.725000 ;
-      RECT 0.085000 1.725000 0.345000 2.465000 ;
-      RECT 0.495000 0.825000 0.840000 0.995000 ;
-      RECT 0.495000 0.995000 2.035000 1.275000 ;
-      RECT 0.495000 1.275000 0.895000 1.555000 ;
-      RECT 1.015000 0.255000 1.280000 0.655000 ;
-      RECT 1.015000 0.655000 2.195000 0.825000 ;
-      RECT 1.070000 1.445000 1.775000 1.865000 ;
-      RECT 1.070000 1.865000 2.615000 2.085000 ;
-      RECT 1.070000 2.085000 1.240000 2.465000 ;
-      RECT 1.950000 0.255000 3.135000 0.425000 ;
-      RECT 1.950000 0.425000 2.195000 0.655000 ;
-      RECT 2.445000 2.085000 2.615000 2.465000 ;
-      RECT 2.865000 0.425000 3.135000 0.775000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.840000 0.825000 ;
+      RECT 0.085000  1.555000 0.895000 1.725000 ;
+      RECT 0.085000  1.725000 0.345000 2.465000 ;
+      RECT 0.495000  0.825000 0.840000 0.995000 ;
+      RECT 0.495000  0.995000 2.035000 1.275000 ;
+      RECT 0.495000  1.275000 0.895000 1.555000 ;
+      RECT 0.515000  0.085000 0.845000 0.485000 ;
+      RECT 0.515000  1.895000 0.895000 2.635000 ;
+      RECT 1.015000  0.255000 1.280000 0.655000 ;
+      RECT 1.015000  0.655000 2.195000 0.825000 ;
+      RECT 1.070000  1.445000 1.775000 1.865000 ;
+      RECT 1.070000  1.865000 2.615000 2.085000 ;
+      RECT 1.070000  2.085000 1.240000 2.465000 ;
+      RECT 1.410000  2.255000 2.275000 2.635000 ;
+      RECT 1.450000  0.085000 1.780000 0.485000 ;
+      RECT 1.950000  0.255000 3.135000 0.425000 ;
+      RECT 1.950000  0.425000 2.195000 0.655000 ;
+      RECT 2.445000  2.085000 2.615000 2.465000 ;
+      RECT 2.865000  0.425000 3.135000 0.775000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
index 74b3b9a..272c35f 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_4.magic.lef
@@ -64,23 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 1.455000  0.085000 1.785000 0.485000 ;
-        RECT 2.295000  0.085000 2.625000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -90,47 +73,61 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 1.835000 0.845000 2.635000 ;
-        RECT 1.410000 1.835000 1.740000 2.635000 ;
-        RECT 2.250000 1.835000 2.640000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.845000 0.825000 ;
-      RECT 0.085000 1.495000 0.845000 1.665000 ;
-      RECT 0.085000 1.665000 0.345000 2.465000 ;
-      RECT 0.515000 0.825000 0.845000 0.995000 ;
-      RECT 0.515000 0.995000 3.020000 1.325000 ;
-      RECT 0.515000 1.325000 0.845000 1.495000 ;
-      RECT 1.015000 0.255000 1.285000 0.655000 ;
-      RECT 1.015000 0.655000 2.995000 0.825000 ;
-      RECT 1.015000 1.495000 3.020000 1.665000 ;
-      RECT 1.015000 1.665000 1.240000 2.465000 ;
-      RECT 1.910000 1.665000 2.080000 2.465000 ;
-      RECT 1.955000 0.255000 2.125000 0.655000 ;
-      RECT 2.810000 1.665000 3.020000 2.295000 ;
-      RECT 2.810000 2.295000 4.975000 2.465000 ;
-      RECT 2.825000 0.255000 4.975000 0.450000 ;
-      RECT 2.825000 0.450000 2.995000 0.655000 ;
-      RECT 3.690000 1.650000 3.860000 2.295000 ;
-      RECT 4.530000 1.650000 4.975000 2.295000 ;
+      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.655000 ;
+      RECT 0.085000  0.655000 0.845000 0.825000 ;
+      RECT 0.085000  1.495000 0.845000 1.665000 ;
+      RECT 0.085000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.485000 ;
+      RECT 0.515000  0.825000 0.845000 0.995000 ;
+      RECT 0.515000  0.995000 3.020000 1.325000 ;
+      RECT 0.515000  1.325000 0.845000 1.495000 ;
+      RECT 0.515000  1.835000 0.845000 2.635000 ;
+      RECT 1.015000  0.255000 1.285000 0.655000 ;
+      RECT 1.015000  0.655000 2.995000 0.825000 ;
+      RECT 1.015000  1.495000 3.020000 1.665000 ;
+      RECT 1.015000  1.665000 1.240000 2.465000 ;
+      RECT 1.410000  1.835000 1.740000 2.635000 ;
+      RECT 1.455000  0.085000 1.785000 0.485000 ;
+      RECT 1.910000  1.665000 2.080000 2.465000 ;
+      RECT 1.955000  0.255000 2.125000 0.655000 ;
+      RECT 2.250000  1.835000 2.640000 2.635000 ;
+      RECT 2.295000  0.085000 2.625000 0.485000 ;
+      RECT 2.810000  1.665000 3.020000 2.295000 ;
+      RECT 2.810000  2.295000 4.975000 2.465000 ;
+      RECT 2.825000  0.255000 4.975000 0.450000 ;
+      RECT 2.825000  0.450000 2.995000 0.655000 ;
+      RECT 3.690000  1.650000 3.860000 2.295000 ;
+      RECT 4.530000  1.650000 4.975000 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
 END sky130_fd_sc_hd__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
index bde8eb8..15f6d00 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_8.magic.lef
@@ -68,32 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 1.455000  0.085000 1.785000 0.485000 ;
-        RECT 2.295000  0.085000 2.625000 0.485000 ;
-        RECT 3.135000  0.085000 3.465000 0.485000 ;
-        RECT 3.975000  0.085000 4.315000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -103,62 +77,85 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.515000 1.835000 0.845000 2.635000 ;
-        RECT 1.410000 1.835000 1.740000 2.635000 ;
-        RECT 2.250000 1.835000 2.580000 2.635000 ;
-        RECT 3.090000 1.835000 3.420000 2.635000 ;
-        RECT 3.930000 1.835000 4.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 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.345000 0.655000 ;
-      RECT 0.090000 0.655000 0.845000 0.825000 ;
-      RECT 0.090000 1.495000 0.845000 1.665000 ;
-      RECT 0.090000 1.665000 0.345000 2.465000 ;
-      RECT 0.515000 0.825000 0.845000 0.995000 ;
-      RECT 0.515000 0.995000 4.475000 1.325000 ;
-      RECT 0.515000 1.325000 0.845000 1.495000 ;
-      RECT 1.015000 0.255000 1.285000 0.655000 ;
-      RECT 1.015000 0.655000 4.700000 0.825000 ;
-      RECT 1.015000 1.495000 4.700000 1.665000 ;
-      RECT 1.015000 1.665000 1.240000 2.465000 ;
-      RECT 1.910000 1.665000 2.080000 2.465000 ;
-      RECT 1.955000 0.255000 2.125000 0.655000 ;
-      RECT 2.750000 1.665000 2.920000 2.465000 ;
-      RECT 2.795000 0.255000 2.965000 0.655000 ;
-      RECT 3.590000 1.665000 3.760000 2.465000 ;
-      RECT 3.635000 0.255000 3.805000 0.655000 ;
-      RECT 4.450000 1.665000 4.700000 2.295000 ;
-      RECT 4.450000 2.295000 8.195000 2.465000 ;
-      RECT 4.485000 0.255000 8.195000 0.450000 ;
-      RECT 4.485000 0.450000 4.700000 0.655000 ;
-      RECT 5.370000 1.795000 5.540000 2.295000 ;
-      RECT 6.210000 1.795000 6.380000 2.295000 ;
-      RECT 7.050000 1.795000 7.220000 2.295000 ;
-      RECT 7.890000 1.795000 8.195000 2.295000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.090000  0.255000 0.345000 0.655000 ;
+      RECT 0.090000  0.655000 0.845000 0.825000 ;
+      RECT 0.090000  1.495000 0.845000 1.665000 ;
+      RECT 0.090000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.485000 ;
+      RECT 0.515000  0.825000 0.845000 0.995000 ;
+      RECT 0.515000  0.995000 4.475000 1.325000 ;
+      RECT 0.515000  1.325000 0.845000 1.495000 ;
+      RECT 0.515000  1.835000 0.845000 2.635000 ;
+      RECT 1.015000  0.255000 1.285000 0.655000 ;
+      RECT 1.015000  0.655000 4.700000 0.825000 ;
+      RECT 1.015000  1.495000 4.700000 1.665000 ;
+      RECT 1.015000  1.665000 1.240000 2.465000 ;
+      RECT 1.410000  1.835000 1.740000 2.635000 ;
+      RECT 1.455000  0.085000 1.785000 0.485000 ;
+      RECT 1.910000  1.665000 2.080000 2.465000 ;
+      RECT 1.955000  0.255000 2.125000 0.655000 ;
+      RECT 2.250000  1.835000 2.580000 2.635000 ;
+      RECT 2.295000  0.085000 2.625000 0.485000 ;
+      RECT 2.750000  1.665000 2.920000 2.465000 ;
+      RECT 2.795000  0.255000 2.965000 0.655000 ;
+      RECT 3.090000  1.835000 3.420000 2.635000 ;
+      RECT 3.135000  0.085000 3.465000 0.485000 ;
+      RECT 3.590000  1.665000 3.760000 2.465000 ;
+      RECT 3.635000  0.255000 3.805000 0.655000 ;
+      RECT 3.930000  1.835000 4.280000 2.635000 ;
+      RECT 3.975000  0.085000 4.315000 0.485000 ;
+      RECT 4.450000  1.665000 4.700000 2.295000 ;
+      RECT 4.450000  2.295000 8.195000 2.465000 ;
+      RECT 4.485000  0.255000 8.195000 0.450000 ;
+      RECT 4.485000  0.450000 4.700000 0.655000 ;
+      RECT 5.370000  1.795000 5.540000 2.295000 ;
+      RECT 6.210000  1.795000 6.380000 2.295000 ;
+      RECT 7.050000  1.795000 7.220000 2.295000 ;
+      RECT 7.890000  1.795000 8.195000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
 END sky130_fd_sc_hd__einvn_8
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
index 6bf5e98..8c3b0fb 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_1.magic.lef
@@ -64,15 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.515000  0.085000 1.450000 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
@@ -82,25 +73,31 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.515000 2.235000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 1.450000 0.825000 ;
-      RECT 0.085000 1.895000 1.450000 2.065000 ;
-      RECT 0.085000 2.065000 0.345000 2.465000 ;
-      RECT 0.715000 0.825000 1.450000 1.895000 ;
+      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.655000 ;
+      RECT 0.085000  0.655000 1.450000 0.825000 ;
+      RECT 0.085000  1.895000 1.450000 2.065000 ;
+      RECT 0.085000  2.065000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 1.450000 0.485000 ;
+      RECT 0.515000  2.235000 1.450000 2.635000 ;
+      RECT 0.715000  0.825000 1.450000 1.895000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
index afb07e8..ea4f431 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_2.magic.lef
@@ -62,18 +62,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.515000  0.085000 0.875000 0.485000 ;
-        RECT 1.410000  0.085000 1.770000 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
@@ -83,40 +71,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.515000 2.125000 0.875000 2.635000 ;
-        RECT 1.455000 1.895000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.875000 0.825000 ;
-      RECT 0.085000 1.785000 0.875000 1.955000 ;
-      RECT 0.085000 1.955000 0.345000 2.465000 ;
-      RECT 0.500000 0.825000 0.875000 0.995000 ;
-      RECT 0.500000 0.995000 2.180000 1.325000 ;
-      RECT 0.500000 1.325000 0.875000 1.785000 ;
-      RECT 1.045000 0.255000 1.240000 0.655000 ;
-      RECT 1.045000 0.655000 2.180000 0.825000 ;
-      RECT 1.045000 1.555000 2.155000 1.725000 ;
-      RECT 1.045000 1.725000 1.285000 2.465000 ;
-      RECT 1.940000 0.255000 3.135000 0.425000 ;
-      RECT 1.940000 0.425000 2.180000 0.655000 ;
-      RECT 1.985000 1.725000 2.155000 2.295000 ;
-      RECT 1.985000 2.295000 3.135000 2.465000 ;
-      RECT 2.850000 0.425000 3.135000 0.595000 ;
-      RECT 2.850000 1.785000 3.135000 2.295000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.875000 0.825000 ;
+      RECT 0.085000  1.785000 0.875000 1.955000 ;
+      RECT 0.085000  1.955000 0.345000 2.465000 ;
+      RECT 0.500000  0.825000 0.875000 0.995000 ;
+      RECT 0.500000  0.995000 2.180000 1.325000 ;
+      RECT 0.500000  1.325000 0.875000 1.785000 ;
+      RECT 0.515000  0.085000 0.875000 0.485000 ;
+      RECT 0.515000  2.125000 0.875000 2.635000 ;
+      RECT 1.045000  0.255000 1.240000 0.655000 ;
+      RECT 1.045000  0.655000 2.180000 0.825000 ;
+      RECT 1.045000  1.555000 2.155000 1.725000 ;
+      RECT 1.045000  1.725000 1.285000 2.465000 ;
+      RECT 1.410000  0.085000 1.770000 0.485000 ;
+      RECT 1.455000  1.895000 1.785000 2.635000 ;
+      RECT 1.940000  0.255000 3.135000 0.425000 ;
+      RECT 1.940000  0.425000 2.180000 0.655000 ;
+      RECT 1.985000  1.725000 2.155000 2.295000 ;
+      RECT 1.985000  2.295000 3.135000 2.465000 ;
+      RECT 2.850000  0.425000 3.135000 0.595000 ;
+      RECT 2.850000  1.785000 3.135000 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 ;
   END
 END sky130_fd_sc_hd__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
index 049d5d5..6bbbe30 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_4.magic.lef
@@ -66,23 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 1.375000  0.085000 1.705000 0.485000 ;
-        RECT 2.215000  0.085000 2.555000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -92,47 +75,61 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.125000 0.875000 2.635000 ;
-        RECT 1.455000 1.895000 1.785000 2.635000 ;
-        RECT 2.295000 1.895000 2.655000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.695000 0.825000 ;
-      RECT 0.085000 1.785000 0.875000 1.955000 ;
-      RECT 0.085000 1.955000 0.345000 2.465000 ;
-      RECT 0.500000 0.825000 0.695000 0.995000 ;
-      RECT 0.500000 0.995000 3.020000 1.325000 ;
-      RECT 0.500000 1.325000 0.875000 1.785000 ;
-      RECT 1.035000 0.255000 1.205000 0.655000 ;
-      RECT 1.035000 0.655000 3.020000 0.825000 ;
-      RECT 1.075000 1.555000 2.995000 1.725000 ;
-      RECT 1.075000 1.725000 1.285000 2.465000 ;
-      RECT 1.875000 0.255000 2.045000 0.655000 ;
-      RECT 1.955000 1.725000 2.125000 2.465000 ;
-      RECT 2.735000 0.255000 4.975000 0.465000 ;
-      RECT 2.735000 0.465000 3.020000 0.655000 ;
-      RECT 2.825000 1.725000 2.995000 2.295000 ;
-      RECT 2.825000 2.295000 4.975000 2.465000 ;
-      RECT 3.690000 1.785000 3.860000 2.295000 ;
-      RECT 4.530000 1.445000 4.975000 2.295000 ;
+      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.655000 ;
+      RECT 0.085000  0.655000 0.695000 0.825000 ;
+      RECT 0.085000  1.785000 0.875000 1.955000 ;
+      RECT 0.085000  1.955000 0.345000 2.465000 ;
+      RECT 0.500000  0.825000 0.695000 0.995000 ;
+      RECT 0.500000  0.995000 3.020000 1.325000 ;
+      RECT 0.500000  1.325000 0.875000 1.785000 ;
+      RECT 0.515000  0.085000 0.845000 0.485000 ;
+      RECT 0.515000  2.125000 0.875000 2.635000 ;
+      RECT 1.035000  0.255000 1.205000 0.655000 ;
+      RECT 1.035000  0.655000 3.020000 0.825000 ;
+      RECT 1.075000  1.555000 2.995000 1.725000 ;
+      RECT 1.075000  1.725000 1.285000 2.465000 ;
+      RECT 1.375000  0.085000 1.705000 0.485000 ;
+      RECT 1.455000  1.895000 1.785000 2.635000 ;
+      RECT 1.875000  0.255000 2.045000 0.655000 ;
+      RECT 1.955000  1.725000 2.125000 2.465000 ;
+      RECT 2.215000  0.085000 2.555000 0.485000 ;
+      RECT 2.295000  1.895000 2.655000 2.635000 ;
+      RECT 2.735000  0.255000 4.975000 0.465000 ;
+      RECT 2.735000  0.465000 3.020000 0.655000 ;
+      RECT 2.825000  1.725000 2.995000 2.295000 ;
+      RECT 2.825000  2.295000 4.975000 2.465000 ;
+      RECT 3.690000  1.785000 3.860000 2.295000 ;
+      RECT 4.530000  1.445000 4.975000 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
 END sky130_fd_sc_hd__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
index 8fa45af..700f9c7 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_8.magic.lef
@@ -68,32 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 1.375000  0.085000 1.705000 0.485000 ;
-        RECT 2.215000  0.085000 2.545000 0.485000 ;
-        RECT 3.055000  0.085000 3.385000 0.485000 ;
-        RECT 3.895000  0.085000 4.235000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -103,62 +77,85 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.515000 2.125000 0.875000 2.635000 ;
-        RECT 1.455000 1.895000 1.785000 2.635000 ;
-        RECT 2.295000 1.895000 2.625000 2.635000 ;
-        RECT 3.135000 1.895000 3.465000 2.635000 ;
-        RECT 3.975000 1.895000 4.305000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.695000 0.825000 ;
-      RECT 0.085000 1.785000 0.875000 1.955000 ;
-      RECT 0.085000 1.955000 0.345000 2.465000 ;
-      RECT 0.500000 0.825000 0.695000 0.995000 ;
-      RECT 0.500000 0.995000 4.700000 1.325000 ;
-      RECT 0.500000 1.325000 0.875000 1.785000 ;
-      RECT 1.035000 0.255000 1.205000 0.655000 ;
-      RECT 1.035000 0.655000 4.700000 0.825000 ;
-      RECT 1.075000 1.555000 4.700000 1.725000 ;
-      RECT 1.075000 1.725000 1.285000 2.465000 ;
-      RECT 1.875000 0.255000 2.045000 0.655000 ;
-      RECT 1.955000 1.725000 2.125000 2.465000 ;
-      RECT 2.715000 0.255000 2.885000 0.655000 ;
-      RECT 2.795000 1.725000 2.965000 2.465000 ;
-      RECT 3.555000 0.255000 3.725000 0.655000 ;
-      RECT 3.635000 1.725000 3.805000 2.465000 ;
-      RECT 4.405000 0.255000 8.195000 0.465000 ;
-      RECT 4.405000 0.465000 4.700000 0.655000 ;
-      RECT 4.475000 1.725000 4.700000 2.295000 ;
-      RECT 4.475000 2.295000 8.195000 2.465000 ;
-      RECT 5.370000 1.785000 5.540000 2.295000 ;
-      RECT 6.210000 1.785000 6.380000 2.295000 ;
-      RECT 7.050000 1.785000 7.220000 2.295000 ;
-      RECT 7.890000 1.445000 8.195000 2.295000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.695000 0.825000 ;
+      RECT 0.085000  1.785000 0.875000 1.955000 ;
+      RECT 0.085000  1.955000 0.345000 2.465000 ;
+      RECT 0.500000  0.825000 0.695000 0.995000 ;
+      RECT 0.500000  0.995000 4.700000 1.325000 ;
+      RECT 0.500000  1.325000 0.875000 1.785000 ;
+      RECT 0.515000  0.085000 0.845000 0.485000 ;
+      RECT 0.515000  2.125000 0.875000 2.635000 ;
+      RECT 1.035000  0.255000 1.205000 0.655000 ;
+      RECT 1.035000  0.655000 4.700000 0.825000 ;
+      RECT 1.075000  1.555000 4.700000 1.725000 ;
+      RECT 1.075000  1.725000 1.285000 2.465000 ;
+      RECT 1.375000  0.085000 1.705000 0.485000 ;
+      RECT 1.455000  1.895000 1.785000 2.635000 ;
+      RECT 1.875000  0.255000 2.045000 0.655000 ;
+      RECT 1.955000  1.725000 2.125000 2.465000 ;
+      RECT 2.215000  0.085000 2.545000 0.485000 ;
+      RECT 2.295000  1.895000 2.625000 2.635000 ;
+      RECT 2.715000  0.255000 2.885000 0.655000 ;
+      RECT 2.795000  1.725000 2.965000 2.465000 ;
+      RECT 3.055000  0.085000 3.385000 0.485000 ;
+      RECT 3.135000  1.895000 3.465000 2.635000 ;
+      RECT 3.555000  0.255000 3.725000 0.655000 ;
+      RECT 3.635000  1.725000 3.805000 2.465000 ;
+      RECT 3.895000  0.085000 4.235000 0.485000 ;
+      RECT 3.975000  1.895000 4.305000 2.635000 ;
+      RECT 4.405000  0.255000 8.195000 0.465000 ;
+      RECT 4.405000  0.465000 4.700000 0.655000 ;
+      RECT 4.475000  1.725000 4.700000 2.295000 ;
+      RECT 4.475000  2.295000 8.195000 2.465000 ;
+      RECT 5.370000  1.785000 5.540000 2.295000 ;
+      RECT 6.210000  1.785000 6.380000 2.295000 ;
+      RECT 7.050000  1.785000 7.220000 2.295000 ;
+      RECT 7.890000  1.445000 8.195000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
 END sky130_fd_sc_hd__einvp_8
diff --git a/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
index 2013ea8..111dd48 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_1.magic.lef
@@ -38,14 +38,28 @@
       LAYER li1 ;
         RECT 0.910000 0.995000 1.240000 1.275000 ;
         RECT 0.910000 1.275000 1.080000 1.325000 ;
-        RECT 2.230000 1.030000 2.620000 1.360000 ;
-        RECT 4.250000 0.955000 4.625000 1.275000 ;
-        RECT 5.885000 1.035000 6.325000 1.275000 ;
       LAYER mcon ;
         RECT 1.070000 1.105000 1.240000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.230000 1.030000 2.620000 1.360000 ;
+      LAYER mcon ;
         RECT 2.450000 1.105000 2.620000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.250000 0.955000 4.625000 1.275000 ;
+      LAYER mcon ;
         RECT 4.310000 1.105000 4.480000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.885000 1.035000 6.325000 1.275000 ;
+      LAYER mcon ;
         RECT 6.150000 1.105000 6.320000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.010000 1.075000 1.300000 1.120000 ;
         RECT 1.010000 1.120000 6.380000 1.260000 ;
@@ -65,12 +79,22 @@
     PORT
       LAYER li1 ;
         RECT 1.300000 1.445000 1.700000 1.880000 ;
-        RECT 3.200000 1.435000 3.560000 1.765000 ;
-        RECT 5.635000 1.445000 6.055000 1.765000 ;
       LAYER mcon ;
         RECT 1.530000 1.445000 1.700000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.200000 1.435000 3.560000 1.765000 ;
+      LAYER mcon ;
         RECT 3.390000 1.445000 3.560000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.635000 1.445000 6.055000 1.765000 ;
+      LAYER mcon ;
         RECT 5.690000 1.445000 5.860000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.470000 1.415000 1.760000 1.460000 ;
         RECT 1.470000 1.460000 5.920000 1.600000 ;
@@ -124,30 +148,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 2.300000  0.085000 2.630000 0.445000 ;
-        RECT 3.240000  0.085000 3.570000 0.490000 ;
-        RECT 4.080000  0.085000 4.410000 0.445000 ;
-        RECT 6.265000  0.085000 6.595000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -157,72 +157,92 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.515000 2.150000 0.765000 2.635000 ;
-        RECT 2.300000 2.275000 2.630000 2.635000 ;
-        RECT 3.240000 2.255000 3.570000 2.635000 ;
-        RECT 4.080000 2.275000 4.410000 2.635000 ;
-        RECT 6.340000 2.275000 6.670000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.995000 0.685000 1.325000 ;
-      RECT 0.515000 0.635000 1.710000 0.805000 ;
-      RECT 0.515000 0.805000 0.685000 0.995000 ;
-      RECT 0.515000 1.325000 0.685000 1.625000 ;
-      RECT 0.515000 1.625000 1.105000 1.945000 ;
-      RECT 0.935000 1.945000 1.105000 2.065000 ;
-      RECT 0.935000 2.065000 1.710000 2.465000 ;
-      RECT 1.110000 0.255000 1.710000 0.635000 ;
-      RECT 1.470000 0.805000 1.710000 0.935000 ;
-      RECT 1.960000 0.255000 2.130000 0.615000 ;
-      RECT 1.960000 0.615000 2.970000 0.785000 ;
-      RECT 1.960000 1.935000 3.035000 2.105000 ;
-      RECT 1.960000 2.105000 2.130000 2.465000 ;
-      RECT 2.800000 0.255000 2.970000 0.615000 ;
-      RECT 2.800000 2.105000 3.035000 2.465000 ;
-      RECT 3.740000 0.255000 3.910000 0.615000 ;
-      RECT 3.740000 0.615000 4.750000 0.785000 ;
-      RECT 3.740000 1.935000 4.750000 2.105000 ;
-      RECT 3.740000 2.105000 3.910000 2.465000 ;
-      RECT 4.580000 0.255000 4.750000 0.615000 ;
-      RECT 4.580000 2.105000 4.750000 2.465000 ;
-      RECT 4.795000 0.955000 5.460000 1.125000 ;
-      RECT 4.965000 0.765000 5.460000 0.955000 ;
-      RECT 5.085000 0.255000 6.095000 0.505000 ;
-      RECT 5.085000 0.505000 5.255000 0.595000 ;
-      RECT 5.085000 2.125000 6.170000 2.465000 ;
-      RECT 5.925000 0.505000 6.095000 0.615000 ;
-      RECT 5.925000 0.615000 6.665000 0.785000 ;
-      RECT 6.000000 1.935000 6.665000 2.105000 ;
-      RECT 6.000000 2.105000 6.170000 2.125000 ;
-      RECT 6.495000 0.785000 6.665000 0.995000 ;
-      RECT 6.495000 0.995000 6.740000 1.325000 ;
-      RECT 6.495000 1.325000 6.665000 1.935000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.430000  0.995000 0.685000 1.325000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  0.635000 1.710000 0.805000 ;
+      RECT 0.515000  0.805000 0.685000 0.995000 ;
+      RECT 0.515000  1.325000 0.685000 1.625000 ;
+      RECT 0.515000  1.625000 1.105000 1.945000 ;
+      RECT 0.515000  2.150000 0.765000 2.635000 ;
+      RECT 0.935000  1.945000 1.105000 2.065000 ;
+      RECT 0.935000  2.065000 1.710000 2.465000 ;
+      RECT 1.110000  0.255000 1.710000 0.635000 ;
+      RECT 1.470000  0.805000 1.710000 0.935000 ;
+      RECT 1.960000  0.255000 2.130000 0.615000 ;
+      RECT 1.960000  0.615000 2.970000 0.785000 ;
+      RECT 1.960000  1.935000 3.035000 2.105000 ;
+      RECT 1.960000  2.105000 2.130000 2.465000 ;
+      RECT 2.300000  0.085000 2.630000 0.445000 ;
+      RECT 2.300000  2.275000 2.630000 2.635000 ;
+      RECT 2.800000  0.255000 2.970000 0.615000 ;
+      RECT 2.800000  2.105000 3.035000 2.465000 ;
+      RECT 3.240000  0.085000 3.570000 0.490000 ;
+      RECT 3.240000  2.255000 3.570000 2.635000 ;
+      RECT 3.740000  0.255000 3.910000 0.615000 ;
+      RECT 3.740000  0.615000 4.750000 0.785000 ;
+      RECT 3.740000  1.935000 4.750000 2.105000 ;
+      RECT 3.740000  2.105000 3.910000 2.465000 ;
+      RECT 4.080000  0.085000 4.410000 0.445000 ;
+      RECT 4.080000  2.275000 4.410000 2.635000 ;
+      RECT 4.580000  0.255000 4.750000 0.615000 ;
+      RECT 4.580000  2.105000 4.750000 2.465000 ;
+      RECT 4.795000  0.955000 5.460000 1.125000 ;
+      RECT 4.965000  0.765000 5.460000 0.955000 ;
+      RECT 5.085000  0.255000 6.095000 0.505000 ;
+      RECT 5.085000  0.505000 5.255000 0.595000 ;
+      RECT 5.085000  2.125000 6.170000 2.465000 ;
+      RECT 5.925000  0.505000 6.095000 0.615000 ;
+      RECT 5.925000  0.615000 6.665000 0.785000 ;
+      RECT 6.000000  1.935000 6.665000 2.105000 ;
+      RECT 6.000000  2.105000 6.170000 2.125000 ;
+      RECT 6.265000  0.085000 6.595000 0.445000 ;
+      RECT 6.340000  2.275000 6.670000 2.635000 ;
+      RECT 6.495000  0.785000 6.665000 0.995000 ;
+      RECT 6.495000  0.995000 6.740000 1.325000 ;
+      RECT 6.495000  1.325000 6.665000 1.935000 ;
     LAYER mcon ;
-      RECT 1.530000 0.765000 1.700000 0.935000 ;
-      RECT 5.230000 0.765000 5.400000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.530000  0.765000 1.700000 0.935000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.230000  0.765000 5.400000 0.935000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
     LAYER met1 ;
       RECT 1.470000 0.735000 1.760000 0.780000 ;
       RECT 1.470000 0.780000 5.460000 0.920000 ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
index 63ee065..b078680 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_2.magic.lef
@@ -38,14 +38,28 @@
       LAYER li1 ;
         RECT 1.245000 0.995000 1.755000 1.275000 ;
         RECT 1.245000 1.275000 1.505000 1.325000 ;
-        RECT 2.685000 1.030000 3.075000 1.360000 ;
-        RECT 4.720000 0.955000 5.080000 1.275000 ;
-        RECT 6.105000 0.995000 6.960000 1.275000 ;
       LAYER mcon ;
         RECT 1.525000 1.105000 1.695000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.685000 1.030000 3.075000 1.360000 ;
+      LAYER mcon ;
         RECT 2.905000 1.105000 3.075000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.720000 0.955000 5.080000 1.275000 ;
+      LAYER mcon ;
         RECT 4.765000 1.105000 4.935000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.105000 0.995000 6.960000 1.275000 ;
+      LAYER mcon ;
         RECT 6.145000 1.105000 6.315000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.465000 1.075000 1.755000 1.120000 ;
         RECT 1.465000 1.120000 6.375000 1.260000 ;
@@ -65,12 +79,22 @@
     PORT
       LAYER li1 ;
         RECT 1.645000 1.445000 2.155000 1.690000 ;
-        RECT 3.655000 1.435000 4.070000 1.745000 ;
-        RECT 6.150000 1.445000 6.835000 1.735000 ;
       LAYER mcon ;
         RECT 1.985000 1.445000 2.155000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.655000 1.435000 4.070000 1.745000 ;
+      LAYER mcon ;
         RECT 3.845000 1.445000 4.015000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.150000 1.445000 6.835000 1.735000 ;
+      LAYER mcon ;
         RECT 6.605000 1.445000 6.775000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.925000 1.415000 2.215000 1.460000 ;
         RECT 1.925000 1.460000 6.835000 1.600000 ;
@@ -136,34 +160,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.180000  0.085000 0.350000 0.565000 ;
-        RECT 1.020000  0.085000 1.350000 0.465000 ;
-        RECT 2.755000  0.085000 3.085000 0.445000 ;
-        RECT 3.695000  0.085000 4.025000 0.490000 ;
-        RECT 4.535000  0.085000 4.865000 0.445000 ;
-        RECT 6.780000  0.085000 7.110000 0.445000 ;
-        RECT 7.895000  0.085000 8.065000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -173,81 +169,105 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.180000 1.795000 0.350000 2.635000 ;
-        RECT 0.980000 2.275000 1.310000 2.635000 ;
-        RECT 2.755000 2.275000 3.085000 2.635000 ;
-        RECT 3.695000 1.915000 4.025000 2.635000 ;
-        RECT 4.535000 2.275000 4.865000 2.635000 ;
-        RECT 6.890000 2.275000 7.220000 2.635000 ;
-        RECT 7.815000 1.795000 7.985000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.540000 1.075000 1.075000 1.245000 ;
-      RECT 0.905000 0.655000 2.165000 0.825000 ;
-      RECT 0.905000 0.825000 1.075000 1.075000 ;
-      RECT 0.905000 1.245000 1.075000 1.430000 ;
-      RECT 0.905000 1.430000 1.110000 1.495000 ;
-      RECT 0.905000 1.495000 1.475000 1.600000 ;
-      RECT 0.940000 1.600000 1.475000 1.665000 ;
-      RECT 1.305000 1.665000 1.475000 1.910000 ;
-      RECT 1.305000 1.910000 2.245000 2.080000 ;
-      RECT 1.535000 0.255000 2.165000 0.655000 ;
-      RECT 1.900000 2.080000 2.245000 2.465000 ;
-      RECT 1.925000 0.825000 2.165000 0.935000 ;
-      RECT 2.415000 0.255000 2.585000 0.615000 ;
-      RECT 2.415000 0.615000 3.425000 0.785000 ;
-      RECT 2.415000 1.935000 3.490000 2.105000 ;
-      RECT 2.415000 2.105000 2.585000 2.465000 ;
-      RECT 3.255000 0.255000 3.425000 0.615000 ;
-      RECT 3.255000 2.105000 3.490000 2.465000 ;
-      RECT 4.195000 0.255000 4.365000 0.615000 ;
-      RECT 4.195000 0.615000 5.205000 0.785000 ;
-      RECT 4.195000 1.935000 5.205000 2.105000 ;
-      RECT 4.195000 2.105000 4.365000 2.465000 ;
-      RECT 5.035000 0.255000 5.205000 0.615000 ;
-      RECT 5.035000 2.105000 5.205000 2.465000 ;
-      RECT 5.250000 0.955000 5.935000 1.125000 ;
-      RECT 5.420000 0.765000 5.935000 0.955000 ;
-      RECT 5.485000 2.125000 6.685000 2.465000 ;
-      RECT 5.540000 0.255000 6.550000 0.505000 ;
-      RECT 5.540000 0.505000 5.710000 0.595000 ;
-      RECT 6.380000 0.505000 6.550000 0.655000 ;
-      RECT 6.380000 0.655000 7.300000 0.825000 ;
-      RECT 6.515000 1.935000 7.180000 2.105000 ;
-      RECT 6.515000 2.105000 6.685000 2.125000 ;
-      RECT 7.010000 1.470000 7.300000 1.640000 ;
-      RECT 7.010000 1.640000 7.180000 1.935000 ;
-      RECT 7.130000 0.825000 7.300000 1.075000 ;
-      RECT 7.130000 1.075000 7.800000 1.245000 ;
-      RECT 7.130000 1.245000 7.300000 1.470000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.180000  0.085000 0.350000 0.565000 ;
+      RECT 0.180000  1.795000 0.350000 2.635000 ;
+      RECT 0.540000  1.075000 1.075000 1.245000 ;
+      RECT 0.905000  0.655000 2.165000 0.825000 ;
+      RECT 0.905000  0.825000 1.075000 1.075000 ;
+      RECT 0.905000  1.245000 1.075000 1.430000 ;
+      RECT 0.905000  1.430000 1.110000 1.495000 ;
+      RECT 0.905000  1.495000 1.475000 1.600000 ;
+      RECT 0.940000  1.600000 1.475000 1.665000 ;
+      RECT 0.980000  2.275000 1.310000 2.635000 ;
+      RECT 1.020000  0.085000 1.350000 0.465000 ;
+      RECT 1.305000  1.665000 1.475000 1.910000 ;
+      RECT 1.305000  1.910000 2.245000 2.080000 ;
+      RECT 1.535000  0.255000 2.165000 0.655000 ;
+      RECT 1.900000  2.080000 2.245000 2.465000 ;
+      RECT 1.925000  0.825000 2.165000 0.935000 ;
+      RECT 2.415000  0.255000 2.585000 0.615000 ;
+      RECT 2.415000  0.615000 3.425000 0.785000 ;
+      RECT 2.415000  1.935000 3.490000 2.105000 ;
+      RECT 2.415000  2.105000 2.585000 2.465000 ;
+      RECT 2.755000  0.085000 3.085000 0.445000 ;
+      RECT 2.755000  2.275000 3.085000 2.635000 ;
+      RECT 3.255000  0.255000 3.425000 0.615000 ;
+      RECT 3.255000  2.105000 3.490000 2.465000 ;
+      RECT 3.695000  0.085000 4.025000 0.490000 ;
+      RECT 3.695000  1.915000 4.025000 2.635000 ;
+      RECT 4.195000  0.255000 4.365000 0.615000 ;
+      RECT 4.195000  0.615000 5.205000 0.785000 ;
+      RECT 4.195000  1.935000 5.205000 2.105000 ;
+      RECT 4.195000  2.105000 4.365000 2.465000 ;
+      RECT 4.535000  0.085000 4.865000 0.445000 ;
+      RECT 4.535000  2.275000 4.865000 2.635000 ;
+      RECT 5.035000  0.255000 5.205000 0.615000 ;
+      RECT 5.035000  2.105000 5.205000 2.465000 ;
+      RECT 5.250000  0.955000 5.935000 1.125000 ;
+      RECT 5.420000  0.765000 5.935000 0.955000 ;
+      RECT 5.485000  2.125000 6.685000 2.465000 ;
+      RECT 5.540000  0.255000 6.550000 0.505000 ;
+      RECT 5.540000  0.505000 5.710000 0.595000 ;
+      RECT 6.380000  0.505000 6.550000 0.655000 ;
+      RECT 6.380000  0.655000 7.300000 0.825000 ;
+      RECT 6.515000  1.935000 7.180000 2.105000 ;
+      RECT 6.515000  2.105000 6.685000 2.125000 ;
+      RECT 6.780000  0.085000 7.110000 0.445000 ;
+      RECT 6.890000  2.275000 7.220000 2.635000 ;
+      RECT 7.010000  1.470000 7.300000 1.640000 ;
+      RECT 7.010000  1.640000 7.180000 1.935000 ;
+      RECT 7.130000  0.825000 7.300000 1.075000 ;
+      RECT 7.130000  1.075000 7.800000 1.245000 ;
+      RECT 7.130000  1.245000 7.300000 1.470000 ;
+      RECT 7.815000  1.795000 7.985000 2.635000 ;
+      RECT 7.895000  0.085000 8.065000 0.565000 ;
     LAYER mcon ;
-      RECT 1.985000 0.765000 2.155000 0.935000 ;
-      RECT 5.685000 0.765000 5.855000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  0.765000 2.155000 0.935000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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.685000  0.765000 5.855000 0.935000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.925000 0.735000 2.215000 0.780000 ;
       RECT 1.925000 0.780000 5.915000 0.920000 ;
diff --git a/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef b/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
index 5b696b3..099dc61 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_hd__fa_4.magic.lef
@@ -38,14 +38,28 @@
       LAYER li1 ;
         RECT 2.080000 0.995000 2.680000 1.275000 ;
         RECT 2.080000 1.275000 2.340000 1.325000 ;
-        RECT 3.610000 1.030000 4.000000 1.360000 ;
-        RECT 5.645000 0.955000 6.005000 1.275000 ;
-        RECT 7.030000 0.995000 7.885000 1.275000 ;
       LAYER mcon ;
         RECT 2.450000 1.105000 2.620000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.610000 1.030000 4.000000 1.360000 ;
+      LAYER mcon ;
         RECT 3.830000 1.105000 4.000000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.645000 0.955000 6.005000 1.275000 ;
+      LAYER mcon ;
         RECT 5.690000 1.105000 5.860000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.030000 0.995000 7.885000 1.275000 ;
+      LAYER mcon ;
         RECT 7.070000 1.105000 7.240000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 2.390000 1.075000 2.680000 1.120000 ;
         RECT 2.390000 1.120000 7.300000 1.260000 ;
@@ -65,12 +79,22 @@
     PORT
       LAYER li1 ;
         RECT 2.480000 1.445000 3.080000 1.690000 ;
-        RECT 4.580000 1.435000 4.995000 1.745000 ;
-        RECT 7.075000 1.445000 7.760000 1.735000 ;
       LAYER mcon ;
         RECT 2.910000 1.445000 3.080000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.580000 1.435000 4.995000 1.745000 ;
+      LAYER mcon ;
         RECT 4.770000 1.445000 4.940000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.075000 1.445000 7.760000 1.735000 ;
+      LAYER mcon ;
         RECT 7.530000 1.445000 7.700000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 2.850000 1.415000 3.140000 1.460000 ;
         RECT 2.850000 1.460000 7.760000 1.600000 ;
@@ -140,40 +164,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.175000  0.085000  0.345000 0.565000 ;
-        RECT 1.015000  0.085000  1.185000 0.565000 ;
-        RECT 1.855000  0.085000  2.185000 0.465000 ;
-        RECT 3.680000  0.085000  4.010000 0.445000 ;
-        RECT 4.620000  0.085000  4.950000 0.490000 ;
-        RECT 5.460000  0.085000  5.790000 0.445000 ;
-        RECT 7.705000  0.085000  8.035000 0.445000 ;
-        RECT 8.820000  0.085000  8.990000 0.565000 ;
-        RECT 9.660000  0.085000  9.830000 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
@@ -183,87 +173,117 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.175000 1.795000  0.345000 2.635000 ;
-        RECT 1.015000 1.795000  1.185000 2.635000 ;
-        RECT 1.815000 2.275000  2.145000 2.635000 ;
-        RECT 3.680000 2.275000  4.010000 2.635000 ;
-        RECT 4.620000 1.915000  4.950000 2.635000 ;
-        RECT 5.460000 2.275000  5.790000 2.635000 ;
-        RECT 7.815000 2.275000  8.145000 2.635000 ;
-        RECT 8.740000 1.795000  8.910000 2.635000 ;
-        RECT 9.660000 1.795000  9.830000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        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.605000 1.075000 1.910000 1.245000 ;
-      RECT 1.740000 0.655000 3.090000 0.825000 ;
-      RECT 1.740000 0.825000 1.910000 1.075000 ;
-      RECT 1.740000 1.245000 1.910000 1.430000 ;
-      RECT 1.740000 1.430000 1.945000 1.495000 ;
-      RECT 1.740000 1.495000 2.310000 1.600000 ;
-      RECT 1.775000 1.600000 2.310000 1.665000 ;
-      RECT 2.140000 1.665000 2.310000 1.910000 ;
-      RECT 2.140000 1.910000 3.170000 2.080000 ;
-      RECT 2.370000 0.255000 3.090000 0.655000 ;
-      RECT 2.735000 2.080000 3.170000 2.465000 ;
-      RECT 2.850000 0.825000 3.090000 0.935000 ;
-      RECT 3.340000 0.255000 3.510000 0.615000 ;
-      RECT 3.340000 0.615000 4.350000 0.785000 ;
-      RECT 3.340000 1.935000 4.415000 2.105000 ;
-      RECT 3.340000 2.105000 3.510000 2.465000 ;
-      RECT 4.180000 0.255000 4.350000 0.615000 ;
-      RECT 4.180000 2.105000 4.415000 2.465000 ;
-      RECT 5.120000 0.255000 5.290000 0.615000 ;
-      RECT 5.120000 0.615000 6.130000 0.785000 ;
-      RECT 5.120000 1.935000 6.130000 2.105000 ;
-      RECT 5.120000 2.105000 5.290000 2.465000 ;
-      RECT 5.960000 0.255000 6.130000 0.615000 ;
-      RECT 5.960000 2.105000 6.130000 2.465000 ;
-      RECT 6.175000 0.955000 6.860000 1.125000 ;
-      RECT 6.345000 0.765000 6.860000 0.955000 ;
-      RECT 6.410000 2.125000 7.610000 2.465000 ;
-      RECT 6.465000 0.255000 7.475000 0.505000 ;
-      RECT 6.465000 0.505000 6.635000 0.595000 ;
-      RECT 7.305000 0.505000 7.475000 0.655000 ;
-      RECT 7.305000 0.655000 8.225000 0.825000 ;
-      RECT 7.440000 1.935000 8.105000 2.105000 ;
-      RECT 7.440000 2.105000 7.610000 2.125000 ;
-      RECT 7.935000 1.470000 8.225000 1.640000 ;
-      RECT 7.935000 1.640000 8.105000 1.935000 ;
-      RECT 8.055000 0.825000 8.225000 1.075000 ;
-      RECT 8.055000 1.075000 9.445000 1.245000 ;
-      RECT 8.055000 1.245000 8.225000 1.470000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.175000  0.085000  0.345000 0.565000 ;
+      RECT 0.175000  1.795000  0.345000 2.635000 ;
+      RECT 0.605000  1.075000  1.910000 1.245000 ;
+      RECT 1.015000  0.085000  1.185000 0.565000 ;
+      RECT 1.015000  1.795000  1.185000 2.635000 ;
+      RECT 1.740000  0.655000  3.090000 0.825000 ;
+      RECT 1.740000  0.825000  1.910000 1.075000 ;
+      RECT 1.740000  1.245000  1.910000 1.430000 ;
+      RECT 1.740000  1.430000  1.945000 1.495000 ;
+      RECT 1.740000  1.495000  2.310000 1.600000 ;
+      RECT 1.775000  1.600000  2.310000 1.665000 ;
+      RECT 1.815000  2.275000  2.145000 2.635000 ;
+      RECT 1.855000  0.085000  2.185000 0.465000 ;
+      RECT 2.140000  1.665000  2.310000 1.910000 ;
+      RECT 2.140000  1.910000  3.170000 2.080000 ;
+      RECT 2.370000  0.255000  3.090000 0.655000 ;
+      RECT 2.735000  2.080000  3.170000 2.465000 ;
+      RECT 2.850000  0.825000  3.090000 0.935000 ;
+      RECT 3.340000  0.255000  3.510000 0.615000 ;
+      RECT 3.340000  0.615000  4.350000 0.785000 ;
+      RECT 3.340000  1.935000  4.415000 2.105000 ;
+      RECT 3.340000  2.105000  3.510000 2.465000 ;
+      RECT 3.680000  0.085000  4.010000 0.445000 ;
+      RECT 3.680000  2.275000  4.010000 2.635000 ;
+      RECT 4.180000  0.255000  4.350000 0.615000 ;
+      RECT 4.180000  2.105000  4.415000 2.465000 ;
+      RECT 4.620000  0.085000  4.950000 0.490000 ;
+      RECT 4.620000  1.915000  4.950000 2.635000 ;
+      RECT 5.120000  0.255000  5.290000 0.615000 ;
+      RECT 5.120000  0.615000  6.130000 0.785000 ;
+      RECT 5.120000  1.935000  6.130000 2.105000 ;
+      RECT 5.120000  2.105000  5.290000 2.465000 ;
+      RECT 5.460000  0.085000  5.790000 0.445000 ;
+      RECT 5.460000  2.275000  5.790000 2.635000 ;
+      RECT 5.960000  0.255000  6.130000 0.615000 ;
+      RECT 5.960000  2.105000  6.130000 2.465000 ;
+      RECT 6.175000  0.955000  6.860000 1.125000 ;
+      RECT 6.345000  0.765000  6.860000 0.955000 ;
+      RECT 6.410000  2.125000  7.610000 2.465000 ;
+      RECT 6.465000  0.255000  7.475000 0.505000 ;
+      RECT 6.465000  0.505000  6.635000 0.595000 ;
+      RECT 7.305000  0.505000  7.475000 0.655000 ;
+      RECT 7.305000  0.655000  8.225000 0.825000 ;
+      RECT 7.440000  1.935000  8.105000 2.105000 ;
+      RECT 7.440000  2.105000  7.610000 2.125000 ;
+      RECT 7.705000  0.085000  8.035000 0.445000 ;
+      RECT 7.815000  2.275000  8.145000 2.635000 ;
+      RECT 7.935000  1.470000  8.225000 1.640000 ;
+      RECT 7.935000  1.640000  8.105000 1.935000 ;
+      RECT 8.055000  0.825000  8.225000 1.075000 ;
+      RECT 8.055000  1.075000  9.445000 1.245000 ;
+      RECT 8.055000  1.245000  8.225000 1.470000 ;
+      RECT 8.740000  1.795000  8.910000 2.635000 ;
+      RECT 8.820000  0.085000  8.990000 0.565000 ;
+      RECT 9.660000  0.085000  9.830000 0.565000 ;
+      RECT 9.660000  1.795000  9.830000 2.635000 ;
     LAYER mcon ;
-      RECT 2.910000 0.765000 3.080000 0.935000 ;
-      RECT 6.610000 0.765000 6.780000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 2.910000  0.765000 3.080000 0.935000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.610000  0.765000 6.780000 0.935000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      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 2.850000 0.735000 3.140000 0.780000 ;
       RECT 2.850000 0.780000 6.840000 0.920000 ;
diff --git a/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef b/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
index f5244ce..34af6e0 100644
--- a/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_hd__fah_1.magic.lef
@@ -48,10 +48,16 @@
         RECT 1.990000 1.075000 2.495000 1.275000 ;
         RECT 1.990000 1.275000 2.190000 1.410000 ;
         RECT 2.015000 1.410000 2.190000 1.725000 ;
-        RECT 5.675000 0.995000 5.925000 1.325000 ;
       LAYER mcon ;
         RECT 1.990000 1.105000 2.160000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.675000 0.995000 5.925000 1.325000 ;
+      LAYER mcon ;
         RECT 5.680000 1.105000 5.850000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.930000 1.075000 2.220000 1.120000 ;
         RECT 1.930000 1.120000 5.910000 1.260000 ;
@@ -98,40 +104,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.420000 0.085000 ;
-        RECT  0.595000  0.085000  0.765000 0.545000 ;
-        RECT  2.010000  0.085000  2.180000 0.545000 ;
-        RECT  9.905000  0.085000 10.075000 0.565000 ;
-        RECT 11.480000  0.085000 11.810000 0.825000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
@@ -141,162 +113,192 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.420000 2.805000 ;
-        RECT  0.565000 2.260000  0.930000 2.635000 ;
-        RECT  2.065000 2.235000  2.395000 2.635000 ;
-        RECT  9.840000 2.275000 10.175000 2.635000 ;
-        RECT 11.560000 1.785000 11.815000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.255000  0.425000 0.805000 ;
-      RECT  0.085000 0.805000  0.255000 1.500000 ;
-      RECT  0.085000 1.500000  0.445000 1.895000 ;
-      RECT  0.085000 1.895000  2.805000 2.065000 ;
-      RECT  0.085000 2.065000  0.395000 2.465000 ;
-      RECT  0.425000 0.995000  0.780000 1.325000 ;
-      RECT  0.595000 0.735000  1.320000 0.905000 ;
-      RECT  0.595000 0.905000  0.780000 0.995000 ;
-      RECT  0.610000 1.325000  0.780000 1.380000 ;
-      RECT  0.610000 1.380000  0.815000 1.445000 ;
-      RECT  0.610000 1.445000  1.315000 1.455000 ;
-      RECT  0.615000 1.455000  1.315000 1.615000 ;
-      RECT  0.985000 1.615000  1.315000 1.715000 ;
-      RECT  0.990000 0.255000  1.320000 0.735000 ;
-      RECT  1.490000 1.445000  1.820000 1.500000 ;
-      RECT  1.490000 1.500000  1.840000 1.725000 ;
-      RECT  1.500000 0.255000  1.840000 0.715000 ;
-      RECT  1.500000 0.715000  2.520000 0.885000 ;
-      RECT  1.500000 0.885000  1.820000 0.905000 ;
-      RECT  1.615000 0.905000  1.820000 1.445000 ;
-      RECT  2.350000 0.255000  4.840000 0.425000 ;
-      RECT  2.350000 0.425000  2.520000 0.715000 ;
-      RECT  2.360000 1.445000  2.860000 1.715000 ;
-      RECT  2.635000 2.065000  2.805000 2.295000 ;
-      RECT  2.635000 2.295000  4.950000 2.465000 ;
-      RECT  2.690000 0.595000  2.860000 1.445000 ;
-      RECT  3.030000 0.425000  4.840000 0.465000 ;
-      RECT  3.030000 0.465000  3.200000 1.955000 ;
-      RECT  3.030000 1.955000  4.320000 2.125000 ;
-      RECT  3.370000 0.635000  3.900000 0.805000 ;
-      RECT  3.370000 0.805000  3.540000 1.455000 ;
-      RECT  3.370000 1.455000  3.815000 1.785000 ;
-      RECT  3.985000 1.785000  4.320000 1.955000 ;
-      RECT  4.070000 0.645000  4.400000 0.735000 ;
-      RECT  4.070000 0.735000  4.560000 0.755000 ;
-      RECT  4.070000 0.755000  5.170000 0.780000 ;
-      RECT  4.070000 0.780000  5.155000 0.805000 ;
-      RECT  4.070000 0.805000  5.145000 0.905000 ;
-      RECT  4.070000 1.075000  4.400000 1.160000 ;
-      RECT  4.070000 1.160000  4.535000 1.615000 ;
-      RECT  4.480000 0.905000  5.145000 0.925000 ;
-      RECT  4.650000 0.465000  4.840000 0.585000 ;
-      RECT  4.705000 0.925000  4.875000 2.295000 ;
-      RECT  4.925000 0.735000  5.180000 0.740000 ;
-      RECT  4.925000 0.740000  5.170000 0.755000 ;
-      RECT  4.950000 0.715000  5.180000 0.735000 ;
-      RECT  4.980000 0.690000  5.180000 0.715000 ;
-      RECT  5.000000 0.655000  5.180000 0.690000 ;
-      RECT  5.010000 0.255000  6.100000 0.425000 ;
-      RECT  5.010000 0.425000  5.180000 0.655000 ;
-      RECT  5.125000 1.150000  5.505000 1.320000 ;
-      RECT  5.125000 1.320000  5.295000 2.295000 ;
-      RECT  5.125000 2.295000  7.560000 2.465000 ;
-      RECT  5.320000 0.865000  5.520000 0.925000 ;
-      RECT  5.320000 0.925000  5.505000 1.150000 ;
-      RECT  5.335000 0.840000  5.520000 0.865000 ;
-      RECT  5.350000 0.595000  5.520000 0.840000 ;
-      RECT  5.475000 1.700000  5.875000 2.030000 ;
-      RECT  5.750000 0.425000  6.100000 0.565000 ;
-      RECT  6.105000 0.740000  6.435000 1.275000 ;
-      RECT  6.105000 1.445000  6.460000 1.615000 ;
-      RECT  6.270000 0.255000  9.735000 0.425000 ;
-      RECT  6.270000 0.425000  6.600000 0.570000 ;
-      RECT  6.290000 1.615000  6.460000 1.955000 ;
-      RECT  6.290000 1.955000  7.220000 2.125000 ;
-      RECT  6.610000 0.755000  6.940000 0.925000 ;
-      RECT  6.610000 0.925000  6.880000 1.275000 ;
-      RECT  6.710000 1.275000  6.880000 1.785000 ;
-      RECT  6.770000 0.595000  6.940000 0.755000 ;
-      RECT  7.050000 1.060000  7.280000 1.130000 ;
-      RECT  7.050000 1.130000  7.245000 1.175000 ;
-      RECT  7.050000 1.175000  7.220000 1.955000 ;
-      RECT  7.065000 1.045000  7.280000 1.060000 ;
-      RECT  7.090000 1.010000  7.280000 1.045000 ;
-      RECT  7.110000 0.595000  7.445000 0.765000 ;
-      RECT  7.110000 0.765000  7.280000 1.010000 ;
-      RECT  7.390000 1.275000  7.620000 1.375000 ;
-      RECT  7.390000 1.375000  7.595000 1.400000 ;
-      RECT  7.390000 1.400000  7.575000 1.425000 ;
-      RECT  7.390000 1.425000  7.560000 2.295000 ;
-      RECT  7.450000 0.995000  7.620000 1.275000 ;
-      RECT  7.705000 0.425000  7.960000 0.825000 ;
-      RECT  7.730000 1.510000  7.960000 2.295000 ;
-      RECT  7.730000 2.295000  9.655000 2.465000 ;
-      RECT  7.790000 0.825000  7.960000 1.510000 ;
-      RECT  8.145000 1.955000  9.250000 2.125000 ;
-      RECT  8.155000 0.595000  8.405000 0.925000 ;
-      RECT  8.225000 0.925000  8.405000 1.445000 ;
-      RECT  8.225000 1.445000  8.910000 1.785000 ;
-      RECT  8.575000 0.595000  8.745000 1.105000 ;
-      RECT  8.575000 1.105000  9.250000 1.275000 ;
-      RECT  8.920000 0.685000  9.300000 0.935000 ;
-      RECT  9.080000 1.275000  9.250000 1.955000 ;
-      RECT  9.400000 0.425000  9.735000 0.515000 ;
-      RECT  9.420000 1.495000 10.350000 1.705000 ;
-      RECT  9.420000 1.705000  9.655000 2.295000 ;
-      RECT 10.180000 0.995000 10.350000 1.495000 ;
-      RECT 10.245000 0.285000 10.690000 0.825000 ;
-      RECT 10.345000 1.875000 10.690000 2.465000 ;
-      RECT 10.520000 0.825000 10.690000 1.875000 ;
-      RECT 11.210000 0.995000 11.460000 1.325000 ;
-      RECT 11.630000 0.995000 11.940000 1.615000 ;
+      RECT  0.000000 -0.085000 12.420000 0.085000 ;
+      RECT  0.000000  2.635000 12.420000 2.805000 ;
+      RECT  0.085000  0.255000  0.425000 0.805000 ;
+      RECT  0.085000  0.805000  0.255000 1.500000 ;
+      RECT  0.085000  1.500000  0.445000 1.895000 ;
+      RECT  0.085000  1.895000  2.805000 2.065000 ;
+      RECT  0.085000  2.065000  0.395000 2.465000 ;
+      RECT  0.425000  0.995000  0.780000 1.325000 ;
+      RECT  0.565000  2.260000  0.930000 2.635000 ;
+      RECT  0.595000  0.085000  0.765000 0.545000 ;
+      RECT  0.595000  0.735000  1.320000 0.905000 ;
+      RECT  0.595000  0.905000  0.780000 0.995000 ;
+      RECT  0.610000  1.325000  0.780000 1.380000 ;
+      RECT  0.610000  1.380000  0.815000 1.445000 ;
+      RECT  0.610000  1.445000  1.315000 1.455000 ;
+      RECT  0.615000  1.455000  1.315000 1.615000 ;
+      RECT  0.985000  1.615000  1.315000 1.715000 ;
+      RECT  0.990000  0.255000  1.320000 0.735000 ;
+      RECT  1.490000  1.445000  1.820000 1.500000 ;
+      RECT  1.490000  1.500000  1.840000 1.725000 ;
+      RECT  1.500000  0.255000  1.840000 0.715000 ;
+      RECT  1.500000  0.715000  2.520000 0.885000 ;
+      RECT  1.500000  0.885000  1.820000 0.905000 ;
+      RECT  1.615000  0.905000  1.820000 1.445000 ;
+      RECT  2.010000  0.085000  2.180000 0.545000 ;
+      RECT  2.065000  2.235000  2.395000 2.635000 ;
+      RECT  2.350000  0.255000  4.840000 0.425000 ;
+      RECT  2.350000  0.425000  2.520000 0.715000 ;
+      RECT  2.360000  1.445000  2.860000 1.715000 ;
+      RECT  2.635000  2.065000  2.805000 2.295000 ;
+      RECT  2.635000  2.295000  4.950000 2.465000 ;
+      RECT  2.690000  0.595000  2.860000 1.445000 ;
+      RECT  3.030000  0.425000  4.840000 0.465000 ;
+      RECT  3.030000  0.465000  3.200000 1.955000 ;
+      RECT  3.030000  1.955000  4.320000 2.125000 ;
+      RECT  3.370000  0.635000  3.900000 0.805000 ;
+      RECT  3.370000  0.805000  3.540000 1.455000 ;
+      RECT  3.370000  1.455000  3.815000 1.785000 ;
+      RECT  3.985000  1.785000  4.320000 1.955000 ;
+      RECT  4.070000  0.645000  4.400000 0.735000 ;
+      RECT  4.070000  0.735000  4.560000 0.755000 ;
+      RECT  4.070000  0.755000  5.170000 0.780000 ;
+      RECT  4.070000  0.780000  5.155000 0.805000 ;
+      RECT  4.070000  0.805000  5.145000 0.905000 ;
+      RECT  4.070000  1.075000  4.400000 1.160000 ;
+      RECT  4.070000  1.160000  4.535000 1.615000 ;
+      RECT  4.480000  0.905000  5.145000 0.925000 ;
+      RECT  4.650000  0.465000  4.840000 0.585000 ;
+      RECT  4.705000  0.925000  4.875000 2.295000 ;
+      RECT  4.925000  0.735000  5.180000 0.740000 ;
+      RECT  4.925000  0.740000  5.170000 0.755000 ;
+      RECT  4.950000  0.715000  5.180000 0.735000 ;
+      RECT  4.980000  0.690000  5.180000 0.715000 ;
+      RECT  5.000000  0.655000  5.180000 0.690000 ;
+      RECT  5.010000  0.255000  6.100000 0.425000 ;
+      RECT  5.010000  0.425000  5.180000 0.655000 ;
+      RECT  5.125000  1.150000  5.505000 1.320000 ;
+      RECT  5.125000  1.320000  5.295000 2.295000 ;
+      RECT  5.125000  2.295000  7.560000 2.465000 ;
+      RECT  5.320000  0.865000  5.520000 0.925000 ;
+      RECT  5.320000  0.925000  5.505000 1.150000 ;
+      RECT  5.335000  0.840000  5.520000 0.865000 ;
+      RECT  5.350000  0.595000  5.520000 0.840000 ;
+      RECT  5.475000  1.700000  5.875000 2.030000 ;
+      RECT  5.750000  0.425000  6.100000 0.565000 ;
+      RECT  6.105000  0.740000  6.435000 1.275000 ;
+      RECT  6.105000  1.445000  6.460000 1.615000 ;
+      RECT  6.270000  0.255000  9.735000 0.425000 ;
+      RECT  6.270000  0.425000  6.600000 0.570000 ;
+      RECT  6.290000  1.615000  6.460000 1.955000 ;
+      RECT  6.290000  1.955000  7.220000 2.125000 ;
+      RECT  6.610000  0.755000  6.940000 0.925000 ;
+      RECT  6.610000  0.925000  6.880000 1.275000 ;
+      RECT  6.710000  1.275000  6.880000 1.785000 ;
+      RECT  6.770000  0.595000  6.940000 0.755000 ;
+      RECT  7.050000  1.060000  7.280000 1.130000 ;
+      RECT  7.050000  1.130000  7.245000 1.175000 ;
+      RECT  7.050000  1.175000  7.220000 1.955000 ;
+      RECT  7.065000  1.045000  7.280000 1.060000 ;
+      RECT  7.090000  1.010000  7.280000 1.045000 ;
+      RECT  7.110000  0.595000  7.445000 0.765000 ;
+      RECT  7.110000  0.765000  7.280000 1.010000 ;
+      RECT  7.390000  1.275000  7.620000 1.375000 ;
+      RECT  7.390000  1.375000  7.595000 1.400000 ;
+      RECT  7.390000  1.400000  7.575000 1.425000 ;
+      RECT  7.390000  1.425000  7.560000 2.295000 ;
+      RECT  7.450000  0.995000  7.620000 1.275000 ;
+      RECT  7.705000  0.425000  7.960000 0.825000 ;
+      RECT  7.730000  1.510000  7.960000 2.295000 ;
+      RECT  7.730000  2.295000  9.655000 2.465000 ;
+      RECT  7.790000  0.825000  7.960000 1.510000 ;
+      RECT  8.145000  1.955000  9.250000 2.125000 ;
+      RECT  8.155000  0.595000  8.405000 0.925000 ;
+      RECT  8.225000  0.925000  8.405000 1.445000 ;
+      RECT  8.225000  1.445000  8.910000 1.785000 ;
+      RECT  8.575000  0.595000  8.745000 1.105000 ;
+      RECT  8.575000  1.105000  9.250000 1.275000 ;
+      RECT  8.920000  0.685000  9.300000 0.935000 ;
+      RECT  9.080000  1.275000  9.250000 1.955000 ;
+      RECT  9.400000  0.425000  9.735000 0.515000 ;
+      RECT  9.420000  1.495000 10.350000 1.705000 ;
+      RECT  9.420000  1.705000  9.655000 2.295000 ;
+      RECT  9.840000  2.275000 10.175000 2.635000 ;
+      RECT  9.905000  0.085000 10.075000 0.565000 ;
+      RECT 10.180000  0.995000 10.350000 1.495000 ;
+      RECT 10.245000  0.285000 10.690000 0.825000 ;
+      RECT 10.345000  1.875000 10.690000 2.465000 ;
+      RECT 10.520000  0.825000 10.690000 1.875000 ;
+      RECT 11.210000  0.995000 11.460000 1.325000 ;
+      RECT 11.480000  0.085000 11.810000 0.825000 ;
+      RECT 11.560000  1.785000 11.815000 2.635000 ;
+      RECT 11.630000  0.995000 11.940000 1.615000 ;
     LAYER mcon ;
-      RECT  2.450000 1.445000  2.620000 1.615000 ;
-      RECT  3.370000 0.765000  3.540000 0.935000 ;
-      RECT  4.365000 1.445000  4.535000 1.615000 ;
-      RECT  5.570000 1.785000  5.740000 1.955000 ;
-      RECT  6.150000 0.765000  6.320000 0.935000 ;
-      RECT  6.150000 1.445000  6.320000 1.615000 ;
-      RECT  6.610000 1.105000  6.780000 1.275000 ;
-      RECT  8.460000 1.445000  8.630000 1.615000 ;
-      RECT  8.920000 0.765000  9.090000 0.935000 ;
-      RECT  9.080000 1.785000  9.250000 1.955000 ;
-      RECT 10.520000 1.785000 10.690000 1.955000 ;
-      RECT 11.220000 1.105000 11.390000 1.275000 ;
-      RECT 11.680000 1.445000 11.850000 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.450000  1.445000  2.620000 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.370000  0.765000  3.540000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.365000  1.445000  4.535000 1.615000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.570000  1.785000  5.740000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.150000  0.765000  6.320000 0.935000 ;
+      RECT  6.150000  1.445000  6.320000 1.615000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  6.610000  1.105000  6.780000 1.275000 ;
+      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.460000  1.445000  8.630000 1.615000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  8.920000  0.765000  9.090000 0.935000 ;
+      RECT  9.080000  1.785000  9.250000 1.955000 ;
+      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.520000  1.785000 10.690000 1.955000 ;
+      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.220000  1.105000 11.390000 1.275000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 11.680000  1.445000 11.850000 1.615000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
     LAYER met1 ;
       RECT  2.390000 1.415000  2.680000 1.460000 ;
       RECT  2.390000 1.460000  6.380000 1.600000 ;
diff --git a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
index 00d727c..7564e25 100644
--- a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.magic.lef
@@ -46,10 +46,16 @@
     PORT
       LAYER li1 ;
         RECT 1.510000 0.665000 1.740000 1.325000 ;
-        RECT 4.240000 0.645000 4.490000 1.325000 ;
       LAYER mcon ;
         RECT 1.525000 0.765000 1.695000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.240000 0.645000 4.490000 1.325000 ;
+      LAYER mcon ;
         RECT 4.285000 0.765000 4.455000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.465000 0.735000 1.755000 0.780000 ;
         RECT 1.465000 0.780000 4.515000 0.920000 ;
@@ -95,40 +101,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.420000 0.085000 ;
-        RECT  0.630000  0.085000  0.800000 0.545000 ;
-        RECT  5.180000  0.085000  5.510000 0.805000 ;
-        RECT 10.180000  0.085000 10.350000 0.565000 ;
-        RECT 11.495000  0.085000 11.825000 0.510000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -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
@@ -138,169 +110,199 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.420000 2.805000 ;
-        RECT  0.600000 2.180000  0.770000 2.635000 ;
-        RECT  5.260000 2.235000  5.590000 2.635000 ;
-        RECT 10.190000 2.195000 10.360000 2.635000 ;
-        RECT 11.575000 1.785000 11.830000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.735000  0.430000 0.805000 ;
-      RECT  0.085000 0.805000  0.255000 1.500000 ;
-      RECT  0.085000 1.500000  0.440000 1.840000 ;
-      RECT  0.085000 1.840000  1.110000 2.010000 ;
-      RECT  0.085000 2.010000  0.430000 2.465000 ;
-      RECT  0.100000 0.255000  0.430000 0.735000 ;
-      RECT  0.425000 0.995000  0.780000 1.325000 ;
-      RECT  0.610000 0.735000  1.325000 0.905000 ;
-      RECT  0.610000 0.905000  0.780000 0.995000 ;
-      RECT  0.610000 1.325000  0.780000 1.500000 ;
-      RECT  0.610000 1.500000  1.450000 1.670000 ;
-      RECT  0.940000 2.010000  1.110000 2.215000 ;
-      RECT  0.940000 2.215000  1.970000 2.295000 ;
-      RECT  0.940000 2.295000  3.515000 2.385000 ;
-      RECT  0.995000 0.255000  3.390000 0.425000 ;
-      RECT  0.995000 0.425000  2.100000 0.465000 ;
-      RECT  0.995000 0.465000  1.325000 0.735000 ;
-      RECT  1.280000 1.670000  1.450000 1.785000 ;
-      RECT  1.280000 1.785000  2.050000 1.955000 ;
-      RECT  1.280000 1.955000  1.450000 2.045000 ;
-      RECT  1.715000 2.385000  3.515000 2.465000 ;
-      RECT  1.985000 0.675000  2.390000 1.350000 ;
-      RECT  2.220000 0.595000  2.390000 0.675000 ;
-      RECT  2.220000 1.350000  2.390000 1.785000 ;
-      RECT  2.515000 0.425000  3.390000 0.465000 ;
-      RECT  2.565000 1.785000  2.895000 2.045000 ;
-      RECT  2.620000 0.655000  3.025000 0.735000 ;
-      RECT  2.620000 0.735000  3.135000 0.755000 ;
-      RECT  2.620000 0.755000  3.730000 0.905000 ;
-      RECT  2.640000 1.075000  2.970000 1.095000 ;
-      RECT  2.640000 1.095000  3.120000 1.245000 ;
-      RECT  2.800000 1.245000  3.120000 1.265000 ;
-      RECT  2.950000 1.265000  3.120000 1.615000 ;
-      RECT  3.055000 0.905000  3.730000 0.925000 ;
-      RECT  3.215000 0.465000  3.390000 0.585000 ;
-      RECT  3.245000 2.110000  3.460000 2.295000 ;
-      RECT  3.290000 0.925000  3.460000 2.110000 ;
-      RECT  3.560000 0.255000  4.570000 0.425000 ;
-      RECT  3.560000 0.425000  3.730000 0.755000 ;
-      RECT  3.710000 1.150000  4.070000 1.320000 ;
-      RECT  3.710000 1.320000  3.880000 2.290000 ;
-      RECT  3.710000 2.290000  5.065000 2.460000 ;
-      RECT  3.900000 0.595000  4.070000 1.150000 ;
-      RECT  4.080000 1.695000  4.445000 2.120000 ;
-      RECT  4.240000 0.425000  4.570000 0.475000 ;
-      RECT  4.690000 1.385000  5.170000 1.725000 ;
-      RECT  4.815000 1.895000  5.995000 2.065000 ;
-      RECT  4.815000 2.065000  5.065000 2.290000 ;
-      RECT  4.830000 0.510000  5.000000 0.995000 ;
-      RECT  4.830000 0.995000  5.630000 1.325000 ;
-      RECT  4.830000 1.325000  5.170000 1.385000 ;
-      RECT  5.635000 1.555000  6.370000 1.725000 ;
-      RECT  5.680000 0.380000  5.970000 0.815000 ;
-      RECT  5.800000 0.815000  5.970000 1.555000 ;
-      RECT  5.825000 2.065000  5.995000 2.295000 ;
-      RECT  5.825000 2.295000  7.950000 2.465000 ;
-      RECT  6.140000 0.740000  6.425000 1.325000 ;
-      RECT  6.200000 1.725000  6.370000 1.895000 ;
-      RECT  6.200000 1.895000  6.530000 1.955000 ;
-      RECT  6.200000 1.955000  7.210000 2.125000 ;
-      RECT  6.255000 0.255000  7.695000 0.425000 ;
-      RECT  6.255000 0.425000  6.585000 0.570000 ;
-      RECT  7.040000 1.060000  7.270000 1.230000 ;
-      RECT  7.040000 1.230000  7.210000 1.955000 ;
-      RECT  7.100000 0.595000  7.350000 0.925000 ;
-      RECT  7.100000 0.925000  7.270000 1.060000 ;
-      RECT  7.380000 1.360000  7.610000 1.530000 ;
-      RECT  7.380000 1.530000  7.550000 2.125000 ;
-      RECT  7.440000 1.105000  7.695000 1.290000 ;
-      RECT  7.440000 1.290000  7.610000 1.360000 ;
-      RECT  7.520000 0.425000  7.695000 1.105000 ;
-      RECT  7.780000 1.550000  8.035000 1.720000 ;
-      RECT  7.780000 1.720000  7.950000 2.295000 ;
-      RECT  7.865000 0.255000  9.980000 0.425000 ;
-      RECT  7.865000 0.425000  8.035000 0.740000 ;
-      RECT  7.865000 0.995000  8.035000 1.550000 ;
-      RECT  8.220000 1.955000  8.390000 2.295000 ;
-      RECT  8.220000 2.295000  9.410000 2.465000 ;
-      RECT  8.305000 0.595000  8.555000 0.925000 ;
-      RECT  8.375000 0.925000  8.555000 1.445000 ;
-      RECT  8.375000 1.445000  8.670000 1.530000 ;
-      RECT  8.375000 1.530000  8.890000 1.785000 ;
-      RECT  8.560000 1.785000  8.890000 2.125000 ;
-      RECT  8.725000 0.595000  9.410000 0.765000 ;
-      RECT  8.835000 0.995000  9.070000 1.325000 ;
-      RECT  9.240000 0.765000  9.410000 1.875000 ;
-      RECT  9.240000 1.875000 10.885000 2.025000 ;
-      RECT  9.240000 2.025000 10.145000 2.030000 ;
-      RECT  9.240000 2.030000 10.130000 2.035000 ;
-      RECT  9.240000 2.035000 10.120000 2.040000 ;
-      RECT  9.240000 2.040000 10.105000 2.045000 ;
-      RECT  9.240000 2.045000  9.410000 2.295000 ;
-      RECT  9.640000 0.425000  9.980000 0.825000 ;
-      RECT  9.640000 0.825000  9.810000 1.535000 ;
-      RECT  9.640000 1.535000 10.010000 1.705000 ;
-      RECT  9.980000 0.995000 10.350000 1.325000 ;
-      RECT 10.055000 1.870000 10.885000 1.875000 ;
-      RECT 10.070000 1.865000 10.885000 1.870000 ;
-      RECT 10.085000 1.860000 10.885000 1.865000 ;
-      RECT 10.100000 1.855000 10.885000 1.860000 ;
-      RECT 10.180000 0.735000 10.910000 0.905000 ;
-      RECT 10.180000 0.905000 10.350000 0.995000 ;
-      RECT 10.180000 1.325000 10.350000 1.445000 ;
-      RECT 10.180000 1.445000 10.885000 1.855000 ;
-      RECT 10.530000 0.285000 10.910000 0.735000 ;
-      RECT 10.535000 2.025000 10.885000 2.465000 ;
-      RECT 11.075000 1.455000 11.405000 2.465000 ;
-      RECT 11.155000 0.270000 11.325000 0.680000 ;
-      RECT 11.155000 0.680000 11.405000 1.455000 ;
-      RECT 11.645000 0.995000 11.955000 1.615000 ;
+      RECT  0.000000 -0.085000 12.420000 0.085000 ;
+      RECT  0.000000  2.635000 12.420000 2.805000 ;
+      RECT  0.085000  0.735000  0.430000 0.805000 ;
+      RECT  0.085000  0.805000  0.255000 1.500000 ;
+      RECT  0.085000  1.500000  0.440000 1.840000 ;
+      RECT  0.085000  1.840000  1.110000 2.010000 ;
+      RECT  0.085000  2.010000  0.430000 2.465000 ;
+      RECT  0.100000  0.255000  0.430000 0.735000 ;
+      RECT  0.425000  0.995000  0.780000 1.325000 ;
+      RECT  0.600000  2.180000  0.770000 2.635000 ;
+      RECT  0.610000  0.735000  1.325000 0.905000 ;
+      RECT  0.610000  0.905000  0.780000 0.995000 ;
+      RECT  0.610000  1.325000  0.780000 1.500000 ;
+      RECT  0.610000  1.500000  1.450000 1.670000 ;
+      RECT  0.630000  0.085000  0.800000 0.545000 ;
+      RECT  0.940000  2.010000  1.110000 2.215000 ;
+      RECT  0.940000  2.215000  1.970000 2.295000 ;
+      RECT  0.940000  2.295000  3.515000 2.385000 ;
+      RECT  0.995000  0.255000  3.390000 0.425000 ;
+      RECT  0.995000  0.425000  2.100000 0.465000 ;
+      RECT  0.995000  0.465000  1.325000 0.735000 ;
+      RECT  1.280000  1.670000  1.450000 1.785000 ;
+      RECT  1.280000  1.785000  2.050000 1.955000 ;
+      RECT  1.280000  1.955000  1.450000 2.045000 ;
+      RECT  1.715000  2.385000  3.515000 2.465000 ;
+      RECT  1.985000  0.675000  2.390000 1.350000 ;
+      RECT  2.220000  0.595000  2.390000 0.675000 ;
+      RECT  2.220000  1.350000  2.390000 1.785000 ;
+      RECT  2.515000  0.425000  3.390000 0.465000 ;
+      RECT  2.565000  1.785000  2.895000 2.045000 ;
+      RECT  2.620000  0.655000  3.025000 0.735000 ;
+      RECT  2.620000  0.735000  3.135000 0.755000 ;
+      RECT  2.620000  0.755000  3.730000 0.905000 ;
+      RECT  2.640000  1.075000  2.970000 1.095000 ;
+      RECT  2.640000  1.095000  3.120000 1.245000 ;
+      RECT  2.800000  1.245000  3.120000 1.265000 ;
+      RECT  2.950000  1.265000  3.120000 1.615000 ;
+      RECT  3.055000  0.905000  3.730000 0.925000 ;
+      RECT  3.215000  0.465000  3.390000 0.585000 ;
+      RECT  3.245000  2.110000  3.460000 2.295000 ;
+      RECT  3.290000  0.925000  3.460000 2.110000 ;
+      RECT  3.560000  0.255000  4.570000 0.425000 ;
+      RECT  3.560000  0.425000  3.730000 0.755000 ;
+      RECT  3.710000  1.150000  4.070000 1.320000 ;
+      RECT  3.710000  1.320000  3.880000 2.290000 ;
+      RECT  3.710000  2.290000  5.065000 2.460000 ;
+      RECT  3.900000  0.595000  4.070000 1.150000 ;
+      RECT  4.080000  1.695000  4.445000 2.120000 ;
+      RECT  4.240000  0.425000  4.570000 0.475000 ;
+      RECT  4.690000  1.385000  5.170000 1.725000 ;
+      RECT  4.815000  1.895000  5.995000 2.065000 ;
+      RECT  4.815000  2.065000  5.065000 2.290000 ;
+      RECT  4.830000  0.510000  5.000000 0.995000 ;
+      RECT  4.830000  0.995000  5.630000 1.325000 ;
+      RECT  4.830000  1.325000  5.170000 1.385000 ;
+      RECT  5.180000  0.085000  5.510000 0.805000 ;
+      RECT  5.260000  2.235000  5.590000 2.635000 ;
+      RECT  5.635000  1.555000  6.370000 1.725000 ;
+      RECT  5.680000  0.380000  5.970000 0.815000 ;
+      RECT  5.800000  0.815000  5.970000 1.555000 ;
+      RECT  5.825000  2.065000  5.995000 2.295000 ;
+      RECT  5.825000  2.295000  7.950000 2.465000 ;
+      RECT  6.140000  0.740000  6.425000 1.325000 ;
+      RECT  6.200000  1.725000  6.370000 1.895000 ;
+      RECT  6.200000  1.895000  6.530000 1.955000 ;
+      RECT  6.200000  1.955000  7.210000 2.125000 ;
+      RECT  6.255000  0.255000  7.695000 0.425000 ;
+      RECT  6.255000  0.425000  6.585000 0.570000 ;
+      RECT  7.040000  1.060000  7.270000 1.230000 ;
+      RECT  7.040000  1.230000  7.210000 1.955000 ;
+      RECT  7.100000  0.595000  7.350000 0.925000 ;
+      RECT  7.100000  0.925000  7.270000 1.060000 ;
+      RECT  7.380000  1.360000  7.610000 1.530000 ;
+      RECT  7.380000  1.530000  7.550000 2.125000 ;
+      RECT  7.440000  1.105000  7.695000 1.290000 ;
+      RECT  7.440000  1.290000  7.610000 1.360000 ;
+      RECT  7.520000  0.425000  7.695000 1.105000 ;
+      RECT  7.780000  1.550000  8.035000 1.720000 ;
+      RECT  7.780000  1.720000  7.950000 2.295000 ;
+      RECT  7.865000  0.255000  9.980000 0.425000 ;
+      RECT  7.865000  0.425000  8.035000 0.740000 ;
+      RECT  7.865000  0.995000  8.035000 1.550000 ;
+      RECT  8.220000  1.955000  8.390000 2.295000 ;
+      RECT  8.220000  2.295000  9.410000 2.465000 ;
+      RECT  8.305000  0.595000  8.555000 0.925000 ;
+      RECT  8.375000  0.925000  8.555000 1.445000 ;
+      RECT  8.375000  1.445000  8.670000 1.530000 ;
+      RECT  8.375000  1.530000  8.890000 1.785000 ;
+      RECT  8.560000  1.785000  8.890000 2.125000 ;
+      RECT  8.725000  0.595000  9.410000 0.765000 ;
+      RECT  8.835000  0.995000  9.070000 1.325000 ;
+      RECT  9.240000  0.765000  9.410000 1.875000 ;
+      RECT  9.240000  1.875000 10.885000 2.025000 ;
+      RECT  9.240000  2.025000 10.145000 2.030000 ;
+      RECT  9.240000  2.030000 10.130000 2.035000 ;
+      RECT  9.240000  2.035000 10.120000 2.040000 ;
+      RECT  9.240000  2.040000 10.105000 2.045000 ;
+      RECT  9.240000  2.045000  9.410000 2.295000 ;
+      RECT  9.640000  0.425000  9.980000 0.825000 ;
+      RECT  9.640000  0.825000  9.810000 1.535000 ;
+      RECT  9.640000  1.535000 10.010000 1.705000 ;
+      RECT  9.980000  0.995000 10.350000 1.325000 ;
+      RECT 10.055000  1.870000 10.885000 1.875000 ;
+      RECT 10.070000  1.865000 10.885000 1.870000 ;
+      RECT 10.085000  1.860000 10.885000 1.865000 ;
+      RECT 10.100000  1.855000 10.885000 1.860000 ;
+      RECT 10.180000  0.085000 10.350000 0.565000 ;
+      RECT 10.180000  0.735000 10.910000 0.905000 ;
+      RECT 10.180000  0.905000 10.350000 0.995000 ;
+      RECT 10.180000  1.325000 10.350000 1.445000 ;
+      RECT 10.180000  1.445000 10.885000 1.855000 ;
+      RECT 10.190000  2.195000 10.360000 2.635000 ;
+      RECT 10.530000  0.285000 10.910000 0.735000 ;
+      RECT 10.535000  2.025000 10.885000 2.465000 ;
+      RECT 11.075000  1.455000 11.405000 2.465000 ;
+      RECT 11.155000  0.270000 11.325000 0.680000 ;
+      RECT 11.155000  0.680000 11.405000 1.455000 ;
+      RECT 11.495000  0.085000 11.825000 0.510000 ;
+      RECT 11.575000  1.785000 11.830000 2.635000 ;
+      RECT 11.645000  0.995000 11.955000 1.615000 ;
     LAYER mcon ;
-      RECT  1.880000 1.785000  2.050000 1.955000 ;
-      RECT  1.985000 1.105000  2.155000 1.275000 ;
-      RECT  2.570000 1.785000  2.740000 1.955000 ;
-      RECT  2.950000 1.445000  3.120000 1.615000 ;
-      RECT  4.140000 1.785000  4.310000 1.955000 ;
-      RECT  4.760000 1.445000  4.930000 1.615000 ;
-      RECT  6.140000 1.105000  6.310000 1.275000 ;
-      RECT  7.520000 0.765000  7.690000 0.935000 ;
-      RECT  8.440000 1.445000  8.610000 1.615000 ;
-      RECT  8.900000 1.105000  9.070000 1.275000 ;
-      RECT 11.220000 0.765000 11.390000 0.935000 ;
-      RECT 11.680000 1.445000 11.850000 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.880000  1.785000  2.050000 1.955000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  1.105000  2.155000 1.275000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.570000  1.785000  2.740000 1.955000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  2.950000  1.445000  3.120000 1.615000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.140000  1.785000  4.310000 1.955000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  4.760000  1.445000  4.930000 1.615000 ;
+      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.140000  1.105000  6.310000 1.275000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.520000  0.765000  7.690000 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.440000  1.445000  8.610000 1.615000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  8.900000  1.105000  9.070000 1.275000 ;
+      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.220000  0.765000 11.390000 0.935000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 11.680000  1.445000 11.850000 1.615000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
     LAYER met1 ;
       RECT  1.820000 1.755000  2.110000 1.800000 ;
       RECT  1.820000 1.800000  4.370000 1.940000 ;
diff --git a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
index fb44ecc..d5c0447 100644
--- a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.magic.lef
@@ -46,10 +46,16 @@
     PORT
       LAYER li1 ;
         RECT 1.510000 0.710000 1.780000 1.325000 ;
-        RECT 4.265000 0.645000 4.515000 1.325000 ;
       LAYER mcon ;
         RECT 1.525000 0.765000 1.695000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.265000 0.645000 4.515000 1.325000 ;
+      LAYER mcon ;
         RECT 4.310000 0.765000 4.480000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.465000 0.735000 1.755000 0.780000 ;
         RECT 1.465000 0.780000 4.540000 0.920000 ;
@@ -95,40 +101,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.420000 0.085000 ;
-        RECT  0.630000  0.085000  0.800000 0.545000 ;
-        RECT  5.200000  0.085000  5.530000 0.805000 ;
-        RECT 10.200000  0.085000 10.370000 0.565000 ;
-        RECT 11.535000  0.085000 11.825000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
@@ -138,152 +110,182 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.420000 2.805000 ;
-        RECT  0.600000 2.180000  0.770000 2.635000 ;
-        RECT  5.270000 2.235000  5.600000 2.635000 ;
-        RECT 10.120000 2.275000 10.455000 2.635000 ;
-        RECT 11.585000 1.785000 11.840000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.735000  0.430000 0.805000 ;
-      RECT  0.085000 0.805000  0.255000 1.500000 ;
-      RECT  0.085000 1.500000  0.440000 1.840000 ;
-      RECT  0.085000 1.840000  1.110000 2.010000 ;
-      RECT  0.085000 2.010000  0.430000 2.465000 ;
-      RECT  0.100000 0.255000  0.430000 0.735000 ;
-      RECT  0.425000 0.995000  0.780000 1.325000 ;
-      RECT  0.610000 0.735000  1.325000 0.905000 ;
-      RECT  0.610000 0.905000  0.780000 0.995000 ;
-      RECT  0.610000 1.325000  0.780000 1.500000 ;
-      RECT  0.610000 1.500000  1.450000 1.670000 ;
-      RECT  0.940000 2.010000  1.110000 2.215000 ;
-      RECT  0.940000 2.215000  2.545000 2.295000 ;
-      RECT  0.940000 2.295000  3.540000 2.385000 ;
-      RECT  0.995000 0.255000  3.410000 0.465000 ;
-      RECT  0.995000 0.465000  1.325000 0.735000 ;
-      RECT  1.280000 1.670000  1.450000 1.875000 ;
-      RECT  1.280000 1.875000  2.920000 2.045000 ;
-      RECT  1.965000 0.635000  2.470000 1.705000 ;
-      RECT  2.375000 2.385000  3.540000 2.465000 ;
-      RECT  2.640000 0.655000  3.025000 0.735000 ;
-      RECT  2.640000 0.735000  3.160000 0.755000 ;
-      RECT  2.640000 0.755000  3.750000 0.905000 ;
-      RECT  2.640000 1.075000  2.975000 1.160000 ;
-      RECT  2.640000 1.160000  3.100000 1.615000 ;
-      RECT  3.055000 0.905000  3.750000 0.925000 ;
-      RECT  3.240000 0.465000  3.410000 0.585000 ;
-      RECT  3.270000 0.925000  3.440000 2.295000 ;
-      RECT  3.580000 0.255000  4.595000 0.425000 ;
-      RECT  3.580000 0.425000  3.750000 0.755000 ;
-      RECT  3.725000 1.150000  4.095000 1.320000 ;
-      RECT  3.725000 1.320000  3.895000 2.295000 ;
-      RECT  3.725000 2.295000  5.100000 2.465000 ;
-      RECT  3.925000 0.595000  4.095000 1.150000 ;
-      RECT  4.210000 1.755000  4.380000 2.095000 ;
-      RECT  4.265000 0.425000  4.595000 0.475000 ;
-      RECT  4.700000 1.385000  5.180000 1.725000 ;
-      RECT  4.840000 0.510000  5.030000 0.995000 ;
-      RECT  4.840000 0.995000  5.180000 1.385000 ;
-      RECT  4.875000 1.895000  6.005000 2.065000 ;
-      RECT  4.875000 2.065000  5.100000 2.295000 ;
-      RECT  5.645000 1.555000  6.380000 1.725000 ;
-      RECT  5.700000 0.380000  5.980000 0.815000 ;
-      RECT  5.810000 0.815000  5.980000 1.555000 ;
-      RECT  5.835000 2.065000  6.005000 2.295000 ;
-      RECT  5.835000 2.295000  7.960000 2.465000 ;
-      RECT  6.150000 0.740000  6.435000 1.325000 ;
-      RECT  6.210000 1.725000  6.380000 1.895000 ;
-      RECT  6.210000 1.895000  6.540000 1.955000 ;
-      RECT  6.210000 1.955000  7.220000 2.125000 ;
-      RECT  6.265000 0.255000  7.700000 0.425000 ;
-      RECT  6.265000 0.425000  6.595000 0.570000 ;
-      RECT  7.050000 1.060000  7.280000 1.230000 ;
-      RECT  7.050000 1.230000  7.220000 1.955000 ;
-      RECT  7.110000 0.595000  7.360000 0.925000 ;
-      RECT  7.110000 0.925000  7.280000 1.060000 ;
-      RECT  7.390000 1.360000  7.620000 1.530000 ;
-      RECT  7.390000 1.530000  7.560000 2.125000 ;
-      RECT  7.450000 1.105000  7.700000 1.290000 ;
-      RECT  7.450000 1.290000  7.620000 1.360000 ;
-      RECT  7.530000 0.425000  7.700000 1.105000 ;
-      RECT  7.790000 1.550000  8.045000 1.720000 ;
-      RECT  7.790000 1.720000  7.960000 2.295000 ;
-      RECT  7.875000 0.995000  8.045000 1.550000 ;
-      RECT  7.935000 0.255000  9.450000 0.425000 ;
-      RECT  7.935000 0.425000  8.270000 0.825000 ;
-      RECT  8.230000 1.785000  8.400000 2.295000 ;
-      RECT  8.230000 2.295000  9.950000 2.465000 ;
-      RECT  8.440000 0.595000  8.900000 0.765000 ;
-      RECT  8.440000 0.765000  8.610000 1.445000 ;
-      RECT  8.440000 1.445000  8.740000 1.530000 ;
-      RECT  8.440000 1.530000  8.900000 1.615000 ;
-      RECT  8.570000 1.615000  8.900000 2.125000 ;
-      RECT  8.780000 0.995000  9.110000 1.275000 ;
-      RECT  9.070000 1.530000  9.450000 2.045000 ;
-      RECT  9.070000 2.045000  9.420000 2.125000 ;
-      RECT  9.280000 0.425000  9.450000 1.530000 ;
-      RECT  9.620000 2.215000  9.950000 2.295000 ;
-      RECT  9.650000 0.255000 10.020000 0.825000 ;
-      RECT  9.650000 0.825000  9.820000 1.535000 ;
-      RECT  9.650000 1.535000  9.950000 2.215000 ;
-      RECT  9.990000 0.995000 10.360000 1.325000 ;
-      RECT 10.190000 0.735000 10.920000 0.905000 ;
-      RECT 10.190000 0.905000 10.360000 0.995000 ;
-      RECT 10.190000 1.325000 10.360000 1.455000 ;
-      RECT 10.190000 1.455000 10.835000 2.045000 ;
-      RECT 10.540000 0.285000 10.920000 0.735000 ;
-      RECT 10.625000 2.045000 10.835000 2.465000 ;
-      RECT 11.085000 1.455000 11.415000 2.465000 ;
-      RECT 11.165000 0.270000 11.335000 0.680000 ;
-      RECT 11.165000 0.680000 11.415000 1.455000 ;
-      RECT 11.655000 0.995000 11.965000 1.615000 ;
+      RECT  0.000000 -0.085000 12.420000 0.085000 ;
+      RECT  0.000000  2.635000 12.420000 2.805000 ;
+      RECT  0.085000  0.735000  0.430000 0.805000 ;
+      RECT  0.085000  0.805000  0.255000 1.500000 ;
+      RECT  0.085000  1.500000  0.440000 1.840000 ;
+      RECT  0.085000  1.840000  1.110000 2.010000 ;
+      RECT  0.085000  2.010000  0.430000 2.465000 ;
+      RECT  0.100000  0.255000  0.430000 0.735000 ;
+      RECT  0.425000  0.995000  0.780000 1.325000 ;
+      RECT  0.600000  2.180000  0.770000 2.635000 ;
+      RECT  0.610000  0.735000  1.325000 0.905000 ;
+      RECT  0.610000  0.905000  0.780000 0.995000 ;
+      RECT  0.610000  1.325000  0.780000 1.500000 ;
+      RECT  0.610000  1.500000  1.450000 1.670000 ;
+      RECT  0.630000  0.085000  0.800000 0.545000 ;
+      RECT  0.940000  2.010000  1.110000 2.215000 ;
+      RECT  0.940000  2.215000  2.545000 2.295000 ;
+      RECT  0.940000  2.295000  3.540000 2.385000 ;
+      RECT  0.995000  0.255000  3.410000 0.465000 ;
+      RECT  0.995000  0.465000  1.325000 0.735000 ;
+      RECT  1.280000  1.670000  1.450000 1.875000 ;
+      RECT  1.280000  1.875000  2.920000 2.045000 ;
+      RECT  1.965000  0.635000  2.470000 1.705000 ;
+      RECT  2.375000  2.385000  3.540000 2.465000 ;
+      RECT  2.640000  0.655000  3.025000 0.735000 ;
+      RECT  2.640000  0.735000  3.160000 0.755000 ;
+      RECT  2.640000  0.755000  3.750000 0.905000 ;
+      RECT  2.640000  1.075000  2.975000 1.160000 ;
+      RECT  2.640000  1.160000  3.100000 1.615000 ;
+      RECT  3.055000  0.905000  3.750000 0.925000 ;
+      RECT  3.240000  0.465000  3.410000 0.585000 ;
+      RECT  3.270000  0.925000  3.440000 2.295000 ;
+      RECT  3.580000  0.255000  4.595000 0.425000 ;
+      RECT  3.580000  0.425000  3.750000 0.755000 ;
+      RECT  3.725000  1.150000  4.095000 1.320000 ;
+      RECT  3.725000  1.320000  3.895000 2.295000 ;
+      RECT  3.725000  2.295000  5.100000 2.465000 ;
+      RECT  3.925000  0.595000  4.095000 1.150000 ;
+      RECT  4.210000  1.755000  4.380000 2.095000 ;
+      RECT  4.265000  0.425000  4.595000 0.475000 ;
+      RECT  4.700000  1.385000  5.180000 1.725000 ;
+      RECT  4.840000  0.510000  5.030000 0.995000 ;
+      RECT  4.840000  0.995000  5.180000 1.385000 ;
+      RECT  4.875000  1.895000  6.005000 2.065000 ;
+      RECT  4.875000  2.065000  5.100000 2.295000 ;
+      RECT  5.200000  0.085000  5.530000 0.805000 ;
+      RECT  5.270000  2.235000  5.600000 2.635000 ;
+      RECT  5.645000  1.555000  6.380000 1.725000 ;
+      RECT  5.700000  0.380000  5.980000 0.815000 ;
+      RECT  5.810000  0.815000  5.980000 1.555000 ;
+      RECT  5.835000  2.065000  6.005000 2.295000 ;
+      RECT  5.835000  2.295000  7.960000 2.465000 ;
+      RECT  6.150000  0.740000  6.435000 1.325000 ;
+      RECT  6.210000  1.725000  6.380000 1.895000 ;
+      RECT  6.210000  1.895000  6.540000 1.955000 ;
+      RECT  6.210000  1.955000  7.220000 2.125000 ;
+      RECT  6.265000  0.255000  7.700000 0.425000 ;
+      RECT  6.265000  0.425000  6.595000 0.570000 ;
+      RECT  7.050000  1.060000  7.280000 1.230000 ;
+      RECT  7.050000  1.230000  7.220000 1.955000 ;
+      RECT  7.110000  0.595000  7.360000 0.925000 ;
+      RECT  7.110000  0.925000  7.280000 1.060000 ;
+      RECT  7.390000  1.360000  7.620000 1.530000 ;
+      RECT  7.390000  1.530000  7.560000 2.125000 ;
+      RECT  7.450000  1.105000  7.700000 1.290000 ;
+      RECT  7.450000  1.290000  7.620000 1.360000 ;
+      RECT  7.530000  0.425000  7.700000 1.105000 ;
+      RECT  7.790000  1.550000  8.045000 1.720000 ;
+      RECT  7.790000  1.720000  7.960000 2.295000 ;
+      RECT  7.875000  0.995000  8.045000 1.550000 ;
+      RECT  7.935000  0.255000  9.450000 0.425000 ;
+      RECT  7.935000  0.425000  8.270000 0.825000 ;
+      RECT  8.230000  1.785000  8.400000 2.295000 ;
+      RECT  8.230000  2.295000  9.950000 2.465000 ;
+      RECT  8.440000  0.595000  8.900000 0.765000 ;
+      RECT  8.440000  0.765000  8.610000 1.445000 ;
+      RECT  8.440000  1.445000  8.740000 1.530000 ;
+      RECT  8.440000  1.530000  8.900000 1.615000 ;
+      RECT  8.570000  1.615000  8.900000 2.125000 ;
+      RECT  8.780000  0.995000  9.110000 1.275000 ;
+      RECT  9.070000  1.530000  9.450000 2.045000 ;
+      RECT  9.070000  2.045000  9.420000 2.125000 ;
+      RECT  9.280000  0.425000  9.450000 1.530000 ;
+      RECT  9.620000  2.215000  9.950000 2.295000 ;
+      RECT  9.650000  0.255000 10.020000 0.825000 ;
+      RECT  9.650000  0.825000  9.820000 1.535000 ;
+      RECT  9.650000  1.535000  9.950000 2.215000 ;
+      RECT  9.990000  0.995000 10.360000 1.325000 ;
+      RECT 10.120000  2.275000 10.455000 2.635000 ;
+      RECT 10.190000  0.735000 10.920000 0.905000 ;
+      RECT 10.190000  0.905000 10.360000 0.995000 ;
+      RECT 10.190000  1.325000 10.360000 1.455000 ;
+      RECT 10.190000  1.455000 10.835000 2.045000 ;
+      RECT 10.200000  0.085000 10.370000 0.565000 ;
+      RECT 10.540000  0.285000 10.920000 0.735000 ;
+      RECT 10.625000  2.045000 10.835000 2.465000 ;
+      RECT 11.085000  1.455000 11.415000 2.465000 ;
+      RECT 11.165000  0.270000 11.335000 0.680000 ;
+      RECT 11.165000  0.680000 11.415000 1.455000 ;
+      RECT 11.535000  0.085000 11.825000 0.555000 ;
+      RECT 11.585000  1.785000 11.840000 2.635000 ;
+      RECT 11.655000  0.995000 11.965000 1.615000 ;
     LAYER mcon ;
-      RECT  1.280000 1.785000  1.450000 1.955000 ;
-      RECT  1.985000 1.105000  2.155000 1.275000 ;
-      RECT  2.930000 1.445000  3.100000 1.615000 ;
-      RECT  4.210000 1.785000  4.380000 1.955000 ;
-      RECT  4.770000 1.445000  4.940000 1.615000 ;
-      RECT  6.150000 1.105000  6.320000 1.275000 ;
-      RECT  7.530000 0.765000  7.700000 0.935000 ;
-      RECT  8.450000 1.445000  8.620000 1.615000 ;
-      RECT  8.910000 1.105000  9.080000 1.275000 ;
-      RECT  9.280000 1.785000  9.450000 1.955000 ;
-      RECT 10.190000 1.785000 10.360000 1.955000 ;
-      RECT 11.230000 0.765000 11.400000 0.935000 ;
-      RECT 11.690000 1.445000 11.860000 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.280000  1.785000  1.450000 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  1.105000  2.155000 1.275000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  2.930000  1.445000  3.100000 1.615000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.210000  1.785000  4.380000 1.955000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  4.770000  1.445000  4.940000 1.615000 ;
+      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.150000  1.105000  6.320000 1.275000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.530000  0.765000  7.700000 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.450000  1.445000  8.620000 1.615000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  8.910000  1.105000  9.080000 1.275000 ;
+      RECT  9.280000  1.785000  9.450000 1.955000 ;
+      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.190000  1.785000 10.360000 1.955000 ;
+      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.230000  0.765000 11.400000 0.935000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 11.690000  1.445000 11.860000 1.615000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
     LAYER met1 ;
       RECT  1.195000 1.755000  1.510000 1.800000 ;
       RECT  1.195000 1.800000  4.440000 1.940000 ;
diff --git a/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
index 0482fad..e1f5653 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_1.magic.lef
@@ -35,10 +35,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -48,12 +44,16 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
 END sky130_fd_sc_hd__fill_1
diff --git a/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
index 1878b21..bf86389 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_2.magic.lef
@@ -35,11 +35,6 @@
     SHAPE ABUTMENT ;
     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
@@ -49,13 +44,18 @@
     SHAPE ABUTMENT ;
     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
 END sky130_fd_sc_hd__fill_2
diff --git a/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
index a1ea09d..5db3e6b 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_4.magic.lef
@@ -35,13 +35,6 @@
     SHAPE ABUTMENT ;
     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
@@ -51,15 +44,22 @@
     SHAPE ABUTMENT ;
     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
 END sky130_fd_sc_hd__fill_4
diff --git a/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
index 1fbdc54..cb6563f 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hd__fill_8.magic.lef
@@ -35,17 +35,6 @@
     SHAPE ABUTMENT ;
     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
@@ -55,19 +44,30 @@
     SHAPE ABUTMENT ;
     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
 END sky130_fd_sc_hd__fill_8
diff --git a/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
index 3a3dda7..4186b9e 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_1.magic.lef
@@ -79,22 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.595000  0.085000 0.790000 0.885000 ;
-        RECT 1.875000  0.085000 2.205000 0.465000 ;
-        RECT 3.755000  0.085000 4.005000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -104,47 +88,60 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.595000 1.515000 0.790000 2.275000 ;
-        RECT 0.595000 2.275000 1.260000 2.635000 ;
-        RECT 2.450000 2.275000 3.120000 2.635000 ;
-        RECT 3.755000 2.125000 4.005000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.490000 1.075000 1.130000 1.245000 ;
-      RECT 0.960000 0.345000 1.285000 0.675000 ;
-      RECT 0.960000 0.675000 1.130000 1.075000 ;
-      RECT 0.960000 1.245000 1.130000 1.935000 ;
-      RECT 0.960000 1.935000 1.680000 2.105000 ;
-      RECT 1.300000 0.975000 3.170000 1.145000 ;
-      RECT 1.300000 1.145000 1.470000 1.325000 ;
-      RECT 1.510000 2.105000 1.680000 2.355000 ;
-      RECT 1.535000 0.345000 1.705000 0.635000 ;
-      RECT 1.535000 0.635000 2.545000 0.805000 ;
-      RECT 2.375000 0.345000 2.545000 0.635000 ;
-      RECT 3.000000 0.345000 3.170000 0.715000 ;
-      RECT 3.000000 0.715000 4.005000 0.885000 ;
-      RECT 3.000000 0.885000 3.170000 0.975000 ;
-      RECT 3.350000 1.785000 4.005000 1.955000 ;
-      RECT 3.350000 1.955000 3.520000 2.355000 ;
-      RECT 3.835000 0.885000 4.005000 0.995000 ;
-      RECT 3.835000 0.995000 4.160000 1.325000 ;
-      RECT 3.835000 1.325000 4.005000 1.785000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.490000  1.075000 1.130000 1.245000 ;
+      RECT 0.595000  0.085000 0.790000 0.885000 ;
+      RECT 0.595000  1.515000 0.790000 2.275000 ;
+      RECT 0.595000  2.275000 1.260000 2.635000 ;
+      RECT 0.960000  0.345000 1.285000 0.675000 ;
+      RECT 0.960000  0.675000 1.130000 1.075000 ;
+      RECT 0.960000  1.245000 1.130000 1.935000 ;
+      RECT 0.960000  1.935000 1.680000 2.105000 ;
+      RECT 1.300000  0.975000 3.170000 1.145000 ;
+      RECT 1.300000  1.145000 1.470000 1.325000 ;
+      RECT 1.510000  2.105000 1.680000 2.355000 ;
+      RECT 1.535000  0.345000 1.705000 0.635000 ;
+      RECT 1.535000  0.635000 2.545000 0.805000 ;
+      RECT 1.875000  0.085000 2.205000 0.465000 ;
+      RECT 2.375000  0.345000 2.545000 0.635000 ;
+      RECT 2.450000  2.275000 3.120000 2.635000 ;
+      RECT 3.000000  0.345000 3.170000 0.715000 ;
+      RECT 3.000000  0.715000 4.005000 0.885000 ;
+      RECT 3.000000  0.885000 3.170000 0.975000 ;
+      RECT 3.350000  1.785000 4.005000 1.955000 ;
+      RECT 3.350000  1.955000 3.520000 2.355000 ;
+      RECT 3.755000  0.085000 4.005000 0.545000 ;
+      RECT 3.755000  2.125000 4.005000 2.635000 ;
+      RECT 3.835000  0.885000 4.005000 0.995000 ;
+      RECT 3.835000  0.995000 4.160000 1.325000 ;
+      RECT 3.835000  1.325000 4.005000 1.785000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__ha_1
diff --git a/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
index 6f1aeb5..17999ed 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_2.magic.lef
@@ -77,26 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.135000  0.085000 0.375000 0.885000 ;
-        RECT 1.055000  0.085000 1.250000 0.885000 ;
-        RECT 2.335000  0.085000 2.665000 0.465000 ;
-        RECT 4.215000  0.085000 4.465000 0.545000 ;
-        RECT 5.145000  0.085000 5.385000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -106,47 +86,64 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.135000 1.495000 0.375000 2.635000 ;
-        RECT 1.055000 1.515000 1.250000 2.635000 ;
-        RECT 2.850000 2.205000 3.640000 2.635000 ;
-        RECT 4.215000 2.205000 4.545000 2.635000 ;
-        RECT 5.145000 1.495000 5.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 ;
-        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.950000 1.075000 1.590000 1.245000 ;
-      RECT 1.420000 0.345000 1.745000 0.675000 ;
-      RECT 1.420000 0.675000 1.590000 1.075000 ;
-      RECT 1.420000 1.245000 1.590000 2.205000 ;
-      RECT 1.420000 2.205000 2.220000 2.375000 ;
-      RECT 1.760000 0.995000 1.930000 1.855000 ;
-      RECT 1.760000 1.855000 4.465000 2.025000 ;
-      RECT 1.995000 0.345000 2.165000 0.635000 ;
-      RECT 1.995000 0.635000 3.005000 0.805000 ;
-      RECT 2.835000 0.345000 3.005000 0.635000 ;
-      RECT 3.460000 0.345000 3.630000 0.715000 ;
-      RECT 3.460000 0.715000 4.465000 0.885000 ;
-      RECT 3.810000 2.025000 3.980000 2.355000 ;
-      RECT 4.295000 0.885000 4.465000 0.995000 ;
-      RECT 4.295000 0.995000 4.620000 1.325000 ;
-      RECT 4.295000 1.325000 4.465000 1.855000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.135000  0.085000 0.375000 0.885000 ;
+      RECT 0.135000  1.495000 0.375000 2.635000 ;
+      RECT 0.950000  1.075000 1.590000 1.245000 ;
+      RECT 1.055000  0.085000 1.250000 0.885000 ;
+      RECT 1.055000  1.515000 1.250000 2.635000 ;
+      RECT 1.420000  0.345000 1.745000 0.675000 ;
+      RECT 1.420000  0.675000 1.590000 1.075000 ;
+      RECT 1.420000  1.245000 1.590000 2.205000 ;
+      RECT 1.420000  2.205000 2.220000 2.375000 ;
+      RECT 1.760000  0.995000 1.930000 1.855000 ;
+      RECT 1.760000  1.855000 4.465000 2.025000 ;
+      RECT 1.995000  0.345000 2.165000 0.635000 ;
+      RECT 1.995000  0.635000 3.005000 0.805000 ;
+      RECT 2.335000  0.085000 2.665000 0.465000 ;
+      RECT 2.835000  0.345000 3.005000 0.635000 ;
+      RECT 2.850000  2.205000 3.640000 2.635000 ;
+      RECT 3.460000  0.345000 3.630000 0.715000 ;
+      RECT 3.460000  0.715000 4.465000 0.885000 ;
+      RECT 3.810000  2.025000 3.980000 2.355000 ;
+      RECT 4.215000  0.085000 4.465000 0.545000 ;
+      RECT 4.215000  2.205000 4.545000 2.635000 ;
+      RECT 4.295000  0.885000 4.465000 0.995000 ;
+      RECT 4.295000  0.995000 4.620000 1.325000 ;
+      RECT 4.295000  1.325000 4.465000 1.855000 ;
+      RECT 5.145000  0.085000 5.385000 0.885000 ;
+      RECT 5.145000  1.495000 5.385000 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
 END sky130_fd_sc_hd__ha_2
diff --git a/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef b/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
index 4e1ac88..9f34b8b 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_hd__ha_4.magic.lef
@@ -99,38 +99,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.135000  0.085000 0.345000 0.885000 ;
-        RECT 1.015000  0.085000 1.185000 0.885000 ;
-        RECT 1.855000  0.085000 2.095000 0.885000 ;
-        RECT 3.555000  0.085000 3.910000 0.465000 ;
-        RECT 4.420000  0.085000 4.750000 0.465000 ;
-        RECT 5.385000  0.085000 5.715000 0.465000 ;
-        RECT 7.055000  0.085000 7.385000 0.465000 ;
-        RECT 8.015000  0.085000 8.225000 0.565000 ;
-        RECT 8.855000  0.085000 9.065000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -140,69 +108,98 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.135000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.515000 1.185000 2.635000 ;
-        RECT 1.855000 1.495000 2.365000 2.635000 ;
-        RECT 3.190000 2.105000 3.360000 2.635000 ;
-        RECT 5.240000 2.205000 5.570000 2.635000 ;
-        RECT 6.175000 2.205000 6.505000 2.635000 ;
-        RECT 7.055000 2.205000 7.385000 2.635000 ;
-        RECT 7.935000 1.755000 8.225000 2.635000 ;
-        RECT 8.855000 1.495000 9.065000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.720000 1.075000 2.750000 1.245000 ;
-      RECT 2.270000 0.305000 3.385000 0.475000 ;
-      RECT 2.580000 0.645000 3.045000 0.815000 ;
-      RECT 2.580000 0.815000 2.750000 1.075000 ;
-      RECT 2.580000 1.245000 2.750000 1.765000 ;
-      RECT 2.580000 1.765000 3.700000 1.935000 ;
-      RECT 2.770000 1.935000 2.940000 2.355000 ;
-      RECT 2.920000 0.995000 3.090000 1.425000 ;
-      RECT 2.920000 1.425000 4.040000 1.595000 ;
-      RECT 3.215000 0.475000 3.385000 0.645000 ;
-      RECT 3.215000 0.645000 5.115000 0.815000 ;
-      RECT 3.530000 1.935000 3.700000 2.205000 ;
-      RECT 3.530000 2.205000 4.330000 2.375000 ;
-      RECT 3.870000 1.595000 4.040000 1.855000 ;
-      RECT 3.870000 1.855000 7.395000 2.025000 ;
-      RECT 4.080000 0.345000 4.250000 0.645000 ;
-      RECT 4.920000 0.255000 5.190000 0.585000 ;
-      RECT 4.920000 0.585000 5.115000 0.645000 ;
-      RECT 5.835000 2.025000 6.005000 2.355000 ;
-      RECT 6.175000 0.295000 6.875000 0.465000 ;
-      RECT 6.675000 2.025000 6.845000 2.355000 ;
-      RECT 6.705000 0.465000 6.875000 0.645000 ;
-      RECT 6.705000 0.645000 7.395000 0.815000 ;
-      RECT 7.225000 0.815000 7.395000 1.075000 ;
-      RECT 7.225000 1.075000 8.225000 1.245000 ;
-      RECT 7.225000 1.245000 7.395000 1.855000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.135000  0.085000 0.345000 0.885000 ;
+      RECT 0.135000  1.495000 0.345000 2.635000 ;
+      RECT 1.015000  0.085000 1.185000 0.885000 ;
+      RECT 1.015000  1.515000 1.185000 2.635000 ;
+      RECT 1.720000  1.075000 2.750000 1.245000 ;
+      RECT 1.855000  0.085000 2.095000 0.885000 ;
+      RECT 1.855000  1.495000 2.365000 2.635000 ;
+      RECT 2.270000  0.305000 3.385000 0.475000 ;
+      RECT 2.580000  0.645000 3.045000 0.815000 ;
+      RECT 2.580000  0.815000 2.750000 1.075000 ;
+      RECT 2.580000  1.245000 2.750000 1.765000 ;
+      RECT 2.580000  1.765000 3.700000 1.935000 ;
+      RECT 2.770000  1.935000 2.940000 2.355000 ;
+      RECT 2.920000  0.995000 3.090000 1.425000 ;
+      RECT 2.920000  1.425000 4.040000 1.595000 ;
+      RECT 3.190000  2.105000 3.360000 2.635000 ;
+      RECT 3.215000  0.475000 3.385000 0.645000 ;
+      RECT 3.215000  0.645000 5.115000 0.815000 ;
+      RECT 3.530000  1.935000 3.700000 2.205000 ;
+      RECT 3.530000  2.205000 4.330000 2.375000 ;
+      RECT 3.555000  0.085000 3.910000 0.465000 ;
+      RECT 3.870000  1.595000 4.040000 1.855000 ;
+      RECT 3.870000  1.855000 7.395000 2.025000 ;
+      RECT 4.080000  0.345000 4.250000 0.645000 ;
+      RECT 4.420000  0.085000 4.750000 0.465000 ;
+      RECT 4.920000  0.255000 5.190000 0.585000 ;
+      RECT 4.920000  0.585000 5.115000 0.645000 ;
+      RECT 5.240000  2.205000 5.570000 2.635000 ;
+      RECT 5.385000  0.085000 5.715000 0.465000 ;
+      RECT 5.835000  2.025000 6.005000 2.355000 ;
+      RECT 6.175000  0.295000 6.875000 0.465000 ;
+      RECT 6.175000  2.205000 6.505000 2.635000 ;
+      RECT 6.675000  2.025000 6.845000 2.355000 ;
+      RECT 6.705000  0.465000 6.875000 0.645000 ;
+      RECT 6.705000  0.645000 7.395000 0.815000 ;
+      RECT 7.055000  0.085000 7.385000 0.465000 ;
+      RECT 7.055000  2.205000 7.385000 2.635000 ;
+      RECT 7.225000  0.815000 7.395000 1.075000 ;
+      RECT 7.225000  1.075000 8.225000 1.245000 ;
+      RECT 7.225000  1.245000 7.395000 1.855000 ;
+      RECT 7.935000  1.755000 8.225000 2.635000 ;
+      RECT 8.015000  0.085000 8.225000 0.565000 ;
+      RECT 8.855000  0.085000 9.065000 0.885000 ;
+      RECT 8.855000  1.495000 9.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 ;
+      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
 END sky130_fd_sc_hd__ha_4
diff --git a/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
index 756face..4514b71 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_1.magic.lef
@@ -55,13 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.320000  0.085000 0.550000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -71,15 +64,22 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.340000 1.495000 0.550000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.320000  0.085000 0.550000 0.905000 ;
+      RECT 0.340000  1.495000 0.550000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
 END sky130_fd_sc_hd__inv_1
diff --git a/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
index 5c22a9a..3b5a6dc 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_12.magic.lef
@@ -68,29 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.255000  0.085000 0.510000 0.545000 ;
-        RECT 1.180000  0.085000 1.350000 0.545000 ;
-        RECT 2.020000  0.085000 2.190000 0.545000 ;
-        RECT 2.860000  0.085000 3.030000 0.545000 ;
-        RECT 3.700000  0.085000 3.870000 0.545000 ;
-        RECT 4.540000  0.085000 4.710000 0.545000 ;
-        RECT 5.555000  0.085000 5.895000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -100,31 +77,54 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.255000 1.835000 0.510000 2.635000 ;
-        RECT 1.180000 1.835000 1.350000 2.635000 ;
-        RECT 2.020000 1.835000 2.190000 2.635000 ;
-        RECT 2.860000 1.835000 3.030000 2.635000 ;
-        RECT 3.700000 1.835000 3.870000 2.635000 ;
-        RECT 4.540000 1.835000 4.710000 2.635000 ;
-        RECT 5.555000 1.835000 5.895000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.255000  0.085000 0.510000 0.545000 ;
+      RECT 0.255000  1.835000 0.510000 2.635000 ;
+      RECT 1.180000  0.085000 1.350000 0.545000 ;
+      RECT 1.180000  1.835000 1.350000 2.635000 ;
+      RECT 2.020000  0.085000 2.190000 0.545000 ;
+      RECT 2.020000  1.835000 2.190000 2.635000 ;
+      RECT 2.860000  0.085000 3.030000 0.545000 ;
+      RECT 2.860000  1.835000 3.030000 2.635000 ;
+      RECT 3.700000  0.085000 3.870000 0.545000 ;
+      RECT 3.700000  1.835000 3.870000 2.635000 ;
+      RECT 4.540000  0.085000 4.710000 0.545000 ;
+      RECT 4.540000  1.835000 4.710000 2.635000 ;
+      RECT 5.555000  0.085000 5.895000 0.545000 ;
+      RECT 5.555000  1.835000 5.895000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      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
 END sky130_fd_sc_hd__inv_12
diff --git a/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
index ada4c46..7c14914 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_16.magic.lef
@@ -71,34 +71,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.180000  0.085000 0.410000 0.885000 ;
-        RECT 1.080000  0.085000 1.250000 0.545000 ;
-        RECT 1.920000  0.085000 2.090000 0.545000 ;
-        RECT 2.760000  0.085000 2.930000 0.545000 ;
-        RECT 3.600000  0.085000 3.770000 0.545000 ;
-        RECT 4.440000  0.085000 4.610000 0.545000 ;
-        RECT 5.280000  0.085000 5.450000 0.545000 ;
-        RECT 6.120000  0.085000 6.290000 0.545000 ;
-        RECT 6.960000  0.085000 7.170000 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
@@ -108,36 +80,64 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.200000 1.485000 0.410000 2.635000 ;
-        RECT 1.080000 1.835000 1.250000 2.635000 ;
-        RECT 1.920000 1.835000 2.090000 2.635000 ;
-        RECT 2.760000 1.835000 2.930000 2.635000 ;
-        RECT 3.600000 1.835000 3.770000 2.635000 ;
-        RECT 4.440000 1.835000 4.610000 2.635000 ;
-        RECT 5.280000 1.835000 5.450000 2.635000 ;
-        RECT 6.120000 1.835000 6.290000 2.635000 ;
-        RECT 6.960000 1.835000 7.170000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.180000  0.085000 0.410000 0.885000 ;
+      RECT 0.200000  1.485000 0.410000 2.635000 ;
+      RECT 1.080000  0.085000 1.250000 0.545000 ;
+      RECT 1.080000  1.835000 1.250000 2.635000 ;
+      RECT 1.920000  0.085000 2.090000 0.545000 ;
+      RECT 1.920000  1.835000 2.090000 2.635000 ;
+      RECT 2.760000  0.085000 2.930000 0.545000 ;
+      RECT 2.760000  1.835000 2.930000 2.635000 ;
+      RECT 3.600000  0.085000 3.770000 0.545000 ;
+      RECT 3.600000  1.835000 3.770000 2.635000 ;
+      RECT 4.440000  0.085000 4.610000 0.545000 ;
+      RECT 4.440000  1.835000 4.610000 2.635000 ;
+      RECT 5.280000  0.085000 5.450000 0.545000 ;
+      RECT 5.280000  1.835000 5.450000 2.635000 ;
+      RECT 6.120000  0.085000 6.290000 0.545000 ;
+      RECT 6.120000  1.835000 6.290000 2.635000 ;
+      RECT 6.960000  0.085000 7.170000 0.885000 ;
+      RECT 6.960000  1.835000 7.170000 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
 END sky130_fd_sc_hd__inv_16
diff --git a/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
index e5f5565..f790425 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_2.magic.lef
@@ -55,14 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.125000  0.085000 0.355000 0.905000 ;
-        RECT 1.025000  0.085000 1.235000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -72,16 +64,24 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.125000 1.495000 0.355000 2.635000 ;
-        RECT 1.025000 1.495000 1.235000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 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.125000  0.085000 0.355000 0.905000 ;
+      RECT 0.125000  1.495000 0.355000 2.635000 ;
+      RECT 1.025000  0.085000 1.235000 0.905000 ;
+      RECT 1.025000  1.495000 1.235000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
 END sky130_fd_sc_hd__inv_2
diff --git a/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
index ec15510..2e24bba 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_4.magic.lef
@@ -60,17 +60,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.130000  0.085000 0.395000 0.545000 ;
-        RECT 1.065000  0.085000 1.235000 0.545000 ;
-        RECT 1.905000  0.085000 2.155000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -80,19 +69,30 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.130000 1.495000 0.395000 2.635000 ;
-        RECT 1.065000 1.835000 1.235000 2.635000 ;
-        RECT 1.905000 2.175000 2.115000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.130000  0.085000 0.395000 0.545000 ;
+      RECT 0.130000  1.495000 0.395000 2.635000 ;
+      RECT 1.065000  0.085000 1.235000 0.545000 ;
+      RECT 1.065000  1.835000 1.235000 2.635000 ;
+      RECT 1.905000  0.085000 2.155000 0.550000 ;
+      RECT 1.905000  2.175000 2.115000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+  END
 END sky130_fd_sc_hd__inv_4
diff --git a/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
index 6bf2c8b..7223734 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_6.magic.lef
@@ -62,20 +62,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.130000  0.085000 0.395000 0.545000 ;
-        RECT 1.185000  0.085000 1.355000 0.545000 ;
-        RECT 2.025000  0.085000 2.195000 0.545000 ;
-        RECT 2.785000  0.085000 3.035000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -85,22 +71,36 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.130000 1.495000 0.425000 2.635000 ;
-        RECT 1.185000 1.835000 1.355000 2.635000 ;
-        RECT 2.025000 1.835000 2.195000 2.635000 ;
-        RECT 2.865000 2.175000 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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.130000  0.085000 0.395000 0.545000 ;
+      RECT 0.130000  1.495000 0.425000 2.635000 ;
+      RECT 1.185000  0.085000 1.355000 0.545000 ;
+      RECT 1.185000  1.835000 1.355000 2.635000 ;
+      RECT 2.025000  0.085000 2.195000 0.545000 ;
+      RECT 2.025000  1.835000 2.195000 2.635000 ;
+      RECT 2.785000  0.085000 3.035000 0.550000 ;
+      RECT 2.865000  2.175000 3.035000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+  END
 END sky130_fd_sc_hd__inv_6
diff --git a/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
index 2c8dec7..bc44b23 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hd__inv_8.magic.lef
@@ -64,23 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.255000  0.085000 0.510000 0.545000 ;
-        RECT 1.180000  0.085000 1.350000 0.545000 ;
-        RECT 2.020000  0.085000 2.190000 0.545000 ;
-        RECT 2.860000  0.085000 3.030000 0.545000 ;
-        RECT 3.700000  0.085000 4.005000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -90,25 +73,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.255000 1.835000 0.510000 2.635000 ;
-        RECT 1.180000 1.835000 1.350000 2.635000 ;
-        RECT 2.020000 1.835000 2.190000 2.635000 ;
-        RECT 2.860000 1.835000 3.030000 2.635000 ;
-        RECT 3.700000 1.835000 4.000000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.255000  0.085000 0.510000 0.545000 ;
+      RECT 0.255000  1.835000 0.510000 2.635000 ;
+      RECT 1.180000  0.085000 1.350000 0.545000 ;
+      RECT 1.180000  1.835000 1.350000 2.635000 ;
+      RECT 2.020000  0.085000 2.190000 0.545000 ;
+      RECT 2.020000  1.835000 2.190000 2.635000 ;
+      RECT 2.860000  0.085000 3.030000 0.545000 ;
+      RECT 2.860000  1.835000 3.030000 2.635000 ;
+      RECT 3.700000  0.085000 4.005000 0.545000 ;
+      RECT 3.700000  1.835000 4.000000 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
 END sky130_fd_sc_hd__inv_8
diff --git a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
index 0515002..9f26a12 100644
--- a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
+++ b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.magic.lef
@@ -44,16 +44,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.285000  0.085000 0.615000 0.870000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -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
@@ -63,18 +53,28 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 2.145000 0.540000 2.475000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       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.285000  0.085000 0.615000 0.870000 ;
+      RECT 2.145000  0.540000 2.475000 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
 END sky130_fd_sc_hd__lpflow_bleeder_1
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
index 86f0932..fbb2e83 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.magic.lef
@@ -59,6 +59,8 @@
         RECT 0.525000 1.875000 0.855000 2.465000 ;
       LAYER mcon ;
         RECT 0.610000 2.125000 0.780000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 1.310000 2.340000 ;
         RECT 0.550000 2.080000 0.840000 2.140000 ;
@@ -69,13 +71,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -85,24 +80,28 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.060000 0.710000 1.390000 ;
-      RECT 0.540000 0.635000 1.205000 0.805000 ;
-      RECT 0.540000 0.805000 0.710000 1.060000 ;
-      RECT 0.540000 1.390000 0.710000 1.535000 ;
-      RECT 0.540000 1.535000 1.205000 1.705000 ;
-      RECT 1.035000 0.255000 1.205000 0.635000 ;
-      RECT 1.035000 1.705000 1.205000 2.465000 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.425000  1.060000 0.710000 1.390000 ;
+      RECT 0.525000  0.085000 0.855000 0.465000 ;
+      RECT 0.540000  0.635000 1.205000 0.805000 ;
+      RECT 0.540000  0.805000 0.710000 1.060000 ;
+      RECT 0.540000  1.390000 0.710000 1.535000 ;
+      RECT 0.540000  1.535000 1.205000 1.705000 ;
+      RECT 1.035000  0.255000 1.205000 0.635000 ;
+      RECT 1.035000  1.705000 1.205000 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 ;
   END
 END sky130_fd_sc_hd__lpflow_clkbufkapwr_1
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
index c48492d..5ecaf20 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.magic.lef
@@ -74,28 +74,70 @@
     PORT
       LAYER li1 ;
         RECT 0.095000 1.495000 0.425000 2.465000 ;
-        RECT 0.955000 1.495000 1.285000 2.465000 ;
-        RECT 1.815000 1.495000 2.145000 2.465000 ;
-        RECT 2.710000 1.905000 2.970000 2.465000 ;
-        RECT 3.570000 1.905000 3.830000 2.465000 ;
-        RECT 4.430000 1.905000 4.690000 2.465000 ;
-        RECT 5.290000 1.905000 5.535000 2.465000 ;
-        RECT 6.150000 1.905000 6.395000 2.465000 ;
-        RECT 7.010000 1.905000 7.255000 2.465000 ;
-        RECT 7.870000 1.905000 8.125000 2.465000 ;
-        RECT 8.755000 1.890000 9.025000 2.465000 ;
       LAYER mcon ;
         RECT 0.175000 2.125000 0.345000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 0.955000 1.495000 1.285000 2.465000 ;
+      LAYER mcon ;
         RECT 1.035000 2.125000 1.205000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.815000 1.495000 2.145000 2.465000 ;
+      LAYER mcon ;
         RECT 1.890000 2.125000 2.060000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.710000 1.905000 2.970000 2.465000 ;
+      LAYER mcon ;
         RECT 2.740000 2.125000 2.910000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.570000 1.905000 3.830000 2.465000 ;
+      LAYER mcon ;
         RECT 3.620000 2.125000 3.790000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.430000 1.905000 4.690000 2.465000 ;
+      LAYER mcon ;
         RECT 4.480000 2.125000 4.650000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.290000 1.905000 5.535000 2.465000 ;
+      LAYER mcon ;
         RECT 5.335000 2.125000 5.505000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.150000 1.905000 6.395000 2.465000 ;
+      LAYER mcon ;
         RECT 6.195000 2.125000 6.365000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.010000 1.905000 7.255000 2.465000 ;
+      LAYER mcon ;
         RECT 7.050000 2.125000 7.220000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.870000 1.905000 8.125000 2.465000 ;
+      LAYER mcon ;
         RECT 7.900000 2.125000 8.070000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 8.755000 1.890000 9.025000 2.465000 ;
+      LAYER mcon ;
         RECT 8.780000 2.125000 8.950000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 9.130000 2.340000 ;
         RECT 0.115000 2.080000 0.405000 2.140000 ;
@@ -116,40 +158,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.085000  0.085000 0.390000 0.595000 ;
-        RECT 0.990000  0.085000 1.250000 0.610000 ;
-        RECT 1.850000  0.085000 2.110000 0.645000 ;
-        RECT 2.710000  0.085000 2.970000 0.565000 ;
-        RECT 3.570000  0.085000 3.830000 0.565000 ;
-        RECT 4.430000  0.085000 4.675000 0.565000 ;
-        RECT 5.290000  0.085000 5.535000 0.565000 ;
-        RECT 6.145000  0.085000 6.395000 0.565000 ;
-        RECT 7.005000  0.085000 7.255000 0.565000 ;
-        RECT 7.865000  0.085000 8.125000 0.565000 ;
-        RECT 8.725000  0.085000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -159,39 +167,70 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 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 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 0.265000 0.820000 1.075000 ;
-      RECT 0.595000 1.075000 7.690000 1.325000 ;
-      RECT 0.595000 1.325000 0.785000 2.465000 ;
-      RECT 1.430000 0.265000 1.680000 1.075000 ;
-      RECT 1.455000 1.325000 1.645000 2.460000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.085000  0.085000 0.390000 0.595000 ;
+      RECT 0.595000  0.265000 0.820000 1.075000 ;
+      RECT 0.595000  1.075000 7.690000 1.325000 ;
+      RECT 0.595000  1.325000 0.785000 2.465000 ;
+      RECT 0.990000  0.085000 1.250000 0.610000 ;
+      RECT 1.430000  0.265000 1.680000 1.075000 ;
+      RECT 1.455000  1.325000 1.645000 2.460000 ;
+      RECT 1.850000  0.085000 2.110000 0.645000 ;
+      RECT 2.710000  0.085000 2.970000 0.565000 ;
+      RECT 3.570000  0.085000 3.830000 0.565000 ;
+      RECT 4.430000  0.085000 4.675000 0.565000 ;
+      RECT 5.290000  0.085000 5.535000 0.565000 ;
+      RECT 6.145000  0.085000 6.395000 0.565000 ;
+      RECT 7.005000  0.085000 7.255000 0.565000 ;
+      RECT 7.865000  0.085000 8.125000 0.565000 ;
+      RECT 8.725000  0.085000 9.025000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      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
 END sky130_fd_sc_hd__lpflow_clkbufkapwr_16
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
index ff3b1dd..5565685 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.magic.lef
@@ -59,10 +59,16 @@
     PORT
       LAYER li1 ;
         RECT 0.525000 1.855000 0.855000 2.465000 ;
-        RECT 1.415000 2.140000 1.750000 2.465000 ;
       LAYER mcon ;
         RECT 0.610000 2.125000 0.780000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.415000 2.140000 1.750000 2.465000 ;
+      LAYER mcon ;
         RECT 1.495000 2.140000 1.665000 2.310000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 1.770000 2.340000 ;
         RECT 0.550000 2.080000 0.840000 2.140000 ;
@@ -74,15 +80,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.555000  0.085000 0.830000 0.565000 ;
-        RECT 1.415000  0.085000 1.750000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -92,23 +89,29 @@
     SHAPE ABUTMENT ;
     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.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.410000 ;
-      RECT 0.085000 1.410000 1.215000 1.580000 ;
-      RECT 0.085000 1.580000 0.355000 2.435000 ;
-      RECT 0.965000 0.995000 1.215000 1.410000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.585000 ;
+      RECT 0.085000  0.585000 0.255000 1.410000 ;
+      RECT 0.085000  1.410000 1.215000 1.580000 ;
+      RECT 0.085000  1.580000 0.355000 2.435000 ;
+      RECT 0.555000  0.085000 0.830000 0.565000 ;
+      RECT 0.965000  0.995000 1.215000 1.410000 ;
+      RECT 1.415000  0.085000 1.750000 0.485000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  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
 END sky130_fd_sc_hd__lpflow_clkbufkapwr_2
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
index 0aa3e7c..f006114 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.magic.lef
@@ -74,12 +74,18 @@
     PORT
       LAYER li1 ;
         RECT 0.525000 1.835000 0.855000 2.465000 ;
+      LAYER mcon ;
+        RECT 0.610000 2.125000 0.780000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 1.435000 2.140000 1.765000 2.465000 ;
         RECT 2.335000 1.765000 2.620000 2.465000 ;
       LAYER mcon ;
-        RECT 0.610000 2.125000 0.780000 2.295000 ;
         RECT 1.495000 2.140000 1.665000 2.310000 ;
         RECT 2.375000 2.125000 2.545000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 2.690000 2.340000 ;
         RECT 0.550000 2.080000 0.840000 2.140000 ;
@@ -92,18 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.555000  0.085000 0.830000 0.565000 ;
-        RECT 1.475000  0.085000 1.730000 0.565000 ;
-        RECT 2.335000  0.085000 2.615000 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
@@ -113,26 +107,35 @@
     SHAPE ABUTMENT ;
     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.085000 0.255000 0.385000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.495000 ;
-      RECT 0.085000 1.495000 1.115000 1.665000 ;
-      RECT 0.085000 1.665000 0.355000 2.465000 ;
-      RECT 0.945000 1.075000 2.085000 1.245000 ;
-      RECT 0.945000 1.245000 1.115000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 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.115000 1.665000 ;
+      RECT 0.085000  1.665000 0.355000 2.465000 ;
+      RECT 0.555000  0.085000 0.830000 0.565000 ;
+      RECT 0.945000  1.075000 2.085000 1.245000 ;
+      RECT 0.945000  1.245000 1.115000 1.495000 ;
+      RECT 1.475000  0.085000 1.730000 0.565000 ;
+      RECT 2.335000  0.085000 2.615000 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
 END sky130_fd_sc_hd__lpflow_clkbufkapwr_4
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
index c8fe540..6461ecf 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.magic.lef
@@ -65,18 +65,40 @@
     PORT
       LAYER li1 ;
         RECT 0.095000 1.525000 0.390000 2.465000 ;
-        RECT 0.990000 1.525000 1.250000 2.465000 ;
-        RECT 1.850000 1.905000 2.110000 2.465000 ;
-        RECT 2.710000 1.905000 2.970000 2.465000 ;
-        RECT 3.570000 1.905000 3.830000 2.465000 ;
-        RECT 4.430000 1.905000 4.725000 2.465000 ;
       LAYER mcon ;
         RECT 0.175000 2.125000 0.345000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 0.990000 1.525000 1.250000 2.465000 ;
+      LAYER mcon ;
         RECT 1.035000 2.125000 1.205000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.850000 1.905000 2.110000 2.465000 ;
+      LAYER mcon ;
         RECT 1.890000 2.125000 2.060000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.710000 1.905000 2.970000 2.465000 ;
+      LAYER mcon ;
         RECT 2.740000 2.125000 2.910000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.570000 1.905000 3.830000 2.465000 ;
+      LAYER mcon ;
         RECT 3.620000 2.125000 3.790000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.430000 1.905000 4.725000 2.465000 ;
+      LAYER mcon ;
         RECT 4.480000 2.125000 4.650000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 4.990000 2.340000 ;
         RECT 0.115000 2.080000 0.405000 2.140000 ;
@@ -92,26 +114,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.145000  0.085000 0.390000 0.545000 ;
-        RECT 0.990000  0.085000 1.250000 0.610000 ;
-        RECT 1.850000  0.085000 2.110000 0.565000 ;
-        RECT 2.710000  0.085000 2.970000 0.565000 ;
-        RECT 3.570000  0.085000 3.830000 0.565000 ;
-        RECT 4.430000  0.085000 4.730000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -121,28 +123,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 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 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 0.265000 0.820000 1.075000 ;
-      RECT 0.570000 1.075000 3.590000 1.325000 ;
-      RECT 0.570000 1.325000 0.820000 2.460000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.145000  0.085000 0.390000 0.545000 ;
+      RECT 0.570000  0.265000 0.820000 1.075000 ;
+      RECT 0.570000  1.075000 3.590000 1.325000 ;
+      RECT 0.570000  1.325000 0.820000 2.460000 ;
+      RECT 0.990000  0.085000 1.250000 0.610000 ;
+      RECT 1.850000  0.085000 2.110000 0.565000 ;
+      RECT 2.710000  0.085000 2.970000 0.565000 ;
+      RECT 3.570000  0.085000 3.830000 0.565000 ;
+      RECT 4.430000  0.085000 4.730000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_clkbufkapwr_8
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
index 6a0f125..33ddc98 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.magic.lef
@@ -58,10 +58,16 @@
     PORT
       LAYER li1 ;
         RECT 0.085000 1.665000 0.425000 2.465000 ;
-        RECT 0.935000 1.665000 1.295000 2.465000 ;
       LAYER mcon ;
         RECT 0.155000 2.125000 0.325000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 0.935000 1.665000 1.295000 2.465000 ;
+      LAYER mcon ;
         RECT 1.055000 2.125000 1.225000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 1.310000 2.340000 ;
         RECT 0.095000 2.080000 0.385000 2.140000 ;
@@ -73,13 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 1.010000  0.085000 1.295000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -89,14 +88,21 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 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 ;
       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 1.010000  0.085000 1.295000 0.590000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  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
 END sky130_fd_sc_hd__lpflow_clkinvkapwr_1
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
index 6495812..6b3f3d0 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.magic.lef
@@ -43,6 +43,8 @@
         RECT 1.985000 1.105000 2.155000 1.275000 ;
         RECT 9.345000 1.105000 9.515000 1.275000 ;
         RECT 9.805000 1.105000 9.975000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.465000 1.075000  2.215000 1.120000 ;
         RECT 1.465000 1.120000 10.035000 1.260000 ;
@@ -88,32 +90,78 @@
     PORT
       LAYER li1 ;
         RECT  0.110000 1.495000  0.440000 2.465000 ;
-        RECT  0.965000 1.835000  1.295000 2.465000 ;
-        RECT  1.825000 1.835000  2.155000 2.465000 ;
-        RECT  2.685000 1.835000  3.015000 2.465000 ;
-        RECT  3.545000 1.835000  3.875000 2.465000 ;
-        RECT  4.425000 1.835000  4.755000 2.465000 ;
-        RECT  5.450000 1.835000  5.780000 2.465000 ;
-        RECT  6.315000 1.835000  6.645000 2.465000 ;
-        RECT  7.175000 1.835000  7.505000 2.465000 ;
-        RECT  8.035000 1.835000  8.365000 2.465000 ;
-        RECT  8.895000 1.835000  9.225000 2.465000 ;
-        RECT  9.755000 1.835000 10.085000 2.465000 ;
         RECT 10.610000 1.835000 10.940000 2.465000 ;
       LAYER mcon ;
         RECT  0.130000 2.125000  0.300000 2.295000 ;
-        RECT  0.990000 2.125000  1.160000 2.295000 ;
-        RECT  1.890000 2.125000  2.060000 2.295000 ;
-        RECT  2.770000 2.125000  2.940000 2.295000 ;
-        RECT  3.690000 2.125000  3.860000 2.295000 ;
-        RECT  4.550000 2.125000  4.720000 2.295000 ;
-        RECT  5.450000 2.125000  5.620000 2.295000 ;
-        RECT  6.370000 2.125000  6.540000 2.295000 ;
-        RECT  7.230000 2.125000  7.400000 2.295000 ;
-        RECT  8.130000 2.125000  8.300000 2.295000 ;
-        RECT  8.960000 2.125000  9.130000 2.295000 ;
-        RECT  9.820000 2.125000  9.990000 2.295000 ;
         RECT 10.720000 2.125000 10.890000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 0.965000 1.835000 1.295000 2.465000 ;
+      LAYER mcon ;
+        RECT 0.990000 2.125000 1.160000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.825000 1.835000 2.155000 2.465000 ;
+      LAYER mcon ;
+        RECT 1.890000 2.125000 2.060000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.685000 1.835000 3.015000 2.465000 ;
+      LAYER mcon ;
+        RECT 2.770000 2.125000 2.940000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.545000 1.835000 3.875000 2.465000 ;
+      LAYER mcon ;
+        RECT 3.690000 2.125000 3.860000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.425000 1.835000 4.755000 2.465000 ;
+      LAYER mcon ;
+        RECT 4.550000 2.125000 4.720000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.450000 1.835000 5.780000 2.465000 ;
+      LAYER mcon ;
+        RECT 5.450000 2.125000 5.620000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.315000 1.835000 6.645000 2.465000 ;
+      LAYER mcon ;
+        RECT 6.370000 2.125000 6.540000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.175000 1.835000 7.505000 2.465000 ;
+      LAYER mcon ;
+        RECT 7.230000 2.125000 7.400000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 8.035000 1.835000 8.365000 2.465000 ;
+      LAYER mcon ;
+        RECT 8.130000 2.125000 8.300000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 8.895000 1.835000 9.225000 2.465000 ;
+      LAYER mcon ;
+        RECT 8.960000 2.125000 9.130000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.755000 1.835000 10.085000 2.465000 ;
+      LAYER mcon ;
+        RECT 9.820000 2.125000 9.990000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT  0.070000 2.080000  0.360000 2.140000 ;
         RECT  0.070000 2.140000 10.970000 2.340000 ;
@@ -136,42 +184,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.040000 0.085000 ;
-        RECT 1.855000  0.085000  2.125000 0.610000 ;
-        RECT 2.720000  0.085000  2.985000 0.610000 ;
-        RECT 3.580000  0.085000  3.845000 0.610000 ;
-        RECT 4.465000  0.085000  4.730000 0.610000 ;
-        RECT 5.490000  0.085000  5.755000 0.610000 ;
-        RECT 6.350000  0.085000  6.575000 0.610000 ;
-        RECT 7.210000  0.085000  7.475000 0.610000 ;
-        RECT 8.070000  0.085000  8.335000 0.610000 ;
-        RECT 8.930000  0.085000  9.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -181,35 +193,71 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 11.040000 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 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 11.040000 0.085000 ;
+      RECT 0.000000  2.635000 11.040000 2.805000 ;
+      RECT 1.855000  0.085000  2.125000 0.610000 ;
+      RECT 2.720000  0.085000  2.985000 0.610000 ;
+      RECT 3.580000  0.085000  3.845000 0.610000 ;
+      RECT 4.465000  0.085000  4.730000 0.610000 ;
+      RECT 5.490000  0.085000  5.755000 0.610000 ;
+      RECT 6.350000  0.085000  6.575000 0.610000 ;
+      RECT 7.210000  0.085000  7.475000 0.610000 ;
+      RECT 8.070000  0.085000  8.335000 0.610000 ;
+      RECT 8.930000  0.085000  9.195000 0.610000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+  END
 END sky130_fd_sc_hd__lpflow_clkinvkapwr_16
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
index 71b5819..929380b 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.magic.lef
@@ -60,10 +60,16 @@
     PORT
       LAYER li1 ;
         RECT 0.545000 1.800000 0.875000 2.465000 ;
-        RECT 1.405000 1.800000 1.735000 2.465000 ;
       LAYER mcon ;
         RECT 0.600000 2.125000 0.770000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.405000 1.800000 1.735000 2.465000 ;
+      LAYER mcon ;
         RECT 1.500000 2.125000 1.670000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 1.770000 2.340000 ;
         RECT 0.540000 2.080000 0.830000 2.140000 ;
@@ -75,15 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.560000  0.085000 0.855000 0.610000 ;
-        RECT 1.420000  0.085000 1.750000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -93,15 +90,24 @@
     SHAPE ABUTMENT ;
     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 ;
+      RECT 0.560000  0.085000 0.855000 0.610000 ;
+      RECT 1.420000  0.085000 1.750000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
 END sky130_fd_sc_hd__lpflow_clkinvkapwr_2
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
index 1d7996c..c381f0a 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.magic.lef
@@ -63,14 +63,28 @@
     PORT
       LAYER li1 ;
         RECT 0.135000 1.800000 0.465000 2.465000 ;
-        RECT 0.995000 1.800000 1.325000 2.465000 ;
-        RECT 1.855000 1.800000 2.185000 2.465000 ;
-        RECT 2.715000 1.800000 3.045000 2.465000 ;
       LAYER mcon ;
         RECT 0.195000 2.125000 0.365000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 0.995000 1.800000 1.325000 2.465000 ;
+      LAYER mcon ;
         RECT 1.055000 2.125000 1.225000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.855000 1.800000 2.185000 2.465000 ;
+      LAYER mcon ;
         RECT 1.955000 2.125000 2.125000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.715000 1.800000 3.045000 2.465000 ;
+      LAYER mcon ;
         RECT 2.835000 2.125000 3.005000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 3.150000 2.340000 ;
         RECT 0.135000 2.080000 0.425000 2.140000 ;
@@ -84,19 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.565000  0.085000 0.860000 0.555000 ;
-        RECT 1.460000  0.085000 1.720000 0.555000 ;
-        RECT 2.315000  0.085000 2.615000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -106,18 +107,31 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.565000  0.085000 0.860000 0.555000 ;
+      RECT 1.460000  0.085000 1.720000 0.555000 ;
+      RECT 2.315000  0.085000 2.615000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+  END
 END sky130_fd_sc_hd__lpflow_clkinvkapwr_4
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
index 5d71acd..4b346fd 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.magic.lef
@@ -68,20 +68,42 @@
     PORT
       LAYER li1 ;
         RECT 0.095000 1.800000 0.425000 2.465000 ;
-        RECT 0.940000 1.800000 1.270000 2.465000 ;
-        RECT 1.780000 1.800000 2.110000 2.465000 ;
-        RECT 2.620000 1.800000 2.950000 2.465000 ;
-        RECT 3.460000 1.800000 3.790000 2.465000 ;
-        RECT 4.300000 1.800000 4.630000 2.465000 ;
         RECT 5.140000 1.800000 5.470000 2.465000 ;
       LAYER mcon ;
         RECT 0.130000 2.125000 0.300000 2.295000 ;
-        RECT 0.990000 2.125000 1.160000 2.295000 ;
-        RECT 1.890000 2.125000 2.060000 2.295000 ;
-        RECT 2.770000 2.125000 2.940000 2.295000 ;
-        RECT 3.495000 2.125000 3.665000 2.295000 ;
-        RECT 4.355000 2.125000 4.525000 2.295000 ;
         RECT 5.255000 2.125000 5.425000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 0.940000 1.800000 1.270000 2.465000 ;
+      LAYER mcon ;
+        RECT 0.990000 2.125000 1.160000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.780000 1.800000 2.110000 2.465000 ;
+      LAYER mcon ;
+        RECT 1.890000 2.125000 2.060000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.620000 1.800000 2.950000 2.465000 ;
+      LAYER mcon ;
+        RECT 2.770000 2.125000 2.940000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.460000 1.800000 3.790000 2.465000 ;
+      LAYER mcon ;
+        RECT 3.495000 2.125000 3.665000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 4.300000 1.800000 4.630000 2.465000 ;
+      LAYER mcon ;
+        RECT 4.355000 2.125000 4.525000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.080000 0.360000 2.140000 ;
         RECT 0.070000 2.140000 5.910000 2.340000 ;
@@ -98,27 +120,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 1.035000  0.085000 1.365000 0.525000 ;
-        RECT 1.895000  0.085000 2.225000 0.525000 ;
-        RECT 2.755000  0.085000 3.085000 0.525000 ;
-        RECT 3.615000  0.085000 3.945000 0.525000 ;
-        RECT 4.475000  0.085000 4.805000 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
@@ -128,24 +129,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 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 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 1.035000  0.085000 1.365000 0.525000 ;
+      RECT 1.895000  0.085000 2.225000 0.525000 ;
+      RECT 2.755000  0.085000 3.085000 0.525000 ;
+      RECT 3.615000  0.085000 3.945000 0.525000 ;
+      RECT 4.475000  0.085000 4.805000 0.525000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__lpflow_clkinvkapwr_8
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
index 5aa30be..1629b0e 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.magic.lef
@@ -51,6 +51,8 @@
         RECT 4.285000 2.125000 4.455000 2.295000 ;
         RECT 4.745000 2.125000 4.915000 2.295000 ;
         RECT 5.205000 2.125000 5.375000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 5.450000 2.340000 ;
         RECT 0.085000 2.080000 5.435000 2.140000 ;
@@ -61,23 +63,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.085000  0.085000 5.430000 0.855000 ;
-        RECT 0.085000  0.855000 2.665000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -87,23 +72,40 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 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 ;
-        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 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__lpflow_decapkapwr_12
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
index 7a0559f..5bdbad5 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.magic.lef
@@ -42,6 +42,8 @@
         RECT 0.145000 2.125000 0.315000 2.295000 ;
         RECT 0.605000 2.125000 0.775000 2.295000 ;
         RECT 1.065000 2.125000 1.235000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 1.310000 2.340000 ;
         RECT 0.085000 2.080000 1.295000 2.140000 ;
@@ -52,14 +54,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.085000  0.085000 1.295000 0.835000 ;
-        RECT 0.085000  0.835000 0.605000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -69,14 +63,22 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 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 ;
       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 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  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
 END sky130_fd_sc_hd__lpflow_decapkapwr_3
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
index a0b58ef..db567ce 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.magic.lef
@@ -43,6 +43,8 @@
         RECT 0.605000 2.125000 0.775000 2.295000 ;
         RECT 1.065000 2.125000 1.235000 2.295000 ;
         RECT 1.525000 2.125000 1.695000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 1.770000 2.340000 ;
         RECT 0.085000 2.080000 1.755000 2.140000 ;
@@ -53,15 +55,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.085000  0.085000 1.755000 0.855000 ;
-        RECT 0.085000  0.855000 0.835000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -71,15 +64,24 @@
     SHAPE ABUTMENT ;
     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 ;
+      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.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  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
 END sky130_fd_sc_hd__lpflow_decapkapwr_4
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
index 1fcbc47..ee9713f 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.magic.lef
@@ -45,6 +45,8 @@
         RECT 1.525000 2.125000 1.695000 2.295000 ;
         RECT 1.985000 2.125000 2.155000 2.295000 ;
         RECT 2.445000 2.125000 2.615000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 2.690000 2.340000 ;
         RECT 0.085000 2.080000 2.675000 2.140000 ;
@@ -55,17 +57,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.085000  0.085000 2.675000 0.855000 ;
-        RECT 0.085000  0.855000 1.295000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -75,17 +66,28 @@
     SHAPE ABUTMENT ;
     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 ;
+      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.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  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
 END sky130_fd_sc_hd__lpflow_decapkapwr_6
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
index 75c19b3..0ec109d 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.magic.lef
@@ -47,6 +47,8 @@
         RECT 2.445000 2.125000 2.615000 2.295000 ;
         RECT 2.905000 2.125000 3.075000 2.295000 ;
         RECT 3.365000 2.125000 3.535000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 3.610000 2.340000 ;
         RECT 0.085000 2.080000 3.595000 2.140000 ;
@@ -57,19 +59,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 3.595000 0.855000 ;
-        RECT 0.085000  0.855000 1.735000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -79,19 +68,32 @@
     SHAPE ABUTMENT ;
     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 ;
+      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.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__lpflow_decapkapwr_8
diff --git a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
index dcdf1f2..279b24f 100644
--- a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
+++ b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.magic.lef
@@ -65,15 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 1.235000  0.085000 1.485000 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
@@ -83,28 +74,34 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.285000 1.965000 0.565000 2.635000 ;
-        RECT 1.235000 1.915000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.285000 0.355000 0.615000 0.715000 ;
-      RECT 0.285000 0.715000 1.675000 0.905000 ;
-      RECT 0.735000 1.575000 1.675000 1.745000 ;
-      RECT 0.735000 1.745000 1.035000 2.295000 ;
-      RECT 1.505000 0.905000 1.675000 0.995000 ;
-      RECT 1.505000 0.995000 1.795000 1.325000 ;
-      RECT 1.505000 1.325000 1.675000 1.575000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.285000  0.355000 0.615000 0.715000 ;
+      RECT 0.285000  0.715000 1.675000 0.905000 ;
+      RECT 0.285000  1.965000 0.565000 2.635000 ;
+      RECT 0.735000  1.575000 1.675000 1.745000 ;
+      RECT 0.735000  1.745000 1.035000 2.295000 ;
+      RECT 1.235000  0.085000 1.485000 0.545000 ;
+      RECT 1.235000  1.915000 1.565000 2.635000 ;
+      RECT 1.505000  0.905000 1.675000 0.995000 ;
+      RECT 1.505000  0.995000 1.795000 1.325000 ;
+      RECT 1.505000  1.325000 1.675000 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
 END sky130_fd_sc_hd__lpflow_inputiso0n_1
diff --git a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
index de5e077..d01cb22 100644
--- a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
+++ b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.magic.lef
@@ -64,17 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.590000 ;
-        RECT 1.850000  0.085000 2.245000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -84,35 +73,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.515000 2.185000 0.845000 2.635000 ;
-        RECT 1.485000 2.165000 2.170000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 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.175000 1.785000 0.850000 2.015000 ;
-      RECT 0.175000 2.015000 0.345000 2.445000 ;
-      RECT 0.595000 0.280000 0.835000 0.655000 ;
-      RECT 0.615000 0.655000 0.835000 0.805000 ;
-      RECT 0.615000 0.805000 1.150000 1.135000 ;
-      RECT 0.615000 1.135000 0.850000 1.785000 ;
-      RECT 1.020000 1.305000 2.305000 1.325000 ;
-      RECT 1.020000 1.325000 1.880000 1.475000 ;
-      RECT 1.020000 1.475000 1.305000 2.420000 ;
-      RECT 1.115000 0.270000 1.285000 0.415000 ;
-      RECT 1.115000 0.415000 1.490000 0.610000 ;
-      RECT 1.320000 0.610000 1.490000 0.945000 ;
-      RECT 1.320000 0.945000 2.305000 1.305000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.590000 ;
+      RECT 0.175000  1.785000 0.850000 2.015000 ;
+      RECT 0.175000  2.015000 0.345000 2.445000 ;
+      RECT 0.515000  2.185000 0.845000 2.635000 ;
+      RECT 0.595000  0.280000 0.835000 0.655000 ;
+      RECT 0.615000  0.655000 0.835000 0.805000 ;
+      RECT 0.615000  0.805000 1.150000 1.135000 ;
+      RECT 0.615000  1.135000 0.850000 1.785000 ;
+      RECT 1.020000  1.305000 2.305000 1.325000 ;
+      RECT 1.020000  1.325000 1.880000 1.475000 ;
+      RECT 1.020000  1.475000 1.305000 2.420000 ;
+      RECT 1.115000  0.270000 1.285000 0.415000 ;
+      RECT 1.115000  0.415000 1.490000 0.610000 ;
+      RECT 1.320000  0.610000 1.490000 0.945000 ;
+      RECT 1.320000  0.945000 2.305000 1.305000 ;
+      RECT 1.485000  2.165000 2.170000 2.635000 ;
+      RECT 1.850000  0.085000 2.245000 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 ;
   END
 END sky130_fd_sc_hd__lpflow_inputiso0p_1
diff --git a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
index ca2affa..58a6302 100644
--- a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
+++ b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.magic.lef
@@ -64,17 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.590000  0.085000 1.325000 0.565000 ;
-        RECT 1.835000  0.085000 2.215000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -84,34 +73,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.915000 1.835000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.265000 0.420000 0.735000 ;
-      RECT 0.110000 0.735000 0.845000 0.905000 ;
-      RECT 0.595000 0.905000 0.845000 0.995000 ;
-      RECT 0.595000 0.995000 1.335000 1.325000 ;
-      RECT 0.595000 1.325000 0.765000 1.885000 ;
-      RECT 0.990000 1.495000 2.235000 1.665000 ;
-      RECT 0.990000 1.665000 1.410000 1.915000 ;
-      RECT 1.495000 0.305000 1.665000 0.655000 ;
-      RECT 1.495000 0.655000 2.235000 0.825000 ;
-      RECT 2.065000 0.825000 2.235000 0.995000 ;
-      RECT 2.065000 0.995000 2.295000 1.325000 ;
-      RECT 2.065000 1.325000 2.235000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.110000  0.265000 0.420000 0.735000 ;
+      RECT 0.110000  0.735000 0.845000 0.905000 ;
+      RECT 0.590000  0.085000 1.325000 0.565000 ;
+      RECT 0.595000  0.905000 0.845000 0.995000 ;
+      RECT 0.595000  0.995000 1.335000 1.325000 ;
+      RECT 0.595000  1.325000 0.765000 1.885000 ;
+      RECT 0.990000  1.495000 2.235000 1.665000 ;
+      RECT 0.990000  1.665000 1.410000 1.915000 ;
+      RECT 1.495000  0.305000 1.665000 0.655000 ;
+      RECT 1.495000  0.655000 2.235000 0.825000 ;
+      RECT 1.835000  0.085000 2.215000 0.485000 ;
+      RECT 1.915000  1.835000 2.195000 2.635000 ;
+      RECT 2.065000  0.825000 2.235000 0.995000 ;
+      RECT 2.065000  0.995000 2.295000 1.325000 ;
+      RECT 2.065000  1.325000 2.235000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_inputiso1n_1
diff --git a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
index ce6881b..d0df261 100644
--- a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
+++ b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.magic.lef
@@ -64,16 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.250000  0.085000 0.490000 0.595000 ;
-        RECT 1.180000  0.085000 1.395000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -83,25 +73,32 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.145000 1.835000 1.475000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.270000 1.495000 1.695000 1.665000 ;
-      RECT 0.270000 1.665000 0.660000 1.840000 ;
-      RECT 0.670000 0.265000 0.950000 0.595000 ;
-      RECT 0.670000 0.595000 0.840000 1.495000 ;
-      RECT 1.525000 0.995000 1.695000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.250000  0.085000 0.490000 0.595000 ;
+      RECT 0.270000  1.495000 1.695000 1.665000 ;
+      RECT 0.270000  1.665000 0.660000 1.840000 ;
+      RECT 0.670000  0.265000 0.950000 0.595000 ;
+      RECT 0.670000  0.595000 0.840000 1.495000 ;
+      RECT 1.145000  1.835000 1.475000 2.635000 ;
+      RECT 1.180000  0.085000 1.395000 0.595000 ;
+      RECT 1.525000  0.995000 1.695000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_inputiso1p_1
diff --git a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
index e1609be..7f7e52f 100644
--- a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
+++ b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.magic.lef
@@ -64,24 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.455000  0.085000 1.785000 0.465000 ;
-        RECT 3.265000  0.085000 3.595000 0.530000 ;
-        RECT 4.295000  0.085000 4.465000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -91,59 +73,74 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.135000 0.845000 2.635000 ;
-        RECT 1.455000 2.255000 1.850000 2.635000 ;
-        RECT 3.355000 2.135000 3.525000 2.635000 ;
-        RECT 4.295000 1.570000 4.465000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.780000 0.805000 ;
-      RECT 0.175000 1.795000 0.780000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.610000 0.805000 0.780000 1.130000 ;
-      RECT 0.610000 1.130000 0.810000 1.460000 ;
-      RECT 0.610000 1.460000 0.780000 1.795000 ;
-      RECT 0.980000 0.740000 1.185000 0.910000 ;
-      RECT 0.980000 0.910000 1.150000 1.825000 ;
-      RECT 0.980000 1.825000 1.185000 1.915000 ;
-      RECT 0.980000 1.915000 2.845000 1.965000 ;
-      RECT 1.015000 0.345000 1.185000 0.740000 ;
-      RECT 1.015000 1.965000 2.845000 2.085000 ;
-      RECT 1.015000 2.085000 1.185000 2.465000 ;
-      RECT 1.320000 1.240000 1.490000 1.525000 ;
-      RECT 1.320000 1.525000 2.335000 1.695000 ;
-      RECT 2.050000 1.355000 2.335000 1.525000 ;
-      RECT 2.295000 0.705000 2.675000 1.035000 ;
-      RECT 2.310000 2.255000 3.185000 2.425000 ;
-      RECT 2.380000 0.365000 3.040000 0.535000 ;
-      RECT 2.505000 1.035000 2.675000 1.575000 ;
-      RECT 2.505000 1.575000 2.845000 1.915000 ;
-      RECT 2.870000 0.535000 3.040000 0.995000 ;
-      RECT 2.870000 0.995000 3.780000 1.165000 ;
-      RECT 3.015000 1.165000 3.780000 1.325000 ;
-      RECT 3.015000 1.325000 3.185000 2.255000 ;
-      RECT 3.420000 1.535000 4.125000 1.865000 ;
-      RECT 3.835000 0.415000 4.125000 0.745000 ;
-      RECT 3.835000 1.865000 4.125000 2.435000 ;
-      RECT 3.950000 0.745000 4.125000 1.535000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.780000 0.805000 ;
+      RECT 0.175000  1.795000 0.780000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.135000 0.845000 2.635000 ;
+      RECT 0.610000  0.805000 0.780000 1.130000 ;
+      RECT 0.610000  1.130000 0.810000 1.460000 ;
+      RECT 0.610000  1.460000 0.780000 1.795000 ;
+      RECT 0.980000  0.740000 1.185000 0.910000 ;
+      RECT 0.980000  0.910000 1.150000 1.825000 ;
+      RECT 0.980000  1.825000 1.185000 1.915000 ;
+      RECT 0.980000  1.915000 2.845000 1.965000 ;
+      RECT 1.015000  0.345000 1.185000 0.740000 ;
+      RECT 1.015000  1.965000 2.845000 2.085000 ;
+      RECT 1.015000  2.085000 1.185000 2.465000 ;
+      RECT 1.320000  1.240000 1.490000 1.525000 ;
+      RECT 1.320000  1.525000 2.335000 1.695000 ;
+      RECT 1.455000  0.085000 1.785000 0.465000 ;
+      RECT 1.455000  2.255000 1.850000 2.635000 ;
+      RECT 2.050000  1.355000 2.335000 1.525000 ;
+      RECT 2.295000  0.705000 2.675000 1.035000 ;
+      RECT 2.310000  2.255000 3.185000 2.425000 ;
+      RECT 2.380000  0.365000 3.040000 0.535000 ;
+      RECT 2.505000  1.035000 2.675000 1.575000 ;
+      RECT 2.505000  1.575000 2.845000 1.915000 ;
+      RECT 2.870000  0.535000 3.040000 0.995000 ;
+      RECT 2.870000  0.995000 3.780000 1.165000 ;
+      RECT 3.015000  1.165000 3.780000 1.325000 ;
+      RECT 3.015000  1.325000 3.185000 2.255000 ;
+      RECT 3.265000  0.085000 3.595000 0.530000 ;
+      RECT 3.355000  2.135000 3.525000 2.635000 ;
+      RECT 3.420000  1.535000 4.125000 1.865000 ;
+      RECT 3.835000  0.415000 4.125000 0.745000 ;
+      RECT 3.835000  1.865000 4.125000 2.435000 ;
+      RECT 3.950000  0.745000 4.125000 1.535000 ;
+      RECT 4.295000  0.085000 4.465000 0.715000 ;
+      RECT 4.295000  1.570000 4.465000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_inputisolatch_1
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
index 7c772db..1e5378b 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.magic.lef
@@ -65,16 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.855000  0.085000 1.065000 0.895000 ;
-        RECT 1.735000  0.085000 2.120000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -84,26 +74,33 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.875000 1.855000 1.205000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.330000 0.370000 0.675000 0.545000 ;
-      RECT 0.415000 1.510000 1.705000 1.680000 ;
-      RECT 0.415000 1.680000 0.675000 1.905000 ;
-      RECT 0.495000 0.545000 0.675000 1.510000 ;
-      RECT 1.535000 1.075000 1.865000 1.245000 ;
-      RECT 1.535000 1.245000 1.705000 1.510000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.330000  0.370000 0.675000 0.545000 ;
+      RECT 0.415000  1.510000 1.705000 1.680000 ;
+      RECT 0.415000  1.680000 0.675000 1.905000 ;
+      RECT 0.495000  0.545000 0.675000 1.510000 ;
+      RECT 0.855000  0.085000 1.065000 0.895000 ;
+      RECT 0.875000  1.855000 1.205000 2.635000 ;
+      RECT 1.535000  1.075000 1.865000 1.245000 ;
+      RECT 1.535000  1.245000 1.705000 1.510000 ;
+      RECT 1.735000  0.085000 2.120000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_isobufsrc_1
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
index 3d83f0d..5065b57 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.magic.lef
@@ -89,64 +89,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.560000 0.085000 ;
-        RECT  0.485000  0.085000  0.815000 0.825000 ;
-        RECT  1.365000  0.085000  1.615000 0.895000 ;
-        RECT  2.205000  0.085000  2.755000 0.905000 ;
-        RECT  3.425000  0.085000  3.595000 0.555000 ;
-        RECT  4.265000  0.085000  4.435000 0.555000 ;
-        RECT  5.105000  0.085000  5.275000 0.555000 ;
-        RECT  5.945000  0.085000  6.115000 0.555000 ;
-        RECT  6.785000  0.085000  6.955000 0.555000 ;
-        RECT  7.625000  0.085000  7.795000 0.555000 ;
-        RECT  8.465000  0.085000  8.635000 0.555000 ;
-        RECT  9.305000  0.085000  9.475000 0.555000 ;
-        RECT 10.145000  0.085000 10.315000 0.555000 ;
-        RECT 10.985000  0.085000 11.155000 0.555000 ;
-        RECT 11.825000  0.085000 11.995000 0.555000 ;
-        RECT 12.665000  0.085000 12.835000 0.555000 ;
-        RECT 13.505000  0.085000 13.675000 0.555000 ;
-        RECT 14.345000  0.085000 14.515000 0.555000 ;
-        RECT 15.185000  0.085000 15.355000 0.555000 ;
-        RECT 16.025000  0.085000 16.295000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
@@ -156,87 +98,142 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 16.560000 2.805000 ;
-        RECT 0.300000 1.495000  0.515000 2.635000 ;
-        RECT 1.185000 1.455000  1.355000 2.635000 ;
-        RECT 2.025000 1.455000  2.270000 2.635000 ;
-        RECT 2.965000 1.835000  3.215000 2.635000 ;
-        RECT 3.805000 1.835000  4.055000 2.635000 ;
-        RECT 4.645000 1.835000  4.895000 2.635000 ;
-        RECT 5.485000 1.835000  5.735000 2.635000 ;
-        RECT 6.325000 1.835000  6.575000 2.635000 ;
-        RECT 7.165000 1.835000  7.415000 2.635000 ;
-        RECT 8.005000 1.835000  8.255000 2.635000 ;
-        RECT 8.845000 1.835000  9.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 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 16.560000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.685000 1.495000  1.015000 2.465000 ;
-      RECT  0.835000 1.065000  2.035000 1.075000 ;
-      RECT  0.835000 1.075000  9.280000 1.285000 ;
-      RECT  0.835000 1.285000  1.015000 1.495000 ;
-      RECT  0.985000 0.255000  1.195000 1.065000 ;
-      RECT  1.525000 1.285000  1.855000 2.465000 ;
-      RECT  1.785000 0.255000  2.035000 1.065000 ;
-      RECT  2.475000 1.455000  9.515000 1.665000 ;
-      RECT  2.475000 1.665000  2.795000 2.465000 ;
-      RECT  3.385000 1.665000  3.635000 2.465000 ;
-      RECT  4.225000 1.665000  4.475000 2.465000 ;
-      RECT  5.065000 1.665000  5.315000 2.465000 ;
-      RECT  5.905000 1.665000  6.155000 2.465000 ;
-      RECT  6.745000 1.665000  6.995000 2.465000 ;
-      RECT  7.585000 1.665000  7.835000 2.465000 ;
-      RECT  8.425000 1.665000  8.675000 2.465000 ;
-      RECT  9.265000 1.665000  9.515000 2.295000 ;
-      RECT  9.265000 2.295000 16.235000 2.465000 ;
-      RECT 10.105000 1.795000 10.355000 2.295000 ;
-      RECT 10.945000 1.795000 11.195000 2.295000 ;
-      RECT 11.785000 1.795000 12.035000 2.295000 ;
-      RECT 12.625000 1.795000 12.875000 2.295000 ;
-      RECT 13.465000 1.795000 13.715000 2.295000 ;
-      RECT 14.305000 1.795000 14.555000 2.295000 ;
-      RECT 15.145000 1.795000 15.395000 2.295000 ;
-      RECT 15.985000 1.795000 16.235000 2.295000 ;
+      RECT  0.000000 -0.085000 16.560000 0.085000 ;
+      RECT  0.000000  2.635000 16.560000 2.805000 ;
+      RECT  0.300000  1.495000  0.515000 2.635000 ;
+      RECT  0.485000  0.085000  0.815000 0.825000 ;
+      RECT  0.685000  1.495000  1.015000 2.465000 ;
+      RECT  0.835000  1.065000  2.035000 1.075000 ;
+      RECT  0.835000  1.075000  9.280000 1.285000 ;
+      RECT  0.835000  1.285000  1.015000 1.495000 ;
+      RECT  0.985000  0.255000  1.195000 1.065000 ;
+      RECT  1.185000  1.455000  1.355000 2.635000 ;
+      RECT  1.365000  0.085000  1.615000 0.895000 ;
+      RECT  1.525000  1.285000  1.855000 2.465000 ;
+      RECT  1.785000  0.255000  2.035000 1.065000 ;
+      RECT  2.025000  1.455000  2.270000 2.635000 ;
+      RECT  2.205000  0.085000  2.755000 0.905000 ;
+      RECT  2.475000  1.455000  9.515000 1.665000 ;
+      RECT  2.475000  1.665000  2.795000 2.465000 ;
+      RECT  2.965000  1.835000  3.215000 2.635000 ;
+      RECT  3.385000  1.665000  3.635000 2.465000 ;
+      RECT  3.425000  0.085000  3.595000 0.555000 ;
+      RECT  3.805000  1.835000  4.055000 2.635000 ;
+      RECT  4.225000  1.665000  4.475000 2.465000 ;
+      RECT  4.265000  0.085000  4.435000 0.555000 ;
+      RECT  4.645000  1.835000  4.895000 2.635000 ;
+      RECT  5.065000  1.665000  5.315000 2.465000 ;
+      RECT  5.105000  0.085000  5.275000 0.555000 ;
+      RECT  5.485000  1.835000  5.735000 2.635000 ;
+      RECT  5.905000  1.665000  6.155000 2.465000 ;
+      RECT  5.945000  0.085000  6.115000 0.555000 ;
+      RECT  6.325000  1.835000  6.575000 2.635000 ;
+      RECT  6.745000  1.665000  6.995000 2.465000 ;
+      RECT  6.785000  0.085000  6.955000 0.555000 ;
+      RECT  7.165000  1.835000  7.415000 2.635000 ;
+      RECT  7.585000  1.665000  7.835000 2.465000 ;
+      RECT  7.625000  0.085000  7.795000 0.555000 ;
+      RECT  8.005000  1.835000  8.255000 2.635000 ;
+      RECT  8.425000  1.665000  8.675000 2.465000 ;
+      RECT  8.465000  0.085000  8.635000 0.555000 ;
+      RECT  8.845000  1.835000  9.095000 2.635000 ;
+      RECT  9.265000  1.665000  9.515000 2.295000 ;
+      RECT  9.265000  2.295000 16.235000 2.465000 ;
+      RECT  9.305000  0.085000  9.475000 0.555000 ;
+      RECT 10.105000  1.795000 10.355000 2.295000 ;
+      RECT 10.145000  0.085000 10.315000 0.555000 ;
+      RECT 10.945000  1.795000 11.195000 2.295000 ;
+      RECT 10.985000  0.085000 11.155000 0.555000 ;
+      RECT 11.785000  1.795000 12.035000 2.295000 ;
+      RECT 11.825000  0.085000 11.995000 0.555000 ;
+      RECT 12.625000  1.795000 12.875000 2.295000 ;
+      RECT 12.665000  0.085000 12.835000 0.555000 ;
+      RECT 13.465000  1.795000 13.715000 2.295000 ;
+      RECT 13.505000  0.085000 13.675000 0.555000 ;
+      RECT 14.305000  1.795000 14.555000 2.295000 ;
+      RECT 14.345000  0.085000 14.515000 0.555000 ;
+      RECT 15.145000  1.795000 15.395000 2.295000 ;
+      RECT 15.185000  0.085000 15.355000 0.555000 ;
+      RECT 15.985000  1.795000 16.235000 2.295000 ;
+      RECT 16.025000  0.085000 16.295000 0.555000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
+      RECT 15.785000 -0.085000 15.955000 0.085000 ;
+      RECT 15.785000  2.635000 15.955000 2.805000 ;
+      RECT 16.245000 -0.085000 16.415000 0.085000 ;
+      RECT 16.245000  2.635000 16.415000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_isobufsrc_16
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
index c66f2e9..0dad736 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.magic.lef
@@ -66,20 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.895000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.895000 ;
-        RECT 2.775000  0.085000 3.030000 0.845000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -89,36 +75,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.575000 1.825000 0.825000 2.635000 ;
-        RECT 2.775000 2.145000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.445000 1.245000 1.655000 ;
-      RECT 0.085000 1.655000 0.405000 2.465000 ;
-      RECT 0.995000 1.655000 1.245000 2.295000 ;
-      RECT 0.995000 2.295000 2.125000 2.465000 ;
-      RECT 1.835000 1.445000 2.090000 1.890000 ;
-      RECT 1.835000 1.890000 2.125000 2.295000 ;
-      RECT 1.875000 1.075000 2.430000 1.245000 ;
-      RECT 2.215000 0.725000 2.565000 0.895000 ;
-      RECT 2.215000 0.895000 2.430000 1.075000 ;
-      RECT 2.260000 1.245000 2.430000 1.445000 ;
-      RECT 2.260000 1.445000 2.565000 1.615000 ;
-      RECT 2.395000 0.445000 2.565000 0.725000 ;
-      RECT 2.395000 1.615000 2.565000 2.460000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.895000 ;
+      RECT 0.085000  1.445000 1.245000 1.655000 ;
+      RECT 0.085000  1.655000 0.405000 2.465000 ;
+      RECT 0.575000  1.825000 0.825000 2.635000 ;
+      RECT 0.995000  1.655000 1.245000 2.295000 ;
+      RECT 0.995000  2.295000 2.125000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.835000  1.445000 2.090000 1.890000 ;
+      RECT 1.835000  1.890000 2.125000 2.295000 ;
+      RECT 1.875000  0.085000 2.045000 0.895000 ;
+      RECT 1.875000  1.075000 2.430000 1.245000 ;
+      RECT 2.215000  0.725000 2.565000 0.895000 ;
+      RECT 2.215000  0.895000 2.430000 1.075000 ;
+      RECT 2.260000  1.245000 2.430000 1.445000 ;
+      RECT 2.260000  1.445000 2.565000 1.615000 ;
+      RECT 2.395000  0.445000 2.565000 0.725000 ;
+      RECT 2.395000  1.615000 2.565000 2.460000 ;
+      RECT 2.775000  0.085000 3.030000 0.845000 ;
+      RECT 2.775000  2.145000 3.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 ;
   END
 END sky130_fd_sc_hd__lpflow_isobufsrc_2
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
index 9d88f1c..30ff8fb 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.magic.lef
@@ -70,26 +70,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.555000 ;
-        RECT 2.715000  0.085000 2.885000 0.555000 ;
-        RECT 3.555000  0.085000 3.845000 0.905000 ;
-        RECT 4.525000  0.085000 4.815000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -99,40 +79,57 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.535000 1.835000 0.865000 2.635000 ;
-        RECT 1.375000 1.835000 1.625000 2.635000 ;
-        RECT 4.525000 1.495000 4.930000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.455000 2.125000 1.665000 ;
-      RECT 0.085000 1.665000 0.365000 2.465000 ;
-      RECT 1.035000 1.665000 1.205000 2.465000 ;
-      RECT 1.795000 1.665000 2.125000 2.295000 ;
-      RECT 1.795000 2.295000 3.855000 2.465000 ;
-      RECT 2.635000 1.935000 2.965000 2.295000 ;
-      RECT 2.795000 1.075000 4.275000 1.275000 ;
-      RECT 3.475000 1.575000 3.855000 2.295000 ;
-      RECT 4.025000 0.255000 4.355000 0.815000 ;
-      RECT 4.025000 0.815000 4.275000 1.075000 ;
-      RECT 4.025000 1.275000 4.275000 1.575000 ;
-      RECT 4.025000 1.575000 4.355000 2.465000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.905000 ;
+      RECT 0.085000  1.455000 2.125000 1.665000 ;
+      RECT 0.085000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.865000 2.635000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.035000  1.665000 1.205000 2.465000 ;
+      RECT 1.375000  1.835000 1.625000 2.635000 ;
+      RECT 1.795000  1.665000 2.125000 2.295000 ;
+      RECT 1.795000  2.295000 3.855000 2.465000 ;
+      RECT 1.875000  0.085000 2.045000 0.555000 ;
+      RECT 2.635000  1.935000 2.965000 2.295000 ;
+      RECT 2.715000  0.085000 2.885000 0.555000 ;
+      RECT 2.795000  1.075000 4.275000 1.275000 ;
+      RECT 3.475000  1.575000 3.855000 2.295000 ;
+      RECT 3.555000  0.085000 3.845000 0.905000 ;
+      RECT 4.025000  0.255000 4.355000 0.815000 ;
+      RECT 4.025000  0.815000 4.275000 1.075000 ;
+      RECT 4.025000  1.275000 4.275000 1.575000 ;
+      RECT 4.025000  1.575000 4.355000 2.465000 ;
+      RECT 4.525000  0.085000 4.815000 0.905000 ;
+      RECT 4.525000  1.495000 4.930000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_isobufsrc_4
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
index 24225f8..c3f11eb 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.magic.lef
@@ -77,38 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.435000  0.085000 0.655000 0.895000 ;
-        RECT 1.325000  0.085000 1.835000 0.905000 ;
-        RECT 2.505000  0.085000 2.675000 0.555000 ;
-        RECT 3.345000  0.085000 3.515000 0.555000 ;
-        RECT 4.185000  0.085000 4.355000 0.555000 ;
-        RECT 5.025000  0.085000 5.195000 0.555000 ;
-        RECT 5.865000  0.085000 6.035000 0.555000 ;
-        RECT 6.705000  0.085000 6.875000 0.555000 ;
-        RECT 7.545000  0.085000 7.715000 0.555000 ;
-        RECT 8.385000  0.085000 8.655000 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
@@ -118,55 +86,84 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.195000 1.455000 0.415000 2.635000 ;
-        RECT 1.085000 1.455000 1.330000 2.635000 ;
-        RECT 2.045000 1.835000 2.295000 2.635000 ;
-        RECT 2.885000 1.835000 3.135000 2.635000 ;
-        RECT 3.725000 1.835000 3.975000 2.635000 ;
-        RECT 4.565000 1.835000 4.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.585000 1.455000 0.915000 2.465000 ;
-      RECT 0.745000 1.065000 1.155000 1.075000 ;
-      RECT 0.745000 1.075000 5.000000 1.285000 ;
-      RECT 0.745000 1.285000 0.915000 1.455000 ;
-      RECT 0.825000 0.255000 1.155000 1.065000 ;
-      RECT 1.555000 1.455000 5.235000 1.665000 ;
-      RECT 1.555000 1.665000 1.875000 2.465000 ;
-      RECT 2.465000 1.665000 2.715000 2.465000 ;
-      RECT 3.305000 1.665000 3.555000 2.465000 ;
-      RECT 4.145000 1.665000 4.395000 2.465000 ;
-      RECT 4.985000 1.665000 5.235000 2.295000 ;
-      RECT 4.985000 2.295000 8.595000 2.465000 ;
-      RECT 5.825000 1.785000 6.075000 2.295000 ;
-      RECT 6.665000 1.785000 6.915000 2.295000 ;
-      RECT 7.505000 1.785000 7.755000 2.295000 ;
-      RECT 8.345000 1.785000 8.595000 2.295000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.195000  1.455000 0.415000 2.635000 ;
+      RECT 0.435000  0.085000 0.655000 0.895000 ;
+      RECT 0.585000  1.455000 0.915000 2.465000 ;
+      RECT 0.745000  1.065000 1.155000 1.075000 ;
+      RECT 0.745000  1.075000 5.000000 1.285000 ;
+      RECT 0.745000  1.285000 0.915000 1.455000 ;
+      RECT 0.825000  0.255000 1.155000 1.065000 ;
+      RECT 1.085000  1.455000 1.330000 2.635000 ;
+      RECT 1.325000  0.085000 1.835000 0.905000 ;
+      RECT 1.555000  1.455000 5.235000 1.665000 ;
+      RECT 1.555000  1.665000 1.875000 2.465000 ;
+      RECT 2.045000  1.835000 2.295000 2.635000 ;
+      RECT 2.465000  1.665000 2.715000 2.465000 ;
+      RECT 2.505000  0.085000 2.675000 0.555000 ;
+      RECT 2.885000  1.835000 3.135000 2.635000 ;
+      RECT 3.305000  1.665000 3.555000 2.465000 ;
+      RECT 3.345000  0.085000 3.515000 0.555000 ;
+      RECT 3.725000  1.835000 3.975000 2.635000 ;
+      RECT 4.145000  1.665000 4.395000 2.465000 ;
+      RECT 4.185000  0.085000 4.355000 0.555000 ;
+      RECT 4.565000  1.835000 4.815000 2.635000 ;
+      RECT 4.985000  1.665000 5.235000 2.295000 ;
+      RECT 4.985000  2.295000 8.595000 2.465000 ;
+      RECT 5.025000  0.085000 5.195000 0.555000 ;
+      RECT 5.825000  1.785000 6.075000 2.295000 ;
+      RECT 5.865000  0.085000 6.035000 0.555000 ;
+      RECT 6.665000  1.785000 6.915000 2.295000 ;
+      RECT 6.705000  0.085000 6.875000 0.555000 ;
+      RECT 7.505000  1.785000 7.755000 2.295000 ;
+      RECT 7.545000  0.085000 7.715000 0.555000 ;
+      RECT 8.345000  1.785000 8.595000 2.295000 ;
+      RECT 8.385000  0.085000 8.655000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
 END sky130_fd_sc_hd__lpflow_isobufsrc_8
diff --git a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
index dc4729f..fdf4797 100644
--- a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
+++ b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.magic.lef
@@ -82,29 +82,71 @@
     USE POWER ;
     PORT
       LAYER li1 ;
-        RECT  5.155000 1.495000  5.485000 2.465000 ;
-        RECT  6.015000 1.495000  6.345000 2.465000 ;
-        RECT  6.875000 1.495000  7.205000 2.465000 ;
-        RECT  7.770000 1.905000  8.030000 2.465000 ;
-        RECT  8.630000 1.905000  8.890000 2.465000 ;
-        RECT  9.490000 1.905000  9.750000 2.465000 ;
         RECT 10.350000 1.905000 10.595000 2.465000 ;
+      LAYER mcon ;
+        RECT 10.395000 2.125000 10.565000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 11.210000 1.905000 11.455000 2.465000 ;
+      LAYER mcon ;
+        RECT 11.255000 2.125000 11.425000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 12.070000 1.905000 12.315000 2.465000 ;
+      LAYER mcon ;
+        RECT 12.110000 2.125000 12.280000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 12.930000 1.905000 13.185000 2.465000 ;
+      LAYER mcon ;
+        RECT 12.960000 2.125000 13.130000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 13.815000 1.890000 14.085000 2.465000 ;
       LAYER mcon ;
-        RECT  5.235000 2.125000  5.405000 2.295000 ;
-        RECT  6.095000 2.125000  6.265000 2.295000 ;
-        RECT  6.950000 2.125000  7.120000 2.295000 ;
-        RECT  7.800000 2.125000  7.970000 2.295000 ;
-        RECT  8.680000 2.125000  8.850000 2.295000 ;
-        RECT  9.540000 2.125000  9.710000 2.295000 ;
-        RECT 10.395000 2.125000 10.565000 2.295000 ;
-        RECT 11.255000 2.125000 11.425000 2.295000 ;
-        RECT 12.110000 2.125000 12.280000 2.295000 ;
-        RECT 12.960000 2.125000 13.130000 2.295000 ;
         RECT 13.840000 2.125000 14.010000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.155000 1.495000 5.485000 2.465000 ;
+      LAYER mcon ;
+        RECT 5.235000 2.125000 5.405000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.015000 1.495000 6.345000 2.465000 ;
+      LAYER mcon ;
+        RECT 6.095000 2.125000 6.265000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.875000 1.495000 7.205000 2.465000 ;
+      LAYER mcon ;
+        RECT 6.950000 2.125000 7.120000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.770000 1.905000 8.030000 2.465000 ;
+      LAYER mcon ;
+        RECT 7.800000 2.125000 7.970000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 8.630000 1.905000 8.890000 2.465000 ;
+      LAYER mcon ;
+        RECT 8.680000 2.125000 8.850000 2.295000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.490000 1.905000 9.750000 2.465000 ;
+      LAYER mcon ;
+        RECT 9.540000 2.125000 9.710000 2.295000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT  0.070000 2.140000 14.190000 2.340000 ;
         RECT  5.175000 2.080000  5.465000 2.140000 ;
@@ -125,57 +167,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.245000  0.085000  0.535000 0.905000 ;
-        RECT  1.215000  0.085000  1.505000 0.905000 ;
-        RECT  2.175000  0.085000  2.345000 0.555000 ;
-        RECT  3.015000  0.085000  3.185000 0.555000 ;
-        RECT  3.855000  0.085000  4.025000 0.555000 ;
-        RECT  4.695000  0.085000  5.450000 0.565000 ;
-        RECT  4.695000  0.565000  4.975000 0.905000 ;
-        RECT  6.050000  0.085000  6.310000 0.610000 ;
-        RECT  6.910000  0.085000  7.170000 0.645000 ;
-        RECT  7.770000  0.085000  8.030000 0.565000 ;
-        RECT  8.630000  0.085000  8.890000 0.565000 ;
-        RECT  9.490000  0.085000  9.735000 0.565000 ;
-        RECT 10.350000  0.085000 10.595000 0.565000 ;
-        RECT 11.205000  0.085000 11.455000 0.565000 ;
-        RECT 12.065000  0.085000 12.315000 0.565000 ;
-        RECT 12.925000  0.085000 13.185000 0.565000 ;
-        RECT 13.785000  0.085000 14.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 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -185,81 +176,128 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 14.260000 2.805000 ;
-        RECT 0.130000 1.495000  0.535000 2.635000 ;
-        RECT 3.435000 1.835000  3.685000 2.635000 ;
-        RECT 4.195000 1.835000  4.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 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.705000 0.255000  1.035000 0.815000 ;
-      RECT 0.705000 1.575000  1.035000 2.465000 ;
-      RECT 0.785000 0.815000  1.035000 1.075000 ;
-      RECT 0.785000 1.075000  2.265000 1.275000 ;
-      RECT 0.785000 1.275000  1.035000 1.575000 ;
-      RECT 1.205000 1.575000  1.585000 2.295000 ;
-      RECT 1.205000 2.295000  3.265000 2.465000 ;
-      RECT 1.675000 0.255000  2.005000 0.725000 ;
-      RECT 1.675000 0.725000  4.525000 0.905000 ;
-      RECT 1.755000 1.445000  2.765000 1.745000 ;
-      RECT 1.755000 1.745000  1.925000 2.125000 ;
-      RECT 2.095000 1.935000  2.425000 2.295000 ;
-      RECT 2.435000 0.905000  3.095000 0.965000 ;
-      RECT 2.435000 0.965000  2.765000 1.445000 ;
-      RECT 2.515000 0.255000  2.845000 0.725000 ;
-      RECT 2.595000 1.745000  2.765000 2.125000 ;
-      RECT 2.935000 1.455000  4.975000 1.665000 ;
-      RECT 2.935000 1.665000  3.265000 2.295000 ;
-      RECT 3.355000 0.255000  3.685000 0.725000 ;
-      RECT 3.855000 1.665000  4.025000 2.465000 ;
-      RECT 4.195000 0.255000  4.525000 0.725000 ;
-      RECT 4.695000 1.665000  4.975000 2.465000 ;
-      RECT 5.145000 0.735000  5.460000 1.325000 ;
-      RECT 5.655000 0.265000  5.880000 1.075000 ;
-      RECT 5.655000 1.075000 12.750000 1.325000 ;
-      RECT 5.655000 1.325000  5.845000 2.465000 ;
-      RECT 6.490000 0.265000  6.740000 1.075000 ;
-      RECT 6.515000 1.325000  6.705000 2.460000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.130000  1.495000  0.535000 2.635000 ;
+      RECT  0.245000  0.085000  0.535000 0.905000 ;
+      RECT  0.705000  0.255000  1.035000 0.815000 ;
+      RECT  0.705000  1.575000  1.035000 2.465000 ;
+      RECT  0.785000  0.815000  1.035000 1.075000 ;
+      RECT  0.785000  1.075000  2.265000 1.275000 ;
+      RECT  0.785000  1.275000  1.035000 1.575000 ;
+      RECT  1.205000  1.575000  1.585000 2.295000 ;
+      RECT  1.205000  2.295000  3.265000 2.465000 ;
+      RECT  1.215000  0.085000  1.505000 0.905000 ;
+      RECT  1.675000  0.255000  2.005000 0.725000 ;
+      RECT  1.675000  0.725000  4.525000 0.905000 ;
+      RECT  1.755000  1.445000  2.765000 1.745000 ;
+      RECT  1.755000  1.745000  1.925000 2.125000 ;
+      RECT  2.095000  1.935000  2.425000 2.295000 ;
+      RECT  2.175000  0.085000  2.345000 0.555000 ;
+      RECT  2.435000  0.905000  3.095000 0.965000 ;
+      RECT  2.435000  0.965000  2.765000 1.445000 ;
+      RECT  2.515000  0.255000  2.845000 0.725000 ;
+      RECT  2.595000  1.745000  2.765000 2.125000 ;
+      RECT  2.935000  1.455000  4.975000 1.665000 ;
+      RECT  2.935000  1.665000  3.265000 2.295000 ;
+      RECT  3.015000  0.085000  3.185000 0.555000 ;
+      RECT  3.355000  0.255000  3.685000 0.725000 ;
+      RECT  3.435000  1.835000  3.685000 2.635000 ;
+      RECT  3.855000  0.085000  4.025000 0.555000 ;
+      RECT  3.855000  1.665000  4.025000 2.465000 ;
+      RECT  4.195000  0.255000  4.525000 0.725000 ;
+      RECT  4.195000  1.835000  4.525000 2.635000 ;
+      RECT  4.695000  0.085000  5.450000 0.565000 ;
+      RECT  4.695000  0.565000  4.975000 0.905000 ;
+      RECT  4.695000  1.665000  4.975000 2.465000 ;
+      RECT  5.145000  0.735000  5.460000 1.325000 ;
+      RECT  5.655000  0.265000  5.880000 1.075000 ;
+      RECT  5.655000  1.075000 12.750000 1.325000 ;
+      RECT  5.655000  1.325000  5.845000 2.465000 ;
+      RECT  6.050000  0.085000  6.310000 0.610000 ;
+      RECT  6.490000  0.265000  6.740000 1.075000 ;
+      RECT  6.515000  1.325000  6.705000 2.460000 ;
+      RECT  6.910000  0.085000  7.170000 0.645000 ;
+      RECT  7.770000  0.085000  8.030000 0.565000 ;
+      RECT  8.630000  0.085000  8.890000 0.565000 ;
+      RECT  9.490000  0.085000  9.735000 0.565000 ;
+      RECT 10.350000  0.085000 10.595000 0.565000 ;
+      RECT 11.205000  0.085000 11.455000 0.565000 ;
+      RECT 12.065000  0.085000 12.315000 0.565000 ;
+      RECT 12.925000  0.085000 13.185000 0.565000 ;
+      RECT 13.785000  0.085000 14.085000 0.565000 ;
     LAYER mcon ;
-      RECT 2.525000 0.765000 2.695000 0.935000 ;
-      RECT 2.885000 0.765000 3.055000 0.935000 ;
-      RECT 5.210000 0.765000 5.380000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.525000  0.765000  2.695000 0.935000 ;
+      RECT  2.885000  0.765000  3.055000 0.935000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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.210000  0.765000  5.380000 0.935000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT 2.465000 0.735000 3.115000 0.780000 ;
       RECT 2.465000 0.780000 5.440000 0.920000 ;
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
index 6975a83..e1c01ee 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.magic.lef
@@ -42,12 +42,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.297500 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 2.985000 0.375000 3.970000 ;
-        RECT 5.865000 2.985000 6.155000 3.955000 ;
-      LAYER mcon ;
-        RECT 0.140000 3.485000 0.310000 3.655000 ;
-        RECT 5.930000 3.485000 6.100000 3.655000 ;
       LAYER met1 ;
         RECT 0.070000 3.500000 6.170000 3.640000 ;
         RECT 0.080000 3.455000 0.370000 3.500000 ;
@@ -71,28 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 5.355000 6.440000 5.525000 ;
-        RECT 0.085000 4.630000 0.375000 5.355000 ;
-        RECT 2.645000 4.515000 2.905000 5.355000 ;
-        RECT 3.575000 4.515000 3.765000 5.355000 ;
-        RECT 4.445000 4.515000 4.955000 5.355000 ;
-        RECT 5.865000 4.630000 6.155000 5.355000 ;
-      LAYER mcon ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-        RECT 0.605000 5.355000 0.775000 5.525000 ;
-        RECT 1.065000 5.355000 1.235000 5.525000 ;
-        RECT 1.525000 5.355000 1.695000 5.525000 ;
-        RECT 1.985000 5.355000 2.155000 5.525000 ;
-        RECT 2.445000 5.355000 2.615000 5.525000 ;
-        RECT 2.905000 5.355000 3.075000 5.525000 ;
-        RECT 3.365000 5.355000 3.535000 5.525000 ;
-        RECT 3.825000 5.355000 3.995000 5.525000 ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-        RECT 4.745000 5.355000 4.915000 5.525000 ;
-        RECT 5.205000 5.355000 5.375000 5.525000 ;
-        RECT 5.665000 5.355000 5.835000 5.525000 ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
     END
@@ -102,19 +74,6 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.890000 2.805000 ;
-        RECT 4.890000 1.625000 5.120000 2.635000 ;
-        RECT 4.890000 2.635000 6.440000 2.805000 ;
-        RECT 4.890000 2.805000 5.120000 3.740000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 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
@@ -133,6 +92,8 @@
         RECT 1.420000 2.115000 1.590000 2.285000 ;
         RECT 1.780000 2.115000 1.950000 2.285000 ;
         RECT 2.140000 2.115000 2.310000 2.285000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 6.170000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
@@ -142,15 +103,21 @@
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 1.890000 2.805000 ;
+      RECT 0.000000  5.355000 6.440000 5.525000 ;
       RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  2.985000 0.375000 3.970000 ;
+      RECT 0.085000  4.630000 0.375000 5.355000 ;
       RECT 2.020000  0.085000 2.350000 0.895000 ;
       RECT 2.560000  0.375000 2.800000 2.130000 ;
       RECT 2.560000  2.130000 3.390000 2.370000 ;
+      RECT 2.645000  4.515000 2.905000 5.355000 ;
       RECT 3.060000  2.370000 3.390000 3.965000 ;
       RECT 3.075000  4.265000 4.265000 4.325000 ;
       RECT 3.075000  4.325000 3.405000 5.185000 ;
       RECT 3.115000  0.085000 3.445000 0.900000 ;
       RECT 3.145000  4.155000 4.195000 4.265000 ;
+      RECT 3.575000  4.515000 3.765000 5.355000 ;
       RECT 3.615000  0.290000 3.805000 0.730000 ;
       RECT 3.615000  0.730000 4.665000 0.980000 ;
       RECT 3.680000  2.405000 4.190000 2.575000 ;
@@ -164,9 +131,13 @@
       RECT 4.020000  3.810000 4.190000 4.155000 ;
       RECT 4.390000  3.085000 4.720000 3.470000 ;
       RECT 4.410000  3.640000 4.720000 3.740000 ;
+      RECT 4.445000  4.515000 4.955000 5.355000 ;
       RECT 4.470000  1.625000 4.640000 2.745000 ;
       RECT 4.475000  0.290000 4.665000 0.730000 ;
       RECT 4.835000  0.085000 5.165000 0.900000 ;
+      RECT 4.890000  1.625000 5.120000 2.635000 ;
+      RECT 4.890000  2.635000 6.440000 2.805000 ;
+      RECT 4.890000  2.805000 5.120000 3.740000 ;
       RECT 5.135000  4.405000 5.765000 4.460000 ;
       RECT 5.135000  4.460000 5.695000 4.820000 ;
       RECT 5.135000  4.820000 5.485000 5.160000 ;
@@ -174,21 +145,46 @@
       RECT 5.360000  4.125000 6.085000 4.355000 ;
       RECT 5.360000  4.355000 5.765000 4.405000 ;
       RECT 5.865000  0.085000 6.155000 0.810000 ;
+      RECT 5.865000  2.985000 6.155000 3.955000 ;
+      RECT 5.865000  4.630000 6.155000 5.355000 ;
     LAYER mcon ;
+      RECT 0.140000  3.485000 0.310000 3.655000 ;
       RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.145000  5.355000 0.315000 5.525000 ;
       RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.605000  5.355000 0.775000 5.525000 ;
       RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.065000  5.355000 1.235000 5.525000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.525000  5.355000 1.695000 5.525000 ;
       RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  5.355000 2.155000 5.525000 ;
       RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  5.355000 2.615000 5.525000 ;
       RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  5.355000 3.075000 5.525000 ;
       RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  5.355000 3.535000 5.525000 ;
       RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  5.355000 3.995000 5.525000 ;
       RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  5.355000 4.455000 5.525000 ;
       RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  5.355000 4.915000 5.525000 ;
       RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.205000  5.355000 5.375000 5.525000 ;
       RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.665000  5.355000 5.835000 5.525000 ;
+      RECT 5.930000  3.485000 6.100000 3.655000 ;
       RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
   END
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
index 75d57eb..4559e84 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.magic.lef
@@ -42,12 +42,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.297500 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 2.985000 0.375000 3.970000 ;
-        RECT 6.065000 2.985000 6.355000 3.955000 ;
-      LAYER mcon ;
-        RECT 0.140000 3.485000 0.310000 3.655000 ;
-        RECT 6.070000 3.485000 6.240000 3.655000 ;
       LAYER met1 ;
         RECT 0.070000 3.500000 6.300000 3.640000 ;
         RECT 0.080000 3.455000 0.370000 3.500000 ;
@@ -71,28 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 5.355000 6.440000 5.525000 ;
-        RECT 0.085000 4.630000 0.375000 5.355000 ;
-        RECT 2.645000 4.515000 2.905000 5.355000 ;
-        RECT 3.575000 4.515000 3.765000 5.355000 ;
-        RECT 4.445000 4.515000 4.955000 5.355000 ;
-        RECT 6.065000 4.630000 6.355000 5.355000 ;
-      LAYER mcon ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-        RECT 0.605000 5.355000 0.775000 5.525000 ;
-        RECT 1.065000 5.355000 1.235000 5.525000 ;
-        RECT 1.525000 5.355000 1.695000 5.525000 ;
-        RECT 1.985000 5.355000 2.155000 5.525000 ;
-        RECT 2.445000 5.355000 2.615000 5.525000 ;
-        RECT 2.905000 5.355000 3.075000 5.525000 ;
-        RECT 3.365000 5.355000 3.535000 5.525000 ;
-        RECT 3.825000 5.355000 3.995000 5.525000 ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-        RECT 4.745000 5.355000 4.915000 5.525000 ;
-        RECT 5.205000 5.355000 5.375000 5.525000 ;
-        RECT 5.665000 5.355000 5.835000 5.525000 ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
     END
@@ -102,20 +74,6 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.890000 2.805000 ;
-        RECT 4.890000 1.625000 5.120000 2.635000 ;
-        RECT 4.890000 2.635000 6.440000 2.805000 ;
-        RECT 4.890000 2.805000 5.120000 3.740000 ;
-        RECT 5.905000 1.610000 6.075000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 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
@@ -134,6 +92,8 @@
         RECT 1.420000 2.115000 1.590000 2.285000 ;
         RECT 1.780000 2.115000 1.950000 2.285000 ;
         RECT 2.140000 2.115000 2.310000 2.285000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 6.370000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
@@ -143,15 +103,21 @@
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 1.890000 2.805000 ;
+      RECT 0.000000  5.355000 6.440000 5.525000 ;
       RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  2.985000 0.375000 3.970000 ;
+      RECT 0.085000  4.630000 0.375000 5.355000 ;
       RECT 2.020000  0.085000 2.350000 0.895000 ;
       RECT 2.560000  0.375000 2.800000 2.130000 ;
       RECT 2.560000  2.130000 3.390000 2.370000 ;
+      RECT 2.645000  4.515000 2.905000 5.355000 ;
       RECT 3.060000  2.370000 3.390000 3.965000 ;
       RECT 3.075000  4.265000 4.265000 4.325000 ;
       RECT 3.075000  4.325000 3.405000 5.185000 ;
       RECT 3.115000  0.085000 3.445000 0.900000 ;
       RECT 3.145000  4.155000 4.195000 4.265000 ;
+      RECT 3.575000  4.515000 3.765000 5.355000 ;
       RECT 3.615000  0.255000 3.805000 0.730000 ;
       RECT 3.615000  0.730000 4.665000 0.980000 ;
       RECT 3.680000  2.405000 4.190000 2.575000 ;
@@ -165,9 +131,13 @@
       RECT 4.020000  3.810000 4.190000 4.155000 ;
       RECT 4.390000  3.085000 4.720000 3.470000 ;
       RECT 4.410000  3.640000 4.720000 3.740000 ;
+      RECT 4.445000  4.515000 4.955000 5.355000 ;
       RECT 4.470000  1.625000 4.640000 2.745000 ;
       RECT 4.475000  0.255000 4.665000 0.730000 ;
       RECT 4.835000  0.085000 5.165000 0.900000 ;
+      RECT 4.890000  1.625000 5.120000 2.635000 ;
+      RECT 4.890000  2.635000 6.440000 2.805000 ;
+      RECT 4.890000  2.805000 5.120000 3.740000 ;
       RECT 5.135000  4.405000 5.765000 4.460000 ;
       RECT 5.135000  4.460000 5.695000 4.820000 ;
       RECT 5.135000  4.820000 5.485000 5.160000 ;
@@ -175,21 +145,47 @@
       RECT 5.360000  4.125000 6.085000 4.355000 ;
       RECT 5.360000  4.355000 5.765000 4.405000 ;
       RECT 5.825000  0.085000 6.155000 0.900000 ;
+      RECT 5.905000  1.610000 6.075000 2.635000 ;
+      RECT 6.065000  2.985000 6.355000 3.955000 ;
+      RECT 6.065000  4.630000 6.355000 5.355000 ;
     LAYER mcon ;
+      RECT 0.140000  3.485000 0.310000 3.655000 ;
       RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.145000  5.355000 0.315000 5.525000 ;
       RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.605000  5.355000 0.775000 5.525000 ;
       RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.065000  5.355000 1.235000 5.525000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.525000  5.355000 1.695000 5.525000 ;
       RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  5.355000 2.155000 5.525000 ;
       RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  5.355000 2.615000 5.525000 ;
       RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  5.355000 3.075000 5.525000 ;
       RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  5.355000 3.535000 5.525000 ;
       RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  5.355000 3.995000 5.525000 ;
       RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  5.355000 4.455000 5.525000 ;
       RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  5.355000 4.915000 5.525000 ;
       RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.205000  5.355000 5.375000 5.525000 ;
       RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.665000  5.355000 5.835000 5.525000 ;
+      RECT 6.070000  3.485000 6.240000 3.655000 ;
       RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
   END
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
index c3a7fc2..f71eee9 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.magic.lef
@@ -42,12 +42,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.297500 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 2.985000 0.375000 3.970000 ;
-        RECT 6.985000 2.985000 7.275000 3.955000 ;
-      LAYER mcon ;
-        RECT 0.140000 3.485000 0.310000 3.655000 ;
-        RECT 6.990000 3.485000 7.160000 3.655000 ;
       LAYER met1 ;
         RECT 0.070000 3.500000 7.290000 3.640000 ;
         RECT 0.080000 3.455000 0.370000 3.500000 ;
@@ -75,30 +69,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 5.355000 7.360000 5.525000 ;
-        RECT 0.085000 4.630000 0.375000 5.355000 ;
-        RECT 2.645000 4.515000 2.905000 5.355000 ;
-        RECT 3.575000 4.515000 3.765000 5.355000 ;
-        RECT 4.445000 4.515000 4.955000 5.355000 ;
-        RECT 6.985000 4.630000 7.275000 5.355000 ;
-      LAYER mcon ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-        RECT 0.605000 5.355000 0.775000 5.525000 ;
-        RECT 1.065000 5.355000 1.235000 5.525000 ;
-        RECT 1.525000 5.355000 1.695000 5.525000 ;
-        RECT 1.985000 5.355000 2.155000 5.525000 ;
-        RECT 2.445000 5.355000 2.615000 5.525000 ;
-        RECT 2.905000 5.355000 3.075000 5.525000 ;
-        RECT 3.365000 5.355000 3.535000 5.525000 ;
-        RECT 3.825000 5.355000 3.995000 5.525000 ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-        RECT 4.745000 5.355000 4.915000 5.525000 ;
-        RECT 5.205000 5.355000 5.375000 5.525000 ;
-        RECT 5.665000 5.355000 5.835000 5.525000 ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-        RECT 6.585000 5.355000 6.755000 5.525000 ;
-        RECT 7.045000 5.355000 7.215000 5.525000 ;
       LAYER met1 ;
         RECT 0.000000 5.200000 7.360000 5.680000 ;
     END
@@ -108,23 +78,6 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.890000 2.805000 ;
-        RECT 4.890000 1.625000 5.120000 2.635000 ;
-        RECT 4.890000 2.635000 7.360000 2.805000 ;
-        RECT 4.890000 2.805000 5.120000 3.740000 ;
-        RECT 5.905000 1.610000 6.075000 2.635000 ;
-        RECT 6.755000 1.610000 6.935000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 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
@@ -143,6 +96,8 @@
         RECT 1.420000 2.115000 1.590000 2.285000 ;
         RECT 1.780000 2.115000 1.950000 2.285000 ;
         RECT 2.140000 2.115000 2.310000 2.285000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 7.290000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
@@ -152,15 +107,21 @@
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 1.890000 2.805000 ;
+      RECT 0.000000  5.355000 7.360000 5.525000 ;
       RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  2.985000 0.375000 3.970000 ;
+      RECT 0.085000  4.630000 0.375000 5.355000 ;
       RECT 2.020000  0.085000 2.350000 0.895000 ;
       RECT 2.560000  0.375000 2.800000 2.130000 ;
       RECT 2.560000  2.130000 3.390000 2.370000 ;
+      RECT 2.645000  4.515000 2.905000 5.355000 ;
       RECT 3.060000  2.370000 3.390000 3.965000 ;
       RECT 3.075000  4.265000 4.265000 4.325000 ;
       RECT 3.075000  4.325000 3.405000 5.185000 ;
       RECT 3.115000  0.085000 3.445000 0.900000 ;
       RECT 3.145000  4.155000 4.195000 4.265000 ;
+      RECT 3.575000  4.515000 3.765000 5.355000 ;
       RECT 3.615000  0.255000 3.805000 0.730000 ;
       RECT 3.615000  0.730000 4.665000 0.980000 ;
       RECT 3.680000  2.405000 4.190000 2.575000 ;
@@ -174,9 +135,13 @@
       RECT 4.020000  3.810000 4.190000 4.155000 ;
       RECT 4.390000  3.085000 4.720000 3.470000 ;
       RECT 4.410000  3.640000 4.720000 3.740000 ;
+      RECT 4.445000  4.515000 4.955000 5.355000 ;
       RECT 4.470000  1.625000 4.640000 2.745000 ;
       RECT 4.475000  0.255000 4.665000 0.730000 ;
       RECT 4.835000  0.085000 5.165000 0.900000 ;
+      RECT 4.890000  1.625000 5.120000 2.635000 ;
+      RECT 4.890000  2.635000 7.360000 2.805000 ;
+      RECT 4.890000  2.805000 5.120000 3.740000 ;
       RECT 5.135000  4.405000 5.765000 4.460000 ;
       RECT 5.135000  4.460000 5.695000 4.820000 ;
       RECT 5.135000  4.820000 5.485000 5.160000 ;
@@ -184,24 +149,55 @@
       RECT 5.360000  4.125000 6.085000 4.355000 ;
       RECT 5.360000  4.355000 5.765000 4.405000 ;
       RECT 5.825000  0.085000 6.155000 0.845000 ;
+      RECT 5.905000  1.610000 6.075000 2.635000 ;
       RECT 6.755000  0.085000 7.005000 0.925000 ;
+      RECT 6.755000  1.610000 6.935000 2.635000 ;
+      RECT 6.985000  2.985000 7.275000 3.955000 ;
+      RECT 6.985000  4.630000 7.275000 5.355000 ;
     LAYER mcon ;
+      RECT 0.140000  3.485000 0.310000 3.655000 ;
       RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.145000  5.355000 0.315000 5.525000 ;
       RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.605000  5.355000 0.775000 5.525000 ;
       RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.065000  5.355000 1.235000 5.525000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.525000  5.355000 1.695000 5.525000 ;
       RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  5.355000 2.155000 5.525000 ;
       RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  5.355000 2.615000 5.525000 ;
       RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  5.355000 3.075000 5.525000 ;
       RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  5.355000 3.535000 5.525000 ;
       RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  5.355000 3.995000 5.525000 ;
       RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  5.355000 4.455000 5.525000 ;
       RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  5.355000 4.915000 5.525000 ;
       RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.205000  5.355000 5.375000 5.525000 ;
       RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.665000  5.355000 5.835000 5.525000 ;
       RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.125000  5.355000 6.295000 5.525000 ;
       RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.585000  5.355000 6.755000 5.525000 ;
+      RECT 6.990000  3.485000 7.160000 3.655000 ;
       RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.045000  5.355000 7.215000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 7.360000 0.240000 ;
   END
diff --git a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
index db46e8c..7eac318 100644
--- a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.magic.lef
@@ -67,6 +67,8 @@
         RECT 1.420000 2.115000 1.590000 2.285000 ;
         RECT 1.780000 2.115000 1.950000 2.285000 ;
         RECT 2.140000 2.115000 2.310000 2.285000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 7.290000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
@@ -78,28 +80,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 5.355000 7.360000 5.525000 ;
-        RECT 2.645000 4.515000 2.905000 5.355000 ;
-        RECT 3.575000 4.515000 3.765000 5.355000 ;
-        RECT 4.445000 4.515000 4.955000 5.355000 ;
-      LAYER mcon ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-        RECT 0.605000 5.355000 0.775000 5.525000 ;
-        RECT 1.065000 5.355000 1.235000 5.525000 ;
-        RECT 1.525000 5.355000 1.695000 5.525000 ;
-        RECT 1.985000 5.355000 2.155000 5.525000 ;
-        RECT 2.445000 5.355000 2.615000 5.525000 ;
-        RECT 2.905000 5.355000 3.075000 5.525000 ;
-        RECT 3.365000 5.355000 3.535000 5.525000 ;
-        RECT 3.825000 5.355000 3.995000 5.525000 ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-        RECT 4.745000 5.355000 4.915000 5.525000 ;
-        RECT 5.205000 5.355000 5.375000 5.525000 ;
-        RECT 5.665000 5.355000 5.835000 5.525000 ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-        RECT 6.585000 5.355000 6.755000 5.525000 ;
-        RECT 7.045000 5.355000 7.215000 5.525000 ;
       LAYER met1 ;
         RECT 0.000000 5.200000 7.360000 5.680000 ;
     END
@@ -109,23 +89,6 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.890000 2.805000 ;
-        RECT 4.890000 1.625000 5.120000 2.635000 ;
-        RECT 4.890000 2.635000 7.360000 2.805000 ;
-        RECT 4.890000 2.805000 5.120000 3.740000 ;
-        RECT 5.905000 1.610000 6.075000 2.635000 ;
-        RECT 6.755000 1.610000 6.935000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 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
@@ -133,14 +96,18 @@
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 1.890000 2.805000 ;
+      RECT 0.000000  5.355000 7.360000 5.525000 ;
       RECT 2.020000  0.085000 2.350000 0.895000 ;
       RECT 2.560000  0.375000 2.800000 2.130000 ;
       RECT 2.560000  2.130000 3.390000 2.370000 ;
+      RECT 2.645000  4.515000 2.905000 5.355000 ;
       RECT 3.060000  2.370000 3.390000 3.965000 ;
       RECT 3.075000  4.265000 4.265000 4.325000 ;
       RECT 3.075000  4.325000 3.405000 5.185000 ;
       RECT 3.115000  0.085000 3.445000 0.900000 ;
       RECT 3.145000  4.155000 4.195000 4.265000 ;
+      RECT 3.575000  4.515000 3.765000 5.355000 ;
       RECT 3.615000  0.255000 3.805000 0.730000 ;
       RECT 3.615000  0.730000 4.665000 0.980000 ;
       RECT 3.680000  2.405000 4.190000 2.575000 ;
@@ -154,9 +121,13 @@
       RECT 4.020000  3.810000 4.190000 4.155000 ;
       RECT 4.390000  3.085000 4.720000 3.470000 ;
       RECT 4.410000  3.640000 4.720000 3.740000 ;
+      RECT 4.445000  4.515000 4.955000 5.355000 ;
       RECT 4.470000  1.625000 4.640000 2.745000 ;
       RECT 4.475000  0.255000 4.665000 0.730000 ;
       RECT 4.835000  0.085000 5.165000 0.900000 ;
+      RECT 4.890000  1.625000 5.120000 2.635000 ;
+      RECT 4.890000  2.635000 7.360000 2.805000 ;
+      RECT 4.890000  2.805000 5.120000 3.740000 ;
       RECT 5.135000  4.405000 5.765000 4.460000 ;
       RECT 5.135000  4.460000 5.695000 4.820000 ;
       RECT 5.135000  4.820000 5.485000 5.160000 ;
@@ -164,24 +135,51 @@
       RECT 5.360000  4.125000 6.085000 4.355000 ;
       RECT 5.360000  4.355000 5.765000 4.405000 ;
       RECT 5.825000  0.085000 6.155000 0.845000 ;
+      RECT 5.905000  1.610000 6.075000 2.635000 ;
       RECT 6.755000  0.085000 7.005000 0.925000 ;
+      RECT 6.755000  1.610000 6.935000 2.635000 ;
     LAYER mcon ;
       RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.145000  5.355000 0.315000 5.525000 ;
       RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.605000  5.355000 0.775000 5.525000 ;
       RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.065000  5.355000 1.235000 5.525000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.525000  5.355000 1.695000 5.525000 ;
       RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  5.355000 2.155000 5.525000 ;
       RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  5.355000 2.615000 5.525000 ;
       RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  5.355000 3.075000 5.525000 ;
       RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  5.355000 3.535000 5.525000 ;
       RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  5.355000 3.995000 5.525000 ;
       RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  5.355000 4.455000 5.525000 ;
       RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  5.355000 4.915000 5.525000 ;
       RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.205000  5.355000 5.375000 5.525000 ;
       RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.665000  5.355000 5.835000 5.525000 ;
       RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.125000  5.355000 6.295000 5.525000 ;
       RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.585000  5.355000 6.755000 5.525000 ;
       RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.045000  5.355000 7.215000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 7.360000 0.240000 ;
   END
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
index 8953c10..fd7adc8 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.magic.lef
@@ -42,12 +42,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.297500 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 2.985000 0.375000 3.970000 ;
-        RECT 5.865000 2.985000 6.155000 3.955000 ;
-      LAYER mcon ;
-        RECT 0.140000 3.485000 0.310000 3.655000 ;
-        RECT 5.930000 3.485000 6.100000 3.655000 ;
       LAYER met1 ;
         RECT 0.070000 3.500000 6.170000 3.640000 ;
         RECT 0.080000 3.455000 0.370000 3.500000 ;
@@ -80,6 +74,8 @@
         RECT 1.420000 2.115000 1.590000 2.285000 ;
         RECT 1.780000 2.115000 1.950000 2.285000 ;
         RECT 2.140000 2.115000 2.310000 2.285000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 6.170000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
@@ -91,28 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 5.355000 6.440000 5.525000 ;
-        RECT 0.085000 4.630000 0.375000 5.355000 ;
-        RECT 2.645000 4.515000 2.905000 5.355000 ;
-        RECT 3.575000 4.515000 3.765000 5.355000 ;
-        RECT 4.445000 4.515000 4.955000 5.355000 ;
-        RECT 5.865000 4.630000 6.155000 5.355000 ;
-      LAYER mcon ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-        RECT 0.605000 5.355000 0.775000 5.525000 ;
-        RECT 1.065000 5.355000 1.235000 5.525000 ;
-        RECT 1.525000 5.355000 1.695000 5.525000 ;
-        RECT 1.985000 5.355000 2.155000 5.525000 ;
-        RECT 2.445000 5.355000 2.615000 5.525000 ;
-        RECT 2.905000 5.355000 3.075000 5.525000 ;
-        RECT 3.365000 5.355000 3.535000 5.525000 ;
-        RECT 3.825000 5.355000 3.995000 5.525000 ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-        RECT 4.745000 5.355000 4.915000 5.525000 ;
-        RECT 5.205000 5.355000 5.375000 5.525000 ;
-        RECT 5.665000 5.355000 5.835000 5.525000 ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
     END
@@ -122,19 +96,6 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.890000 2.805000 ;
-        RECT 4.890000 1.625000 5.120000 2.635000 ;
-        RECT 4.890000 2.635000 6.440000 2.805000 ;
-        RECT 4.890000 2.805000 5.120000 3.740000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 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,15 +103,21 @@
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 1.890000 2.805000 ;
+      RECT 0.000000  5.355000 6.440000 5.525000 ;
       RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  2.985000 0.375000 3.970000 ;
+      RECT 0.085000  4.630000 0.375000 5.355000 ;
       RECT 2.020000  0.085000 2.350000 0.895000 ;
       RECT 2.560000  0.375000 2.800000 2.130000 ;
       RECT 2.560000  2.130000 3.390000 2.370000 ;
+      RECT 2.645000  4.515000 2.905000 5.355000 ;
       RECT 3.060000  2.370000 3.390000 3.965000 ;
       RECT 3.075000  4.265000 4.265000 4.325000 ;
       RECT 3.075000  4.325000 3.405000 5.185000 ;
       RECT 3.115000  0.085000 3.445000 0.900000 ;
       RECT 3.145000  4.155000 4.195000 4.265000 ;
+      RECT 3.575000  4.515000 3.765000 5.355000 ;
       RECT 3.615000  0.290000 3.805000 0.730000 ;
       RECT 3.615000  0.730000 4.665000 0.980000 ;
       RECT 3.680000  2.405000 4.190000 2.575000 ;
@@ -164,9 +131,13 @@
       RECT 4.020000  3.810000 4.190000 4.155000 ;
       RECT 4.390000  3.085000 4.720000 3.470000 ;
       RECT 4.410000  3.640000 4.720000 3.740000 ;
+      RECT 4.445000  4.515000 4.955000 5.355000 ;
       RECT 4.470000  1.625000 4.640000 2.745000 ;
       RECT 4.475000  0.290000 4.665000 0.730000 ;
       RECT 4.835000  0.085000 5.165000 0.900000 ;
+      RECT 4.890000  1.625000 5.120000 2.635000 ;
+      RECT 4.890000  2.635000 6.440000 2.805000 ;
+      RECT 4.890000  2.805000 5.120000 3.740000 ;
       RECT 5.135000  4.405000 5.765000 4.460000 ;
       RECT 5.135000  4.460000 5.695000 4.820000 ;
       RECT 5.135000  4.820000 5.485000 5.160000 ;
@@ -174,21 +145,46 @@
       RECT 5.360000  4.125000 6.085000 4.355000 ;
       RECT 5.360000  4.355000 5.765000 4.405000 ;
       RECT 5.865000  0.085000 6.155000 0.810000 ;
+      RECT 5.865000  2.985000 6.155000 3.955000 ;
+      RECT 5.865000  4.630000 6.155000 5.355000 ;
     LAYER mcon ;
+      RECT 0.140000  3.485000 0.310000 3.655000 ;
       RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.145000  5.355000 0.315000 5.525000 ;
       RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.605000  5.355000 0.775000 5.525000 ;
       RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.065000  5.355000 1.235000 5.525000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.525000  5.355000 1.695000 5.525000 ;
       RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  5.355000 2.155000 5.525000 ;
       RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  5.355000 2.615000 5.525000 ;
       RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  5.355000 3.075000 5.525000 ;
       RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  5.355000 3.535000 5.525000 ;
       RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  5.355000 3.995000 5.525000 ;
       RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  5.355000 4.455000 5.525000 ;
       RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  5.355000 4.915000 5.525000 ;
       RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.205000  5.355000 5.375000 5.525000 ;
       RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.665000  5.355000 5.835000 5.525000 ;
+      RECT 5.930000  3.485000 6.100000 3.655000 ;
       RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
   END
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
index 43f122b..5ea4ac5 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.magic.lef
@@ -42,12 +42,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.297500 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 2.985000 0.375000 3.970000 ;
-        RECT 6.065000 2.985000 6.355000 3.955000 ;
-      LAYER mcon ;
-        RECT 0.140000 3.485000 0.310000 3.655000 ;
-        RECT 6.070000 3.485000 6.240000 3.655000 ;
       LAYER met1 ;
         RECT 0.070000 3.500000 6.300000 3.640000 ;
         RECT 0.080000 3.455000 0.370000 3.500000 ;
@@ -80,6 +74,8 @@
         RECT 1.420000 2.115000 1.590000 2.285000 ;
         RECT 1.780000 2.115000 1.950000 2.285000 ;
         RECT 2.140000 2.115000 2.310000 2.285000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 6.370000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
@@ -91,28 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 5.355000 6.440000 5.525000 ;
-        RECT 0.085000 4.630000 0.375000 5.355000 ;
-        RECT 2.645000 4.515000 2.905000 5.355000 ;
-        RECT 3.575000 4.515000 3.765000 5.355000 ;
-        RECT 4.445000 4.515000 4.955000 5.355000 ;
-        RECT 6.065000 4.630000 6.355000 5.355000 ;
-      LAYER mcon ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-        RECT 0.605000 5.355000 0.775000 5.525000 ;
-        RECT 1.065000 5.355000 1.235000 5.525000 ;
-        RECT 1.525000 5.355000 1.695000 5.525000 ;
-        RECT 1.985000 5.355000 2.155000 5.525000 ;
-        RECT 2.445000 5.355000 2.615000 5.525000 ;
-        RECT 2.905000 5.355000 3.075000 5.525000 ;
-        RECT 3.365000 5.355000 3.535000 5.525000 ;
-        RECT 3.825000 5.355000 3.995000 5.525000 ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-        RECT 4.745000 5.355000 4.915000 5.525000 ;
-        RECT 5.205000 5.355000 5.375000 5.525000 ;
-        RECT 5.665000 5.355000 5.835000 5.525000 ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
       LAYER met1 ;
         RECT 0.000000 5.200000 6.440000 5.680000 ;
     END
@@ -122,20 +96,6 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.890000 2.805000 ;
-        RECT 4.890000 1.625000 5.120000 2.635000 ;
-        RECT 4.890000 2.635000 6.440000 2.805000 ;
-        RECT 4.890000 2.805000 5.120000 3.740000 ;
-        RECT 5.905000 1.610000 6.075000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 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
@@ -143,15 +103,21 @@
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 1.890000 2.805000 ;
+      RECT 0.000000  5.355000 6.440000 5.525000 ;
       RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  2.985000 0.375000 3.970000 ;
+      RECT 0.085000  4.630000 0.375000 5.355000 ;
       RECT 2.020000  0.085000 2.350000 0.895000 ;
       RECT 2.560000  0.375000 2.800000 2.130000 ;
       RECT 2.560000  2.130000 3.390000 2.370000 ;
+      RECT 2.645000  4.515000 2.905000 5.355000 ;
       RECT 3.060000  2.370000 3.390000 3.965000 ;
       RECT 3.075000  4.265000 4.265000 4.325000 ;
       RECT 3.075000  4.325000 3.405000 5.185000 ;
       RECT 3.115000  0.085000 3.445000 0.900000 ;
       RECT 3.145000  4.155000 4.195000 4.265000 ;
+      RECT 3.575000  4.515000 3.765000 5.355000 ;
       RECT 3.615000  0.255000 3.805000 0.730000 ;
       RECT 3.615000  0.730000 4.665000 0.980000 ;
       RECT 3.680000  2.405000 4.190000 2.575000 ;
@@ -165,9 +131,13 @@
       RECT 4.020000  3.810000 4.190000 4.155000 ;
       RECT 4.390000  3.085000 4.720000 3.470000 ;
       RECT 4.410000  3.640000 4.720000 3.740000 ;
+      RECT 4.445000  4.515000 4.955000 5.355000 ;
       RECT 4.470000  1.625000 4.640000 2.745000 ;
       RECT 4.475000  0.255000 4.665000 0.730000 ;
       RECT 4.835000  0.085000 5.165000 0.900000 ;
+      RECT 4.890000  1.625000 5.120000 2.635000 ;
+      RECT 4.890000  2.635000 6.440000 2.805000 ;
+      RECT 4.890000  2.805000 5.120000 3.740000 ;
       RECT 5.135000  4.405000 5.765000 4.460000 ;
       RECT 5.135000  4.460000 5.695000 4.820000 ;
       RECT 5.135000  4.820000 5.485000 5.160000 ;
@@ -175,21 +145,47 @@
       RECT 5.360000  4.125000 6.085000 4.355000 ;
       RECT 5.360000  4.355000 5.765000 4.405000 ;
       RECT 5.825000  0.085000 6.155000 0.900000 ;
+      RECT 5.905000  1.610000 6.075000 2.635000 ;
+      RECT 6.065000  2.985000 6.355000 3.955000 ;
+      RECT 6.065000  4.630000 6.355000 5.355000 ;
     LAYER mcon ;
+      RECT 0.140000  3.485000 0.310000 3.655000 ;
       RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.145000  5.355000 0.315000 5.525000 ;
       RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.605000  5.355000 0.775000 5.525000 ;
       RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.065000  5.355000 1.235000 5.525000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.525000  5.355000 1.695000 5.525000 ;
       RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  5.355000 2.155000 5.525000 ;
       RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  5.355000 2.615000 5.525000 ;
       RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  5.355000 3.075000 5.525000 ;
       RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  5.355000 3.535000 5.525000 ;
       RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  5.355000 3.995000 5.525000 ;
       RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  5.355000 4.455000 5.525000 ;
       RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  5.355000 4.915000 5.525000 ;
       RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.205000  5.355000 5.375000 5.525000 ;
       RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.665000  5.355000 5.835000 5.525000 ;
+      RECT 6.070000  3.485000 6.240000 3.655000 ;
       RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.125000  5.355000 6.295000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 6.440000 0.240000 ;
   END
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
index 413d013..e52adb0 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.magic.lef
@@ -42,12 +42,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.297500 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 2.985000 0.375000 3.970000 ;
-        RECT 6.985000 2.985000 7.275000 3.955000 ;
-      LAYER mcon ;
-        RECT 0.140000 3.485000 0.310000 3.655000 ;
-        RECT 6.990000 3.485000 7.160000 3.655000 ;
       LAYER met1 ;
         RECT 0.070000 3.500000 7.290000 3.640000 ;
         RECT 0.080000 3.455000 0.370000 3.500000 ;
@@ -84,6 +78,8 @@
         RECT 1.420000 2.115000 1.590000 2.285000 ;
         RECT 1.780000 2.115000 1.950000 2.285000 ;
         RECT 2.140000 2.115000 2.310000 2.285000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.070000 2.140000 7.290000 2.280000 ;
         RECT 1.360000 2.085000 2.370000 2.140000 ;
@@ -95,30 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 5.355000 7.360000 5.525000 ;
-        RECT 0.085000 4.630000 0.375000 5.355000 ;
-        RECT 2.645000 4.515000 2.905000 5.355000 ;
-        RECT 3.575000 4.515000 3.765000 5.355000 ;
-        RECT 4.445000 4.515000 4.955000 5.355000 ;
-        RECT 6.985000 4.630000 7.275000 5.355000 ;
-      LAYER mcon ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-        RECT 0.605000 5.355000 0.775000 5.525000 ;
-        RECT 1.065000 5.355000 1.235000 5.525000 ;
-        RECT 1.525000 5.355000 1.695000 5.525000 ;
-        RECT 1.985000 5.355000 2.155000 5.525000 ;
-        RECT 2.445000 5.355000 2.615000 5.525000 ;
-        RECT 2.905000 5.355000 3.075000 5.525000 ;
-        RECT 3.365000 5.355000 3.535000 5.525000 ;
-        RECT 3.825000 5.355000 3.995000 5.525000 ;
-        RECT 4.285000 5.355000 4.455000 5.525000 ;
-        RECT 4.745000 5.355000 4.915000 5.525000 ;
-        RECT 5.205000 5.355000 5.375000 5.525000 ;
-        RECT 5.665000 5.355000 5.835000 5.525000 ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-        RECT 6.585000 5.355000 6.755000 5.525000 ;
-        RECT 7.045000 5.355000 7.215000 5.525000 ;
       LAYER met1 ;
         RECT 0.000000 5.200000 7.360000 5.680000 ;
     END
@@ -128,23 +100,6 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.890000 2.805000 ;
-        RECT 4.890000 1.625000 5.120000 2.635000 ;
-        RECT 4.890000 2.635000 7.360000 2.805000 ;
-        RECT 4.890000 2.805000 5.120000 3.740000 ;
-        RECT 5.905000 1.610000 6.075000 2.635000 ;
-        RECT 6.755000 1.610000 6.935000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 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
@@ -152,15 +107,21 @@
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 1.890000 2.805000 ;
+      RECT 0.000000  5.355000 7.360000 5.525000 ;
       RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  2.985000 0.375000 3.970000 ;
+      RECT 0.085000  4.630000 0.375000 5.355000 ;
       RECT 2.020000  0.085000 2.350000 0.895000 ;
       RECT 2.560000  0.375000 2.800000 2.130000 ;
       RECT 2.560000  2.130000 3.390000 2.370000 ;
+      RECT 2.645000  4.515000 2.905000 5.355000 ;
       RECT 3.060000  2.370000 3.390000 3.965000 ;
       RECT 3.075000  4.265000 4.265000 4.325000 ;
       RECT 3.075000  4.325000 3.405000 5.185000 ;
       RECT 3.115000  0.085000 3.445000 0.900000 ;
       RECT 3.145000  4.155000 4.195000 4.265000 ;
+      RECT 3.575000  4.515000 3.765000 5.355000 ;
       RECT 3.615000  0.255000 3.805000 0.730000 ;
       RECT 3.615000  0.730000 4.665000 0.980000 ;
       RECT 3.680000  2.405000 4.190000 2.575000 ;
@@ -174,9 +135,13 @@
       RECT 4.020000  3.810000 4.190000 4.155000 ;
       RECT 4.390000  3.085000 4.720000 3.470000 ;
       RECT 4.410000  3.640000 4.720000 3.740000 ;
+      RECT 4.445000  4.515000 4.955000 5.355000 ;
       RECT 4.470000  1.625000 4.640000 2.745000 ;
       RECT 4.475000  0.255000 4.665000 0.730000 ;
       RECT 4.835000  0.085000 5.165000 0.900000 ;
+      RECT 4.890000  1.625000 5.120000 2.635000 ;
+      RECT 4.890000  2.635000 7.360000 2.805000 ;
+      RECT 4.890000  2.805000 5.120000 3.740000 ;
       RECT 5.135000  4.405000 5.765000 4.460000 ;
       RECT 5.135000  4.460000 5.695000 4.820000 ;
       RECT 5.135000  4.820000 5.485000 5.160000 ;
@@ -184,24 +149,55 @@
       RECT 5.360000  4.125000 6.085000 4.355000 ;
       RECT 5.360000  4.355000 5.765000 4.405000 ;
       RECT 5.825000  0.085000 6.155000 0.845000 ;
+      RECT 5.905000  1.610000 6.075000 2.635000 ;
       RECT 6.755000  0.085000 7.005000 0.925000 ;
+      RECT 6.755000  1.610000 6.935000 2.635000 ;
+      RECT 6.985000  2.985000 7.275000 3.955000 ;
+      RECT 6.985000  4.630000 7.275000 5.355000 ;
     LAYER mcon ;
+      RECT 0.140000  3.485000 0.310000 3.655000 ;
       RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.145000  5.355000 0.315000 5.525000 ;
       RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.605000  5.355000 0.775000 5.525000 ;
       RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.065000  5.355000 1.235000 5.525000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.525000  5.355000 1.695000 5.525000 ;
       RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  5.355000 2.155000 5.525000 ;
       RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  5.355000 2.615000 5.525000 ;
       RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  5.355000 3.075000 5.525000 ;
       RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  5.355000 3.535000 5.525000 ;
       RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  5.355000 3.995000 5.525000 ;
       RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  5.355000 4.455000 5.525000 ;
       RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  5.355000 4.915000 5.525000 ;
       RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.205000  5.355000 5.375000 5.525000 ;
       RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.665000  5.355000 5.835000 5.525000 ;
       RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.125000  5.355000 6.295000 5.525000 ;
       RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.585000  5.355000 6.755000 5.525000 ;
+      RECT 6.990000  3.485000 7.160000 3.655000 ;
       RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.045000  5.355000 7.215000 5.525000 ;
     LAYER met1 ;
       RECT 0.000000 -0.240000 7.360000 0.240000 ;
   END
diff --git a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
index 8752702..fca61b1 100644
--- a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
+++ b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.magic.lef
@@ -37,16 +37,34 @@
     PORT
       LAYER li1 ;
         RECT 4.215000 1.075000 4.965000 1.325000 ;
-        RECT 5.135000 1.075000 5.895000 1.325000 ;
-        RECT 6.755000 0.915000 7.275000 2.465000 ;
-        RECT 7.445000 1.075000 8.205000 1.325000 ;
-        RECT 8.375000 1.075000 9.125000 1.325000 ;
       LAYER mcon ;
         RECT 4.775000 1.105000 4.945000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.135000 1.075000 5.895000 1.325000 ;
+      LAYER mcon ;
         RECT 5.705000 1.105000 5.875000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.755000 0.915000 7.275000 2.465000 ;
+      LAYER mcon ;
         RECT 6.765000 1.105000 6.935000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.445000 1.075000 8.205000 1.325000 ;
+      LAYER mcon ;
         RECT 7.625000 1.105000 7.795000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 8.375000 1.075000 9.125000 1.325000 ;
+      LAYER mcon ;
         RECT 8.485000 1.105000 8.655000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 4.715000 1.075000 5.005000 1.120000 ;
         RECT 4.715000 1.120000 8.715000 1.260000 ;
@@ -111,6 +129,8 @@
         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 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -165,6 +185,8 @@
         RECT 12.105000 2.635000 12.275000 2.805000 ;
         RECT 12.565000 2.635000 12.735000 2.805000 ;
         RECT 13.025000 2.635000 13.195000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
index 8f938b6..4953534 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_1.magic.lef
@@ -75,19 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.875000  0.085000 1.205000 0.485000 ;
-        RECT 2.545000  0.085000 2.880000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -97,35 +84,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.955000 1.715000 1.205000 2.635000 ;
-        RECT 2.555000 1.845000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.255000 0.395000 0.655000 ;
-      RECT 0.135000 0.655000 2.245000 0.825000 ;
-      RECT 0.135000 0.825000 0.395000 2.125000 ;
-      RECT 1.655000 0.255000 1.985000 0.640000 ;
-      RECT 1.655000 0.640000 2.245000 0.655000 ;
-      RECT 1.655000 1.815000 2.245000 2.080000 ;
-      RECT 2.075000 0.825000 2.245000 1.495000 ;
-      RECT 2.075000 1.495000 3.095000 1.665000 ;
-      RECT 2.075000 1.665000 2.245000 1.815000 ;
-      RECT 2.925000 0.995000 3.200000 1.325000 ;
-      RECT 2.925000 1.325000 3.095000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.135000  0.255000 0.395000 0.655000 ;
+      RECT 0.135000  0.655000 2.245000 0.825000 ;
+      RECT 0.135000  0.825000 0.395000 2.125000 ;
+      RECT 0.875000  0.085000 1.205000 0.485000 ;
+      RECT 0.955000  1.715000 1.205000 2.635000 ;
+      RECT 1.655000  0.255000 1.985000 0.640000 ;
+      RECT 1.655000  0.640000 2.245000 0.655000 ;
+      RECT 1.655000  1.815000 2.245000 2.080000 ;
+      RECT 2.075000  0.825000 2.245000 1.495000 ;
+      RECT 2.075000  1.495000 3.095000 1.665000 ;
+      RECT 2.075000  1.665000 2.245000 1.815000 ;
+      RECT 2.545000  0.085000 2.880000 0.470000 ;
+      RECT 2.555000  1.845000 2.885000 2.635000 ;
+      RECT 2.925000  0.995000 3.200000 1.325000 ;
+      RECT 2.925000  1.325000 3.095000 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
 END sky130_fd_sc_hd__maj3_1
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
index 2948d2c..8e2ab15 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_2.magic.lef
@@ -75,21 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.975000  0.085000 1.305000 0.485000 ;
-        RECT 2.635000  0.085000 2.965000 0.485000 ;
-        RECT 3.785000  0.085000 4.055000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -99,35 +84,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.975000 2.175000 1.305000 2.635000 ;
-        RECT 2.535000 1.835000 2.860000 2.635000 ;
-        RECT 3.785000 1.495000 4.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.525000 0.655000 ;
-      RECT 0.085000 0.655000 3.105000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.835000 ;
-      RECT 0.085000 1.835000 2.085000 2.005000 ;
-      RECT 0.085000 2.005000 0.615000 2.465000 ;
-      RECT 1.755000 0.255000 2.085000 0.655000 ;
-      RECT 1.755000 2.005000 2.085000 2.465000 ;
-      RECT 2.925000 0.825000 3.105000 1.075000 ;
-      RECT 2.925000 1.075000 3.275000 1.245000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.280000 0.525000 0.655000 ;
+      RECT 0.085000  0.655000 3.105000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.835000 ;
+      RECT 0.085000  1.835000 2.085000 2.005000 ;
+      RECT 0.085000  2.005000 0.615000 2.465000 ;
+      RECT 0.975000  0.085000 1.305000 0.485000 ;
+      RECT 0.975000  2.175000 1.305000 2.635000 ;
+      RECT 1.755000  0.255000 2.085000 0.655000 ;
+      RECT 1.755000  2.005000 2.085000 2.465000 ;
+      RECT 2.535000  1.835000 2.860000 2.635000 ;
+      RECT 2.635000  0.085000 2.965000 0.485000 ;
+      RECT 2.925000  0.825000 3.105000 1.075000 ;
+      RECT 2.925000  1.075000 3.275000 1.245000 ;
+      RECT 3.785000  0.085000 4.055000 0.905000 ;
+      RECT 3.785000  1.495000 4.055000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__maj3_2
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
index b90cbba..7ce0807 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_4.magic.lef
@@ -84,24 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 1.120000  0.085000 1.450000 0.490000 ;
-        RECT 2.860000  0.085000 3.205000 0.545000 ;
-        RECT 3.875000  0.085000 4.045000 0.545000 ;
-        RECT 4.715000  0.085000 4.885000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -111,40 +93,55 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 1.120000 2.255000 1.450000 2.635000 ;
-        RECT 2.845000 1.455000 3.175000 2.635000 ;
-        RECT 3.875000 1.795000 4.045000 2.635000 ;
-        RECT 4.715000 1.795000 4.925000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.635000 0.660000 ;
-      RECT 0.085000 0.660000 2.290000 0.715000 ;
-      RECT 0.085000 0.715000 3.285000 0.885000 ;
-      RECT 0.085000 0.885000 0.255000 1.455000 ;
-      RECT 0.085000 1.455000 0.465000 2.465000 ;
-      RECT 1.620000 0.885000 1.790000 1.545000 ;
-      RECT 1.620000 1.545000 2.290000 1.745000 ;
-      RECT 1.960000 0.255000 2.290000 0.660000 ;
-      RECT 1.960000 1.745000 2.290000 2.055000 ;
-      RECT 3.115000 0.885000 3.285000 1.075000 ;
-      RECT 3.115000 1.075000 4.545000 1.285000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.085000  0.255000 0.635000 0.660000 ;
+      RECT 0.085000  0.660000 2.290000 0.715000 ;
+      RECT 0.085000  0.715000 3.285000 0.885000 ;
+      RECT 0.085000  0.885000 0.255000 1.455000 ;
+      RECT 0.085000  1.455000 0.465000 2.465000 ;
+      RECT 1.120000  0.085000 1.450000 0.490000 ;
+      RECT 1.120000  2.255000 1.450000 2.635000 ;
+      RECT 1.620000  0.885000 1.790000 1.545000 ;
+      RECT 1.620000  1.545000 2.290000 1.745000 ;
+      RECT 1.960000  0.255000 2.290000 0.660000 ;
+      RECT 1.960000  1.745000 2.290000 2.055000 ;
+      RECT 2.845000  1.455000 3.175000 2.635000 ;
+      RECT 2.860000  0.085000 3.205000 0.545000 ;
+      RECT 3.115000  0.885000 3.285000 1.075000 ;
+      RECT 3.115000  1.075000 4.545000 1.285000 ;
+      RECT 3.875000  0.085000 4.045000 0.545000 ;
+      RECT 3.875000  1.795000 4.045000 2.635000 ;
+      RECT 4.715000  0.085000 4.885000 0.545000 ;
+      RECT 4.715000  1.795000 4.925000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__maj3_4
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
index 5734a97..7376d69 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_1.magic.lef
@@ -79,20 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 2.805000  0.085000 3.315000 0.620000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -102,36 +88,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.595000 1.495000 0.765000 2.635000 ;
-        RECT 3.135000 1.875000 3.305000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.995000 0.685000 1.325000 ;
-      RECT 0.515000 0.655000 1.445000 0.825000 ;
-      RECT 0.515000 0.825000 0.685000 0.995000 ;
-      RECT 1.270000 0.255000 1.800000 0.620000 ;
-      RECT 1.270000 0.620000 1.445000 0.655000 ;
-      RECT 1.275000 0.825000 1.445000 1.955000 ;
-      RECT 1.275000 1.955000 2.400000 2.125000 ;
-      RECT 2.825000 0.895000 4.055000 1.065000 ;
-      RECT 3.535000 0.290000 3.780000 0.895000 ;
-      RECT 3.540000 1.875000 4.055000 2.285000 ;
-      RECT 3.715000 1.065000 4.055000 1.875000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.430000  0.995000 0.685000 1.325000 ;
+      RECT 0.515000  0.085000 0.845000 0.485000 ;
+      RECT 0.515000  0.655000 1.445000 0.825000 ;
+      RECT 0.515000  0.825000 0.685000 0.995000 ;
+      RECT 0.595000  1.495000 0.765000 2.635000 ;
+      RECT 1.270000  0.255000 1.800000 0.620000 ;
+      RECT 1.270000  0.620000 1.445000 0.655000 ;
+      RECT 1.275000  0.825000 1.445000 1.955000 ;
+      RECT 1.275000  1.955000 2.400000 2.125000 ;
+      RECT 2.805000  0.085000 3.315000 0.620000 ;
+      RECT 2.825000  0.895000 4.055000 1.065000 ;
+      RECT 3.135000  1.875000 3.305000 2.635000 ;
+      RECT 3.535000  0.290000 3.780000 0.895000 ;
+      RECT 3.540000  1.875000 4.055000 2.285000 ;
+      RECT 3.715000  1.065000 4.055000 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
 END sky130_fd_sc_hd__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
index 11d80e9..2758bcf 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_2.magic.lef
@@ -76,21 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.885000 ;
-        RECT 0.935000  0.085000 1.265000 0.465000 ;
-        RECT 3.350000  0.085000 3.550000 0.585000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -100,41 +85,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.025000 2.175000 1.315000 2.635000 ;
-        RECT 3.325000 2.175000 3.545000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.855000 0.995000 1.165000 1.325000 ;
-      RECT 0.995000 0.635000 1.605000 0.805000 ;
-      RECT 0.995000 0.805000 1.165000 0.995000 ;
-      RECT 0.995000 1.325000 1.165000 1.835000 ;
-      RECT 0.995000 1.835000 1.655000 2.005000 ;
-      RECT 1.335000 0.995000 1.505000 1.495000 ;
-      RECT 1.335000 1.495000 1.995000 1.665000 ;
-      RECT 1.435000 0.295000 2.730000 0.465000 ;
-      RECT 1.435000 0.465000 1.605000 0.635000 ;
-      RECT 1.485000 2.005000 1.655000 2.255000 ;
-      RECT 1.485000 2.255000 2.795000 2.425000 ;
-      RECT 1.825000 1.665000 1.995000 1.835000 ;
-      RECT 1.825000 1.835000 4.050000 2.005000 ;
-      RECT 3.715000 2.005000 4.050000 2.465000 ;
-      RECT 3.720000 0.255000 4.050000 1.835000 ;
+      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.885000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.855000  0.995000 1.165000 1.325000 ;
+      RECT 0.935000  0.085000 1.265000 0.465000 ;
+      RECT 0.995000  0.635000 1.605000 0.805000 ;
+      RECT 0.995000  0.805000 1.165000 0.995000 ;
+      RECT 0.995000  1.325000 1.165000 1.835000 ;
+      RECT 0.995000  1.835000 1.655000 2.005000 ;
+      RECT 1.025000  2.175000 1.315000 2.635000 ;
+      RECT 1.335000  0.995000 1.505000 1.495000 ;
+      RECT 1.335000  1.495000 1.995000 1.665000 ;
+      RECT 1.435000  0.295000 2.730000 0.465000 ;
+      RECT 1.435000  0.465000 1.605000 0.635000 ;
+      RECT 1.485000  2.005000 1.655000 2.255000 ;
+      RECT 1.485000  2.255000 2.795000 2.425000 ;
+      RECT 1.825000  1.665000 1.995000 1.835000 ;
+      RECT 1.825000  1.835000 4.050000 2.005000 ;
+      RECT 3.325000  2.175000 3.545000 2.635000 ;
+      RECT 3.350000  0.085000 3.550000 0.585000 ;
+      RECT 3.715000  2.005000 4.050000 2.465000 ;
+      RECT 3.720000  0.255000 4.050000 1.835000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
index d56dae0..7926af0 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_4.magic.lef
@@ -81,25 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 3.415000  0.085000 3.745000 0.465000 ;
-        RECT 4.255000  0.085000 4.585000 0.465000 ;
-        RECT 5.095000  0.085000 5.425000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -109,47 +90,63 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 1.835000 0.820000 2.635000 ;
-        RECT 3.415000 2.255000 3.745000 2.635000 ;
-        RECT 4.255000 1.915000 4.585000 2.635000 ;
-        RECT 5.095000 1.915000 5.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 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.295000 0.345000 0.625000 ;
-      RECT 0.090000 0.625000 0.260000 1.495000 ;
-      RECT 0.090000 1.495000 1.080000 1.665000 ;
-      RECT 0.090000 1.665000 0.345000 2.465000 ;
-      RECT 0.910000 0.995000 1.080000 1.495000 ;
-      RECT 0.990000 1.935000 1.340000 2.275000 ;
-      RECT 0.990000 2.275000 2.770000 2.445000 ;
-      RECT 1.530000 1.935000 3.245000 2.105000 ;
-      RECT 1.975000 0.295000 3.230000 0.465000 ;
-      RECT 1.980000 1.595000 3.735000 1.765000 ;
-      RECT 3.060000 0.465000 3.230000 0.655000 ;
-      RECT 3.060000 0.655000 3.735000 0.825000 ;
-      RECT 3.075000 2.105000 3.245000 2.465000 ;
-      RECT 3.565000 0.825000 3.735000 1.075000 ;
-      RECT 3.565000 1.075000 5.030000 1.245000 ;
-      RECT 3.565000 1.245000 3.735000 1.595000 ;
-      RECT 3.565000 1.765000 3.735000 1.785000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.090000  0.295000 0.345000 0.625000 ;
+      RECT 0.090000  0.625000 0.260000 1.495000 ;
+      RECT 0.090000  1.495000 1.080000 1.665000 ;
+      RECT 0.090000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  1.835000 0.820000 2.635000 ;
+      RECT 0.910000  0.995000 1.080000 1.495000 ;
+      RECT 0.990000  1.935000 1.340000 2.275000 ;
+      RECT 0.990000  2.275000 2.770000 2.445000 ;
+      RECT 1.530000  1.935000 3.245000 2.105000 ;
+      RECT 1.975000  0.295000 3.230000 0.465000 ;
+      RECT 1.980000  1.595000 3.735000 1.765000 ;
+      RECT 3.060000  0.465000 3.230000 0.655000 ;
+      RECT 3.060000  0.655000 3.735000 0.825000 ;
+      RECT 3.075000  2.105000 3.245000 2.465000 ;
+      RECT 3.415000  0.085000 3.745000 0.465000 ;
+      RECT 3.415000  2.255000 3.745000 2.635000 ;
+      RECT 3.565000  0.825000 3.735000 1.075000 ;
+      RECT 3.565000  1.075000 5.030000 1.245000 ;
+      RECT 3.565000  1.245000 3.735000 1.595000 ;
+      RECT 3.565000  1.765000 3.735000 1.785000 ;
+      RECT 4.255000  0.085000 4.585000 0.465000 ;
+      RECT 4.255000  1.915000 4.585000 2.635000 ;
+      RECT 5.095000  0.085000 5.425000 0.465000 ;
+      RECT 5.095000  1.915000 5.425000 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
 END sky130_fd_sc_hd__mux2_4
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
index f405dc9..ac756b0 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_8.magic.lef
@@ -53,10 +53,16 @@
         RECT 4.290000 1.105000 4.475000 1.275000 ;
         RECT 4.305000 0.995000 4.475000 1.105000 ;
         RECT 4.305000 1.275000 4.475000 1.325000 ;
-        RECT 7.960000 0.995000 8.245000 1.325000 ;
       LAYER mcon ;
         RECT 4.290000 1.105000 4.460000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.960000 0.995000 8.245000 1.325000 ;
+      LAYER mcon ;
         RECT 7.960000 1.105000 8.130000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 4.230000 1.075000 4.520000 1.120000 ;
         RECT 4.230000 1.120000 8.190000 1.260000 ;
@@ -74,10 +80,16 @@
         RECT 3.795000 0.995000 3.965000 1.495000 ;
         RECT 3.795000 1.495000 6.035000 1.665000 ;
         RECT 5.670000 0.995000 6.035000 1.495000 ;
-        RECT 9.215000 0.995000 9.510000 1.615000 ;
       LAYER mcon ;
         RECT 5.670000 1.445000 5.840000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.215000 0.995000 9.510000 1.615000 ;
+      LAYER mcon ;
         RECT 9.340000 1.445000 9.510000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 5.610000 1.415000 5.900000 1.460000 ;
         RECT 5.610000 1.460000 9.570000 1.600000 ;
@@ -110,37 +122,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.465000 ;
-        RECT 0.935000  0.085000 1.265000 0.465000 ;
-        RECT 1.775000  0.085000 2.105000 0.465000 ;
-        RECT 2.615000  0.085000 2.945000 0.465000 ;
-        RECT 3.455000  0.085000 3.785000 0.465000 ;
-        RECT 6.060000  0.085000 6.390000 0.465000 ;
-        RECT 8.815000  0.085000 9.145000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -150,67 +131,94 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.090000 1.915000 0.425000 2.635000 ;
-        RECT 0.935000 1.915000 1.265000 2.635000 ;
-        RECT 1.775000 1.915000 2.105000 2.635000 ;
-        RECT 2.615000 1.915000 2.945000 2.635000 ;
-        RECT 3.455000 2.255000 3.785000 2.635000 ;
-        RECT 6.075000 2.175000 6.245000 2.635000 ;
-        RECT 8.815000 2.255000 9.145000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.985000 1.075000 3.625000 1.245000 ;
-      RECT 3.455000 0.635000 4.920000 0.805000 ;
-      RECT 3.455000 0.805000 3.625000 1.075000 ;
-      RECT 3.455000 1.245000 3.625000 1.835000 ;
-      RECT 3.455000 1.835000 8.225000 2.005000 ;
-      RECT 3.955000 0.295000 5.125000 0.465000 ;
-      RECT 3.955000 2.255000 5.905000 2.425000 ;
-      RECT 4.750000 0.805000 4.920000 0.935000 ;
-      RECT 6.345000 0.995000 6.515000 1.495000 ;
-      RECT 6.345000 1.495000 8.855000 1.665000 ;
-      RECT 6.480000 2.255000 8.645000 2.425000 ;
-      RECT 6.575000 0.295000 7.865000 0.465000 ;
-      RECT 7.115000 0.635000 7.670000 0.805000 ;
-      RECT 7.500000 0.805000 7.670000 0.935000 ;
-      RECT 8.685000 0.645000 9.485000 0.815000 ;
-      RECT 8.685000 0.815000 8.855000 1.495000 ;
-      RECT 8.685000 1.665000 8.855000 1.915000 ;
-      RECT 8.685000 1.915000 9.485000 2.085000 ;
-      RECT 9.315000 0.295000 9.485000 0.645000 ;
-      RECT 9.315000 1.795000 9.485000 1.915000 ;
-      RECT 9.315000 2.085000 9.485000 2.465000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.465000 ;
+      RECT 0.090000  1.915000 0.425000 2.635000 ;
+      RECT 0.935000  0.085000 1.265000 0.465000 ;
+      RECT 0.935000  1.915000 1.265000 2.635000 ;
+      RECT 0.985000  1.075000 3.625000 1.245000 ;
+      RECT 1.775000  0.085000 2.105000 0.465000 ;
+      RECT 1.775000  1.915000 2.105000 2.635000 ;
+      RECT 2.615000  0.085000 2.945000 0.465000 ;
+      RECT 2.615000  1.915000 2.945000 2.635000 ;
+      RECT 3.455000  0.085000 3.785000 0.465000 ;
+      RECT 3.455000  0.635000 4.920000 0.805000 ;
+      RECT 3.455000  0.805000 3.625000 1.075000 ;
+      RECT 3.455000  1.245000 3.625000 1.835000 ;
+      RECT 3.455000  1.835000 8.225000 2.005000 ;
+      RECT 3.455000  2.255000 3.785000 2.635000 ;
+      RECT 3.955000  0.295000 5.125000 0.465000 ;
+      RECT 3.955000  2.255000 5.905000 2.425000 ;
+      RECT 4.750000  0.805000 4.920000 0.935000 ;
+      RECT 6.060000  0.085000 6.390000 0.465000 ;
+      RECT 6.075000  2.175000 6.245000 2.635000 ;
+      RECT 6.345000  0.995000 6.515000 1.495000 ;
+      RECT 6.345000  1.495000 8.855000 1.665000 ;
+      RECT 6.480000  2.255000 8.645000 2.425000 ;
+      RECT 6.575000  0.295000 7.865000 0.465000 ;
+      RECT 7.115000  0.635000 7.670000 0.805000 ;
+      RECT 7.500000  0.805000 7.670000 0.935000 ;
+      RECT 8.685000  0.645000 9.485000 0.815000 ;
+      RECT 8.685000  0.815000 8.855000 1.495000 ;
+      RECT 8.685000  1.665000 8.855000 1.915000 ;
+      RECT 8.685000  1.915000 9.485000 2.085000 ;
+      RECT 8.815000  0.085000 9.145000 0.465000 ;
+      RECT 8.815000  2.255000 9.145000 2.635000 ;
+      RECT 9.315000  0.295000 9.485000 0.645000 ;
+      RECT 9.315000  1.795000 9.485000 1.915000 ;
+      RECT 9.315000  2.085000 9.485000 2.465000 ;
     LAYER mcon ;
-      RECT 4.750000 0.765000 4.920000 0.935000 ;
-      RECT 7.500000 0.765000 7.670000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 4.750000  0.765000 4.920000 0.935000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.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.500000  0.765000 7.670000 0.935000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
     LAYER met1 ;
       RECT 4.690000 0.735000 4.980000 0.780000 ;
       RECT 4.690000 0.780000 7.730000 0.920000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
index 206f72e..9ab0093 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.magic.lef
@@ -75,19 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 1.975000  0.085000 2.145000 0.545000 ;
-        RECT 3.335000  0.085000 3.555000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -97,41 +84,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 1.745000 1.835000 1.975000 2.635000 ;
-        RECT 3.295000 1.835000 3.590000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 1.805000 0.425000 ;
-      RECT 0.085000 0.425000 0.440000 0.465000 ;
-      RECT 0.085000 0.465000 0.345000 0.885000 ;
-      RECT 0.120000 1.455000 0.420000 2.295000 ;
-      RECT 0.120000 2.295000 1.575000 2.465000 ;
-      RECT 0.955000 0.655000 1.520000 0.715000 ;
-      RECT 0.955000 0.715000 2.620000 0.825000 ;
-      RECT 0.965000 0.425000 1.805000 0.465000 ;
-      RECT 1.295000 0.825000 2.620000 0.885000 ;
-      RECT 1.385000 1.075000 3.085000 1.310000 ;
-      RECT 1.405000 1.480000 2.615000 1.650000 ;
-      RECT 1.405000 1.650000 1.575000 2.295000 ;
-      RECT 2.285000 1.650000 2.615000 2.465000 ;
-      RECT 2.385000 0.255000 2.620000 0.715000 ;
-      RECT 2.800000 0.255000 3.165000 0.485000 ;
-      RECT 2.800000 0.485000 3.085000 1.075000 ;
-      RECT 2.860000 1.310000 3.085000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.255000 1.805000 0.425000 ;
+      RECT 0.085000  0.425000 0.440000 0.465000 ;
+      RECT 0.085000  0.465000 0.345000 0.885000 ;
+      RECT 0.120000  1.455000 0.420000 2.295000 ;
+      RECT 0.120000  2.295000 1.575000 2.465000 ;
+      RECT 0.955000  0.655000 1.520000 0.715000 ;
+      RECT 0.955000  0.715000 2.620000 0.825000 ;
+      RECT 0.965000  0.425000 1.805000 0.465000 ;
+      RECT 1.295000  0.825000 2.620000 0.885000 ;
+      RECT 1.385000  1.075000 3.085000 1.310000 ;
+      RECT 1.405000  1.480000 2.615000 1.650000 ;
+      RECT 1.405000  1.650000 1.575000 2.295000 ;
+      RECT 1.745000  1.835000 1.975000 2.635000 ;
+      RECT 1.975000  0.085000 2.145000 0.545000 ;
+      RECT 2.285000  1.650000 2.615000 2.465000 ;
+      RECT 2.385000  0.255000 2.620000 0.715000 ;
+      RECT 2.800000  0.255000 3.165000 0.485000 ;
+      RECT 2.800000  0.485000 3.085000 1.075000 ;
+      RECT 2.860000  1.310000 3.085000 2.465000 ;
+      RECT 3.295000  1.835000 3.590000 2.635000 ;
+      RECT 3.335000  0.085000 3.555000 0.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
 END sky130_fd_sc_hd__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
index f58a8ee..56685e6 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.magic.lef
@@ -75,23 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.515000  0.085000 0.835000 0.545000 ;
-        RECT 1.435000  0.085000 1.685000 0.885000 ;
-        RECT 2.275000  0.085000 2.445000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -101,55 +84,68 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 1.355000 2.255000 1.685000 2.635000 ;
-        RECT 2.275000 2.175000 2.525000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.675000 ;
-      RECT 0.085000 0.675000 0.260000 1.495000 ;
-      RECT 0.085000 1.495000 1.395000 1.665000 ;
-      RECT 0.085000 1.665000 0.260000 2.135000 ;
-      RECT 0.085000 2.135000 0.345000 2.465000 ;
-      RECT 0.935000 1.835000 1.735000 2.005000 ;
-      RECT 1.015000 0.575000 1.255000 0.935000 ;
-      RECT 1.225000 1.155000 1.985000 1.325000 ;
-      RECT 1.225000 1.325000 1.395000 1.495000 ;
-      RECT 1.565000 1.495000 3.465000 1.665000 ;
-      RECT 1.565000 1.665000 1.735000 1.835000 ;
-      RECT 1.655000 1.075000 1.985000 1.155000 ;
-      RECT 1.855000 0.295000 2.025000 0.735000 ;
-      RECT 1.855000 0.735000 3.465000 0.905000 ;
-      RECT 1.855000 2.135000 2.080000 2.465000 ;
-      RECT 1.910000 1.835000 2.885000 1.915000 ;
-      RECT 1.910000 1.915000 4.350000 2.005000 ;
-      RECT 1.910000 2.005000 2.080000 2.135000 ;
-      RECT 2.715000 2.005000 4.350000 2.085000 ;
-      RECT 3.135000 0.655000 3.465000 0.735000 ;
-      RECT 3.135000 1.665000 3.465000 1.715000 ;
-      RECT 3.850000 0.655000 4.345000 0.825000 ;
-      RECT 3.850000 0.825000 4.105000 0.935000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.675000 ;
+      RECT 0.085000  0.675000 0.260000 1.495000 ;
+      RECT 0.085000  1.495000 1.395000 1.665000 ;
+      RECT 0.085000  1.665000 0.260000 2.135000 ;
+      RECT 0.085000  2.135000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.835000 0.545000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 0.935000  1.835000 1.735000 2.005000 ;
+      RECT 1.015000  0.575000 1.255000 0.935000 ;
+      RECT 1.225000  1.155000 1.985000 1.325000 ;
+      RECT 1.225000  1.325000 1.395000 1.495000 ;
+      RECT 1.355000  2.255000 1.685000 2.635000 ;
+      RECT 1.435000  0.085000 1.685000 0.885000 ;
+      RECT 1.565000  1.495000 3.465000 1.665000 ;
+      RECT 1.565000  1.665000 1.735000 1.835000 ;
+      RECT 1.655000  1.075000 1.985000 1.155000 ;
+      RECT 1.855000  0.295000 2.025000 0.735000 ;
+      RECT 1.855000  0.735000 3.465000 0.905000 ;
+      RECT 1.855000  2.135000 2.080000 2.465000 ;
+      RECT 1.910000  1.835000 2.885000 1.915000 ;
+      RECT 1.910000  1.915000 4.350000 2.005000 ;
+      RECT 1.910000  2.005000 2.080000 2.135000 ;
+      RECT 2.275000  0.085000 2.445000 0.545000 ;
+      RECT 2.275000  2.175000 2.525000 2.635000 ;
+      RECT 2.715000  2.005000 4.350000 2.085000 ;
+      RECT 3.135000  0.655000 3.465000 0.735000 ;
+      RECT 3.135000  1.665000 3.465000 1.715000 ;
+      RECT 3.850000  0.655000 4.345000 0.825000 ;
+      RECT 3.850000  0.825000 4.105000 0.935000 ;
     LAYER mcon ;
-      RECT 1.070000 0.765000 1.240000 0.935000 ;
-      RECT 3.850000 0.765000 4.020000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  0.765000 1.240000 0.935000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 3.850000  0.765000 4.020000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
     LAYER met1 ;
       RECT 1.010000 0.735000 1.300000 0.780000 ;
       RECT 1.010000 0.780000 4.080000 0.920000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
index 43519b8..a21677a 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.magic.lef
@@ -77,32 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 3.975000  0.085000 4.305000 0.465000 ;
-        RECT 4.815000  0.085000 5.145000 0.465000 ;
-        RECT 5.655000  0.085000 5.980000 0.590000 ;
-        RECT 6.545000  0.085000 6.795000 0.545000 ;
-        RECT 7.435000  0.085000 7.765000 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
@@ -112,62 +86,84 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 3.975000 2.255000 4.305000 2.635000 ;
-        RECT 4.815000 2.255000 5.145000 2.635000 ;
-        RECT 5.655000 2.255000 5.985000 2.635000 ;
-        RECT 6.495000 2.255000 6.825000 2.635000 ;
-        RECT 7.435000 2.255000 7.765000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.655000 1.700000 0.825000 ;
-      RECT 0.515000 1.575000 5.580000 1.745000 ;
-      RECT 1.355000 0.825000 1.700000 0.935000 ;
-      RECT 2.195000 0.655000 5.485000 0.825000 ;
-      RECT 2.195000 1.915000 7.165000 2.085000 ;
-      RECT 4.475000 0.255000 4.645000 0.655000 ;
-      RECT 5.315000 0.255000 5.485000 0.655000 ;
-      RECT 6.150000 0.255000 6.325000 0.715000 ;
-      RECT 6.150000 0.715000 7.165000 0.905000 ;
-      RECT 6.150000 0.905000 6.450000 0.935000 ;
-      RECT 6.155000 1.795000 6.325000 1.915000 ;
-      RECT 6.155000 2.085000 6.325000 2.465000 ;
-      RECT 6.730000 1.075000 7.510000 1.245000 ;
-      RECT 6.995000 0.510000 7.165000 0.715000 ;
-      RECT 6.995000 1.795000 7.165000 1.915000 ;
-      RECT 6.995000 2.085000 7.165000 2.465000 ;
-      RECT 7.340000 0.655000 8.195000 0.825000 ;
-      RECT 7.340000 0.825000 7.510000 1.075000 ;
-      RECT 7.935000 0.255000 8.195000 0.655000 ;
-      RECT 7.935000 1.795000 8.195000 2.465000 ;
-      RECT 8.020000 0.825000 8.195000 1.795000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.515000  0.655000 1.700000 0.825000 ;
+      RECT 0.515000  1.575000 5.580000 1.745000 ;
+      RECT 1.355000  0.825000 1.700000 0.935000 ;
+      RECT 2.195000  0.655000 5.485000 0.825000 ;
+      RECT 2.195000  1.915000 7.165000 2.085000 ;
+      RECT 3.975000  0.085000 4.305000 0.465000 ;
+      RECT 3.975000  2.255000 4.305000 2.635000 ;
+      RECT 4.475000  0.255000 4.645000 0.655000 ;
+      RECT 4.815000  0.085000 5.145000 0.465000 ;
+      RECT 4.815000  2.255000 5.145000 2.635000 ;
+      RECT 5.315000  0.255000 5.485000 0.655000 ;
+      RECT 5.655000  0.085000 5.980000 0.590000 ;
+      RECT 5.655000  2.255000 5.985000 2.635000 ;
+      RECT 6.150000  0.255000 6.325000 0.715000 ;
+      RECT 6.150000  0.715000 7.165000 0.905000 ;
+      RECT 6.150000  0.905000 6.450000 0.935000 ;
+      RECT 6.155000  1.795000 6.325000 1.915000 ;
+      RECT 6.155000  2.085000 6.325000 2.465000 ;
+      RECT 6.495000  2.255000 6.825000 2.635000 ;
+      RECT 6.545000  0.085000 6.795000 0.545000 ;
+      RECT 6.730000  1.075000 7.510000 1.245000 ;
+      RECT 6.995000  0.510000 7.165000 0.715000 ;
+      RECT 6.995000  1.795000 7.165000 1.915000 ;
+      RECT 6.995000  2.085000 7.165000 2.465000 ;
+      RECT 7.340000  0.655000 8.195000 0.825000 ;
+      RECT 7.340000  0.825000 7.510000 1.075000 ;
+      RECT 7.435000  0.085000 7.765000 0.465000 ;
+      RECT 7.435000  2.255000 7.765000 2.635000 ;
+      RECT 7.935000  0.255000 8.195000 0.655000 ;
+      RECT 7.935000  1.795000 8.195000 2.465000 ;
+      RECT 8.020000  0.825000 8.195000 1.795000 ;
     LAYER mcon ;
-      RECT 1.530000 0.765000 1.700000 0.935000 ;
-      RECT 6.150000 0.765000 6.320000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.530000  0.765000 1.700000 0.935000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.150000  0.765000 6.320000 0.935000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.470000 0.735000 1.760000 0.780000 ;
       RECT 1.470000 0.780000 6.380000 0.920000 ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
index 09592bb..54884a4 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_1.magic.lef
@@ -98,35 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 2.800000  0.085000 3.090000 0.805000 ;
-        RECT 5.150000  0.085000 5.320000 0.545000 ;
-        RECT 6.010000  0.085000 6.340000 0.465000 ;
-        RECT 8.895000  0.085000 9.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 ;
-        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
@@ -136,118 +107,143 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 3.235000 2.255000 3.565000 2.635000 ;
-        RECT 5.060000 2.255000 5.390000 2.635000 ;
-        RECT 5.980000 2.255000 6.330000 2.635000 ;
-        RECT 8.815000 2.255000 9.145000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.175000 0.260000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 1.185000 0.805000 ;
-      RECT 0.175000 1.795000 1.705000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 1.015000 0.255000 2.090000 0.425000 ;
-      RECT 1.015000 0.425000 1.185000 0.635000 ;
-      RECT 1.015000 2.135000 1.185000 2.295000 ;
-      RECT 1.015000 2.295000 2.545000 2.465000 ;
-      RECT 1.410000 0.595000 1.750000 0.765000 ;
-      RECT 1.410000 0.765000 1.700000 0.935000 ;
-      RECT 1.410000 0.935000 1.580000 1.455000 ;
-      RECT 1.410000 1.455000 2.045000 1.625000 ;
-      RECT 1.535000 1.965000 1.705000 2.125000 ;
-      RECT 1.875000 1.625000 2.045000 1.955000 ;
-      RECT 1.875000 1.955000 2.205000 2.125000 ;
-      RECT 1.920000 0.425000 2.090000 0.760000 ;
-      RECT 2.080000 1.105000 2.620000 1.285000 ;
-      RECT 2.260000 0.430000 2.620000 1.105000 ;
-      RECT 2.260000 1.285000 2.620000 1.395000 ;
-      RECT 2.260000 1.395000 3.065000 1.625000 ;
-      RECT 2.375000 1.795000 2.545000 2.295000 ;
-      RECT 2.715000 1.625000 3.065000 2.465000 ;
-      RECT 3.380000 0.255000 4.980000 0.425000 ;
-      RECT 3.380000 0.425000 3.550000 0.795000 ;
-      RECT 3.720000 0.595000 4.050000 0.845000 ;
-      RECT 3.735000 0.845000 4.050000 0.920000 ;
-      RECT 3.735000 0.920000 3.905000 1.445000 ;
-      RECT 3.735000 1.445000 4.495000 1.615000 ;
-      RECT 3.825000 1.785000 3.995000 2.295000 ;
-      RECT 3.825000 2.295000 4.835000 2.465000 ;
-      RECT 4.075000 1.095000 4.405000 1.105000 ;
-      RECT 4.075000 1.105000 4.460000 1.265000 ;
-      RECT 4.165000 1.615000 4.495000 2.125000 ;
-      RECT 4.220000 0.595000 4.390000 0.715000 ;
-      RECT 4.220000 0.715000 5.740000 0.885000 ;
-      RECT 4.220000 0.885000 4.390000 0.925000 ;
-      RECT 4.290000 1.265000 4.460000 1.275000 ;
-      RECT 4.625000 0.425000 4.980000 0.465000 ;
-      RECT 4.665000 1.915000 5.730000 2.085000 ;
-      RECT 4.665000 2.085000 4.835000 2.295000 ;
-      RECT 5.495000 0.295000 5.740000 0.715000 ;
-      RECT 5.560000 2.085000 5.730000 2.465000 ;
-      RECT 6.500000 2.135000 6.685000 2.465000 ;
-      RECT 6.510000 0.325000 6.685000 0.655000 ;
-      RECT 6.515000 0.655000 6.685000 1.105000 ;
-      RECT 6.515000 1.105000 6.805000 1.275000 ;
-      RECT 6.515000 1.275000 6.685000 2.135000 ;
-      RECT 6.980000 0.765000 7.220000 0.935000 ;
-      RECT 6.980000 0.935000 7.150000 2.135000 ;
-      RECT 6.980000 2.135000 7.190000 2.465000 ;
-      RECT 7.030000 0.255000 7.200000 0.415000 ;
-      RECT 7.030000 0.415000 7.560000 0.585000 ;
-      RECT 7.360000 2.255000 7.690000 2.295000 ;
-      RECT 7.360000 2.295000 8.645000 2.465000 ;
-      RECT 7.390000 0.585000 7.560000 1.755000 ;
-      RECT 7.390000 1.755000 8.175000 1.985000 ;
-      RECT 7.730000 0.255000 8.725000 0.425000 ;
-      RECT 7.730000 0.425000 7.900000 0.585000 ;
-      RECT 7.845000 1.985000 8.175000 2.125000 ;
-      RECT 7.970000 0.765000 8.385000 0.925000 ;
-      RECT 7.970000 0.925000 8.380000 0.935000 ;
-      RECT 8.190000 1.105000 8.645000 1.275000 ;
-      RECT 8.210000 0.595000 8.385000 0.765000 ;
-      RECT 8.475000 1.665000 9.125000 1.835000 ;
-      RECT 8.475000 1.835000 8.645000 2.295000 ;
-      RECT 8.555000 0.425000 8.725000 0.715000 ;
-      RECT 8.555000 0.715000 9.125000 0.885000 ;
-      RECT 8.955000 0.885000 9.125000 1.665000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.175000  0.260000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 1.185000 0.805000 ;
+      RECT 0.175000  1.795000 1.705000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 1.015000  0.255000 2.090000 0.425000 ;
+      RECT 1.015000  0.425000 1.185000 0.635000 ;
+      RECT 1.015000  2.135000 1.185000 2.295000 ;
+      RECT 1.015000  2.295000 2.545000 2.465000 ;
+      RECT 1.410000  0.595000 1.750000 0.765000 ;
+      RECT 1.410000  0.765000 1.700000 0.935000 ;
+      RECT 1.410000  0.935000 1.580000 1.455000 ;
+      RECT 1.410000  1.455000 2.045000 1.625000 ;
+      RECT 1.535000  1.965000 1.705000 2.125000 ;
+      RECT 1.875000  1.625000 2.045000 1.955000 ;
+      RECT 1.875000  1.955000 2.205000 2.125000 ;
+      RECT 1.920000  0.425000 2.090000 0.760000 ;
+      RECT 2.080000  1.105000 2.620000 1.285000 ;
+      RECT 2.260000  0.430000 2.620000 1.105000 ;
+      RECT 2.260000  1.285000 2.620000 1.395000 ;
+      RECT 2.260000  1.395000 3.065000 1.625000 ;
+      RECT 2.375000  1.795000 2.545000 2.295000 ;
+      RECT 2.715000  1.625000 3.065000 2.465000 ;
+      RECT 2.800000  0.085000 3.090000 0.805000 ;
+      RECT 3.235000  2.255000 3.565000 2.635000 ;
+      RECT 3.380000  0.255000 4.980000 0.425000 ;
+      RECT 3.380000  0.425000 3.550000 0.795000 ;
+      RECT 3.720000  0.595000 4.050000 0.845000 ;
+      RECT 3.735000  0.845000 4.050000 0.920000 ;
+      RECT 3.735000  0.920000 3.905000 1.445000 ;
+      RECT 3.735000  1.445000 4.495000 1.615000 ;
+      RECT 3.825000  1.785000 3.995000 2.295000 ;
+      RECT 3.825000  2.295000 4.835000 2.465000 ;
+      RECT 4.075000  1.095000 4.405000 1.105000 ;
+      RECT 4.075000  1.105000 4.460000 1.265000 ;
+      RECT 4.165000  1.615000 4.495000 2.125000 ;
+      RECT 4.220000  0.595000 4.390000 0.715000 ;
+      RECT 4.220000  0.715000 5.740000 0.885000 ;
+      RECT 4.220000  0.885000 4.390000 0.925000 ;
+      RECT 4.290000  1.265000 4.460000 1.275000 ;
+      RECT 4.625000  0.425000 4.980000 0.465000 ;
+      RECT 4.665000  1.915000 5.730000 2.085000 ;
+      RECT 4.665000  2.085000 4.835000 2.295000 ;
+      RECT 5.060000  2.255000 5.390000 2.635000 ;
+      RECT 5.150000  0.085000 5.320000 0.545000 ;
+      RECT 5.495000  0.295000 5.740000 0.715000 ;
+      RECT 5.560000  2.085000 5.730000 2.465000 ;
+      RECT 5.980000  2.255000 6.330000 2.635000 ;
+      RECT 6.010000  0.085000 6.340000 0.465000 ;
+      RECT 6.500000  2.135000 6.685000 2.465000 ;
+      RECT 6.510000  0.325000 6.685000 0.655000 ;
+      RECT 6.515000  0.655000 6.685000 1.105000 ;
+      RECT 6.515000  1.105000 6.805000 1.275000 ;
+      RECT 6.515000  1.275000 6.685000 2.135000 ;
+      RECT 6.980000  0.765000 7.220000 0.935000 ;
+      RECT 6.980000  0.935000 7.150000 2.135000 ;
+      RECT 6.980000  2.135000 7.190000 2.465000 ;
+      RECT 7.030000  0.255000 7.200000 0.415000 ;
+      RECT 7.030000  0.415000 7.560000 0.585000 ;
+      RECT 7.360000  2.255000 7.690000 2.295000 ;
+      RECT 7.360000  2.295000 8.645000 2.465000 ;
+      RECT 7.390000  0.585000 7.560000 1.755000 ;
+      RECT 7.390000  1.755000 8.175000 1.985000 ;
+      RECT 7.730000  0.255000 8.725000 0.425000 ;
+      RECT 7.730000  0.425000 7.900000 0.585000 ;
+      RECT 7.845000  1.985000 8.175000 2.125000 ;
+      RECT 7.970000  0.765000 8.385000 0.925000 ;
+      RECT 7.970000  0.925000 8.380000 0.935000 ;
+      RECT 8.190000  1.105000 8.645000 1.275000 ;
+      RECT 8.210000  0.595000 8.385000 0.765000 ;
+      RECT 8.475000  1.665000 9.125000 1.835000 ;
+      RECT 8.475000  1.835000 8.645000 2.295000 ;
+      RECT 8.555000  0.425000 8.725000 0.715000 ;
+      RECT 8.555000  0.715000 9.125000 0.885000 ;
+      RECT 8.815000  2.255000 9.145000 2.635000 ;
+      RECT 8.895000  0.085000 9.065000 0.545000 ;
+      RECT 8.955000  0.885000 9.125000 1.665000 ;
     LAYER mcon ;
-      RECT 1.530000 0.765000 1.700000 0.935000 ;
-      RECT 2.450000 1.105000 2.620000 1.275000 ;
-      RECT 4.290000 1.105000 4.460000 1.275000 ;
-      RECT 4.325000 1.785000 4.495000 1.955000 ;
-      RECT 6.635000 1.105000 6.805000 1.275000 ;
-      RECT 7.050000 0.765000 7.220000 0.935000 ;
-      RECT 7.555000 1.785000 7.725000 1.955000 ;
-      RECT 8.475000 1.105000 8.645000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.530000  0.765000 1.700000 0.935000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.450000  1.105000 2.620000 1.275000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.290000  1.105000 4.460000 1.275000 ;
+      RECT 4.325000  1.785000 4.495000 1.955000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.635000  1.105000 6.805000 1.275000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.050000  0.765000 7.220000 0.935000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.555000  1.785000 7.725000 1.955000 ;
+      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.475000  1.105000 8.645000 1.275000 ;
+      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 1.470000 0.735000 1.760000 0.780000 ;
       RECT 1.470000 0.780000 8.200000 0.920000 ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
index bb8d1ef..3542e22 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_2.magic.lef
@@ -77,13 +77,23 @@
     PORT
       LAYER li1 ;
         RECT 0.145000 0.975000 0.325000 1.745000 ;
-        RECT 1.005000 1.445000 1.390000 1.615000 ;
-        RECT 1.220000 1.285000 1.390000 1.445000 ;
-        RECT 6.125000 1.245000 6.465000 1.645000 ;
       LAYER mcon ;
         RECT 0.145000 1.445000 0.315000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.005000 1.445000 1.390000 1.615000 ;
+        RECT 1.220000 1.285000 1.390000 1.445000 ;
+      LAYER mcon ;
         RECT 1.065000 1.445000 1.235000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.125000 1.245000 6.465000 1.645000 ;
+      LAYER mcon ;
         RECT 6.125000 1.445000 6.295000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.085000 1.415000 0.375000 1.460000 ;
         RECT 0.085000 1.460000 6.355000 1.600000 ;
@@ -120,32 +130,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 2.450000  0.085000 2.780000 0.545000 ;
-        RECT 4.795000  0.085000 5.125000 0.545000 ;
-        RECT 7.015000  0.085000 7.265000 0.815000 ;
-        RECT 7.935000  0.085000 8.190000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -155,88 +139,110 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 2.595000 2.055000 2.825000 2.635000 ;
-        RECT 4.755000 2.005000 5.100000 2.635000 ;
-        RECT 7.015000 1.835000 7.185000 2.635000 ;
-        RECT 7.935000 1.495000 8.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.345000 0.345000 0.635000 ;
-      RECT 0.170000 0.635000 0.665000 0.805000 ;
-      RECT 0.175000 1.915000 1.900000 1.955000 ;
-      RECT 0.175000 1.955000 0.665000 2.085000 ;
-      RECT 0.175000 2.085000 0.345000 2.375000 ;
-      RECT 0.495000 0.805000 0.665000 1.785000 ;
-      RECT 0.495000 1.785000 1.900000 1.915000 ;
-      RECT 1.405000 0.705000 1.730000 1.035000 ;
-      RECT 1.410000 2.125000 2.240000 2.295000 ;
-      RECT 1.470000 0.365000 2.070000 0.535000 ;
-      RECT 1.560000 1.035000 1.730000 1.575000 ;
-      RECT 1.560000 1.575000 1.900000 1.785000 ;
-      RECT 1.900000 0.535000 2.070000 1.235000 ;
-      RECT 1.900000 1.235000 2.240000 1.405000 ;
-      RECT 2.070000 1.405000 2.240000 2.125000 ;
-      RECT 2.970000 1.785000 3.315000 1.955000 ;
-      RECT 2.985000 0.295000 3.415000 0.465000 ;
-      RECT 3.145000 1.490000 3.415000 1.660000 ;
-      RECT 3.145000 1.660000 3.315000 1.785000 ;
-      RECT 3.245000 0.465000 3.415000 1.060000 ;
-      RECT 3.245000 1.060000 3.480000 1.390000 ;
-      RECT 3.245000 1.390000 3.415000 1.490000 ;
-      RECT 3.305000 2.125000 3.820000 2.295000 ;
-      RECT 3.565000 1.810000 3.820000 2.125000 ;
-      RECT 3.585000 0.345000 3.820000 0.675000 ;
-      RECT 3.650000 0.675000 3.820000 1.810000 ;
-      RECT 3.990000 0.345000 4.180000 2.125000 ;
-      RECT 3.990000 2.125000 4.515000 2.295000 ;
-      RECT 4.395000 0.255000 4.600000 0.585000 ;
-      RECT 4.395000 0.585000 4.565000 1.565000 ;
-      RECT 4.395000 1.565000 5.495000 1.735000 ;
-      RECT 4.395000 1.735000 4.585000 1.895000 ;
-      RECT 5.325000 0.295000 6.220000 0.465000 ;
-      RECT 5.325000 0.465000 5.495000 1.565000 ;
-      RECT 5.325000 1.735000 5.495000 2.155000 ;
-      RECT 5.325000 2.155000 6.275000 2.325000 ;
-      RECT 5.665000 0.705000 6.285000 1.035000 ;
-      RECT 5.665000 1.035000 5.955000 1.985000 ;
-      RECT 6.525000 2.125000 6.845000 2.295000 ;
-      RECT 6.675000 1.495000 7.285000 1.665000 ;
-      RECT 6.675000 1.665000 6.845000 2.125000 ;
-      RECT 7.115000 0.995000 7.425000 1.325000 ;
-      RECT 7.115000 1.325000 7.285000 1.495000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.170000  0.345000 0.345000 0.635000 ;
+      RECT 0.170000  0.635000 0.665000 0.805000 ;
+      RECT 0.175000  1.915000 1.900000 1.955000 ;
+      RECT 0.175000  1.955000 0.665000 2.085000 ;
+      RECT 0.175000  2.085000 0.345000 2.375000 ;
+      RECT 0.495000  0.805000 0.665000 1.785000 ;
+      RECT 0.495000  1.785000 1.900000 1.915000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 1.405000  0.705000 1.730000 1.035000 ;
+      RECT 1.410000  2.125000 2.240000 2.295000 ;
+      RECT 1.470000  0.365000 2.070000 0.535000 ;
+      RECT 1.560000  1.035000 1.730000 1.575000 ;
+      RECT 1.560000  1.575000 1.900000 1.785000 ;
+      RECT 1.900000  0.535000 2.070000 1.235000 ;
+      RECT 1.900000  1.235000 2.240000 1.405000 ;
+      RECT 2.070000  1.405000 2.240000 2.125000 ;
+      RECT 2.450000  0.085000 2.780000 0.545000 ;
+      RECT 2.595000  2.055000 2.825000 2.635000 ;
+      RECT 2.970000  1.785000 3.315000 1.955000 ;
+      RECT 2.985000  0.295000 3.415000 0.465000 ;
+      RECT 3.145000  1.490000 3.415000 1.660000 ;
+      RECT 3.145000  1.660000 3.315000 1.785000 ;
+      RECT 3.245000  0.465000 3.415000 1.060000 ;
+      RECT 3.245000  1.060000 3.480000 1.390000 ;
+      RECT 3.245000  1.390000 3.415000 1.490000 ;
+      RECT 3.305000  2.125000 3.820000 2.295000 ;
+      RECT 3.565000  1.810000 3.820000 2.125000 ;
+      RECT 3.585000  0.345000 3.820000 0.675000 ;
+      RECT 3.650000  0.675000 3.820000 1.810000 ;
+      RECT 3.990000  0.345000 4.180000 2.125000 ;
+      RECT 3.990000  2.125000 4.515000 2.295000 ;
+      RECT 4.395000  0.255000 4.600000 0.585000 ;
+      RECT 4.395000  0.585000 4.565000 1.565000 ;
+      RECT 4.395000  1.565000 5.495000 1.735000 ;
+      RECT 4.395000  1.735000 4.585000 1.895000 ;
+      RECT 4.755000  2.005000 5.100000 2.635000 ;
+      RECT 4.795000  0.085000 5.125000 0.545000 ;
+      RECT 5.325000  0.295000 6.220000 0.465000 ;
+      RECT 5.325000  0.465000 5.495000 1.565000 ;
+      RECT 5.325000  1.735000 5.495000 2.155000 ;
+      RECT 5.325000  2.155000 6.275000 2.325000 ;
+      RECT 5.665000  0.705000 6.285000 1.035000 ;
+      RECT 5.665000  1.035000 5.955000 1.985000 ;
+      RECT 6.525000  2.125000 6.845000 2.295000 ;
+      RECT 6.675000  1.495000 7.285000 1.665000 ;
+      RECT 6.675000  1.665000 6.845000 2.125000 ;
+      RECT 7.015000  0.085000 7.265000 0.815000 ;
+      RECT 7.015000  1.835000 7.185000 2.635000 ;
+      RECT 7.115000  0.995000 7.425000 1.325000 ;
+      RECT 7.115000  1.325000 7.285000 1.495000 ;
+      RECT 7.935000  0.085000 8.190000 0.885000 ;
+      RECT 7.935000  1.495000 8.185000 2.635000 ;
     LAYER mcon ;
-      RECT 1.525000 1.785000 1.695000 1.955000 ;
-      RECT 1.985000 2.125000 2.155000 2.295000 ;
-      RECT 3.365000 2.125000 3.535000 2.295000 ;
-      RECT 4.285000 2.125000 4.455000 2.295000 ;
-      RECT 5.665000 1.785000 5.835000 1.955000 ;
-      RECT 6.585000 2.125000 6.755000 2.295000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  1.785000 1.695000 1.955000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.125000 2.155000 2.295000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.125000 3.535000 2.295000 ;
+      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.125000 4.455000 2.295000 ;
+      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  1.785000 5.835000 1.955000 ;
+      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.125000 6.755000 2.295000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.465000 1.755000 1.755000 1.800000 ;
       RECT 1.465000 1.800000 5.895000 1.940000 ;
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
index a7d7741..7c5df71 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_4.magic.lef
@@ -77,13 +77,23 @@
     PORT
       LAYER li1 ;
         RECT 0.150000 0.975000 0.330000 1.745000 ;
-        RECT 1.010000 1.445000 1.395000 1.615000 ;
-        RECT 1.225000 1.285000 1.395000 1.445000 ;
-        RECT 6.130000 1.245000 6.470000 1.645000 ;
       LAYER mcon ;
         RECT 0.150000 1.445000 0.320000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 1.010000 1.445000 1.395000 1.615000 ;
+        RECT 1.225000 1.285000 1.395000 1.445000 ;
+      LAYER mcon ;
         RECT 1.070000 1.445000 1.240000 1.615000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 6.130000 1.245000 6.470000 1.645000 ;
+      LAYER mcon ;
         RECT 6.130000 1.445000 6.300000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.085000 1.415000 0.380000 1.460000 ;
         RECT 0.085000 1.460000 6.360000 1.600000 ;
@@ -124,35 +134,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 2.455000  0.085000 2.785000 0.545000 ;
-        RECT 4.800000  0.085000 5.130000 0.545000 ;
-        RECT 7.020000  0.085000 7.270000 0.815000 ;
-        RECT 7.940000  0.085000 8.190000 0.885000 ;
-        RECT 8.855000  0.085000 9.105000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -162,91 +143,116 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.515000 2.255000 0.845000 2.635000 ;
-        RECT 2.600000 2.055000 2.830000 2.635000 ;
-        RECT 4.760000 2.005000 5.105000 2.635000 ;
-        RECT 7.020000 1.835000 7.190000 2.635000 ;
-        RECT 7.940000 1.495000 8.190000 2.635000 ;
-        RECT 8.855000 1.495000 9.105000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.345000 0.345000 0.635000 ;
-      RECT 0.135000 0.635000 0.670000 0.805000 ;
-      RECT 0.135000 1.915000 1.905000 1.955000 ;
-      RECT 0.135000 1.955000 0.670000 2.085000 ;
-      RECT 0.135000 2.085000 0.345000 2.375000 ;
-      RECT 0.500000 0.805000 0.670000 1.785000 ;
-      RECT 0.500000 1.785000 1.905000 1.915000 ;
-      RECT 1.410000 0.705000 1.735000 1.035000 ;
-      RECT 1.415000 2.125000 2.245000 2.295000 ;
-      RECT 1.475000 0.365000 2.075000 0.535000 ;
-      RECT 1.565000 1.035000 1.735000 1.575000 ;
-      RECT 1.565000 1.575000 1.905000 1.785000 ;
-      RECT 1.905000 0.535000 2.075000 1.235000 ;
-      RECT 1.905000 1.235000 2.245000 1.405000 ;
-      RECT 2.075000 1.405000 2.245000 2.125000 ;
-      RECT 2.975000 1.785000 3.320000 1.955000 ;
-      RECT 2.990000 0.295000 3.420000 0.465000 ;
-      RECT 3.150000 1.490000 3.420000 1.660000 ;
-      RECT 3.150000 1.660000 3.320000 1.785000 ;
-      RECT 3.250000 0.465000 3.420000 1.060000 ;
-      RECT 3.250000 1.060000 3.485000 1.390000 ;
-      RECT 3.250000 1.390000 3.420000 1.490000 ;
-      RECT 3.310000 2.125000 3.825000 2.295000 ;
-      RECT 3.575000 1.810000 3.825000 2.125000 ;
-      RECT 3.590000 0.345000 3.825000 0.675000 ;
-      RECT 3.655000 0.675000 3.825000 1.810000 ;
-      RECT 3.995000 0.345000 4.185000 2.125000 ;
-      RECT 3.995000 2.125000 4.520000 2.295000 ;
-      RECT 4.400000 0.255000 4.605000 0.585000 ;
-      RECT 4.400000 0.585000 4.570000 1.565000 ;
-      RECT 4.400000 1.565000 5.500000 1.735000 ;
-      RECT 4.400000 1.735000 4.590000 1.895000 ;
-      RECT 5.330000 0.295000 6.225000 0.465000 ;
-      RECT 5.330000 0.465000 5.500000 1.565000 ;
-      RECT 5.330000 1.735000 5.500000 2.155000 ;
-      RECT 5.330000 2.155000 6.280000 2.325000 ;
-      RECT 5.670000 0.705000 6.290000 1.035000 ;
-      RECT 5.670000 1.035000 5.960000 1.985000 ;
-      RECT 6.530000 2.125000 6.850000 2.295000 ;
-      RECT 6.680000 1.495000 7.290000 1.665000 ;
-      RECT 6.680000 1.665000 6.850000 2.125000 ;
-      RECT 7.120000 0.995000 7.430000 1.325000 ;
-      RECT 7.120000 1.325000 7.290000 1.495000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.135000  0.345000 0.345000 0.635000 ;
+      RECT 0.135000  0.635000 0.670000 0.805000 ;
+      RECT 0.135000  1.915000 1.905000 1.955000 ;
+      RECT 0.135000  1.955000 0.670000 2.085000 ;
+      RECT 0.135000  2.085000 0.345000 2.375000 ;
+      RECT 0.500000  0.805000 0.670000 1.785000 ;
+      RECT 0.500000  1.785000 1.905000 1.915000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.255000 0.845000 2.635000 ;
+      RECT 1.410000  0.705000 1.735000 1.035000 ;
+      RECT 1.415000  2.125000 2.245000 2.295000 ;
+      RECT 1.475000  0.365000 2.075000 0.535000 ;
+      RECT 1.565000  1.035000 1.735000 1.575000 ;
+      RECT 1.565000  1.575000 1.905000 1.785000 ;
+      RECT 1.905000  0.535000 2.075000 1.235000 ;
+      RECT 1.905000  1.235000 2.245000 1.405000 ;
+      RECT 2.075000  1.405000 2.245000 2.125000 ;
+      RECT 2.455000  0.085000 2.785000 0.545000 ;
+      RECT 2.600000  2.055000 2.830000 2.635000 ;
+      RECT 2.975000  1.785000 3.320000 1.955000 ;
+      RECT 2.990000  0.295000 3.420000 0.465000 ;
+      RECT 3.150000  1.490000 3.420000 1.660000 ;
+      RECT 3.150000  1.660000 3.320000 1.785000 ;
+      RECT 3.250000  0.465000 3.420000 1.060000 ;
+      RECT 3.250000  1.060000 3.485000 1.390000 ;
+      RECT 3.250000  1.390000 3.420000 1.490000 ;
+      RECT 3.310000  2.125000 3.825000 2.295000 ;
+      RECT 3.575000  1.810000 3.825000 2.125000 ;
+      RECT 3.590000  0.345000 3.825000 0.675000 ;
+      RECT 3.655000  0.675000 3.825000 1.810000 ;
+      RECT 3.995000  0.345000 4.185000 2.125000 ;
+      RECT 3.995000  2.125000 4.520000 2.295000 ;
+      RECT 4.400000  0.255000 4.605000 0.585000 ;
+      RECT 4.400000  0.585000 4.570000 1.565000 ;
+      RECT 4.400000  1.565000 5.500000 1.735000 ;
+      RECT 4.400000  1.735000 4.590000 1.895000 ;
+      RECT 4.760000  2.005000 5.105000 2.635000 ;
+      RECT 4.800000  0.085000 5.130000 0.545000 ;
+      RECT 5.330000  0.295000 6.225000 0.465000 ;
+      RECT 5.330000  0.465000 5.500000 1.565000 ;
+      RECT 5.330000  1.735000 5.500000 2.155000 ;
+      RECT 5.330000  2.155000 6.280000 2.325000 ;
+      RECT 5.670000  0.705000 6.290000 1.035000 ;
+      RECT 5.670000  1.035000 5.960000 1.985000 ;
+      RECT 6.530000  2.125000 6.850000 2.295000 ;
+      RECT 6.680000  1.495000 7.290000 1.665000 ;
+      RECT 6.680000  1.665000 6.850000 2.125000 ;
+      RECT 7.020000  0.085000 7.270000 0.815000 ;
+      RECT 7.020000  1.835000 7.190000 2.635000 ;
+      RECT 7.120000  0.995000 7.430000 1.325000 ;
+      RECT 7.120000  1.325000 7.290000 1.495000 ;
+      RECT 7.940000  0.085000 8.190000 0.885000 ;
+      RECT 7.940000  1.495000 8.190000 2.635000 ;
+      RECT 8.855000  0.085000 9.105000 0.885000 ;
+      RECT 8.855000  1.495000 9.105000 2.635000 ;
     LAYER mcon ;
-      RECT 1.530000 1.785000 1.700000 1.955000 ;
-      RECT 1.990000 2.125000 2.160000 2.295000 ;
-      RECT 3.370000 2.125000 3.540000 2.295000 ;
-      RECT 4.290000 2.125000 4.460000 2.295000 ;
-      RECT 5.670000 1.785000 5.840000 1.955000 ;
-      RECT 6.590000 2.125000 6.760000 2.295000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.530000  1.785000 1.700000 1.955000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 1.990000  2.125000 2.160000 2.295000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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.370000  2.125000 3.540000 2.295000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.290000  2.125000 4.460000 2.295000 ;
+      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.670000  1.785000 5.840000 1.955000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.590000  2.125000 6.760000 2.295000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
     LAYER met1 ;
       RECT 1.470000 1.755000 1.760000 1.800000 ;
       RECT 1.470000 1.800000 5.900000 1.940000 ;
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
index 0b2403a..6c67830 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_1.magic.lef
@@ -64,13 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.085000  0.085000 0.395000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -80,16 +73,23 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.085000 1.495000 0.365000 2.635000 ;
-        RECT 1.035000 1.495000 1.295000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       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 0.395000 0.885000 ;
+      RECT 0.085000  1.495000 0.365000 2.635000 ;
+      RECT 1.035000  1.495000 1.295000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
 END sky130_fd_sc_hd__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
index 4f31485..ef4f6d0 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_2.magic.lef
@@ -66,15 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 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
@@ -84,27 +75,33 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.110000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 0.715000 ;
-      RECT 0.085000 0.715000 1.185000 0.885000 ;
-      RECT 0.935000 0.255000 2.105000 0.465000 ;
-      RECT 0.935000 0.465000 1.185000 0.715000 ;
-      RECT 1.775000 0.465000 2.105000 0.485000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.085000  0.255000 0.425000 0.715000 ;
+      RECT 0.085000  0.715000 1.185000 0.885000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.545000 ;
+      RECT 0.935000  0.255000 2.105000 0.465000 ;
+      RECT 0.935000  0.465000 1.185000 0.715000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.775000  0.465000 2.105000 0.485000 ;
+      RECT 1.855000  1.835000 2.110000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
index 4535be1..e6e1a6f 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_4.magic.lef
@@ -69,20 +69,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.545000 ;
-        RECT 1.435000  0.085000 1.605000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -92,34 +78,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.025000 2.635000 ;
-        RECT 2.695000 1.835000 2.865000 2.635000 ;
-        RECT 3.535000 1.835000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.715000 ;
-      RECT 0.090000 0.715000 2.025000 0.905000 ;
-      RECT 0.935000 0.255000 1.265000 0.715000 ;
-      RECT 1.775000 0.255000 3.785000 0.465000 ;
-      RECT 1.775000 0.465000 2.025000 0.715000 ;
-      RECT 3.535000 0.465000 3.785000 0.885000 ;
+      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.715000 ;
+      RECT 0.090000  0.715000 2.025000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.545000 ;
+      RECT 0.935000  0.255000 1.265000 0.715000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.435000  0.085000 1.605000 0.545000 ;
+      RECT 1.775000  0.255000 3.785000 0.465000 ;
+      RECT 1.775000  0.465000 2.025000 0.715000 ;
+      RECT 1.855000  1.835000 2.025000 2.635000 ;
+      RECT 2.695000  1.835000 2.865000 2.635000 ;
+      RECT 3.535000  0.465000 3.785000 0.885000 ;
+      RECT 3.535000  1.835000 3.785000 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
 END sky130_fd_sc_hd__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
index 0f27c1b..e15644c 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_8.magic.lef
@@ -74,29 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.565000 ;
-        RECT 1.435000  0.085000 1.605000 0.565000 ;
-        RECT 2.275000  0.085000 2.445000 0.565000 ;
-        RECT 3.115000  0.085000 3.285000 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
@@ -106,47 +83,67 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.025000 2.635000 ;
-        RECT 2.695000 1.835000 2.865000 2.635000 ;
-        RECT 3.535000 1.835000 3.705000 2.635000 ;
-        RECT 4.375000 1.835000 4.545000 2.635000 ;
-        RECT 5.215000 1.835000 5.385000 2.635000 ;
-        RECT 6.055000 1.835000 6.225000 2.635000 ;
-        RECT 6.915000 1.495000 7.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 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 3.705000 0.905000 ;
-      RECT 0.935000 0.255000 1.265000 0.735000 ;
-      RECT 1.775000 0.255000 2.105000 0.735000 ;
-      RECT 2.615000 0.255000 2.945000 0.735000 ;
-      RECT 3.455000 0.255000 7.270000 0.485000 ;
-      RECT 3.455000 0.485000 3.705000 0.735000 ;
-      RECT 6.895000 0.485000 7.270000 0.905000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 3.705000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.565000 ;
+      RECT 0.935000  0.255000 1.265000 0.735000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.435000  0.085000 1.605000 0.565000 ;
+      RECT 1.775000  0.255000 2.105000 0.735000 ;
+      RECT 1.855000  1.835000 2.025000 2.635000 ;
+      RECT 2.275000  0.085000 2.445000 0.565000 ;
+      RECT 2.615000  0.255000 2.945000 0.735000 ;
+      RECT 2.695000  1.835000 2.865000 2.635000 ;
+      RECT 3.115000  0.085000 3.285000 0.565000 ;
+      RECT 3.455000  0.255000 7.270000 0.485000 ;
+      RECT 3.455000  0.485000 3.705000 0.735000 ;
+      RECT 3.535000  1.835000 3.705000 2.635000 ;
+      RECT 4.375000  1.835000 4.545000 2.635000 ;
+      RECT 5.215000  1.835000 5.385000 2.635000 ;
+      RECT 6.055000  1.835000 6.225000 2.635000 ;
+      RECT 6.895000  0.485000 7.270000 0.905000 ;
+      RECT 6.915000  1.495000 7.270000 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
 END sky130_fd_sc_hd__nand2_8
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
index 6dd8637..1abb130 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.magic.lef
@@ -65,15 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 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
@@ -83,28 +74,34 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.580000 1.835000 0.830000 2.635000 ;
-        RECT 1.500000 2.175000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.525000 0.360000 0.735000 ;
-      RECT 0.090000 0.735000 1.425000 0.905000 ;
-      RECT 0.090000 1.495000 1.425000 1.665000 ;
-      RECT 0.090000 1.665000 0.370000 1.825000 ;
-      RECT 1.255000 0.905000 1.425000 1.075000 ;
-      RECT 1.255000 1.075000 1.630000 1.325000 ;
-      RECT 1.255000 1.325000 1.425000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.090000  0.525000 0.360000 0.735000 ;
+      RECT 0.090000  0.735000 1.425000 0.905000 ;
+      RECT 0.090000  1.495000 1.425000 1.665000 ;
+      RECT 0.090000  1.665000 0.370000 1.825000 ;
+      RECT 0.580000  0.085000 0.910000 0.545000 ;
+      RECT 0.580000  1.835000 0.830000 2.635000 ;
+      RECT 1.255000  0.905000 1.425000 1.075000 ;
+      RECT 1.255000  1.075000 1.630000 1.325000 ;
+      RECT 1.255000  1.325000 1.425000 1.495000 ;
+      RECT 1.500000  2.175000 1.715000 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
 END sky130_fd_sc_hd__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
index 44a8331..9848397 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.magic.lef
@@ -69,18 +69,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.825000 ;
-        RECT 2.445000  0.085000 2.615000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -90,34 +78,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.580000 1.835000 0.835000 2.635000 ;
-        RECT 1.535000 2.175000 2.110000 2.635000 ;
-        RECT 2.805000 1.495000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.510000 0.345000 0.840000 ;
-      RECT 0.110000 0.840000 0.280000 1.495000 ;
-      RECT 0.110000 1.495000 1.360000 1.665000 ;
-      RECT 0.110000 1.665000 0.410000 1.860000 ;
-      RECT 1.030000 1.075000 1.360000 1.495000 ;
-      RECT 1.080000 0.255000 2.275000 0.465000 ;
-      RECT 1.080000 0.465000 1.355000 0.905000 ;
-      RECT 2.025000 0.465000 2.275000 0.695000 ;
-      RECT 2.025000 0.695000 3.135000 0.905000 ;
-      RECT 2.785000 0.255000 3.135000 0.695000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.110000  0.510000 0.345000 0.840000 ;
+      RECT 0.110000  0.840000 0.280000 1.495000 ;
+      RECT 0.110000  1.495000 1.360000 1.665000 ;
+      RECT 0.110000  1.665000 0.410000 1.860000 ;
+      RECT 0.515000  0.085000 0.845000 0.825000 ;
+      RECT 0.580000  1.835000 0.835000 2.635000 ;
+      RECT 1.030000  1.075000 1.360000 1.495000 ;
+      RECT 1.080000  0.255000 2.275000 0.465000 ;
+      RECT 1.080000  0.465000 1.355000 0.905000 ;
+      RECT 1.535000  2.175000 2.110000 2.635000 ;
+      RECT 2.025000  0.465000 2.275000 0.695000 ;
+      RECT 2.025000  0.695000 3.135000 0.905000 ;
+      RECT 2.445000  0.085000 2.615000 0.525000 ;
+      RECT 2.785000  0.255000 3.135000 0.695000 ;
+      RECT 2.805000  1.495000 3.135000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
index 0e48da3..79b39c2 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.magic.lef
@@ -68,23 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.595000  0.085000 0.790000 0.545000 ;
-        RECT 3.230000  0.085000 3.400000 0.545000 ;
-        RECT 4.070000  0.085000 4.310000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -94,44 +77,58 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.595000 1.835000 1.285000 2.635000 ;
-        RECT 0.970000 1.445000 1.285000 1.835000 ;
-        RECT 1.955000 1.835000 2.125000 2.635000 ;
-        RECT 2.810000 1.835000 2.980000 2.635000 ;
-        RECT 3.650000 1.835000 3.820000 2.635000 ;
-        RECT 4.520000 1.495000 4.850000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.715000 ;
-      RECT 0.090000 0.715000 0.780000 0.905000 ;
-      RECT 0.090000 1.445000 0.780000 1.665000 ;
-      RECT 0.090000 1.665000 0.425000 2.465000 ;
-      RECT 0.610000 0.905000 0.780000 1.075000 ;
-      RECT 0.610000 1.075000 2.205000 1.275000 ;
-      RECT 0.610000 1.275000 0.780000 1.445000 ;
-      RECT 1.035000 0.255000 3.060000 0.465000 ;
-      RECT 1.035000 0.465000 1.285000 0.905000 ;
-      RECT 2.810000 0.465000 3.060000 0.715000 ;
-      RECT 2.810000 0.715000 4.850000 0.905000 ;
-      RECT 3.570000 0.255000 3.900000 0.715000 ;
-      RECT 4.520000 0.255000 4.850000 0.715000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.715000 ;
+      RECT 0.090000  0.715000 0.780000 0.905000 ;
+      RECT 0.090000  1.445000 0.780000 1.665000 ;
+      RECT 0.090000  1.665000 0.425000 2.465000 ;
+      RECT 0.595000  0.085000 0.790000 0.545000 ;
+      RECT 0.595000  1.835000 1.285000 2.635000 ;
+      RECT 0.610000  0.905000 0.780000 1.075000 ;
+      RECT 0.610000  1.075000 2.205000 1.275000 ;
+      RECT 0.610000  1.275000 0.780000 1.445000 ;
+      RECT 0.970000  1.445000 1.285000 1.835000 ;
+      RECT 1.035000  0.255000 3.060000 0.465000 ;
+      RECT 1.035000  0.465000 1.285000 0.905000 ;
+      RECT 1.955000  1.835000 2.125000 2.635000 ;
+      RECT 2.810000  0.465000 3.060000 0.715000 ;
+      RECT 2.810000  0.715000 4.850000 0.905000 ;
+      RECT 2.810000  1.835000 2.980000 2.635000 ;
+      RECT 3.230000  0.085000 3.400000 0.545000 ;
+      RECT 3.570000  0.255000 3.900000 0.715000 ;
+      RECT 3.650000  1.835000 3.820000 2.635000 ;
+      RECT 4.070000  0.085000 4.310000 0.545000 ;
+      RECT 4.520000  0.255000 4.850000 0.715000 ;
+      RECT 4.520000  1.495000 4.850000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__nand2b_4
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
index a4d094f..2792a44 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_1.magic.lef
@@ -76,14 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -93,17 +85,25 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.245000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       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.090000  0.085000 0.345000 0.575000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 1.015000  1.835000 1.245000 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
 END sky130_fd_sc_hd__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
index 96c2d93..897b411 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_2.magic.lef
@@ -75,19 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 2.295000  0.085000 2.625000 0.465000 ;
-        RECT 3.215000  0.085000 3.595000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -97,29 +84,39 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.545000 2.635000 ;
-        RECT 3.215000 1.445000 3.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.295000 2.105000 0.465000 ;
-      RECT 0.090000 0.465000 0.345000 0.785000 ;
-      RECT 1.355000 0.635000 3.045000 0.905000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  0.295000 2.105000 0.465000 ;
+      RECT 0.090000  0.465000 0.345000 0.785000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.355000  0.635000 3.045000 0.905000 ;
+      RECT 1.855000  1.835000 2.545000 2.635000 ;
+      RECT 2.295000  0.085000 2.625000 0.465000 ;
+      RECT 3.215000  0.085000 3.595000 0.885000 ;
+      RECT 3.215000  1.445000 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
 END sky130_fd_sc_hd__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
index cc7b4c0..e359347 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_4.magic.lef
@@ -79,25 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.565000 ;
-        RECT 1.435000  0.085000 1.605000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -107,42 +88,58 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.090000 1.445000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.025000 2.635000 ;
-        RECT 2.695000 1.835000 2.865000 2.635000 ;
-        RECT 3.535000 1.835000 4.225000 2.635000 ;
-        RECT 4.895000 1.835000 5.065000 2.635000 ;
-        RECT 5.735000 1.835000 6.000000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 3.785000 0.905000 ;
-      RECT 0.935000 0.255000 1.265000 0.735000 ;
-      RECT 1.775000 0.655000 2.105000 0.735000 ;
-      RECT 2.195000 0.255000 6.000000 0.485000 ;
-      RECT 2.615000 0.655000 2.945000 0.735000 ;
-      RECT 3.455000 0.655000 3.785000 0.735000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 3.785000 0.905000 ;
+      RECT 0.090000  1.445000 0.345000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.565000 ;
+      RECT 0.935000  0.255000 1.265000 0.735000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.435000  0.085000 1.605000 0.565000 ;
+      RECT 1.775000  0.655000 2.105000 0.735000 ;
+      RECT 1.855000  1.835000 2.025000 2.635000 ;
+      RECT 2.195000  0.255000 6.000000 0.485000 ;
+      RECT 2.615000  0.655000 2.945000 0.735000 ;
+      RECT 2.695000  1.835000 2.865000 2.635000 ;
+      RECT 3.455000  0.655000 3.785000 0.735000 ;
+      RECT 3.535000  1.835000 4.225000 2.635000 ;
+      RECT 4.895000  1.835000 5.065000 2.635000 ;
+      RECT 5.735000  1.835000 6.000000 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
 END sky130_fd_sc_hd__nand3_4
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
index 8e9d41d..0da88b6 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.magic.lef
@@ -75,16 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.710000  0.085000 1.040000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -94,27 +84,34 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.710000 1.495000 0.960000 2.635000 ;
-        RECT 1.630000 1.835000 1.915000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.445000 0.510000 0.655000 ;
-      RECT 0.085000 0.655000 2.215000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.595000 ;
-      RECT 0.085000 1.595000 0.510000 1.925000 ;
-      RECT 2.045000 0.825000 2.215000 1.325000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.445000 0.510000 0.655000 ;
+      RECT 0.085000  0.655000 2.215000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.595000 ;
+      RECT 0.085000  1.595000 0.510000 1.925000 ;
+      RECT 0.710000  0.085000 1.040000 0.485000 ;
+      RECT 0.710000  1.495000 0.960000 2.635000 ;
+      RECT 1.630000  1.835000 1.915000 2.635000 ;
+      RECT 2.045000  0.825000 2.215000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
index 063b48b..926d467 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.magic.lef
@@ -78,20 +78,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.580000  0.085000 0.890000 0.905000 ;
-        RECT 1.560000  0.085000 1.810000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -101,39 +87,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.580000 1.835000 0.890000 2.635000 ;
-        RECT 1.560000 2.175000 1.730000 2.635000 ;
-        RECT 2.400000 2.175000 2.650000 2.635000 ;
-        RECT 2.840000 2.175000 3.090000 2.635000 ;
-        RECT 3.760000 2.175000 4.050000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.410000 0.655000 ;
-      RECT 0.090000 0.655000 0.260000 1.445000 ;
-      RECT 0.090000 1.445000 3.650000 1.615000 ;
-      RECT 0.090000 1.615000 0.260000 2.065000 ;
-      RECT 0.090000 2.065000 0.410000 2.465000 ;
-      RECT 1.060000 0.255000 1.390000 0.715000 ;
-      RECT 1.060000 0.715000 2.750000 0.905000 ;
-      RECT 2.000000 0.255000 4.050000 0.465000 ;
-      RECT 2.000000 0.635000 2.750000 0.715000 ;
-      RECT 2.920000 0.465000 3.090000 0.905000 ;
-      RECT 3.320000 1.075000 3.650000 1.445000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  0.255000 0.410000 0.655000 ;
+      RECT 0.090000  0.655000 0.260000 1.445000 ;
+      RECT 0.090000  1.445000 3.650000 1.615000 ;
+      RECT 0.090000  1.615000 0.260000 2.065000 ;
+      RECT 0.090000  2.065000 0.410000 2.465000 ;
+      RECT 0.580000  0.085000 0.890000 0.905000 ;
+      RECT 0.580000  1.835000 0.890000 2.635000 ;
+      RECT 1.060000  0.255000 1.390000 0.715000 ;
+      RECT 1.060000  0.715000 2.750000 0.905000 ;
+      RECT 1.560000  0.085000 1.810000 0.545000 ;
+      RECT 1.560000  2.175000 1.730000 2.635000 ;
+      RECT 2.000000  0.255000 4.050000 0.465000 ;
+      RECT 2.000000  0.635000 2.750000 0.715000 ;
+      RECT 2.400000  2.175000 2.650000 2.635000 ;
+      RECT 2.840000  2.175000 3.090000 2.635000 ;
+      RECT 2.920000  0.465000 3.090000 0.905000 ;
+      RECT 3.320000  1.075000 3.650000 1.445000 ;
+      RECT 3.760000  2.175000 4.050000 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
 END sky130_fd_sc_hd__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
index 8b9cc41..0eb4905 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.magic.lef
@@ -81,29 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.595000  0.085000 0.845000 0.545000 ;
-        RECT 4.915000  0.085000 5.165000 0.545000 ;
-        RECT 5.835000  0.085000 6.005000 0.545000 ;
-        RECT 6.675000  0.085000 7.005000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -113,48 +90,68 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.595000 1.445000 1.285000 2.635000 ;
-        RECT 1.955000 1.835000 2.125000 2.635000 ;
-        RECT 2.795000 2.175000 2.965000 2.635000 ;
-        RECT 3.635000 1.835000 3.805000 2.635000 ;
-        RECT 4.475000 1.835000 5.165000 2.635000 ;
-        RECT 5.835000 1.835000 6.005000 2.635000 ;
-        RECT 6.675000 1.445000 7.005000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 0.715000 ;
-      RECT 0.085000 0.715000 1.285000 0.905000 ;
-      RECT 0.085000 0.905000 0.260000 1.445000 ;
-      RECT 0.085000 1.445000 0.425000 2.465000 ;
-      RECT 1.005000 0.905000 1.285000 1.075000 ;
-      RECT 1.005000 1.075000 2.625000 1.275000 ;
-      RECT 1.035000 0.255000 4.725000 0.465000 ;
-      RECT 3.135000 0.635000 4.725000 0.715000 ;
-      RECT 3.135000 0.715000 6.505000 0.905000 ;
-      RECT 5.335000 0.255000 5.665000 0.715000 ;
-      RECT 6.175000 0.255000 6.505000 0.715000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.085000  0.255000 0.425000 0.715000 ;
+      RECT 0.085000  0.715000 1.285000 0.905000 ;
+      RECT 0.085000  0.905000 0.260000 1.445000 ;
+      RECT 0.085000  1.445000 0.425000 2.465000 ;
+      RECT 0.595000  0.085000 0.845000 0.545000 ;
+      RECT 0.595000  1.445000 1.285000 2.635000 ;
+      RECT 1.005000  0.905000 1.285000 1.075000 ;
+      RECT 1.005000  1.075000 2.625000 1.275000 ;
+      RECT 1.035000  0.255000 4.725000 0.465000 ;
+      RECT 1.955000  1.835000 2.125000 2.635000 ;
+      RECT 2.795000  2.175000 2.965000 2.635000 ;
+      RECT 3.135000  0.635000 4.725000 0.715000 ;
+      RECT 3.135000  0.715000 6.505000 0.905000 ;
+      RECT 3.635000  1.835000 3.805000 2.635000 ;
+      RECT 4.475000  1.835000 5.165000 2.635000 ;
+      RECT 4.915000  0.085000 5.165000 0.545000 ;
+      RECT 5.335000  0.255000 5.665000 0.715000 ;
+      RECT 5.835000  0.085000 6.005000 0.545000 ;
+      RECT 5.835000  1.835000 6.005000 2.635000 ;
+      RECT 6.175000  0.255000 6.505000 0.715000 ;
+      RECT 6.675000  0.085000 7.005000 0.905000 ;
+      RECT 6.675000  1.445000 7.005000 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
 END sky130_fd_sc_hd__nand3b_4
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
index 6c26daa..2ce503a 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_1.magic.lef
@@ -87,15 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -105,19 +96,28 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.915000 1.835000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.090000  0.085000 0.425000 0.825000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.915000  1.835000 2.195000 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
 END sky130_fd_sc_hd__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
index b2e983e..bebec20 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_2.magic.lef
@@ -86,20 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -109,37 +95,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.185000 2.635000 ;
-        RECT 2.995000 1.835000 3.325000 2.635000 ;
-        RECT 4.095000 1.445000 4.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 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 1.185000 0.905000 ;
-      RECT 0.935000 0.255000 2.125000 0.465000 ;
-      RECT 0.935000 0.465000 1.185000 0.735000 ;
-      RECT 1.355000 0.635000 3.085000 0.905000 ;
-      RECT 2.315000 0.255000 4.425000 0.465000 ;
-      RECT 3.255000 0.465000 3.425000 0.885000 ;
-      RECT 4.095000 0.465000 4.425000 0.905000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 1.185000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.545000 ;
+      RECT 0.935000  0.255000 2.125000 0.465000 ;
+      RECT 0.935000  0.465000 1.185000 0.735000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.355000  0.635000 3.085000 0.905000 ;
+      RECT 1.855000  1.835000 2.185000 2.635000 ;
+      RECT 2.315000  0.255000 4.425000 0.465000 ;
+      RECT 2.995000  1.835000 3.325000 2.635000 ;
+      RECT 3.255000  0.465000 3.425000 0.885000 ;
+      RECT 4.095000  0.465000 4.425000 0.905000 ;
+      RECT 4.095000  1.445000 4.425000 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
 END sky130_fd_sc_hd__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
index 38bba39..f2f6dec 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_4.magic.lef
@@ -90,28 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 1.355000  0.085000 1.685000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -121,49 +99,68 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.090000 1.445000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.835000 2.025000 2.635000 ;
-        RECT 2.695000 1.835000 2.865000 2.635000 ;
-        RECT 3.535000 1.835000 4.225000 2.635000 ;
-        RECT 4.895000 1.835000 5.065000 2.635000 ;
-        RECT 5.770000 1.835000 5.940000 2.635000 ;
-        RECT 6.635000 1.835000 6.805000 2.635000 ;
-        RECT 7.475000 1.445000 7.735000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.345000 0.655000 ;
-      RECT 0.090000 0.655000 2.025000 0.905000 ;
-      RECT 1.015000 0.255000 1.185000 0.655000 ;
-      RECT 1.855000 0.255000 3.785000 0.485000 ;
-      RECT 1.855000 0.485000 2.025000 0.655000 ;
-      RECT 2.195000 0.655000 5.565000 0.905000 ;
-      RECT 3.975000 0.255000 7.730000 0.485000 ;
-      RECT 5.770000 0.485000 5.940000 0.905000 ;
-      RECT 7.475000 0.485000 7.730000 0.905000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.090000  0.255000 0.345000 0.655000 ;
+      RECT 0.090000  0.655000 2.025000 0.905000 ;
+      RECT 0.090000  1.445000 0.345000 2.635000 ;
+      RECT 0.515000  0.085000 0.845000 0.485000 ;
+      RECT 1.015000  0.255000 1.185000 0.655000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.355000  0.085000 1.685000 0.485000 ;
+      RECT 1.855000  0.255000 3.785000 0.485000 ;
+      RECT 1.855000  0.485000 2.025000 0.655000 ;
+      RECT 1.855000  1.835000 2.025000 2.635000 ;
+      RECT 2.195000  0.655000 5.565000 0.905000 ;
+      RECT 2.695000  1.835000 2.865000 2.635000 ;
+      RECT 3.535000  1.835000 4.225000 2.635000 ;
+      RECT 3.975000  0.255000 7.730000 0.485000 ;
+      RECT 4.895000  1.835000 5.065000 2.635000 ;
+      RECT 5.770000  0.485000 5.940000 0.905000 ;
+      RECT 5.770000  1.835000 5.940000 2.635000 ;
+      RECT 6.635000  1.835000 6.805000 2.635000 ;
+      RECT 7.475000  0.485000 7.730000 0.905000 ;
+      RECT 7.475000  1.445000 7.735000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
   END
 END sky130_fd_sc_hd__nand4_4
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
index 741c15c..7d0ba44 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.magic.lef
@@ -84,17 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.655000  0.085000 0.985000 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
@@ -104,32 +93,40 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.710000 1.495000 0.960000 2.635000 ;
-        RECT 1.630000 1.835000 1.915000 2.635000 ;
-        RECT 2.705000 1.835000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.445000 0.475000 0.655000 ;
-      RECT 0.085000 0.655000 1.335000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.595000 ;
-      RECT 0.085000 1.595000 0.510000 1.925000 ;
-      RECT 1.155000 0.425000 2.525000 0.595000 ;
-      RECT 1.155000 0.595000 1.335000 0.655000 ;
-      RECT 2.355000 0.595000 2.525000 0.995000 ;
-      RECT 2.355000 0.995000 2.755000 1.325000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.445000 0.475000 0.655000 ;
+      RECT 0.085000  0.655000 1.335000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.595000 ;
+      RECT 0.085000  1.595000 0.510000 1.925000 ;
+      RECT 0.655000  0.085000 0.985000 0.485000 ;
+      RECT 0.710000  1.495000 0.960000 2.635000 ;
+      RECT 1.155000  0.425000 2.525000 0.595000 ;
+      RECT 1.155000  0.595000 1.335000 0.655000 ;
+      RECT 1.630000  1.835000 1.915000 2.635000 ;
+      RECT 2.355000  0.595000 2.525000 0.995000 ;
+      RECT 2.355000  0.995000 2.755000 1.325000 ;
+      RECT 2.705000  1.835000 2.920000 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
 END sky130_fd_sc_hd__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
index 2557c38..de3e587 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.magic.lef
@@ -86,23 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 4.665000  0.085000 4.835000 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
@@ -112,49 +95,63 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 2.255000 1.285000 2.635000 ;
-        RECT 1.035000 1.445000 1.285000 2.255000 ;
-        RECT 1.955000 1.835000 2.125000 2.635000 ;
-        RECT 2.795000 1.835000 3.435000 2.635000 ;
-        RECT 4.105000 1.835000 4.365000 2.635000 ;
-        RECT 5.035000 1.495000 5.430000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.345000 0.635000 ;
-      RECT 0.090000 0.635000 0.670000 0.805000 ;
-      RECT 0.090000 1.915000 0.670000 2.085000 ;
-      RECT 0.090000 2.085000 0.345000 2.465000 ;
-      RECT 0.500000 0.805000 0.670000 1.075000 ;
-      RECT 0.500000 1.075000 1.380000 1.245000 ;
-      RECT 0.500000 1.245000 0.670000 1.915000 ;
-      RECT 1.035000 0.255000 2.125000 0.465000 ;
-      RECT 1.035000 0.465000 1.285000 0.905000 ;
-      RECT 1.955000 0.465000 2.125000 0.635000 ;
-      RECT 1.955000 0.635000 3.045000 0.905000 ;
-      RECT 2.295000 0.255000 3.985000 0.465000 ;
-      RECT 3.235000 0.635000 4.455000 0.715000 ;
-      RECT 3.235000 0.715000 5.340000 0.905000 ;
-      RECT 4.155000 0.255000 4.415000 0.615000 ;
-      RECT 4.155000 0.615000 4.455000 0.635000 ;
-      RECT 5.005000 0.255000 5.340000 0.715000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.090000  0.255000 0.345000 0.635000 ;
+      RECT 0.090000  0.635000 0.670000 0.805000 ;
+      RECT 0.090000  1.915000 0.670000 2.085000 ;
+      RECT 0.090000  2.085000 0.345000 2.465000 ;
+      RECT 0.500000  0.805000 0.670000 1.075000 ;
+      RECT 0.500000  1.075000 1.380000 1.245000 ;
+      RECT 0.500000  1.245000 0.670000 1.915000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.515000  2.255000 1.285000 2.635000 ;
+      RECT 1.035000  0.255000 2.125000 0.465000 ;
+      RECT 1.035000  0.465000 1.285000 0.905000 ;
+      RECT 1.035000  1.445000 1.285000 2.255000 ;
+      RECT 1.955000  0.465000 2.125000 0.635000 ;
+      RECT 1.955000  0.635000 3.045000 0.905000 ;
+      RECT 1.955000  1.835000 2.125000 2.635000 ;
+      RECT 2.295000  0.255000 3.985000 0.465000 ;
+      RECT 2.795000  1.835000 3.435000 2.635000 ;
+      RECT 3.235000  0.635000 4.455000 0.715000 ;
+      RECT 3.235000  0.715000 5.340000 0.905000 ;
+      RECT 4.105000  1.835000 4.365000 2.635000 ;
+      RECT 4.155000  0.255000 4.415000 0.615000 ;
+      RECT 4.155000  0.615000 4.455000 0.635000 ;
+      RECT 4.665000  0.085000 4.835000 0.545000 ;
+      RECT 5.005000  0.255000 5.340000 0.715000 ;
+      RECT 5.035000  1.495000 5.430000 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
 END sky130_fd_sc_hd__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
index d8a4746..6dd9bf3 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.magic.lef
@@ -90,31 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.595000  0.085000 0.845000 0.545000 ;
-        RECT 7.095000  0.085000 7.265000 0.545000 ;
-        RECT 7.935000  0.085000 8.105000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -124,58 +99,80 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.595000 1.835000 1.285000 2.635000 ;
-        RECT 0.995000 1.495000 1.285000 1.835000 ;
-        RECT 1.955000 1.835000 2.125000 2.635000 ;
-        RECT 2.795000 1.835000 2.965000 2.635000 ;
-        RECT 3.635000 1.835000 3.805000 2.635000 ;
-        RECT 4.475000 1.835000 5.165000 2.635000 ;
-        RECT 5.835000 1.835000 6.005000 2.635000 ;
-        RECT 6.675000 1.835000 6.845000 2.635000 ;
-        RECT 7.515000 1.835000 7.685000 2.635000 ;
-        RECT 8.355000 1.445000 8.610000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 0.805000 0.905000 ;
-      RECT 0.090000 1.495000 0.805000 1.665000 ;
-      RECT 0.090000 1.665000 0.425000 2.465000 ;
-      RECT 0.610000 0.905000 0.805000 1.075000 ;
-      RECT 0.610000 1.075000 2.205000 1.275000 ;
-      RECT 0.610000 1.275000 0.805000 1.495000 ;
-      RECT 1.035000 0.255000 4.725000 0.465000 ;
-      RECT 1.035000 0.465000 1.285000 0.905000 ;
-      RECT 3.135000 0.635000 6.505000 0.905000 ;
-      RECT 4.915000 0.255000 6.925000 0.465000 ;
-      RECT 6.675000 0.465000 6.925000 0.735000 ;
-      RECT 6.675000 0.735000 8.610000 0.905000 ;
-      RECT 7.435000 0.255000 7.765000 0.735000 ;
-      RECT 8.275000 0.255000 8.610000 0.735000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 0.805000 0.905000 ;
+      RECT 0.090000  1.495000 0.805000 1.665000 ;
+      RECT 0.090000  1.665000 0.425000 2.465000 ;
+      RECT 0.595000  0.085000 0.845000 0.545000 ;
+      RECT 0.595000  1.835000 1.285000 2.635000 ;
+      RECT 0.610000  0.905000 0.805000 1.075000 ;
+      RECT 0.610000  1.075000 2.205000 1.275000 ;
+      RECT 0.610000  1.275000 0.805000 1.495000 ;
+      RECT 0.995000  1.495000 1.285000 1.835000 ;
+      RECT 1.035000  0.255000 4.725000 0.465000 ;
+      RECT 1.035000  0.465000 1.285000 0.905000 ;
+      RECT 1.955000  1.835000 2.125000 2.635000 ;
+      RECT 2.795000  1.835000 2.965000 2.635000 ;
+      RECT 3.135000  0.635000 6.505000 0.905000 ;
+      RECT 3.635000  1.835000 3.805000 2.635000 ;
+      RECT 4.475000  1.835000 5.165000 2.635000 ;
+      RECT 4.915000  0.255000 6.925000 0.465000 ;
+      RECT 5.835000  1.835000 6.005000 2.635000 ;
+      RECT 6.675000  0.465000 6.925000 0.735000 ;
+      RECT 6.675000  0.735000 8.610000 0.905000 ;
+      RECT 6.675000  1.835000 6.845000 2.635000 ;
+      RECT 7.095000  0.085000 7.265000 0.545000 ;
+      RECT 7.435000  0.255000 7.765000 0.735000 ;
+      RECT 7.515000  1.835000 7.685000 2.635000 ;
+      RECT 7.935000  0.085000 8.105000 0.545000 ;
+      RECT 8.275000  0.255000 8.610000 0.735000 ;
+      RECT 8.355000  1.445000 8.610000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
 END sky130_fd_sc_hd__nand4b_4
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
index 442d58b..06674df 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.magic.lef
@@ -84,20 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.595000  0.085000 0.900000 0.545000 ;
-        RECT 3.100000  0.085000 3.450000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -107,38 +93,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.595000 1.835000 0.925000 2.635000 ;
-        RECT 1.640000 1.835000 1.970000 2.635000 ;
-        RECT 2.680000 2.175000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.485000 0.425000 0.715000 ;
-      RECT 0.085000 0.715000 1.270000 0.905000 ;
-      RECT 0.085000 0.905000 0.260000 2.065000 ;
-      RECT 0.085000 2.065000 0.425000 2.465000 ;
-      RECT 1.080000 0.365000 2.250000 0.555000 ;
-      RECT 1.080000 0.555000 1.270000 0.715000 ;
-      RECT 1.970000 0.555000 2.250000 1.325000 ;
-      RECT 2.840000 0.995000 3.090000 1.835000 ;
-      RECT 2.840000 1.835000 4.055000 2.005000 ;
-      RECT 3.620000 0.255000 4.055000 0.545000 ;
-      RECT 3.635000 2.005000 4.055000 2.465000 ;
-      RECT 3.810000 0.545000 4.055000 1.835000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.485000 0.425000 0.715000 ;
+      RECT 0.085000  0.715000 1.270000 0.905000 ;
+      RECT 0.085000  0.905000 0.260000 2.065000 ;
+      RECT 0.085000  2.065000 0.425000 2.465000 ;
+      RECT 0.595000  0.085000 0.900000 0.545000 ;
+      RECT 0.595000  1.835000 0.925000 2.635000 ;
+      RECT 1.080000  0.365000 2.250000 0.555000 ;
+      RECT 1.080000  0.555000 1.270000 0.715000 ;
+      RECT 1.640000  1.835000 1.970000 2.635000 ;
+      RECT 1.970000  0.555000 2.250000 1.325000 ;
+      RECT 2.680000  2.175000 3.450000 2.635000 ;
+      RECT 2.840000  0.995000 3.090000 1.835000 ;
+      RECT 2.840000  1.835000 4.055000 2.005000 ;
+      RECT 3.100000  0.085000 3.450000 0.545000 ;
+      RECT 3.620000  0.255000 4.055000 0.545000 ;
+      RECT 3.635000  2.005000 4.055000 2.465000 ;
+      RECT 3.810000  0.545000 4.055000 1.835000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
index 724111e..a64f4c0 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.magic.lef
@@ -88,24 +88,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.765000 0.545000 ;
-        RECT 5.205000  0.085000 5.375000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -115,55 +97,69 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.540000 2.195000 0.765000 2.635000 ;
-        RECT 1.745000 1.495000 1.915000 2.635000 ;
-        RECT 2.505000 1.835000 2.755000 2.635000 ;
-        RECT 3.425000 1.835000 4.115000 2.635000 ;
-        RECT 4.785000 1.835000 4.955000 2.635000 ;
-        RECT 5.625000 1.445000 5.895000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.730000 ;
-      RECT 0.085000 0.730000 1.230000 0.900000 ;
-      RECT 0.085000 1.785000 1.230000 1.980000 ;
-      RECT 0.085000 1.980000 0.370000 2.440000 ;
-      RECT 0.935000 0.255000 1.575000 0.560000 ;
-      RECT 0.935000 2.150000 1.575000 2.465000 ;
-      RECT 1.060000 0.900000 1.230000 1.785000 ;
-      RECT 1.400000 0.560000 1.575000 0.715000 ;
-      RECT 1.400000 0.715000 1.580000 1.410000 ;
-      RECT 1.400000 1.410000 1.575000 2.150000 ;
-      RECT 1.745000 0.255000 3.675000 0.485000 ;
-      RECT 1.745000 0.485000 1.915000 0.585000 ;
-      RECT 2.745000 1.075000 3.075000 1.275000 ;
-      RECT 2.925000 0.655000 4.615000 0.905000 ;
-      RECT 3.865000 0.255000 5.035000 0.485000 ;
-      RECT 4.785000 0.485000 5.035000 0.735000 ;
-      RECT 4.785000 0.735000 5.895000 0.905000 ;
-      RECT 5.545000 0.255000 5.895000 0.735000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.730000 ;
+      RECT 0.085000  0.730000 1.230000 0.900000 ;
+      RECT 0.085000  1.785000 1.230000 1.980000 ;
+      RECT 0.085000  1.980000 0.370000 2.440000 ;
+      RECT 0.515000  0.085000 0.765000 0.545000 ;
+      RECT 0.540000  2.195000 0.765000 2.635000 ;
+      RECT 0.935000  0.255000 1.575000 0.560000 ;
+      RECT 0.935000  2.150000 1.575000 2.465000 ;
+      RECT 1.060000  0.900000 1.230000 1.785000 ;
+      RECT 1.400000  0.560000 1.575000 0.715000 ;
+      RECT 1.400000  0.715000 1.580000 1.410000 ;
+      RECT 1.400000  1.410000 1.575000 2.150000 ;
+      RECT 1.745000  0.255000 3.675000 0.485000 ;
+      RECT 1.745000  0.485000 1.915000 0.585000 ;
+      RECT 1.745000  1.495000 1.915000 2.635000 ;
+      RECT 2.505000  1.835000 2.755000 2.635000 ;
+      RECT 2.745000  1.075000 3.075000 1.275000 ;
+      RECT 2.925000  0.655000 4.615000 0.905000 ;
+      RECT 3.425000  1.835000 4.115000 2.635000 ;
+      RECT 3.865000  0.255000 5.035000 0.485000 ;
+      RECT 4.785000  0.485000 5.035000 0.735000 ;
+      RECT 4.785000  0.735000 5.895000 0.905000 ;
+      RECT 4.785000  1.835000 4.955000 2.635000 ;
+      RECT 5.205000  0.085000 5.375000 0.565000 ;
+      RECT 5.545000  0.255000 5.895000 0.735000 ;
+      RECT 5.625000  1.445000 5.895000 2.635000 ;
     LAYER mcon ;
-      RECT 1.060000 1.105000 1.230000 1.275000 ;
-      RECT 2.905000 1.105000 3.075000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.060000  1.105000 1.230000 1.275000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  1.105000 3.075000 1.275000 ;
+      RECT 2.905000  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 ;
     LAYER met1 ;
       RECT 1.000000 1.075000 3.135000 1.305000 ;
   END
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
index db4702c..dcc28b4 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.magic.lef
@@ -90,34 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.515000  0.085000  0.845000 0.465000 ;
-        RECT 8.420000  0.085000  8.750000 0.485000 ;
-        RECT 9.260000  0.085000  9.590000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -127,69 +99,93 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.540000 2.195000  0.765000 2.635000 ;
-        RECT 2.200000 1.495000  2.370000 2.635000 ;
-        RECT 2.960000 1.835000  3.210000 2.635000 ;
-        RECT 3.880000 1.835000  4.050000 2.635000 ;
-        RECT 4.720000 1.835000  4.890000 2.635000 ;
-        RECT 5.610000 1.835000  6.540000 2.635000 ;
-        RECT 7.240000 1.835000  7.410000 2.635000 ;
-        RECT 8.080000 1.835000  8.250000 2.635000 ;
-        RECT 8.920000 1.835000  9.090000 2.635000 ;
-        RECT 9.760000 1.445000 10.035000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000  0.345000 0.635000 ;
-      RECT 0.085000 0.635000  1.455000 0.805000 ;
-      RECT 0.085000 1.785000  1.455000 1.980000 ;
-      RECT 0.085000 1.980000  0.370000 2.440000 ;
-      RECT 0.935000 2.150000  1.795000 2.465000 ;
-      RECT 1.015000 0.255000  1.795000 0.465000 ;
-      RECT 1.145000 0.805000  1.455000 1.785000 ;
-      RECT 1.625000 0.465000  1.795000 1.075000 ;
-      RECT 1.625000 1.075000  2.210000 1.305000 ;
-      RECT 1.625000 1.305000  1.795000 2.150000 ;
-      RECT 2.200000 0.255000  5.810000 0.485000 ;
-      RECT 2.200000 0.485000  2.370000 0.905000 ;
-      RECT 2.540000 1.075000  3.285000 1.245000 ;
-      RECT 4.160000 1.075000  5.390000 1.275000 ;
-      RECT 4.220000 0.655000  5.390000 0.735000 ;
-      RECT 4.220000 0.735000  6.150000 0.905000 ;
-      RECT 5.980000 0.255000  7.910000 0.485000 ;
-      RECT 5.980000 0.485000  6.150000 0.735000 ;
-      RECT 6.320000 0.655000 10.035000 0.905000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.085000  0.255000  0.345000 0.635000 ;
+      RECT 0.085000  0.635000  1.455000 0.805000 ;
+      RECT 0.085000  1.785000  1.455000 1.980000 ;
+      RECT 0.085000  1.980000  0.370000 2.440000 ;
+      RECT 0.515000  0.085000  0.845000 0.465000 ;
+      RECT 0.540000  2.195000  0.765000 2.635000 ;
+      RECT 0.935000  2.150000  1.795000 2.465000 ;
+      RECT 1.015000  0.255000  1.795000 0.465000 ;
+      RECT 1.145000  0.805000  1.455000 1.785000 ;
+      RECT 1.625000  0.465000  1.795000 1.075000 ;
+      RECT 1.625000  1.075000  2.210000 1.305000 ;
+      RECT 1.625000  1.305000  1.795000 2.150000 ;
+      RECT 2.200000  0.255000  5.810000 0.485000 ;
+      RECT 2.200000  0.485000  2.370000 0.905000 ;
+      RECT 2.200000  1.495000  2.370000 2.635000 ;
+      RECT 2.540000  1.075000  3.285000 1.245000 ;
+      RECT 2.960000  1.835000  3.210000 2.635000 ;
+      RECT 3.880000  1.835000  4.050000 2.635000 ;
+      RECT 4.160000  1.075000  5.390000 1.275000 ;
+      RECT 4.220000  0.655000  5.390000 0.735000 ;
+      RECT 4.220000  0.735000  6.150000 0.905000 ;
+      RECT 4.720000  1.835000  4.890000 2.635000 ;
+      RECT 5.610000  1.835000  6.540000 2.635000 ;
+      RECT 5.980000  0.255000  7.910000 0.485000 ;
+      RECT 5.980000  0.485000  6.150000 0.735000 ;
+      RECT 6.320000  0.655000 10.035000 0.905000 ;
+      RECT 7.240000  1.835000  7.410000 2.635000 ;
+      RECT 8.080000  1.835000  8.250000 2.635000 ;
+      RECT 8.420000  0.085000  8.750000 0.485000 ;
+      RECT 8.920000  1.835000  9.090000 2.635000 ;
+      RECT 9.260000  0.085000  9.590000 0.485000 ;
+      RECT 9.760000  1.445000 10.035000 2.635000 ;
     LAYER mcon ;
-      RECT 1.980000 1.105000 2.150000 1.275000 ;
-      RECT 4.280000 1.105000 4.450000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.980000  1.105000 2.150000 1.275000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.280000  1.105000 4.450000 1.275000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.920000 1.075000 2.210000 1.120000 ;
       RECT 1.920000 1.120000 4.510000 1.260000 ;
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
index 6f071a5..d4a7900 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_1.magic.lef
@@ -65,14 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.895000 ;
-        RECT 1.015000  0.085000 1.285000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -82,15 +74,23 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.955000 1.495000 1.285000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       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.105000  0.085000 0.345000 0.895000 ;
+      RECT 0.955000  1.495000 1.285000 2.635000 ;
+      RECT 1.015000  0.085000 1.285000 0.895000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
 END sky130_fd_sc_hd__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
index 890bcbb..7333f66 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_2.magic.lef
@@ -68,17 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.165000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -88,25 +77,33 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.535000 1.835000 0.865000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 1.205000 1.665000 ;
-      RECT 0.090000 1.665000 0.365000 2.465000 ;
-      RECT 1.035000 1.665000 1.205000 2.295000 ;
-      RECT 1.035000 2.295000 2.175000 2.465000 ;
-      RECT 1.875000 1.835000 2.175000 2.295000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 1.205000 1.665000 ;
+      RECT 0.090000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.865000 2.635000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.035000  1.665000 1.205000 2.295000 ;
+      RECT 1.035000  2.295000 2.175000 2.465000 ;
+      RECT 1.875000  0.085000 2.165000 0.555000 ;
+      RECT 1.875000  1.835000 2.175000 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 ;
   END
 END sky130_fd_sc_hd__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
index 4ee8c6b..3cd0ce6 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_4.magic.lef
@@ -70,23 +70,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.555000 ;
-        RECT 2.715000  0.085000 2.885000 0.555000 ;
-        RECT 3.555000  0.085000 3.840000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -96,32 +79,46 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.535000 1.835000 0.865000 2.635000 ;
-        RECT 1.375000 1.835000 1.625000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 2.125000 1.665000 ;
-      RECT 0.090000 1.665000 0.365000 2.465000 ;
-      RECT 1.035000 1.665000 1.205000 2.465000 ;
-      RECT 1.795000 1.665000 2.125000 2.295000 ;
-      RECT 1.795000 2.295000 3.890000 2.465000 ;
-      RECT 2.635000 1.935000 2.965000 2.295000 ;
-      RECT 3.475000 1.915000 3.890000 2.295000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 2.125000 1.665000 ;
+      RECT 0.090000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.865000 2.635000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.035000  1.665000 1.205000 2.465000 ;
+      RECT 1.375000  1.835000 1.625000 2.635000 ;
+      RECT 1.795000  1.665000 2.125000 2.295000 ;
+      RECT 1.795000  2.295000 3.890000 2.465000 ;
+      RECT 1.875000  0.085000 2.045000 0.555000 ;
+      RECT 2.635000  1.935000 2.965000 2.295000 ;
+      RECT 2.715000  0.085000 2.885000 0.555000 ;
+      RECT 3.475000  1.915000 3.890000 2.295000 ;
+      RECT 3.555000  0.085000 3.840000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
index 3c0aa30..8e923aa 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_8.magic.lef
@@ -76,34 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.555000 ;
-        RECT 2.715000  0.085000 2.885000 0.555000 ;
-        RECT 3.555000  0.085000 3.725000 0.555000 ;
-        RECT 4.395000  0.085000 4.565000 0.555000 ;
-        RECT 5.235000  0.085000 5.405000 0.555000 ;
-        RECT 6.075000  0.085000 6.245000 0.555000 ;
-        RECT 6.915000  0.085000 7.205000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -113,45 +85,70 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.575000 1.835000 0.825000 2.635000 ;
-        RECT 1.415000 1.835000 1.665000 2.635000 ;
-        RECT 2.255000 1.835000 2.505000 2.635000 ;
-        RECT 3.095000 1.835000 3.345000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 3.765000 1.665000 ;
-      RECT 0.090000 1.665000 0.405000 2.465000 ;
-      RECT 0.995000 1.665000 1.245000 2.465000 ;
-      RECT 1.835000 1.665000 2.085000 2.465000 ;
-      RECT 2.675000 1.665000 2.925000 2.465000 ;
-      RECT 3.515000 1.665000 3.765000 2.295000 ;
-      RECT 3.515000 2.295000 7.125000 2.465000 ;
-      RECT 4.355000 1.785000 4.605000 2.295000 ;
-      RECT 5.195000 1.785000 5.445000 2.295000 ;
-      RECT 6.035000 1.785000 6.285000 2.295000 ;
-      RECT 6.875000 1.785000 7.125000 2.295000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 3.765000 1.665000 ;
+      RECT 0.090000  1.665000 0.405000 2.465000 ;
+      RECT 0.575000  1.835000 0.825000 2.635000 ;
+      RECT 0.995000  1.665000 1.245000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.415000  1.835000 1.665000 2.635000 ;
+      RECT 1.835000  1.665000 2.085000 2.465000 ;
+      RECT 1.875000  0.085000 2.045000 0.555000 ;
+      RECT 2.255000  1.835000 2.505000 2.635000 ;
+      RECT 2.675000  1.665000 2.925000 2.465000 ;
+      RECT 2.715000  0.085000 2.885000 0.555000 ;
+      RECT 3.095000  1.835000 3.345000 2.635000 ;
+      RECT 3.515000  1.665000 3.765000 2.295000 ;
+      RECT 3.515000  2.295000 7.125000 2.465000 ;
+      RECT 3.555000  0.085000 3.725000 0.555000 ;
+      RECT 4.355000  1.785000 4.605000 2.295000 ;
+      RECT 4.395000  0.085000 4.565000 0.555000 ;
+      RECT 5.195000  1.785000 5.445000 2.295000 ;
+      RECT 5.235000  0.085000 5.405000 0.555000 ;
+      RECT 6.035000  1.785000 6.285000 2.295000 ;
+      RECT 6.075000  0.085000 6.245000 0.555000 ;
+      RECT 6.875000  1.785000 7.125000 2.295000 ;
+      RECT 6.915000  0.085000 7.205000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor2_8
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
index dc23063..b73f112 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.magic.lef
@@ -65,16 +65,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.855000  0.085000 1.065000 0.895000 ;
-        RECT 1.735000  0.085000 2.120000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -84,26 +74,33 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.875000 1.855000 1.205000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.330000 0.370000 0.675000 0.545000 ;
-      RECT 0.415000 1.510000 1.705000 1.680000 ;
-      RECT 0.415000 1.680000 0.675000 1.905000 ;
-      RECT 0.495000 0.545000 0.675000 1.510000 ;
-      RECT 1.535000 1.075000 1.865000 1.245000 ;
-      RECT 1.535000 1.245000 1.705000 1.510000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.330000  0.370000 0.675000 0.545000 ;
+      RECT 0.415000  1.510000 1.705000 1.680000 ;
+      RECT 0.415000  1.680000 0.675000 1.905000 ;
+      RECT 0.495000  0.545000 0.675000 1.510000 ;
+      RECT 0.855000  0.085000 1.065000 0.895000 ;
+      RECT 0.875000  1.855000 1.205000 2.635000 ;
+      RECT 1.535000  1.075000 1.865000 1.245000 ;
+      RECT 1.535000  1.245000 1.705000 1.510000 ;
+      RECT 1.735000  0.085000 2.120000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
index 887aa8b..96db810 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.magic.lef
@@ -66,20 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.895000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.895000 ;
-        RECT 2.775000  0.085000 3.030000 0.845000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -89,36 +75,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.575000 1.825000 0.825000 2.635000 ;
-        RECT 2.775000 2.145000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.445000 1.245000 1.655000 ;
-      RECT 0.085000 1.655000 0.405000 2.465000 ;
-      RECT 0.995000 1.655000 1.245000 2.295000 ;
-      RECT 0.995000 2.295000 2.125000 2.465000 ;
-      RECT 1.835000 1.445000 2.090000 1.890000 ;
-      RECT 1.835000 1.890000 2.125000 2.295000 ;
-      RECT 1.875000 1.075000 2.430000 1.245000 ;
-      RECT 2.215000 0.725000 2.565000 0.895000 ;
-      RECT 2.215000 0.895000 2.430000 1.075000 ;
-      RECT 2.260000 1.245000 2.430000 1.445000 ;
-      RECT 2.260000 1.445000 2.565000 1.615000 ;
-      RECT 2.395000 0.445000 2.565000 0.725000 ;
-      RECT 2.395000 1.615000 2.565000 2.460000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.895000 ;
+      RECT 0.085000  1.445000 1.245000 1.655000 ;
+      RECT 0.085000  1.655000 0.405000 2.465000 ;
+      RECT 0.575000  1.825000 0.825000 2.635000 ;
+      RECT 0.995000  1.655000 1.245000 2.295000 ;
+      RECT 0.995000  2.295000 2.125000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.835000  1.445000 2.090000 1.890000 ;
+      RECT 1.835000  1.890000 2.125000 2.295000 ;
+      RECT 1.875000  0.085000 2.045000 0.895000 ;
+      RECT 1.875000  1.075000 2.430000 1.245000 ;
+      RECT 2.215000  0.725000 2.565000 0.895000 ;
+      RECT 2.215000  0.895000 2.430000 1.075000 ;
+      RECT 2.260000  1.245000 2.430000 1.445000 ;
+      RECT 2.260000  1.445000 2.565000 1.615000 ;
+      RECT 2.395000  0.445000 2.565000 0.725000 ;
+      RECT 2.395000  1.615000 2.565000 2.460000 ;
+      RECT 2.775000  0.085000 3.030000 0.845000 ;
+      RECT 2.775000  2.145000 3.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 ;
   END
 END sky130_fd_sc_hd__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
index fc5e589..b7537b0 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.magic.lef
@@ -70,26 +70,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.555000 ;
-        RECT 2.715000  0.085000 2.885000 0.555000 ;
-        RECT 3.555000  0.085000 3.845000 0.905000 ;
-        RECT 4.525000  0.085000 4.815000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -99,40 +79,57 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.535000 1.835000 0.865000 2.635000 ;
-        RECT 1.375000 1.835000 1.625000 2.635000 ;
-        RECT 4.525000 1.495000 4.930000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.455000 2.125000 1.665000 ;
-      RECT 0.085000 1.665000 0.365000 2.465000 ;
-      RECT 1.035000 1.665000 1.205000 2.465000 ;
-      RECT 1.795000 1.665000 2.125000 2.295000 ;
-      RECT 1.795000 2.295000 3.855000 2.465000 ;
-      RECT 2.635000 1.935000 2.965000 2.295000 ;
-      RECT 2.795000 1.075000 4.275000 1.275000 ;
-      RECT 3.475000 1.575000 3.855000 2.295000 ;
-      RECT 4.025000 0.255000 4.355000 0.815000 ;
-      RECT 4.025000 0.815000 4.275000 1.075000 ;
-      RECT 4.025000 1.275000 4.275000 1.575000 ;
-      RECT 4.025000 1.575000 4.355000 2.465000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.905000 ;
+      RECT 0.085000  1.455000 2.125000 1.665000 ;
+      RECT 0.085000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.865000 2.635000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.035000  1.665000 1.205000 2.465000 ;
+      RECT 1.375000  1.835000 1.625000 2.635000 ;
+      RECT 1.795000  1.665000 2.125000 2.295000 ;
+      RECT 1.795000  2.295000 3.855000 2.465000 ;
+      RECT 1.875000  0.085000 2.045000 0.555000 ;
+      RECT 2.635000  1.935000 2.965000 2.295000 ;
+      RECT 2.715000  0.085000 2.885000 0.555000 ;
+      RECT 2.795000  1.075000 4.275000 1.275000 ;
+      RECT 3.475000  1.575000 3.855000 2.295000 ;
+      RECT 3.555000  0.085000 3.845000 0.905000 ;
+      RECT 4.025000  0.255000 4.355000 0.815000 ;
+      RECT 4.025000  0.815000 4.275000 1.075000 ;
+      RECT 4.025000  1.275000 4.275000 1.575000 ;
+      RECT 4.025000  1.575000 4.355000 2.465000 ;
+      RECT 4.525000  0.085000 4.815000 0.905000 ;
+      RECT 4.525000  1.495000 4.930000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor2b_4
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
index b02a516..75e1e7a 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_1.magic.lef
@@ -79,15 +79,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.485000 ;
-        RECT 1.355000  0.085000 1.685000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -97,16 +88,25 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 1.435000 1.835000 1.750000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       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.515000  0.085000 0.845000 0.485000 ;
+      RECT 1.355000  0.085000 1.685000 0.485000 ;
+      RECT 1.435000  1.835000 1.750000 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
 END sky130_fd_sc_hd__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
index 9ea6d03..ba4f81e 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_2.magic.lef
@@ -78,21 +78,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.585000 0.555000 ;
-        RECT 3.255000  0.085000 3.545000 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
@@ -102,31 +87,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.575000 1.795000 0.825000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 1.455000 2.085000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 0.995000 1.625000 1.245000 2.465000 ;
-      RECT 1.415000 1.795000 1.665000 2.295000 ;
-      RECT 1.415000 2.295000 3.465000 2.465000 ;
-      RECT 1.835000 1.625000 2.085000 2.125000 ;
-      RECT 2.415000 1.795000 2.625000 2.295000 ;
-      RECT 3.215000 1.795000 3.465000 2.295000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 2.085000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.575000  1.795000 0.825000 2.635000 ;
+      RECT 0.995000  1.625000 1.245000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.415000  1.795000 1.665000 2.295000 ;
+      RECT 1.415000  2.295000 3.465000 2.465000 ;
+      RECT 1.835000  1.625000 2.085000 2.125000 ;
+      RECT 1.875000  0.085000 2.585000 0.555000 ;
+      RECT 2.415000  1.795000 2.625000 2.295000 ;
+      RECT 3.215000  1.795000 3.465000 2.295000 ;
+      RECT 3.255000  0.085000 3.545000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
index 456facd..dd83738 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_4.magic.lef
@@ -88,29 +88,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.555000 ;
-        RECT 2.715000  0.085000 2.885000 0.555000 ;
-        RECT 3.555000  0.085000 3.725000 0.555000 ;
-        RECT 4.395000  0.085000 4.565000 0.555000 ;
-        RECT 5.235000  0.085000 5.405000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -120,46 +97,65 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.575000 1.795000 0.825000 2.635000 ;
-        RECT 1.415000 1.795000 1.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 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 1.455000 2.085000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 0.995000 1.625000 1.245000 2.465000 ;
-      RECT 1.835000 1.625000 2.085000 2.085000 ;
-      RECT 1.835000 2.085000 2.925000 2.465000 ;
-      RECT 2.255000 1.455000 3.345000 1.625000 ;
-      RECT 2.255000 1.625000 2.505000 1.915000 ;
-      RECT 2.675000 1.795000 2.925000 2.085000 ;
-      RECT 3.095000 1.625000 3.345000 2.295000 ;
-      RECT 3.095000 2.295000 5.025000 2.465000 ;
-      RECT 3.935000 2.135000 4.185000 2.295000 ;
-      RECT 4.775000 2.135000 5.025000 2.295000 ;
-      RECT 5.195000 2.125000 5.445000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 2.085000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.575000  1.795000 0.825000 2.635000 ;
+      RECT 0.995000  1.625000 1.245000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.415000  1.795000 1.665000 2.635000 ;
+      RECT 1.835000  1.625000 2.085000 2.085000 ;
+      RECT 1.835000  2.085000 2.925000 2.465000 ;
+      RECT 1.875000  0.085000 2.045000 0.555000 ;
+      RECT 2.255000  1.455000 3.345000 1.625000 ;
+      RECT 2.255000  1.625000 2.505000 1.915000 ;
+      RECT 2.675000  1.795000 2.925000 2.085000 ;
+      RECT 2.715000  0.085000 2.885000 0.555000 ;
+      RECT 3.095000  1.625000 3.345000 2.295000 ;
+      RECT 3.095000  2.295000 5.025000 2.465000 ;
+      RECT 3.555000  0.085000 3.725000 0.555000 ;
+      RECT 3.935000  2.135000 4.185000 2.295000 ;
+      RECT 4.395000  0.085000 4.565000 0.555000 ;
+      RECT 4.775000  2.135000 5.025000 2.295000 ;
+      RECT 5.195000  2.125000 5.445000 2.465000 ;
+      RECT 5.235000  0.085000 5.405000 0.555000 ;
     LAYER mcon ;
-      RECT 2.445000 2.125000 2.615000 2.295000 ;
-      RECT 5.205000 2.125000 5.375000 2.295000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.125000 2.615000 2.295000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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.125000 5.375000 2.295000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
     LAYER met1 ;
       RECT 2.385000 2.065000 2.680000 2.140000 ;
       RECT 2.385000 2.140000 5.440000 2.280000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
index f5a0842..8685ea2 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.magic.lef
@@ -75,17 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.775000  0.085000 1.105000 0.485000 ;
-        RECT 1.615000  0.085000 1.945000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -95,27 +84,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 1.615000 2.125000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.075000 0.885000 1.245000 ;
-      RECT 0.715000 1.245000 0.885000 1.785000 ;
-      RECT 0.715000 1.785000 2.675000 1.955000 ;
-      RECT 2.180000 0.405000 2.350000 0.655000 ;
-      RECT 2.180000 0.655000 2.675000 0.825000 ;
-      RECT 2.505000 0.825000 2.675000 1.785000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.425000  1.075000 0.885000 1.245000 ;
+      RECT 0.715000  1.245000 0.885000 1.785000 ;
+      RECT 0.715000  1.785000 2.675000 1.955000 ;
+      RECT 0.775000  0.085000 1.105000 0.485000 ;
+      RECT 1.615000  0.085000 1.945000 0.825000 ;
+      RECT 1.615000  2.125000 1.945000 2.635000 ;
+      RECT 2.180000  0.405000 2.350000 0.655000 ;
+      RECT 2.180000  0.655000 2.675000 0.825000 ;
+      RECT 2.505000  0.825000 2.675000 1.785000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
index 6f64b38..fe1f71c 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.magic.lef
@@ -75,24 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.605000 0.555000 ;
-        RECT 3.275000  0.085000 3.480000 0.895000 ;
-        RECT 4.215000  0.085000 4.505000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -102,39 +84,54 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.575000 1.795000 0.825000 2.635000 ;
-        RECT 4.215000 1.540000 4.465000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 2.085000 1.625000 ;
-      RECT 0.090000 1.625000 0.405000 2.465000 ;
-      RECT 0.995000 1.625000 1.245000 2.465000 ;
-      RECT 1.415000 1.795000 1.665000 2.295000 ;
-      RECT 1.415000 2.295000 3.480000 2.465000 ;
-      RECT 1.835000 1.625000 2.085000 2.125000 ;
-      RECT 2.375000 1.455000 2.645000 2.295000 ;
-      RECT 3.235000 1.075000 3.860000 1.285000 ;
-      RECT 3.235000 1.455000 3.480000 2.295000 ;
-      RECT 3.690000 0.380000 4.045000 0.905000 ;
-      RECT 3.690000 0.905000 3.860000 1.075000 ;
-      RECT 3.690000 1.285000 3.860000 1.455000 ;
-      RECT 3.690000 1.455000 4.045000 1.870000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 2.085000 1.625000 ;
+      RECT 0.090000  1.625000 0.405000 2.465000 ;
+      RECT 0.575000  1.795000 0.825000 2.635000 ;
+      RECT 0.995000  1.625000 1.245000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.415000  1.795000 1.665000 2.295000 ;
+      RECT 1.415000  2.295000 3.480000 2.465000 ;
+      RECT 1.835000  1.625000 2.085000 2.125000 ;
+      RECT 1.875000  0.085000 2.605000 0.555000 ;
+      RECT 2.375000  1.455000 2.645000 2.295000 ;
+      RECT 3.235000  1.075000 3.860000 1.285000 ;
+      RECT 3.235000  1.455000 3.480000 2.295000 ;
+      RECT 3.275000  0.085000 3.480000 0.895000 ;
+      RECT 3.690000  0.380000 4.045000 0.905000 ;
+      RECT 3.690000  0.905000 3.860000 1.075000 ;
+      RECT 3.690000  1.285000 3.860000 1.455000 ;
+      RECT 3.690000  1.455000 4.045000 1.870000 ;
+      RECT 4.215000  0.085000 4.505000 0.825000 ;
+      RECT 4.215000  1.540000 4.465000 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
 END sky130_fd_sc_hd__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
index 4d74e5d..b98f2e7 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.magic.lef
@@ -83,31 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.615000  0.085000 0.785000 0.555000 ;
-        RECT 1.455000  0.085000 1.625000 0.555000 ;
-        RECT 2.295000  0.085000 2.985000 0.555000 ;
-        RECT 3.655000  0.085000 3.825000 0.555000 ;
-        RECT 4.495000  0.085000 4.665000 0.555000 ;
-        RECT 5.335000  0.085000 5.505000 0.555000 ;
-        RECT 6.175000  0.085000 6.345000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -117,50 +92,72 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.575000 1.795000 0.825000 2.635000 ;
-        RECT 1.415000 2.135000 1.665000 2.635000 ;
-        RECT 2.255000 2.135000 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 ;
-        RECT 2.905000 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.110000 0.255000 0.445000 0.735000 ;
-      RECT 0.110000 0.735000 0.785000 0.905000 ;
-      RECT 0.110000 1.455000 4.705000 1.625000 ;
-      RECT 0.110000 1.625000 0.405000 2.465000 ;
-      RECT 0.615000 0.905000 0.785000 1.455000 ;
-      RECT 0.995000 1.795000 4.285000 1.965000 ;
-      RECT 0.995000 1.965000 1.245000 2.465000 ;
-      RECT 1.835000 1.965000 2.085000 2.465000 ;
-      RECT 2.775000 2.135000 3.025000 2.295000 ;
-      RECT 2.775000 2.295000 6.385000 2.465000 ;
-      RECT 3.195000 1.965000 3.445000 2.125000 ;
-      RECT 3.615000 2.135000 3.865000 2.295000 ;
-      RECT 4.035000 1.965000 4.285000 2.125000 ;
-      RECT 4.455000 1.795000 4.705000 2.295000 ;
-      RECT 4.535000 1.075000 6.125000 1.285000 ;
-      RECT 4.535000 1.285000 4.705000 1.455000 ;
-      RECT 5.295000 1.795000 5.545000 2.295000 ;
-      RECT 6.135000 1.795000 6.385000 2.295000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.110000  0.255000 0.445000 0.735000 ;
+      RECT 0.110000  0.735000 0.785000 0.905000 ;
+      RECT 0.110000  1.455000 4.705000 1.625000 ;
+      RECT 0.110000  1.625000 0.405000 2.465000 ;
+      RECT 0.575000  1.795000 0.825000 2.635000 ;
+      RECT 0.615000  0.085000 0.785000 0.555000 ;
+      RECT 0.615000  0.905000 0.785000 1.455000 ;
+      RECT 0.995000  1.795000 4.285000 1.965000 ;
+      RECT 0.995000  1.965000 1.245000 2.465000 ;
+      RECT 1.415000  2.135000 1.665000 2.635000 ;
+      RECT 1.455000  0.085000 1.625000 0.555000 ;
+      RECT 1.835000  1.965000 2.085000 2.465000 ;
+      RECT 2.255000  2.135000 2.505000 2.635000 ;
+      RECT 2.295000  0.085000 2.985000 0.555000 ;
+      RECT 2.775000  2.135000 3.025000 2.295000 ;
+      RECT 2.775000  2.295000 6.385000 2.465000 ;
+      RECT 3.195000  1.965000 3.445000 2.125000 ;
+      RECT 3.615000  2.135000 3.865000 2.295000 ;
+      RECT 3.655000  0.085000 3.825000 0.555000 ;
+      RECT 4.035000  1.965000 4.285000 2.125000 ;
+      RECT 4.455000  1.795000 4.705000 2.295000 ;
+      RECT 4.495000  0.085000 4.665000 0.555000 ;
+      RECT 4.535000  1.075000 6.125000 1.285000 ;
+      RECT 4.535000  1.285000 4.705000 1.455000 ;
+      RECT 5.295000  1.795000 5.545000 2.295000 ;
+      RECT 5.335000  0.085000 5.505000 0.555000 ;
+      RECT 6.135000  1.795000 6.385000 2.295000 ;
+      RECT 6.175000  0.085000 6.345000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor3b_4
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
index f3cc184..44a82bf 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_1.magic.lef
@@ -89,17 +89,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.575000 ;
-        RECT 1.035000  0.085000 1.365000 0.485000 ;
-        RECT 1.875000  0.085000 2.205000 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
@@ -109,17 +98,28 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.955000 1.835000 2.215000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.575000 ;
+      RECT 1.035000  0.085000 1.365000 0.485000 ;
+      RECT 1.875000  0.085000 2.205000 0.485000 ;
+      RECT 1.955000  1.835000 2.215000 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
 END sky130_fd_sc_hd__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
index 3eb907e..dd9944d 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_2.magic.lef
@@ -87,24 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.605000 0.555000 ;
-        RECT 3.275000  0.085000 3.445000 0.555000 ;
-        RECT 4.115000  0.085000 4.405000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -114,37 +96,52 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.575000 1.795000 0.825000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 1.455000 2.085000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 0.995000 1.625000 1.245000 2.465000 ;
-      RECT 1.415000 1.795000 1.665000 2.295000 ;
-      RECT 1.415000 2.295000 3.065000 2.465000 ;
-      RECT 1.835000 1.625000 2.085000 2.125000 ;
-      RECT 2.395000 1.455000 3.485000 1.625000 ;
-      RECT 2.395000 1.625000 2.645000 2.125000 ;
-      RECT 2.815000 1.795000 3.065000 2.295000 ;
-      RECT 3.235000 1.625000 3.485000 2.295000 ;
-      RECT 3.235000 2.295000 4.325000 2.465000 ;
-      RECT 4.075000 1.795000 4.325000 2.295000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 2.085000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.575000  1.795000 0.825000 2.635000 ;
+      RECT 0.995000  1.625000 1.245000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.415000  1.795000 1.665000 2.295000 ;
+      RECT 1.415000  2.295000 3.065000 2.465000 ;
+      RECT 1.835000  1.625000 2.085000 2.125000 ;
+      RECT 1.875000  0.085000 2.605000 0.555000 ;
+      RECT 2.395000  1.455000 3.485000 1.625000 ;
+      RECT 2.395000  1.625000 2.645000 2.125000 ;
+      RECT 2.815000  1.795000 3.065000 2.295000 ;
+      RECT 3.235000  1.625000 3.485000 2.295000 ;
+      RECT 3.235000  2.295000 4.325000 2.465000 ;
+      RECT 3.275000  0.085000 3.445000 0.555000 ;
+      RECT 4.075000  1.795000 4.325000 2.295000 ;
+      RECT 4.115000  0.085000 4.405000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
index c5fec20..745c012 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_4.magic.lef
@@ -92,35 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.035000  0.085000 1.205000 0.555000 ;
-        RECT 1.875000  0.085000 2.045000 0.555000 ;
-        RECT 2.715000  0.085000 2.885000 0.555000 ;
-        RECT 3.555000  0.085000 4.245000 0.555000 ;
-        RECT 4.915000  0.085000 5.085000 0.555000 ;
-        RECT 5.755000  0.085000 5.925000 0.555000 ;
-        RECT 6.595000  0.085000 6.765000 0.555000 ;
-        RECT 7.435000  0.085000 7.605000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -130,51 +101,77 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.575000 1.795000 0.825000 2.635000 ;
-        RECT 1.415000 1.795000 1.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 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 2.085000 1.625000 ;
-      RECT 0.090000 1.625000 0.405000 2.465000 ;
-      RECT 0.995000 1.625000 1.245000 2.465000 ;
-      RECT 1.835000 1.625000 2.085000 2.295000 ;
-      RECT 1.835000 2.295000 3.820000 2.465000 ;
-      RECT 2.255000 1.455000 5.545000 1.625000 ;
-      RECT 2.255000 1.625000 2.505000 2.125000 ;
-      RECT 2.675000 1.795000 2.925000 2.295000 ;
-      RECT 3.095000 1.625000 3.345000 2.125000 ;
-      RECT 3.515000 1.795000 3.820000 2.295000 ;
-      RECT 4.005000 1.795000 4.285000 2.295000 ;
-      RECT 4.005000 2.295000 7.645000 2.465000 ;
-      RECT 4.455000 1.625000 4.705000 2.125000 ;
-      RECT 4.875000 1.795000 5.125000 2.295000 ;
-      RECT 5.295000 1.625000 5.545000 2.125000 ;
-      RECT 5.715000 1.795000 5.965000 2.295000 ;
-      RECT 6.555000 1.795000 6.805000 2.295000 ;
-      RECT 7.395000 1.795000 7.645000 2.295000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 2.085000 1.625000 ;
+      RECT 0.090000  1.625000 0.405000 2.465000 ;
+      RECT 0.575000  1.795000 0.825000 2.635000 ;
+      RECT 0.995000  1.625000 1.245000 2.465000 ;
+      RECT 1.035000  0.085000 1.205000 0.555000 ;
+      RECT 1.415000  1.795000 1.665000 2.635000 ;
+      RECT 1.835000  1.625000 2.085000 2.295000 ;
+      RECT 1.835000  2.295000 3.820000 2.465000 ;
+      RECT 1.875000  0.085000 2.045000 0.555000 ;
+      RECT 2.255000  1.455000 5.545000 1.625000 ;
+      RECT 2.255000  1.625000 2.505000 2.125000 ;
+      RECT 2.675000  1.795000 2.925000 2.295000 ;
+      RECT 2.715000  0.085000 2.885000 0.555000 ;
+      RECT 3.095000  1.625000 3.345000 2.125000 ;
+      RECT 3.515000  1.795000 3.820000 2.295000 ;
+      RECT 3.555000  0.085000 4.245000 0.555000 ;
+      RECT 4.005000  1.795000 4.285000 2.295000 ;
+      RECT 4.005000  2.295000 7.645000 2.465000 ;
+      RECT 4.455000  1.625000 4.705000 2.125000 ;
+      RECT 4.875000  1.795000 5.125000 2.295000 ;
+      RECT 4.915000  0.085000 5.085000 0.555000 ;
+      RECT 5.295000  1.625000 5.545000 2.125000 ;
+      RECT 5.715000  1.795000 5.965000 2.295000 ;
+      RECT 5.755000  0.085000 5.925000 0.555000 ;
+      RECT 6.555000  1.795000 6.805000 2.295000 ;
+      RECT 6.595000  0.085000 6.765000 0.555000 ;
+      RECT 7.395000  1.795000 7.645000 2.295000 ;
+      RECT 7.435000  0.085000 7.605000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor4_4
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
index bc7fab6..1941853 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.magic.lef
@@ -83,19 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.355000  0.085000 0.685000 0.480000 ;
-        RECT 1.225000  0.085000 1.555000 0.485000 ;
-        RECT 2.095000  0.085000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -105,27 +92,37 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 2.095000 2.185000 2.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 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 0.995000 0.745000 1.795000 ;
-      RECT 0.525000 1.795000 3.135000 2.005000 ;
-      RECT 2.660000 0.405000 2.830000 0.655000 ;
-      RECT 2.660000 0.655000 3.135000 0.825000 ;
-      RECT 2.965000 0.825000 3.135000 1.795000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.355000  0.085000 0.685000 0.480000 ;
+      RECT 0.525000  0.995000 0.745000 1.795000 ;
+      RECT 0.525000  1.795000 3.135000 2.005000 ;
+      RECT 1.225000  0.085000 1.555000 0.485000 ;
+      RECT 2.095000  0.085000 2.425000 0.825000 ;
+      RECT 2.095000  2.185000 2.425000 2.635000 ;
+      RECT 2.660000  0.405000 2.830000 0.655000 ;
+      RECT 2.660000  0.655000 3.135000 0.825000 ;
+      RECT 2.965000  0.825000 3.135000 1.795000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
index be34cd9..d1e191c 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.magic.lef
@@ -89,27 +89,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.905000 ;
-        RECT 1.015000  0.085000 1.185000 0.555000 ;
-        RECT 1.855000  0.085000 2.580000 0.555000 ;
-        RECT 3.250000  0.085000 3.420000 0.555000 ;
-        RECT 4.090000  0.085000 4.295000 0.895000 ;
-        RECT 4.990000  0.085000 5.240000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -119,45 +98,63 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.595000 1.795000 0.805000 2.635000 ;
-        RECT 4.990000 2.135000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.455000 2.105000 1.625000 ;
-      RECT 0.085000 1.625000 0.425000 2.465000 ;
-      RECT 0.975000 1.625000 1.225000 2.465000 ;
-      RECT 1.395000 1.795000 1.605000 2.295000 ;
-      RECT 1.395000 2.295000 3.040000 2.465000 ;
-      RECT 1.775000 1.625000 2.105000 2.125000 ;
-      RECT 2.275000 1.455000 3.460000 1.625000 ;
-      RECT 2.275000 1.625000 2.660000 2.125000 ;
-      RECT 2.830000 1.795000 3.040000 2.295000 ;
-      RECT 3.210000 1.625000 3.460000 2.295000 ;
-      RECT 3.210000 2.295000 4.295000 2.465000 ;
-      RECT 4.050000 1.795000 4.295000 2.295000 ;
-      RECT 4.320000 1.075000 4.635000 1.245000 ;
-      RECT 4.465000 0.380000 4.820000 0.905000 ;
-      RECT 4.465000 0.905000 4.635000 1.075000 ;
-      RECT 4.465000 1.245000 4.635000 2.035000 ;
-      RECT 4.465000 2.035000 4.820000 2.450000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.905000 ;
+      RECT 0.085000  1.455000 2.105000 1.625000 ;
+      RECT 0.085000  1.625000 0.425000 2.465000 ;
+      RECT 0.595000  1.795000 0.805000 2.635000 ;
+      RECT 0.975000  1.625000 1.225000 2.465000 ;
+      RECT 1.015000  0.085000 1.185000 0.555000 ;
+      RECT 1.395000  1.795000 1.605000 2.295000 ;
+      RECT 1.395000  2.295000 3.040000 2.465000 ;
+      RECT 1.775000  1.625000 2.105000 2.125000 ;
+      RECT 1.855000  0.085000 2.580000 0.555000 ;
+      RECT 2.275000  1.455000 3.460000 1.625000 ;
+      RECT 2.275000  1.625000 2.660000 2.125000 ;
+      RECT 2.830000  1.795000 3.040000 2.295000 ;
+      RECT 3.210000  1.625000 3.460000 2.295000 ;
+      RECT 3.210000  2.295000 4.295000 2.465000 ;
+      RECT 3.250000  0.085000 3.420000 0.555000 ;
+      RECT 4.050000  1.795000 4.295000 2.295000 ;
+      RECT 4.090000  0.085000 4.295000 0.895000 ;
+      RECT 4.320000  1.075000 4.635000 1.245000 ;
+      RECT 4.465000  0.380000 4.820000 0.905000 ;
+      RECT 4.465000  0.905000 4.635000 1.075000 ;
+      RECT 4.465000  1.245000 4.635000 2.035000 ;
+      RECT 4.465000  2.035000 4.820000 2.450000 ;
+      RECT 4.990000  0.085000 5.240000 0.825000 ;
+      RECT 4.990000  2.135000 5.240000 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
 END sky130_fd_sc_hd__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
index 1f57e4b..79eeeee 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.magic.lef
@@ -92,38 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.895000 ;
-        RECT 1.015000  0.085000 1.185000 0.555000 ;
-        RECT 1.855000  0.085000 2.025000 0.555000 ;
-        RECT 2.695000  0.085000 2.865000 0.555000 ;
-        RECT 3.535000  0.085000 4.225000 0.555000 ;
-        RECT 4.895000  0.085000 5.065000 0.555000 ;
-        RECT 5.735000  0.085000 5.905000 0.555000 ;
-        RECT 6.575000  0.085000 6.745000 0.555000 ;
-        RECT 7.415000  0.085000 7.585000 0.555000 ;
-        RECT 8.355000  0.085000 8.585000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -133,61 +101,90 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.595000 1.795000 0.805000 2.635000 ;
-        RECT 1.395000 1.795000 1.645000 2.635000 ;
-        RECT 8.355000 1.455000 8.585000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.455000 2.065000 1.625000 ;
-      RECT 0.095000 1.625000 0.425000 2.465000 ;
-      RECT 0.975000 1.625000 1.225000 2.465000 ;
-      RECT 1.815000 1.625000 2.065000 2.295000 ;
-      RECT 1.815000 2.295000 3.745000 2.465000 ;
-      RECT 2.235000 1.455000 5.525000 1.625000 ;
-      RECT 2.235000 1.625000 2.485000 2.125000 ;
-      RECT 2.655000 1.795000 2.905000 2.295000 ;
-      RECT 3.075000 1.625000 3.325000 2.125000 ;
-      RECT 3.495000 1.795000 3.745000 2.295000 ;
-      RECT 4.015000 1.795000 4.265000 2.295000 ;
-      RECT 4.015000 2.295000 7.625000 2.465000 ;
-      RECT 4.435000 1.625000 4.685000 2.125000 ;
-      RECT 4.855000 1.795000 5.105000 2.295000 ;
-      RECT 5.275000 1.625000 5.525000 2.125000 ;
-      RECT 5.695000 1.455000 5.945000 2.295000 ;
-      RECT 6.535000 1.795000 6.785000 2.295000 ;
-      RECT 6.635000 1.075000 7.640000 1.285000 ;
-      RECT 7.375000 1.795000 7.625000 2.295000 ;
-      RECT 7.470000 0.735000 8.185000 0.905000 ;
-      RECT 7.470000 0.905000 7.640000 1.075000 ;
-      RECT 7.470000 1.285000 7.640000 1.455000 ;
-      RECT 7.470000 1.455000 8.185000 1.625000 ;
-      RECT 7.810000 0.255000 8.185000 0.735000 ;
-      RECT 7.850000 1.625000 8.185000 2.465000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.095000  1.455000 2.065000 1.625000 ;
+      RECT 0.095000  1.625000 0.425000 2.465000 ;
+      RECT 0.175000  0.085000 0.345000 0.895000 ;
+      RECT 0.595000  1.795000 0.805000 2.635000 ;
+      RECT 0.975000  1.625000 1.225000 2.465000 ;
+      RECT 1.015000  0.085000 1.185000 0.555000 ;
+      RECT 1.395000  1.795000 1.645000 2.635000 ;
+      RECT 1.815000  1.625000 2.065000 2.295000 ;
+      RECT 1.815000  2.295000 3.745000 2.465000 ;
+      RECT 1.855000  0.085000 2.025000 0.555000 ;
+      RECT 2.235000  1.455000 5.525000 1.625000 ;
+      RECT 2.235000  1.625000 2.485000 2.125000 ;
+      RECT 2.655000  1.795000 2.905000 2.295000 ;
+      RECT 2.695000  0.085000 2.865000 0.555000 ;
+      RECT 3.075000  1.625000 3.325000 2.125000 ;
+      RECT 3.495000  1.795000 3.745000 2.295000 ;
+      RECT 3.535000  0.085000 4.225000 0.555000 ;
+      RECT 4.015000  1.795000 4.265000 2.295000 ;
+      RECT 4.015000  2.295000 7.625000 2.465000 ;
+      RECT 4.435000  1.625000 4.685000 2.125000 ;
+      RECT 4.855000  1.795000 5.105000 2.295000 ;
+      RECT 4.895000  0.085000 5.065000 0.555000 ;
+      RECT 5.275000  1.625000 5.525000 2.125000 ;
+      RECT 5.695000  1.455000 5.945000 2.295000 ;
+      RECT 5.735000  0.085000 5.905000 0.555000 ;
+      RECT 6.535000  1.795000 6.785000 2.295000 ;
+      RECT 6.575000  0.085000 6.745000 0.555000 ;
+      RECT 6.635000  1.075000 7.640000 1.285000 ;
+      RECT 7.375000  1.795000 7.625000 2.295000 ;
+      RECT 7.415000  0.085000 7.585000 0.555000 ;
+      RECT 7.470000  0.735000 8.185000 0.905000 ;
+      RECT 7.470000  0.905000 7.640000 1.075000 ;
+      RECT 7.470000  1.285000 7.640000 1.455000 ;
+      RECT 7.470000  1.455000 8.185000 1.625000 ;
+      RECT 7.810000  0.255000 8.185000 0.735000 ;
+      RECT 7.850000  1.625000 8.185000 2.465000 ;
+      RECT 8.355000  0.085000 8.585000 0.905000 ;
+      RECT 8.355000  1.455000 8.585000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor4b_4
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
index f9187d7..8a4b16c 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.magic.lef
@@ -87,21 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.655000  0.085000 0.825000 0.825000 ;
-        RECT 1.515000  0.085000 1.845000 0.480000 ;
-        RECT 2.385000  0.085000 2.715000 0.485000 ;
-        RECT 3.255000  0.085000 3.585000 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
@@ -111,37 +96,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.240000 0.845000 2.635000 ;
-        RECT 3.255000 1.875000 3.585000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.405000 0.825000 ;
-      RECT 0.085000 0.825000 0.260000 1.885000 ;
-      RECT 0.085000 1.885000 1.205000 2.070000 ;
-      RECT 0.085000 2.070000 0.345000 2.455000 ;
-      RECT 0.995000 1.525000 1.590000 1.715000 ;
-      RECT 1.035000 2.070000 1.205000 2.295000 ;
-      RECT 1.035000 2.295000 2.395000 2.465000 ;
-      RECT 1.075000 0.450000 1.245000 0.655000 ;
-      RECT 1.075000 0.655000 1.590000 0.825000 ;
-      RECT 1.410000 0.825000 1.590000 0.995000 ;
-      RECT 1.410000 0.995000 1.685000 1.325000 ;
-      RECT 1.410000 1.325000 1.590000 1.525000 ;
-      RECT 2.225000 0.995000 2.395000 2.295000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.450000 0.405000 0.825000 ;
+      RECT 0.085000  0.825000 0.260000 1.885000 ;
+      RECT 0.085000  1.885000 1.205000 2.070000 ;
+      RECT 0.085000  2.070000 0.345000 2.455000 ;
+      RECT 0.515000  2.240000 0.845000 2.635000 ;
+      RECT 0.655000  0.085000 0.825000 0.825000 ;
+      RECT 0.995000  1.525000 1.590000 1.715000 ;
+      RECT 1.035000  2.070000 1.205000 2.295000 ;
+      RECT 1.035000  2.295000 2.395000 2.465000 ;
+      RECT 1.075000  0.450000 1.245000 0.655000 ;
+      RECT 1.075000  0.655000 1.590000 0.825000 ;
+      RECT 1.410000  0.825000 1.590000 0.995000 ;
+      RECT 1.410000  0.995000 1.685000 1.325000 ;
+      RECT 1.410000  1.325000 1.590000 1.525000 ;
+      RECT 1.515000  0.085000 1.845000 0.480000 ;
+      RECT 2.225000  0.995000 2.395000 2.295000 ;
+      RECT 2.385000  0.085000 2.715000 0.485000 ;
+      RECT 3.255000  0.085000 3.585000 0.825000 ;
+      RECT 3.255000  1.875000 3.585000 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
 END sky130_fd_sc_hd__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
index 6487187..b417ccf 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.magic.lef
@@ -86,28 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.635000  0.085000 0.805000 0.825000 ;
-        RECT 1.560000  0.085000 1.890000 0.480000 ;
-        RECT 2.560000  0.085000 2.730000 0.555000 ;
-        RECT 3.400000  0.085000 4.110000 0.555000 ;
-        RECT 4.780000  0.085000 4.950000 0.555000 ;
-        RECT 5.620000  0.085000 5.895000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -117,54 +95,73 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 2.240000 0.845000 2.635000 ;
-        RECT 5.160000 1.795000 5.370000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.465000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.885000 ;
-      RECT 0.085000 1.885000 1.915000 2.055000 ;
-      RECT 0.085000 2.055000 0.345000 2.455000 ;
-      RECT 0.995000 1.525000 1.575000 1.715000 ;
-      RECT 1.055000 0.450000 1.250000 0.655000 ;
-      RECT 1.055000 0.655000 1.575000 0.825000 ;
-      RECT 1.405000 0.825000 1.575000 1.075000 ;
-      RECT 1.405000 1.075000 2.390000 1.245000 ;
-      RECT 1.405000 1.245000 1.575000 1.525000 ;
-      RECT 1.640000 2.225000 1.970000 2.295000 ;
-      RECT 1.640000 2.295000 3.650000 2.465000 ;
-      RECT 1.745000 1.415000 2.730000 1.585000 ;
-      RECT 1.745000 1.585000 1.915000 1.885000 ;
-      RECT 2.140000 1.795000 2.310000 1.875000 ;
-      RECT 2.140000 1.875000 4.610000 2.045000 ;
-      RECT 2.140000 2.045000 2.310000 2.125000 ;
-      RECT 2.480000 2.215000 3.650000 2.295000 ;
-      RECT 2.560000 1.075000 3.405000 1.275000 ;
-      RECT 2.560000 1.275000 2.730000 1.415000 ;
-      RECT 3.860000 2.215000 4.990000 2.465000 ;
-      RECT 4.320000 1.455000 4.610000 1.875000 ;
-      RECT 4.780000 1.455000 5.870000 1.625000 ;
-      RECT 4.780000 1.625000 4.990000 2.215000 ;
-      RECT 5.540000 1.625000 5.870000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.450000 0.465000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.885000 ;
+      RECT 0.085000  1.885000 1.915000 2.055000 ;
+      RECT 0.085000  2.055000 0.345000 2.455000 ;
+      RECT 0.515000  2.240000 0.845000 2.635000 ;
+      RECT 0.635000  0.085000 0.805000 0.825000 ;
+      RECT 0.995000  1.525000 1.575000 1.715000 ;
+      RECT 1.055000  0.450000 1.250000 0.655000 ;
+      RECT 1.055000  0.655000 1.575000 0.825000 ;
+      RECT 1.405000  0.825000 1.575000 1.075000 ;
+      RECT 1.405000  1.075000 2.390000 1.245000 ;
+      RECT 1.405000  1.245000 1.575000 1.525000 ;
+      RECT 1.560000  0.085000 1.890000 0.480000 ;
+      RECT 1.640000  2.225000 1.970000 2.295000 ;
+      RECT 1.640000  2.295000 3.650000 2.465000 ;
+      RECT 1.745000  1.415000 2.730000 1.585000 ;
+      RECT 1.745000  1.585000 1.915000 1.885000 ;
+      RECT 2.140000  1.795000 2.310000 1.875000 ;
+      RECT 2.140000  1.875000 4.610000 2.045000 ;
+      RECT 2.140000  2.045000 2.310000 2.125000 ;
+      RECT 2.480000  2.215000 3.650000 2.295000 ;
+      RECT 2.560000  0.085000 2.730000 0.555000 ;
+      RECT 2.560000  1.075000 3.405000 1.275000 ;
+      RECT 2.560000  1.275000 2.730000 1.415000 ;
+      RECT 3.400000  0.085000 4.110000 0.555000 ;
+      RECT 3.860000  2.215000 4.990000 2.465000 ;
+      RECT 4.320000  1.455000 4.610000 1.875000 ;
+      RECT 4.780000  0.085000 4.950000 0.555000 ;
+      RECT 4.780000  1.455000 5.870000 1.625000 ;
+      RECT 4.780000  1.625000 4.990000 2.215000 ;
+      RECT 5.160000  1.795000 5.370000 2.635000 ;
+      RECT 5.540000  1.625000 5.870000 2.465000 ;
+      RECT 5.620000  0.085000 5.895000 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
 END sky130_fd_sc_hd__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
index 8fd2e08..cb551d8 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.magic.lef
@@ -90,39 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.615000  0.085000 0.785000 0.555000 ;
-        RECT 1.595000  0.085000 1.765000 0.555000 ;
-        RECT 2.435000  0.085000 2.605000 0.555000 ;
-        RECT 3.275000  0.085000 3.445000 0.555000 ;
-        RECT 4.115000  0.085000 4.285000 0.555000 ;
-        RECT 4.955000  0.085000 5.645000 0.555000 ;
-        RECT 6.315000  0.085000 6.485000 0.555000 ;
-        RECT 7.155000  0.085000 7.325000 0.555000 ;
-        RECT 7.995000  0.085000 8.165000 0.555000 ;
-        RECT 8.835000  0.085000 9.110000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -132,67 +99,97 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.535000 2.215000 0.865000 2.635000 ;
-        RECT 7.535000 1.795000 7.785000 2.635000 ;
-        RECT 8.375000 1.795000 8.625000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.445000 0.725000 ;
-      RECT 0.085000 0.725000 0.785000 0.895000 ;
-      RECT 0.085000 1.535000 0.785000 1.875000 ;
-      RECT 0.085000 1.875000 3.525000 2.045000 ;
-      RECT 0.085000 2.045000 0.365000 2.465000 ;
-      RECT 0.615000 0.895000 0.785000 1.535000 ;
-      RECT 0.955000 0.255000 1.285000 0.735000 ;
-      RECT 0.955000 0.735000 1.635000 0.905000 ;
-      RECT 0.955000 1.535000 1.635000 1.705000 ;
-      RECT 1.465000 0.905000 1.635000 1.075000 ;
-      RECT 1.465000 1.075000 2.845000 1.245000 ;
-      RECT 1.465000 1.245000 1.635000 1.535000 ;
-      RECT 1.515000 2.215000 3.525000 2.295000 ;
-      RECT 1.515000 2.295000 5.195000 2.465000 ;
-      RECT 3.355000 1.075000 4.905000 1.285000 ;
-      RECT 3.355000 1.285000 3.525000 1.875000 ;
-      RECT 3.695000 1.455000 6.945000 1.625000 ;
-      RECT 3.695000 1.625000 3.905000 2.125000 ;
-      RECT 4.075000 1.795000 4.325000 2.295000 ;
-      RECT 4.495000 1.625000 4.745000 2.125000 ;
-      RECT 4.915000 1.795000 5.195000 2.295000 ;
-      RECT 5.380000 1.795000 5.685000 2.295000 ;
-      RECT 5.380000 2.295000 7.365000 2.465000 ;
-      RECT 5.855000 1.625000 6.105000 2.125000 ;
-      RECT 6.275000 1.795000 6.525000 2.295000 ;
-      RECT 6.695000 1.625000 6.945000 2.125000 ;
-      RECT 7.115000 1.455000 9.110000 1.625000 ;
-      RECT 7.115000 1.625000 7.365000 2.295000 ;
-      RECT 7.955000 1.625000 8.205000 2.465000 ;
-      RECT 8.795000 1.625000 9.110000 2.465000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.085000  0.255000 0.445000 0.725000 ;
+      RECT 0.085000  0.725000 0.785000 0.895000 ;
+      RECT 0.085000  1.535000 0.785000 1.875000 ;
+      RECT 0.085000  1.875000 3.525000 2.045000 ;
+      RECT 0.085000  2.045000 0.365000 2.465000 ;
+      RECT 0.535000  2.215000 0.865000 2.635000 ;
+      RECT 0.615000  0.085000 0.785000 0.555000 ;
+      RECT 0.615000  0.895000 0.785000 1.535000 ;
+      RECT 0.955000  0.255000 1.285000 0.735000 ;
+      RECT 0.955000  0.735000 1.635000 0.905000 ;
+      RECT 0.955000  1.535000 1.635000 1.705000 ;
+      RECT 1.465000  0.905000 1.635000 1.075000 ;
+      RECT 1.465000  1.075000 2.845000 1.245000 ;
+      RECT 1.465000  1.245000 1.635000 1.535000 ;
+      RECT 1.515000  2.215000 3.525000 2.295000 ;
+      RECT 1.515000  2.295000 5.195000 2.465000 ;
+      RECT 1.595000  0.085000 1.765000 0.555000 ;
+      RECT 2.435000  0.085000 2.605000 0.555000 ;
+      RECT 3.275000  0.085000 3.445000 0.555000 ;
+      RECT 3.355000  1.075000 4.905000 1.285000 ;
+      RECT 3.355000  1.285000 3.525000 1.875000 ;
+      RECT 3.695000  1.455000 6.945000 1.625000 ;
+      RECT 3.695000  1.625000 3.905000 2.125000 ;
+      RECT 4.075000  1.795000 4.325000 2.295000 ;
+      RECT 4.115000  0.085000 4.285000 0.555000 ;
+      RECT 4.495000  1.625000 4.745000 2.125000 ;
+      RECT 4.915000  1.795000 5.195000 2.295000 ;
+      RECT 4.955000  0.085000 5.645000 0.555000 ;
+      RECT 5.380000  1.795000 5.685000 2.295000 ;
+      RECT 5.380000  2.295000 7.365000 2.465000 ;
+      RECT 5.855000  1.625000 6.105000 2.125000 ;
+      RECT 6.275000  1.795000 6.525000 2.295000 ;
+      RECT 6.315000  0.085000 6.485000 0.555000 ;
+      RECT 6.695000  1.625000 6.945000 2.125000 ;
+      RECT 7.115000  1.455000 9.110000 1.625000 ;
+      RECT 7.115000  1.625000 7.365000 2.295000 ;
+      RECT 7.155000  0.085000 7.325000 0.555000 ;
+      RECT 7.535000  1.795000 7.785000 2.635000 ;
+      RECT 7.955000  1.625000 8.205000 2.465000 ;
+      RECT 7.995000  0.085000 8.165000 0.555000 ;
+      RECT 8.375000  1.795000 8.625000 2.635000 ;
+      RECT 8.795000  1.625000 9.110000 2.465000 ;
+      RECT 8.835000  0.085000 9.110000 0.905000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
   END
 END sky130_fd_sc_hd__nor4bb_4
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
index 7e53658..ce56779 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.magic.lef
@@ -92,20 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.535000  0.085000 0.845000 0.565000 ;
-        RECT 3.330000  0.085000 3.620000 0.535000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -115,37 +101,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.525000 1.835000 1.335000 2.635000 ;
-        RECT 2.020000 1.835000 2.760000 2.635000 ;
-        RECT 3.730000 1.835000 4.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 0.995000 0.865000 1.325000 ;
-      RECT 0.695000 0.735000 1.365000 0.905000 ;
-      RECT 0.695000 0.905000 0.865000 0.995000 ;
-      RECT 0.695000 1.325000 0.865000 1.495000 ;
-      RECT 0.695000 1.495000 3.180000 1.665000 ;
-      RECT 1.025000 0.255000 1.365000 0.735000 ;
-      RECT 1.505000 1.665000 1.835000 2.465000 ;
-      RECT 2.870000 0.255000 3.160000 0.705000 ;
-      RECT 2.870000 0.705000 4.055000 0.875000 ;
-      RECT 2.930000 1.665000 3.180000 2.465000 ;
-      RECT 3.790000 0.255000 4.055000 0.705000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.525000  0.995000 0.865000 1.325000 ;
+      RECT 0.525000  1.835000 1.335000 2.635000 ;
+      RECT 0.535000  0.085000 0.845000 0.565000 ;
+      RECT 0.695000  0.735000 1.365000 0.905000 ;
+      RECT 0.695000  0.905000 0.865000 0.995000 ;
+      RECT 0.695000  1.325000 0.865000 1.495000 ;
+      RECT 0.695000  1.495000 3.180000 1.665000 ;
+      RECT 1.025000  0.255000 1.365000 0.735000 ;
+      RECT 1.505000  1.665000 1.835000 2.465000 ;
+      RECT 2.020000  1.835000 2.760000 2.635000 ;
+      RECT 2.870000  0.255000 3.160000 0.705000 ;
+      RECT 2.870000  0.705000 4.055000 0.875000 ;
+      RECT 2.930000  1.665000 3.180000 2.465000 ;
+      RECT 3.330000  0.085000 3.620000 0.535000 ;
+      RECT 3.730000  1.835000 4.055000 2.635000 ;
+      RECT 3.790000  0.255000 4.055000 0.705000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__o2111a_1
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
index 0aaea91..a4380e0 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.magic.lef
@@ -91,22 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.135000  0.085000 0.345000 0.885000 ;
-        RECT 1.035000  0.085000 1.285000 0.545000 ;
-        RECT 3.385000  0.085000 3.715000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -116,37 +100,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.135000 1.495000 0.345000 2.635000 ;
-        RECT 1.035000 2.195000 1.655000 2.635000 ;
-        RECT 2.325000 2.255000 2.655000 2.635000 ;
-        RECT 3.885000 1.495000 4.140000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.030000 0.715000 1.805000 0.885000 ;
-      RECT 1.030000 0.885000 1.305000 1.785000 ;
-      RECT 1.030000 1.785000 3.195000 2.025000 ;
-      RECT 1.475000 0.255000 1.805000 0.715000 ;
-      RECT 1.860000 2.025000 2.140000 2.465000 ;
-      RECT 2.865000 0.255000 3.195000 0.625000 ;
-      RECT 2.865000 0.625000 4.215000 0.825000 ;
-      RECT 2.865000 2.025000 3.195000 2.465000 ;
-      RECT 3.885000 0.255000 4.215000 0.625000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.135000  0.085000 0.345000 0.885000 ;
+      RECT 0.135000  1.495000 0.345000 2.635000 ;
+      RECT 1.030000  0.715000 1.805000 0.885000 ;
+      RECT 1.030000  0.885000 1.305000 1.785000 ;
+      RECT 1.030000  1.785000 3.195000 2.025000 ;
+      RECT 1.035000  0.085000 1.285000 0.545000 ;
+      RECT 1.035000  2.195000 1.655000 2.635000 ;
+      RECT 1.475000  0.255000 1.805000 0.715000 ;
+      RECT 1.860000  2.025000 2.140000 2.465000 ;
+      RECT 2.325000  2.255000 2.655000 2.635000 ;
+      RECT 2.865000  0.255000 3.195000 0.625000 ;
+      RECT 2.865000  0.625000 4.215000 0.825000 ;
+      RECT 2.865000  2.025000 3.195000 2.465000 ;
+      RECT 3.385000  0.085000 3.715000 0.455000 ;
+      RECT 3.885000  0.255000 4.215000 0.625000 ;
+      RECT 3.885000  1.495000 4.140000 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
 END sky130_fd_sc_hd__o2111a_2
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
index b0e02a4..8905d97 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.magic.lef
@@ -105,30 +105,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 3.110000  0.085000 3.440000 0.485000 ;
-        RECT 3.995000  0.085000 4.365000 0.485000 ;
-        RECT 5.035000  0.085000 5.300000 0.545000 ;
-        RECT 6.075000  0.085000 6.375000 0.525000 ;
-        RECT 6.915000  0.085000 7.275000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -138,53 +114,74 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.515000 2.175000 0.845000 2.635000 ;
-        RECT 1.400000 2.175000 1.625000 2.635000 ;
-        RECT 2.195000 2.175000 2.525000 2.635000 ;
-        RECT 3.805000 2.180000 4.135000 2.635000 ;
-        RECT 5.245000 2.170000 5.585000 2.635000 ;
-        RECT 6.095000 1.835000 6.415000 2.635000 ;
-        RECT 6.945000 1.835000 7.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 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.835000 5.550000 2.000000 ;
-      RECT 0.090000 2.000000 5.065000 2.005000 ;
-      RECT 0.090000 2.005000 0.345000 2.465000 ;
-      RECT 0.100000 0.255000 2.940000 0.485000 ;
-      RECT 0.100000 0.485000 0.345000 0.825000 ;
-      RECT 0.515000 0.655000 0.860000 1.830000 ;
-      RECT 0.515000 1.830000 5.550000 1.835000 ;
-      RECT 1.015000 2.005000 1.230000 2.465000 ;
-      RECT 1.720000 0.655000 4.795000 0.885000 ;
-      RECT 1.795000 2.005000 2.025000 2.465000 ;
-      RECT 2.695000 2.005000 3.285000 2.465000 ;
-      RECT 3.610000 0.255000 3.825000 0.655000 ;
-      RECT 4.535000 0.255000 4.795000 0.655000 ;
-      RECT 4.775000 2.005000 5.065000 2.465000 ;
-      RECT 5.380000 1.075000 6.760000 1.320000 ;
-      RECT 5.380000 1.320000 5.550000 1.830000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.090000  1.835000 5.550000 2.000000 ;
+      RECT 0.090000  2.000000 5.065000 2.005000 ;
+      RECT 0.090000  2.005000 0.345000 2.465000 ;
+      RECT 0.100000  0.255000 2.940000 0.485000 ;
+      RECT 0.100000  0.485000 0.345000 0.825000 ;
+      RECT 0.515000  0.655000 0.860000 1.830000 ;
+      RECT 0.515000  1.830000 5.550000 1.835000 ;
+      RECT 0.515000  2.175000 0.845000 2.635000 ;
+      RECT 1.015000  2.005000 1.230000 2.465000 ;
+      RECT 1.400000  2.175000 1.625000 2.635000 ;
+      RECT 1.720000  0.655000 4.795000 0.885000 ;
+      RECT 1.795000  2.005000 2.025000 2.465000 ;
+      RECT 2.195000  2.175000 2.525000 2.635000 ;
+      RECT 2.695000  2.005000 3.285000 2.465000 ;
+      RECT 3.110000  0.085000 3.440000 0.485000 ;
+      RECT 3.610000  0.255000 3.825000 0.655000 ;
+      RECT 3.805000  2.180000 4.135000 2.635000 ;
+      RECT 3.995000  0.085000 4.365000 0.485000 ;
+      RECT 4.535000  0.255000 4.795000 0.655000 ;
+      RECT 4.775000  2.005000 5.065000 2.465000 ;
+      RECT 5.035000  0.085000 5.300000 0.545000 ;
+      RECT 5.245000  2.170000 5.585000 2.635000 ;
+      RECT 5.380000  1.075000 6.760000 1.320000 ;
+      RECT 5.380000  1.320000 5.550000 1.830000 ;
+      RECT 6.075000  0.085000 6.375000 0.525000 ;
+      RECT 6.095000  1.835000 6.415000 2.635000 ;
+      RECT 6.915000  0.085000 7.275000 0.525000 ;
+      RECT 6.945000  1.835000 7.270000 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
 END sky130_fd_sc_hd__o2111a_4
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
index aef8bc2..d83d31b 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.magic.lef
@@ -94,17 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 2.285000  0.085000 2.615000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -114,27 +103,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.290000 2.195000 0.620000 2.635000 ;
-        RECT 1.210000 2.255000 1.540000 2.635000 ;
-        RECT 2.785000 1.795000 3.115000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.750000 0.255000 2.095000 0.625000 ;
-      RECT 1.750000 0.625000 3.115000 0.825000 ;
-      RECT 2.785000 0.255000 3.115000 0.625000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.290000  2.195000 0.620000 2.635000 ;
+      RECT 1.210000  2.255000 1.540000 2.635000 ;
+      RECT 1.750000  0.255000 2.095000 0.625000 ;
+      RECT 1.750000  0.625000 3.115000 0.825000 ;
+      RECT 2.285000  0.085000 2.615000 0.455000 ;
+      RECT 2.785000  0.255000 3.115000 0.625000 ;
+      RECT 2.785000  1.795000 3.115000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__o2111ai_1
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
index 3243545..b86a252 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.magic.lef
@@ -95,23 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 3.740000  0.085000 4.070000 0.485000 ;
-        RECT 4.600000  0.085000 4.930000 0.480000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -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
@@ -121,50 +104,64 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.175000 1.525000 0.425000 2.635000 ;
-        RECT 1.035000 1.835000 1.365000 2.635000 ;
-        RECT 1.895000 1.840000 2.225000 2.635000 ;
-        RECT 2.755000 1.835000 3.085000 2.635000 ;
-        RECT 4.670000 1.855000 4.930000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.175000 0.260000 1.300000 0.445000 ;
-      RECT 0.175000 0.445000 0.435000 0.865000 ;
-      RECT 1.115000 0.445000 1.300000 0.735000 ;
-      RECT 1.115000 0.735000 2.275000 0.905000 ;
-      RECT 1.470000 0.255000 3.210000 0.445000 ;
-      RECT 1.470000 0.445000 1.775000 0.530000 ;
-      RECT 1.470000 0.530000 1.760000 0.565000 ;
-      RECT 1.925000 0.620000 2.275000 0.735000 ;
-      RECT 2.450000 0.655000 5.435000 0.840000 ;
-      RECT 2.880000 0.445000 3.210000 0.485000 ;
-      RECT 3.310000 1.835000 3.570000 2.275000 ;
-      RECT 3.310000 2.275000 4.500000 2.465000 ;
-      RECT 3.380000 0.365000 3.570000 0.655000 ;
-      RECT 4.240000 0.365000 4.430000 0.650000 ;
-      RECT 4.240000 0.650000 5.435000 0.655000 ;
-      RECT 4.240000 1.515000 5.360000 1.685000 ;
-      RECT 4.240000 1.685000 4.500000 2.275000 ;
-      RECT 5.100000 0.365000 5.435000 0.650000 ;
-      RECT 5.100000 1.685000 5.360000 2.465000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.175000  0.260000 1.300000 0.445000 ;
+      RECT 0.175000  0.445000 0.435000 0.865000 ;
+      RECT 0.175000  1.525000 0.425000 2.635000 ;
+      RECT 1.035000  1.835000 1.365000 2.635000 ;
+      RECT 1.115000  0.445000 1.300000 0.735000 ;
+      RECT 1.115000  0.735000 2.275000 0.905000 ;
+      RECT 1.470000  0.255000 3.210000 0.445000 ;
+      RECT 1.470000  0.445000 1.775000 0.530000 ;
+      RECT 1.470000  0.530000 1.760000 0.565000 ;
+      RECT 1.895000  1.840000 2.225000 2.635000 ;
+      RECT 1.925000  0.620000 2.275000 0.735000 ;
+      RECT 2.450000  0.655000 5.435000 0.840000 ;
+      RECT 2.755000  1.835000 3.085000 2.635000 ;
+      RECT 2.880000  0.445000 3.210000 0.485000 ;
+      RECT 3.310000  1.835000 3.570000 2.275000 ;
+      RECT 3.310000  2.275000 4.500000 2.465000 ;
+      RECT 3.380000  0.365000 3.570000 0.655000 ;
+      RECT 3.740000  0.085000 4.070000 0.485000 ;
+      RECT 4.240000  0.365000 4.430000 0.650000 ;
+      RECT 4.240000  0.650000 5.435000 0.655000 ;
+      RECT 4.240000  1.515000 5.360000 1.685000 ;
+      RECT 4.240000  1.685000 4.500000 2.275000 ;
+      RECT 4.600000  0.085000 4.930000 0.480000 ;
+      RECT 4.670000  1.855000 4.930000 2.635000 ;
+      RECT 5.100000  0.365000 5.435000 0.650000 ;
+      RECT 5.100000  1.685000 5.360000 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 ;
   END
 END sky130_fd_sc_hd__o2111ai_2
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
index 90d3a3d..29583ab 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.magic.lef
@@ -100,34 +100,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 6.100000  0.085000 6.430000 0.485000 ;
-        RECT 6.960000  0.085000 7.290000 0.485000 ;
-        RECT 7.825000  0.085000 8.155000 0.485000 ;
-        RECT 8.665000  0.085000 8.995000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -137,57 +109,82 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.530000 1.855000 0.845000 2.635000 ;
-        RECT 1.390000 1.855000 1.675000 2.635000 ;
-        RECT 2.205000 1.855000 2.515000 2.635000 ;
-        RECT 3.045000 1.855000 3.355000 2.635000 ;
-        RECT 4.075000 1.855000 4.400000 2.635000 ;
-        RECT 4.930000 1.855000 5.220000 2.635000 ;
-        RECT 7.555000 2.230000 7.885000 2.635000 ;
-        RECT 8.410000 1.855000 8.720000 2.635000 ;
-        RECT 9.265000 1.535000 9.575000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.285000 2.025000 0.475000 ;
-      RECT 1.855000 0.475000 2.025000 0.615000 ;
-      RECT 1.855000 0.615000 3.785000 0.825000 ;
-      RECT 2.195000 0.255000 5.565000 0.445000 ;
-      RECT 3.975000 0.655000 9.440000 0.905000 ;
-      RECT 5.785000 1.855000 6.115000 2.270000 ;
-      RECT 5.785000 2.270000 7.005000 2.465000 ;
-      RECT 6.705000 1.890000 8.235000 2.060000 ;
-      RECT 6.705000 2.060000 7.005000 2.270000 ;
-      RECT 8.045000 1.515000 9.080000 1.685000 ;
-      RECT 8.045000 1.685000 8.235000 1.890000 ;
-      RECT 8.055000 2.060000 8.235000 2.465000 ;
-      RECT 8.890000 1.685000 9.080000 2.465000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.095000  0.285000 2.025000 0.475000 ;
+      RECT 0.530000  1.855000 0.845000 2.635000 ;
+      RECT 1.390000  1.855000 1.675000 2.635000 ;
+      RECT 1.855000  0.475000 2.025000 0.615000 ;
+      RECT 1.855000  0.615000 3.785000 0.825000 ;
+      RECT 2.195000  0.255000 5.565000 0.445000 ;
+      RECT 2.205000  1.855000 2.515000 2.635000 ;
+      RECT 3.045000  1.855000 3.355000 2.635000 ;
+      RECT 3.975000  0.655000 9.440000 0.905000 ;
+      RECT 4.075000  1.855000 4.400000 2.635000 ;
+      RECT 4.930000  1.855000 5.220000 2.635000 ;
+      RECT 5.785000  1.855000 6.115000 2.270000 ;
+      RECT 5.785000  2.270000 7.005000 2.465000 ;
+      RECT 6.100000  0.085000 6.430000 0.485000 ;
+      RECT 6.705000  1.890000 8.235000 2.060000 ;
+      RECT 6.705000  2.060000 7.005000 2.270000 ;
+      RECT 6.960000  0.085000 7.290000 0.485000 ;
+      RECT 7.555000  2.230000 7.885000 2.635000 ;
+      RECT 7.825000  0.085000 8.155000 0.485000 ;
+      RECT 8.045000  1.515000 9.080000 1.685000 ;
+      RECT 8.045000  1.685000 8.235000 1.890000 ;
+      RECT 8.055000  2.060000 8.235000 2.465000 ;
+      RECT 8.410000  1.855000 8.720000 2.635000 ;
+      RECT 8.665000  0.085000 8.995000 0.485000 ;
+      RECT 8.890000  1.685000 9.080000 2.465000 ;
+      RECT 9.265000  1.535000 9.575000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
   END
 END sky130_fd_sc_hd__o2111ai_4
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
index d7a47e0..b182d82 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_1.magic.lef
@@ -82,19 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.595000  0.085000 0.845000 0.885000 ;
-        RECT 1.535000  0.085000 1.760000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -104,35 +91,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.595000 1.495000 0.765000 2.635000 ;
-        RECT 1.035000 1.835000 1.285000 2.635000 ;
-        RECT 2.560000 1.835000 2.890000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 1.075000 1.125000 1.245000 ;
-      RECT 0.955000 1.245000 1.125000 1.495000 ;
-      RECT 0.955000 1.495000 3.390000 1.665000 ;
-      RECT 1.035000 0.255000 1.365000 0.735000 ;
-      RECT 1.035000 0.735000 2.260000 0.905000 ;
-      RECT 1.930000 0.255000 2.260000 0.735000 ;
-      RECT 1.930000 1.665000 2.260000 2.465000 ;
-      RECT 2.890000 0.255000 3.390000 0.865000 ;
-      RECT 2.890000 0.865000 3.060000 1.495000 ;
-      RECT 3.060000 1.665000 3.390000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.430000  1.075000 1.125000 1.245000 ;
+      RECT 0.595000  0.085000 0.845000 0.885000 ;
+      RECT 0.595000  1.495000 0.765000 2.635000 ;
+      RECT 0.955000  1.245000 1.125000 1.495000 ;
+      RECT 0.955000  1.495000 3.390000 1.665000 ;
+      RECT 1.035000  0.255000 1.365000 0.735000 ;
+      RECT 1.035000  0.735000 2.260000 0.905000 ;
+      RECT 1.035000  1.835000 1.285000 2.635000 ;
+      RECT 1.535000  0.085000 1.760000 0.545000 ;
+      RECT 1.930000  0.255000 2.260000 0.735000 ;
+      RECT 1.930000  1.665000 2.260000 2.465000 ;
+      RECT 2.560000  1.835000 2.890000 2.635000 ;
+      RECT 2.890000  0.255000 3.390000 0.865000 ;
+      RECT 2.890000  0.865000 3.060000 1.495000 ;
+      RECT 3.060000  1.665000 3.390000 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
 END sky130_fd_sc_hd__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
index ff12ab2..94db51a 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_2.magic.lef
@@ -84,20 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 1.390000  0.085000 1.725000 0.465000 ;
-        RECT 2.315000  0.085000 2.550000 0.525000 ;
-        RECT 3.220000  0.085000 3.550000 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
@@ -107,34 +93,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.525000 1.935000 0.855000 2.635000 ;
-        RECT 2.200000 1.935000 2.630000 2.635000 ;
-        RECT 3.170000 2.255000 3.500000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.510000 2.665000 1.765000 ;
-      RECT 0.090000 1.765000 0.355000 2.465000 ;
-      RECT 0.095000 0.255000 0.430000 0.425000 ;
-      RECT 0.095000 0.425000 0.710000 0.825000 ;
-      RECT 0.530000 0.825000 0.710000 1.510000 ;
-      RECT 0.880000 0.635000 2.150000 0.825000 ;
-      RECT 1.025000 1.765000 1.695000 2.465000 ;
-      RECT 2.495000 0.995000 3.175000 1.325000 ;
-      RECT 2.495000 1.325000 2.665000 1.510000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  1.510000 2.665000 1.765000 ;
+      RECT 0.090000  1.765000 0.355000 2.465000 ;
+      RECT 0.095000  0.255000 0.430000 0.425000 ;
+      RECT 0.095000  0.425000 0.710000 0.825000 ;
+      RECT 0.525000  1.935000 0.855000 2.635000 ;
+      RECT 0.530000  0.825000 0.710000 1.510000 ;
+      RECT 0.880000  0.635000 2.150000 0.825000 ;
+      RECT 1.025000  1.765000 1.695000 2.465000 ;
+      RECT 1.390000  0.085000 1.725000 0.465000 ;
+      RECT 2.200000  1.935000 2.630000 2.635000 ;
+      RECT 2.315000  0.085000 2.550000 0.525000 ;
+      RECT 2.495000  0.995000 3.175000 1.325000 ;
+      RECT 2.495000  1.325000 2.665000 1.510000 ;
+      RECT 3.170000  2.255000 3.500000 2.635000 ;
+      RECT 3.220000  0.085000 3.550000 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 ;
   END
 END sky130_fd_sc_hd__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
index 718427e..07a7e2a 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_4.magic.lef
@@ -91,28 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 0.935000  0.085000 1.265000 0.445000 ;
-        RECT 1.775000  0.085000 2.140000 0.465000 ;
-        RECT 4.670000  0.085000 4.985000 0.525000 ;
-        RECT 5.655000  0.085000 5.845000 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
@@ -122,47 +100,66 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.480000 1.870000 0.810000 2.635000 ;
-        RECT 1.340000 1.870000 1.670000 2.635000 ;
-        RECT 2.200000 2.200000 2.530000 2.635000 ;
-        RECT 3.285000 2.195000 3.615000 2.635000 ;
-        RECT 4.290000 2.195000 4.555000 2.635000 ;
-        RECT 6.015000 1.915000 6.345000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 1.065000 2.370000 1.265000 ;
-      RECT 2.200000 0.635000 3.520000 0.815000 ;
-      RECT 2.200000 0.815000 2.370000 1.065000 ;
-      RECT 2.200000 1.265000 2.370000 1.855000 ;
-      RECT 2.200000 1.855000 5.485000 2.025000 ;
-      RECT 2.330000 0.255000 4.500000 0.465000 ;
-      RECT 2.700000 2.025000 3.060000 2.465000 ;
-      RECT 3.785000 2.025000 4.120000 2.465000 ;
-      RECT 4.170000 0.465000 4.500000 0.695000 ;
-      RECT 4.170000 0.695000 6.345000 0.865000 ;
-      RECT 5.155000 0.255000 5.485000 0.695000 ;
-      RECT 5.155000 2.025000 5.485000 2.465000 ;
-      RECT 6.015000 0.255000 6.345000 0.695000 ;
+      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.465000 ;
+      RECT 0.480000  1.870000 0.810000 2.635000 ;
+      RECT 0.535000  1.065000 2.370000 1.265000 ;
+      RECT 0.935000  0.085000 1.265000 0.445000 ;
+      RECT 1.340000  1.870000 1.670000 2.635000 ;
+      RECT 1.775000  0.085000 2.140000 0.465000 ;
+      RECT 2.200000  0.635000 3.520000 0.815000 ;
+      RECT 2.200000  0.815000 2.370000 1.065000 ;
+      RECT 2.200000  1.265000 2.370000 1.855000 ;
+      RECT 2.200000  1.855000 5.485000 2.025000 ;
+      RECT 2.200000  2.200000 2.530000 2.635000 ;
+      RECT 2.330000  0.255000 4.500000 0.465000 ;
+      RECT 2.700000  2.025000 3.060000 2.465000 ;
+      RECT 3.285000  2.195000 3.615000 2.635000 ;
+      RECT 3.785000  2.025000 4.120000 2.465000 ;
+      RECT 4.170000  0.465000 4.500000 0.695000 ;
+      RECT 4.170000  0.695000 6.345000 0.865000 ;
+      RECT 4.290000  2.195000 4.555000 2.635000 ;
+      RECT 4.670000  0.085000 4.985000 0.525000 ;
+      RECT 5.155000  0.255000 5.485000 0.695000 ;
+      RECT 5.155000  2.025000 5.485000 2.465000 ;
+      RECT 5.655000  0.085000 5.845000 0.525000 ;
+      RECT 6.015000  0.255000 6.345000 0.695000 ;
+      RECT 6.015000  1.915000 6.345000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__o211a_4
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
index 6a11a6b..6865ad3 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.magic.lef
@@ -87,16 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.595000  0.085000 0.925000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -106,25 +96,32 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.095000 1.575000 0.425000 2.635000 ;
-        RECT 1.445000 2.275000 1.775000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.425000 0.615000 ;
-      RECT 0.095000 0.615000 1.455000 0.825000 ;
-      RECT 1.125000 0.255000 1.455000 0.615000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  0.255000 0.425000 0.615000 ;
+      RECT 0.095000  0.615000 1.455000 0.825000 ;
+      RECT 0.095000  1.575000 0.425000 2.635000 ;
+      RECT 0.595000  0.085000 0.925000 0.445000 ;
+      RECT 1.125000  0.255000 1.455000 0.615000 ;
+      RECT 1.445000  2.275000 1.775000 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
 END sky130_fd_sc_hd__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
index 28be261..e0fe5cd 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.magic.lef
@@ -86,22 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 2.395000  0.085000 2.725000 0.445000 ;
-        RECT 3.255000  0.085000 3.585000 0.445000 ;
-        RECT 4.115000  0.085000 4.445000 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
@@ -111,38 +95,51 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.115000 2.175000 0.375000 2.635000 ;
-        RECT 0.975000 1.915000 1.305000 2.635000 ;
-        RECT 1.835000 1.915000 2.165000 2.635000 ;
-        RECT 3.685000 1.865000 4.015000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 2.165000 0.445000 ;
-      RECT 1.045000 0.445000 2.165000 0.465000 ;
-      RECT 1.045000 0.465000 1.235000 0.890000 ;
-      RECT 1.405000 0.635000 3.945000 0.845000 ;
-      RECT 2.395000 2.100000 2.655000 2.295000 ;
-      RECT 2.395000 2.295000 3.515000 2.465000 ;
-      RECT 3.325000 1.525000 4.445000 1.695000 ;
-      RECT 3.325000 1.695000 3.515000 2.295000 ;
-      RECT 3.755000 0.515000 3.945000 0.635000 ;
-      RECT 4.185000 1.695000 4.445000 2.465000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.095000  0.255000 2.165000 0.445000 ;
+      RECT 0.115000  2.175000 0.375000 2.635000 ;
+      RECT 0.975000  1.915000 1.305000 2.635000 ;
+      RECT 1.045000  0.445000 2.165000 0.465000 ;
+      RECT 1.045000  0.465000 1.235000 0.890000 ;
+      RECT 1.405000  0.635000 3.945000 0.845000 ;
+      RECT 1.835000  1.915000 2.165000 2.635000 ;
+      RECT 2.395000  0.085000 2.725000 0.445000 ;
+      RECT 2.395000  2.100000 2.655000 2.295000 ;
+      RECT 2.395000  2.295000 3.515000 2.465000 ;
+      RECT 3.255000  0.085000 3.585000 0.445000 ;
+      RECT 3.325000  1.525000 4.445000 1.695000 ;
+      RECT 3.325000  1.695000 3.515000 2.295000 ;
+      RECT 3.685000  1.865000 4.015000 2.635000 ;
+      RECT 3.755000  0.515000 3.945000 0.635000 ;
+      RECT 4.115000  0.085000 4.445000 0.445000 ;
+      RECT 4.185000  1.695000 4.445000 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
 END sky130_fd_sc_hd__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
index 95f3387..c56c8d9 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.magic.lef
@@ -93,30 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.445000 ;
-        RECT 1.465000  0.085000 1.635000 0.525000 ;
-        RECT 2.245000  0.085000 2.575000 0.445000 ;
-        RECT 3.105000  0.085000 3.435000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -126,59 +102,79 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.090000 1.665000 0.385000 2.635000 ;
-        RECT 0.955000 2.275000 1.285000 2.635000 ;
-        RECT 3.615000 2.195000 3.885000 2.635000 ;
-        RECT 4.435000 2.275000 4.765000 2.635000 ;
-        RECT 5.280000 2.275000 5.610000 2.635000 ;
-        RECT 6.120000 2.275000 6.455000 2.635000 ;
-        RECT 7.355000 2.275000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.535000 0.355000 0.625000 ;
-      RECT 0.155000 0.625000 1.240000 0.695000 ;
-      RECT 0.155000 0.695000 3.835000 0.795000 ;
-      RECT 0.155000 0.795000 3.130000 0.865000 ;
-      RECT 0.155000 0.865000 1.795000 0.905000 ;
-      RECT 0.555000 1.860000 0.775000 1.935000 ;
-      RECT 0.555000 1.935000 1.635000 2.105000 ;
-      RECT 0.555000 2.105000 0.775000 2.190000 ;
-      RECT 1.025000 0.425000 1.240000 0.625000 ;
-      RECT 1.455000 2.105000 1.635000 2.275000 ;
-      RECT 1.455000 2.275000 3.435000 2.465000 ;
-      RECT 1.775000 0.625000 3.835000 0.695000 ;
-      RECT 3.605000 0.255000 4.920000 0.455000 ;
-      RECT 3.605000 0.455000 3.835000 0.625000 ;
-      RECT 4.005000 0.635000 6.170000 0.815000 ;
-      RECT 6.980000 0.310000 7.680000 0.480000 ;
-      RECT 7.510000 0.480000 7.680000 0.595000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.090000  1.665000 0.385000 2.635000 ;
+      RECT 0.155000  0.535000 0.355000 0.625000 ;
+      RECT 0.155000  0.625000 1.240000 0.695000 ;
+      RECT 0.155000  0.695000 3.835000 0.795000 ;
+      RECT 0.155000  0.795000 3.130000 0.865000 ;
+      RECT 0.155000  0.865000 1.795000 0.905000 ;
+      RECT 0.525000  0.085000 0.855000 0.445000 ;
+      RECT 0.555000  1.860000 0.775000 1.935000 ;
+      RECT 0.555000  1.935000 1.635000 2.105000 ;
+      RECT 0.555000  2.105000 0.775000 2.190000 ;
+      RECT 0.955000  2.275000 1.285000 2.635000 ;
+      RECT 1.025000  0.425000 1.240000 0.625000 ;
+      RECT 1.455000  2.105000 1.635000 2.275000 ;
+      RECT 1.455000  2.275000 3.435000 2.465000 ;
+      RECT 1.465000  0.085000 1.635000 0.525000 ;
+      RECT 1.775000  0.625000 3.835000 0.695000 ;
+      RECT 2.245000  0.085000 2.575000 0.445000 ;
+      RECT 3.105000  0.085000 3.435000 0.445000 ;
+      RECT 3.605000  0.255000 4.920000 0.455000 ;
+      RECT 3.605000  0.455000 3.835000 0.625000 ;
+      RECT 3.615000  2.195000 3.885000 2.635000 ;
+      RECT 4.005000  0.635000 6.170000 0.815000 ;
+      RECT 4.435000  2.275000 4.765000 2.635000 ;
+      RECT 5.280000  2.275000 5.610000 2.635000 ;
+      RECT 6.120000  2.275000 6.455000 2.635000 ;
+      RECT 6.980000  0.310000 7.680000 0.480000 ;
+      RECT 7.355000  2.275000 7.685000 2.635000 ;
+      RECT 7.510000  0.480000 7.680000 0.595000 ;
     LAYER mcon ;
-      RECT 1.070000 0.425000 1.240000 0.595000 ;
-      RECT 7.510000 0.425000 7.680000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.070000  0.425000 1.240000 0.595000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.510000  0.425000 7.680000 0.595000 ;
     LAYER met1 ;
       RECT 1.010000 0.395000 1.300000 0.440000 ;
       RECT 1.010000 0.440000 7.740000 0.580000 ;
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
index 5366e97..ed014f0 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_1.magic.lef
@@ -75,17 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.545000 ;
-        RECT 1.995000  0.085000 2.165000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -95,38 +84,46 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.535000 1.860000 1.245000 2.635000 ;
-        RECT 2.335000 1.915000 2.665000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 0.715000 1.305000 0.905000 ;
-      RECT 0.595000 0.905000 0.880000 1.475000 ;
-      RECT 0.595000 1.475000 1.745000 1.690000 ;
-      RECT 1.005000 0.255000 1.365000 0.520000 ;
-      RECT 1.005000 0.520000 1.360000 0.525000 ;
-      RECT 1.005000 0.525000 1.355000 0.535000 ;
-      RECT 1.005000 0.535000 1.350000 0.540000 ;
-      RECT 1.005000 0.540000 1.345000 0.550000 ;
-      RECT 1.005000 0.550000 1.340000 0.555000 ;
-      RECT 1.005000 0.555000 1.330000 0.565000 ;
-      RECT 1.005000 0.565000 1.320000 0.575000 ;
-      RECT 1.005000 0.575000 1.305000 0.715000 ;
-      RECT 1.415000 1.690000 1.745000 2.465000 ;
-      RECT 1.495000 0.635000 1.825000 0.715000 ;
-      RECT 1.495000 0.715000 2.675000 0.905000 ;
-      RECT 2.335000 0.255000 2.675000 0.715000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.535000  1.860000 1.245000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.545000 ;
+      RECT 0.595000  0.715000 1.305000 0.905000 ;
+      RECT 0.595000  0.905000 0.880000 1.475000 ;
+      RECT 0.595000  1.475000 1.745000 1.690000 ;
+      RECT 1.005000  0.255000 1.365000 0.520000 ;
+      RECT 1.005000  0.520000 1.360000 0.525000 ;
+      RECT 1.005000  0.525000 1.355000 0.535000 ;
+      RECT 1.005000  0.535000 1.350000 0.540000 ;
+      RECT 1.005000  0.540000 1.345000 0.550000 ;
+      RECT 1.005000  0.550000 1.340000 0.555000 ;
+      RECT 1.005000  0.555000 1.330000 0.565000 ;
+      RECT 1.005000  0.565000 1.320000 0.575000 ;
+      RECT 1.005000  0.575000 1.305000 0.715000 ;
+      RECT 1.415000  1.690000 1.745000 2.465000 ;
+      RECT 1.495000  0.635000 1.825000 0.715000 ;
+      RECT 1.495000  0.715000 2.675000 0.905000 ;
+      RECT 1.995000  0.085000 2.165000 0.545000 ;
+      RECT 2.335000  0.255000 2.675000 0.715000 ;
+      RECT 2.335000  1.915000 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
 END sky130_fd_sc_hd__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
index eb7961a..8ca8981 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_2.magic.lef
@@ -72,19 +72,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.885000 ;
-        RECT 0.945000  0.085000 1.275000 0.465000 ;
-        RECT 2.345000  0.085000 2.675000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -94,33 +81,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.090000 1.635000 0.345000 2.635000 ;
-        RECT 0.945000 2.185000 1.795000 2.635000 ;
-        RECT 2.795000 1.650000 3.120000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.945000 0.635000 1.795000 0.840000 ;
-      RECT 0.945000 0.840000 1.275000 1.330000 ;
-      RECT 1.105000 1.330000 1.275000 1.785000 ;
-      RECT 1.105000 1.785000 2.225000 2.005000 ;
-      RECT 1.465000 0.255000 1.795000 0.635000 ;
-      RECT 1.965000 0.465000 2.175000 0.635000 ;
-      RECT 1.965000 0.635000 3.120000 0.825000 ;
-      RECT 1.965000 2.005000 2.225000 2.465000 ;
-      RECT 2.845000 0.495000 3.120000 0.635000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  1.635000 0.345000 2.635000 ;
+      RECT 0.105000  0.085000 0.345000 0.885000 ;
+      RECT 0.945000  0.085000 1.275000 0.465000 ;
+      RECT 0.945000  0.635000 1.795000 0.840000 ;
+      RECT 0.945000  0.840000 1.275000 1.330000 ;
+      RECT 0.945000  2.185000 1.795000 2.635000 ;
+      RECT 1.105000  1.330000 1.275000 1.785000 ;
+      RECT 1.105000  1.785000 2.225000 2.005000 ;
+      RECT 1.465000  0.255000 1.795000 0.635000 ;
+      RECT 1.965000  0.465000 2.175000 0.635000 ;
+      RECT 1.965000  0.635000 3.120000 0.825000 ;
+      RECT 1.965000  2.005000 2.225000 2.465000 ;
+      RECT 2.345000  0.085000 2.675000 0.465000 ;
+      RECT 2.795000  1.650000 3.120000 2.635000 ;
+      RECT 2.845000  0.495000 3.120000 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 ;
   END
 END sky130_fd_sc_hd__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
index f72b629..63476fe 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_4.magic.lef
@@ -78,26 +78,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 0.955000  0.085000 1.285000 0.445000 ;
-        RECT 1.815000  0.085000 2.145000 0.465000 ;
-        RECT 3.775000  0.085000 4.115000 0.445000 ;
-        RECT 4.645000  0.085000 4.975000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -107,43 +87,60 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.415000 1.870000 0.745000 2.635000 ;
-        RECT 1.275000 1.870000 1.605000 2.635000 ;
-        RECT 2.135000 2.255000 2.485000 2.635000 ;
-        RECT 3.015000 2.275000 3.685000 2.635000 ;
-        RECT 5.075000 1.935000 5.435000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.490000 0.995000 2.315000 1.335000 ;
-      RECT 2.115000 0.655000 3.095000 0.870000 ;
-      RECT 2.115000 0.870000 2.315000 0.995000 ;
-      RECT 2.125000 1.335000 2.315000 1.830000 ;
-      RECT 2.125000 1.830000 2.845000 1.875000 ;
-      RECT 2.125000 1.875000 4.545000 2.085000 ;
-      RECT 2.335000 0.255000 3.605000 0.485000 ;
-      RECT 2.655000 2.085000 4.545000 2.105000 ;
-      RECT 2.655000 2.105000 2.845000 2.465000 ;
-      RECT 3.275000 0.485000 3.605000 0.615000 ;
-      RECT 3.275000 0.615000 5.405000 0.785000 ;
-      RECT 4.215000 2.105000 4.545000 2.445000 ;
+      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.465000 ;
+      RECT 0.415000  1.870000 0.745000 2.635000 ;
+      RECT 0.490000  0.995000 2.315000 1.335000 ;
+      RECT 0.955000  0.085000 1.285000 0.445000 ;
+      RECT 1.275000  1.870000 1.605000 2.635000 ;
+      RECT 1.815000  0.085000 2.145000 0.465000 ;
+      RECT 2.115000  0.655000 3.095000 0.870000 ;
+      RECT 2.115000  0.870000 2.315000 0.995000 ;
+      RECT 2.125000  1.335000 2.315000 1.830000 ;
+      RECT 2.125000  1.830000 2.845000 1.875000 ;
+      RECT 2.125000  1.875000 4.545000 2.085000 ;
+      RECT 2.135000  2.255000 2.485000 2.635000 ;
+      RECT 2.335000  0.255000 3.605000 0.485000 ;
+      RECT 2.655000  2.085000 4.545000 2.105000 ;
+      RECT 2.655000  2.105000 2.845000 2.465000 ;
+      RECT 3.015000  2.275000 3.685000 2.635000 ;
+      RECT 3.275000  0.485000 3.605000 0.615000 ;
+      RECT 3.275000  0.615000 5.405000 0.785000 ;
+      RECT 3.775000  0.085000 4.115000 0.445000 ;
+      RECT 4.215000  2.105000 4.545000 2.445000 ;
+      RECT 4.645000  0.085000 4.975000 0.445000 ;
+      RECT 5.075000  1.935000 5.435000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
 END sky130_fd_sc_hd__o21a_4
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
index dc72c3f..ab9fade 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.magic.lef
@@ -76,14 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.550000  0.085000 0.880000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -93,23 +85,28 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.145000 1.825000 0.475000 2.635000 ;
-        RECT 1.470000 1.855000 1.725000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 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.120000 0.280000 0.380000 0.615000 ;
-      RECT 0.120000 0.615000 1.285000 0.785000 ;
-      RECT 1.050000 0.280000 1.285000 0.615000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.120000  0.280000 0.380000 0.615000 ;
+      RECT 0.120000  0.615000 1.285000 0.785000 ;
+      RECT 0.145000  1.825000 0.475000 2.635000 ;
+      RECT 0.550000  0.085000 0.880000 0.445000 ;
+      RECT 1.050000  0.280000 1.285000 0.615000 ;
+      RECT 1.470000  1.855000 1.725000 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
 END sky130_fd_sc_hd__o21ai_0
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
index 106ea81..d98c0cc 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.magic.lef
@@ -76,14 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -93,23 +85,28 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.090000 1.495000 0.410000 2.635000 ;
-        RECT 1.495000 1.835000 1.750000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.265000 0.380000 0.615000 ;
-      RECT 0.090000 0.615000 1.305000 0.785000 ;
-      RECT 1.075000 0.310000 1.305000 0.615000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.090000  0.265000 0.380000 0.615000 ;
+      RECT 0.090000  0.615000 1.305000 0.785000 ;
+      RECT 0.090000  1.495000 0.410000 2.635000 ;
+      RECT 0.575000  0.085000 0.905000 0.445000 ;
+      RECT 1.075000  0.310000 1.305000 0.615000 ;
+      RECT 1.495000  1.835000 1.750000 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
 END sky130_fd_sc_hd__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
index a81f749..30c2911 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.magic.lef
@@ -76,18 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.615000  0.085000 0.785000 0.545000 ;
-        RECT 1.525000  0.085000 1.695000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -97,33 +85,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.105000 1.785000 0.435000 2.635000 ;
-        RECT 1.910000 2.175000 2.240000 2.635000 ;
-        RECT 2.815000 1.570000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.255000 0.435000 0.715000 ;
-      RECT 0.105000 0.715000 2.265000 0.885000 ;
-      RECT 0.605000 1.785000 0.825000 2.295000 ;
-      RECT 0.605000 2.295000 1.715000 2.465000 ;
-      RECT 0.965000 0.255000 1.295000 0.715000 ;
-      RECT 1.525000 2.135000 1.715000 2.295000 ;
-      RECT 1.935000 0.255000 3.125000 0.425000 ;
-      RECT 1.935000 0.425000 2.265000 0.715000 ;
-      RECT 2.815000 0.425000 3.125000 0.595000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.105000  0.255000 0.435000 0.715000 ;
+      RECT 0.105000  0.715000 2.265000 0.885000 ;
+      RECT 0.105000  1.785000 0.435000 2.635000 ;
+      RECT 0.605000  1.785000 0.825000 2.295000 ;
+      RECT 0.605000  2.295000 1.715000 2.465000 ;
+      RECT 0.615000  0.085000 0.785000 0.545000 ;
+      RECT 0.965000  0.255000 1.295000 0.715000 ;
+      RECT 1.525000  0.085000 1.695000 0.545000 ;
+      RECT 1.525000  2.135000 1.715000 2.295000 ;
+      RECT 1.910000  2.175000 2.240000 2.635000 ;
+      RECT 1.935000  0.255000 3.125000 0.425000 ;
+      RECT 1.935000  0.425000 2.265000 0.715000 ;
+      RECT 2.815000  0.425000 3.125000 0.595000 ;
+      RECT 2.815000  1.570000 3.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 ;
   END
 END sky130_fd_sc_hd__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
index 6b6c207..c7d8541 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.magic.lef
@@ -81,26 +81,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.550000  0.085000 0.880000 0.445000 ;
-        RECT 1.410000  0.085000 1.740000 0.445000 ;
-        RECT 2.270000  0.085000 2.600000 0.445000 ;
-        RECT 3.130000  0.085000 3.460000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -110,39 +90,56 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.120000 1.820000 0.405000 2.635000 ;
-        RECT 0.980000 2.255000 1.310000 2.635000 ;
-        RECT 3.630000 2.195000 3.910000 2.635000 ;
-        RECT 4.460000 2.255000 4.790000 2.635000 ;
-        RECT 5.320000 1.880000 5.650000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 0.615000 3.860000 0.820000 ;
-      RECT 0.575000 1.915000 1.670000 2.085000 ;
-      RECT 0.575000 2.085000 0.810000 2.465000 ;
-      RECT 1.480000 2.085000 1.670000 2.275000 ;
-      RECT 1.480000 2.275000 3.460000 2.465000 ;
-      RECT 3.630000 0.255000 5.650000 0.445000 ;
-      RECT 3.630000 0.445000 3.860000 0.615000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.120000  0.615000 3.860000 0.820000 ;
+      RECT 0.120000  1.820000 0.405000 2.635000 ;
+      RECT 0.550000  0.085000 0.880000 0.445000 ;
+      RECT 0.575000  1.915000 1.670000 2.085000 ;
+      RECT 0.575000  2.085000 0.810000 2.465000 ;
+      RECT 0.980000  2.255000 1.310000 2.635000 ;
+      RECT 1.410000  0.085000 1.740000 0.445000 ;
+      RECT 1.480000  2.085000 1.670000 2.275000 ;
+      RECT 1.480000  2.275000 3.460000 2.465000 ;
+      RECT 2.270000  0.085000 2.600000 0.445000 ;
+      RECT 3.130000  0.085000 3.460000 0.445000 ;
+      RECT 3.630000  0.255000 5.650000 0.445000 ;
+      RECT 3.630000  0.445000 3.860000 0.615000 ;
+      RECT 3.630000  2.195000 3.910000 2.635000 ;
+      RECT 4.460000  2.255000 4.790000 2.635000 ;
+      RECT 5.320000  1.880000 5.650000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
 END sky130_fd_sc_hd__o21ai_4
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
index 24cdfd3..bc6f9fe 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.magic.lef
@@ -73,19 +73,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.710000  0.085000 0.880000 0.825000 ;
-        RECT 2.770000  0.085000 2.940000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -95,38 +82,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.595000 2.205000 1.005000 2.635000 ;
-        RECT 1.750000 2.215000 2.080000 2.635000 ;
-        RECT 3.050000 1.535000 3.380000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.510000 0.995000 0.860000 1.325000 ;
-      RECT 0.595000 1.325000 0.860000 1.865000 ;
-      RECT 0.595000 1.865000 2.575000 2.035000 ;
-      RECT 1.075000 1.525000 1.700000 1.695000 ;
-      RECT 1.160000 0.450000 1.330000 0.655000 ;
-      RECT 1.160000 0.655000 1.700000 0.825000 ;
-      RECT 1.530000 0.825000 1.700000 1.525000 ;
-      RECT 1.870000 0.255000 2.040000 1.455000 ;
-      RECT 1.870000 1.455000 2.575000 1.865000 ;
-      RECT 2.250000 2.035000 2.575000 2.465000 ;
-      RECT 2.270000 0.255000 2.600000 0.735000 ;
-      RECT 2.270000 0.735000 3.440000 0.905000 ;
-      RECT 3.110000 0.270000 3.440000 0.735000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.510000  0.995000 0.860000 1.325000 ;
+      RECT 0.595000  1.325000 0.860000 1.865000 ;
+      RECT 0.595000  1.865000 2.575000 2.035000 ;
+      RECT 0.595000  2.205000 1.005000 2.635000 ;
+      RECT 0.710000  0.085000 0.880000 0.825000 ;
+      RECT 1.075000  1.525000 1.700000 1.695000 ;
+      RECT 1.160000  0.450000 1.330000 0.655000 ;
+      RECT 1.160000  0.655000 1.700000 0.825000 ;
+      RECT 1.530000  0.825000 1.700000 1.525000 ;
+      RECT 1.750000  2.215000 2.080000 2.635000 ;
+      RECT 1.870000  0.255000 2.040000 1.455000 ;
+      RECT 1.870000  1.455000 2.575000 1.865000 ;
+      RECT 2.250000  2.035000 2.575000 2.465000 ;
+      RECT 2.270000  0.255000 2.600000 0.735000 ;
+      RECT 2.270000  0.735000 3.440000 0.905000 ;
+      RECT 2.770000  0.085000 2.940000 0.555000 ;
+      RECT 3.050000  1.535000 3.380000 2.635000 ;
+      RECT 3.110000  0.270000 3.440000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
 END sky130_fd_sc_hd__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
index 7fd2116..953e9bc 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.magic.lef
@@ -74,20 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.595000  0.085000 0.775000 0.825000 ;
-        RECT 1.410000  0.085000 1.770000 0.485000 ;
-        RECT 2.915000  0.085000 3.085000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -97,41 +83,52 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.520000 2.205000 0.910000 2.635000 ;
-        RECT 1.415000 2.205000 2.230000 2.635000 ;
-        RECT 3.200000 1.875000 3.530000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.430000 0.345000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.495000 ;
-      RECT 0.085000 1.495000 0.395000 1.865000 ;
-      RECT 0.085000 1.865000 1.935000 2.035000 ;
-      RECT 1.285000 0.890000 1.595000 1.060000 ;
-      RECT 1.285000 1.060000 1.455000 1.325000 ;
-      RECT 1.425000 0.655000 2.275000 0.825000 ;
-      RECT 1.425000 0.825000 1.595000 0.890000 ;
-      RECT 1.765000 0.995000 1.935000 1.865000 ;
-      RECT 1.940000 0.255000 2.275000 0.655000 ;
-      RECT 2.105000 0.825000 2.275000 1.455000 ;
-      RECT 2.105000 1.455000 2.725000 2.035000 ;
-      RECT 2.400000 2.035000 2.725000 2.465000 ;
-      RECT 2.445000 0.365000 2.745000 0.735000 ;
-      RECT 2.445000 0.735000 3.590000 0.905000 ;
-      RECT 3.255000 0.270000 3.590000 0.735000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.430000 0.345000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.495000 ;
+      RECT 0.085000  1.495000 0.395000 1.865000 ;
+      RECT 0.085000  1.865000 1.935000 2.035000 ;
+      RECT 0.520000  2.205000 0.910000 2.635000 ;
+      RECT 0.595000  0.085000 0.775000 0.825000 ;
+      RECT 1.285000  0.890000 1.595000 1.060000 ;
+      RECT 1.285000  1.060000 1.455000 1.325000 ;
+      RECT 1.410000  0.085000 1.770000 0.485000 ;
+      RECT 1.415000  2.205000 2.230000 2.635000 ;
+      RECT 1.425000  0.655000 2.275000 0.825000 ;
+      RECT 1.425000  0.825000 1.595000 0.890000 ;
+      RECT 1.765000  0.995000 1.935000 1.865000 ;
+      RECT 1.940000  0.255000 2.275000 0.655000 ;
+      RECT 2.105000  0.825000 2.275000 1.455000 ;
+      RECT 2.105000  1.455000 2.725000 2.035000 ;
+      RECT 2.400000  2.035000 2.725000 2.465000 ;
+      RECT 2.445000  0.365000 2.745000 0.735000 ;
+      RECT 2.445000  0.735000 3.590000 0.905000 ;
+      RECT 2.915000  0.085000 3.085000 0.555000 ;
+      RECT 3.200000  1.875000 3.530000 2.635000 ;
+      RECT 3.255000  0.270000 3.590000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
 END sky130_fd_sc_hd__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
index d72db22..0817a23 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.magic.lef
@@ -76,27 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.715000  0.085000 0.885000 0.905000 ;
-        RECT 1.555000  0.085000 1.725000 0.555000 ;
-        RECT 2.395000  0.085000 2.565000 0.555000 ;
-        RECT 4.175000  0.085000 4.345000 0.555000 ;
-        RECT 5.015000  0.085000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -106,60 +85,78 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.635000 2.215000 0.965000 2.635000 ;
-        RECT 1.475000 2.215000 1.805000 2.635000 ;
-        RECT 2.315000 2.215000 2.645000 2.635000 ;
-        RECT 3.200000 2.135000 3.450000 2.635000 ;
-        RECT 4.935000 1.835000 5.265000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.265000 0.545000 0.855000 ;
-      RECT 0.085000 0.855000 0.255000 1.455000 ;
-      RECT 0.085000 1.455000 0.435000 1.875000 ;
-      RECT 0.085000 1.875000 2.565000 2.045000 ;
-      RECT 0.085000 2.045000 0.435000 2.465000 ;
-      RECT 1.625000 1.075000 2.565000 1.275000 ;
-      RECT 2.395000 0.725000 3.585000 0.895000 ;
-      RECT 2.395000 0.895000 2.565000 1.075000 ;
-      RECT 2.395000 1.445000 2.905000 1.615000 ;
-      RECT 2.395000 1.615000 2.565000 1.875000 ;
-      RECT 2.735000 1.075000 3.135000 1.245000 ;
-      RECT 2.735000 1.245000 2.905000 1.445000 ;
-      RECT 2.805000 0.255000 4.005000 0.475000 ;
-      RECT 2.815000 1.795000 4.380000 1.965000 ;
-      RECT 2.815000 1.965000 2.985000 2.465000 ;
-      RECT 3.235000 0.645000 3.585000 0.725000 ;
-      RECT 3.395000 0.895000 3.585000 1.795000 ;
-      RECT 3.685000 2.135000 3.925000 2.295000 ;
-      RECT 3.685000 2.295000 4.765000 2.465000 ;
-      RECT 3.755000 0.475000 4.005000 0.725000 ;
-      RECT 3.755000 0.725000 5.710000 0.905000 ;
-      RECT 4.135000 1.445000 4.380000 1.795000 ;
-      RECT 4.135000 1.965000 4.380000 2.125000 ;
-      RECT 4.515000 0.255000 4.845000 0.725000 ;
-      RECT 4.595000 1.455000 5.710000 1.665000 ;
-      RECT 4.595000 1.665000 4.765000 2.295000 ;
-      RECT 5.355000 0.265000 5.710000 0.725000 ;
-      RECT 5.435000 1.665000 5.710000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.265000 0.545000 0.855000 ;
+      RECT 0.085000  0.855000 0.255000 1.455000 ;
+      RECT 0.085000  1.455000 0.435000 1.875000 ;
+      RECT 0.085000  1.875000 2.565000 2.045000 ;
+      RECT 0.085000  2.045000 0.435000 2.465000 ;
+      RECT 0.635000  2.215000 0.965000 2.635000 ;
+      RECT 0.715000  0.085000 0.885000 0.905000 ;
+      RECT 1.475000  2.215000 1.805000 2.635000 ;
+      RECT 1.555000  0.085000 1.725000 0.555000 ;
+      RECT 1.625000  1.075000 2.565000 1.275000 ;
+      RECT 2.315000  2.215000 2.645000 2.635000 ;
+      RECT 2.395000  0.085000 2.565000 0.555000 ;
+      RECT 2.395000  0.725000 3.585000 0.895000 ;
+      RECT 2.395000  0.895000 2.565000 1.075000 ;
+      RECT 2.395000  1.445000 2.905000 1.615000 ;
+      RECT 2.395000  1.615000 2.565000 1.875000 ;
+      RECT 2.735000  1.075000 3.135000 1.245000 ;
+      RECT 2.735000  1.245000 2.905000 1.445000 ;
+      RECT 2.805000  0.255000 4.005000 0.475000 ;
+      RECT 2.815000  1.795000 4.380000 1.965000 ;
+      RECT 2.815000  1.965000 2.985000 2.465000 ;
+      RECT 3.200000  2.135000 3.450000 2.635000 ;
+      RECT 3.235000  0.645000 3.585000 0.725000 ;
+      RECT 3.395000  0.895000 3.585000 1.795000 ;
+      RECT 3.685000  2.135000 3.925000 2.295000 ;
+      RECT 3.685000  2.295000 4.765000 2.465000 ;
+      RECT 3.755000  0.475000 4.005000 0.725000 ;
+      RECT 3.755000  0.725000 5.710000 0.905000 ;
+      RECT 4.135000  1.445000 4.380000 1.795000 ;
+      RECT 4.135000  1.965000 4.380000 2.125000 ;
+      RECT 4.175000  0.085000 4.345000 0.555000 ;
+      RECT 4.515000  0.255000 4.845000 0.725000 ;
+      RECT 4.595000  1.455000 5.710000 1.665000 ;
+      RECT 4.595000  1.665000 4.765000 2.295000 ;
+      RECT 4.935000  1.835000 5.265000 2.635000 ;
+      RECT 5.015000  0.085000 5.185000 0.555000 ;
+      RECT 5.355000  0.265000 5.710000 0.725000 ;
+      RECT 5.435000  1.665000 5.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 ;
   END
 END sky130_fd_sc_hd__o21ba_4
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
index 40d2b48..7c703b1 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.magic.lef
@@ -76,17 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.085000  0.085000 0.360000 0.825000 ;
-        RECT 1.995000  0.085000 2.165000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -96,32 +85,40 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.970000 1.875000 1.300000 2.635000 ;
-        RECT 2.270000 1.535000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.535000 1.015000 1.705000 ;
-      RECT 0.525000 1.705000 0.800000 2.210000 ;
-      RECT 0.580000 0.495000 0.770000 0.655000 ;
-      RECT 0.580000 0.655000 0.890000 0.825000 ;
-      RECT 0.720000 0.825000 0.890000 0.995000 ;
-      RECT 0.720000 0.995000 1.015000 1.535000 ;
-      RECT 1.490000 0.255000 1.820000 0.485000 ;
-      RECT 1.570000 0.485000 1.740000 0.735000 ;
-      RECT 1.570000 0.735000 2.665000 0.905000 ;
-      RECT 2.335000 0.270000 2.665000 0.735000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.085000 0.360000 0.825000 ;
+      RECT 0.525000  1.535000 1.015000 1.705000 ;
+      RECT 0.525000  1.705000 0.800000 2.210000 ;
+      RECT 0.580000  0.495000 0.770000 0.655000 ;
+      RECT 0.580000  0.655000 0.890000 0.825000 ;
+      RECT 0.720000  0.825000 0.890000 0.995000 ;
+      RECT 0.720000  0.995000 1.015000 1.535000 ;
+      RECT 0.970000  1.875000 1.300000 2.635000 ;
+      RECT 1.490000  0.255000 1.820000 0.485000 ;
+      RECT 1.570000  0.485000 1.740000 0.735000 ;
+      RECT 1.570000  0.735000 2.665000 0.905000 ;
+      RECT 1.995000  0.085000 2.165000 0.555000 ;
+      RECT 2.270000  1.535000 2.645000 2.635000 ;
+      RECT 2.335000  0.270000 2.665000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
index 1adc393..83ebaea 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.magic.lef
@@ -75,21 +75,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.180000  0.085000 0.350000 0.825000 ;
-        RECT 2.445000  0.085000 2.615000 0.555000 ;
-        RECT 3.285000  0.085000 3.455000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -99,43 +84,55 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.585000 1.875000 0.915000 2.635000 ;
-        RECT 1.470000 1.795000 1.720000 2.635000 ;
-        RECT 3.205000 1.835000 3.535000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.180000 1.495000 0.865000 1.665000 ;
-      RECT 0.180000 1.665000 0.350000 1.915000 ;
-      RECT 0.600000 0.445000 0.865000 0.825000 ;
-      RECT 0.695000 0.825000 0.865000 1.075000 ;
-      RECT 0.695000 1.075000 1.335000 1.245000 ;
-      RECT 0.695000 1.245000 0.865000 1.495000 ;
-      RECT 1.075000 0.255000 2.275000 0.475000 ;
-      RECT 1.075000 0.475000 1.355000 0.905000 ;
-      RECT 1.955000 1.795000 2.235000 2.295000 ;
-      RECT 1.955000 2.295000 3.035000 2.465000 ;
-      RECT 2.025000 0.475000 2.275000 0.725000 ;
-      RECT 2.025000 0.725000 3.980000 0.905000 ;
-      RECT 2.785000 0.255000 3.115000 0.725000 ;
-      RECT 2.865000 1.455000 3.980000 1.665000 ;
-      RECT 2.865000 1.665000 3.035000 2.295000 ;
-      RECT 3.625000 0.265000 3.980000 0.725000 ;
-      RECT 3.705000 1.665000 3.980000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.180000  0.085000 0.350000 0.825000 ;
+      RECT 0.180000  1.495000 0.865000 1.665000 ;
+      RECT 0.180000  1.665000 0.350000 1.915000 ;
+      RECT 0.585000  1.875000 0.915000 2.635000 ;
+      RECT 0.600000  0.445000 0.865000 0.825000 ;
+      RECT 0.695000  0.825000 0.865000 1.075000 ;
+      RECT 0.695000  1.075000 1.335000 1.245000 ;
+      RECT 0.695000  1.245000 0.865000 1.495000 ;
+      RECT 1.075000  0.255000 2.275000 0.475000 ;
+      RECT 1.075000  0.475000 1.355000 0.905000 ;
+      RECT 1.470000  1.795000 1.720000 2.635000 ;
+      RECT 1.955000  1.795000 2.235000 2.295000 ;
+      RECT 1.955000  2.295000 3.035000 2.465000 ;
+      RECT 2.025000  0.475000 2.275000 0.725000 ;
+      RECT 2.025000  0.725000 3.980000 0.905000 ;
+      RECT 2.445000  0.085000 2.615000 0.555000 ;
+      RECT 2.785000  0.255000 3.115000 0.725000 ;
+      RECT 2.865000  1.455000 3.980000 1.665000 ;
+      RECT 2.865000  1.665000 3.035000 2.295000 ;
+      RECT 3.205000  1.835000 3.535000 2.635000 ;
+      RECT 3.285000  0.085000 3.455000 0.555000 ;
+      RECT 3.625000  0.265000 3.980000 0.725000 ;
+      RECT 3.705000  1.665000 3.980000 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
 END sky130_fd_sc_hd__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
index cac68b3..590d8a8 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.magic.lef
@@ -80,29 +80,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.225000  0.085000 0.395000 0.895000 ;
-        RECT 3.265000  0.085000 3.435000 0.555000 ;
-        RECT 4.105000  0.085000 4.275000 0.555000 ;
-        RECT 4.945000  0.085000 5.115000 0.555000 ;
-        RECT 5.785000  0.085000 5.955000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -112,54 +89,74 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.645000 1.795000 0.855000 2.635000 ;
-        RECT 1.445000 1.795000 1.695000 2.635000 ;
-        RECT 2.285000 1.795000 2.535000 2.635000 ;
-        RECT 4.905000 1.795000 5.155000 2.635000 ;
-        RECT 5.745000 1.795000 5.995000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 1.455000 0.895000 1.625000 ;
-      RECT 0.145000 1.625000 0.475000 2.435000 ;
-      RECT 0.565000 0.290000 0.895000 0.895000 ;
-      RECT 0.725000 0.895000 0.895000 1.075000 ;
-      RECT 0.725000 1.075000 2.275000 1.285000 ;
-      RECT 0.725000 1.285000 0.895000 1.455000 ;
-      RECT 1.080000 0.305000 3.095000 0.475000 ;
-      RECT 2.775000 1.795000 3.055000 2.295000 ;
-      RECT 2.775000 2.295000 4.735000 2.465000 ;
-      RECT 2.845000 0.475000 3.095000 0.725000 ;
-      RECT 2.845000 0.725000 6.455000 0.905000 ;
-      RECT 3.605000 0.255000 3.935000 0.725000 ;
-      RECT 3.645000 1.795000 3.895000 2.295000 ;
-      RECT 4.445000 0.255000 4.775000 0.725000 ;
-      RECT 4.485000 1.455000 6.415000 1.625000 ;
-      RECT 4.485000 1.625000 4.735000 2.295000 ;
-      RECT 5.285000 0.255000 5.615000 0.725000 ;
-      RECT 5.325000 1.625000 5.575000 2.465000 ;
-      RECT 6.125000 0.255000 6.455000 0.725000 ;
-      RECT 6.165000 1.625000 6.415000 2.465000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.145000  1.455000 0.895000 1.625000 ;
+      RECT 0.145000  1.625000 0.475000 2.435000 ;
+      RECT 0.225000  0.085000 0.395000 0.895000 ;
+      RECT 0.565000  0.290000 0.895000 0.895000 ;
+      RECT 0.645000  1.795000 0.855000 2.635000 ;
+      RECT 0.725000  0.895000 0.895000 1.075000 ;
+      RECT 0.725000  1.075000 2.275000 1.285000 ;
+      RECT 0.725000  1.285000 0.895000 1.455000 ;
+      RECT 1.080000  0.305000 3.095000 0.475000 ;
+      RECT 1.445000  1.795000 1.695000 2.635000 ;
+      RECT 2.285000  1.795000 2.535000 2.635000 ;
+      RECT 2.775000  1.795000 3.055000 2.295000 ;
+      RECT 2.775000  2.295000 4.735000 2.465000 ;
+      RECT 2.845000  0.475000 3.095000 0.725000 ;
+      RECT 2.845000  0.725000 6.455000 0.905000 ;
+      RECT 3.265000  0.085000 3.435000 0.555000 ;
+      RECT 3.605000  0.255000 3.935000 0.725000 ;
+      RECT 3.645000  1.795000 3.895000 2.295000 ;
+      RECT 4.105000  0.085000 4.275000 0.555000 ;
+      RECT 4.445000  0.255000 4.775000 0.725000 ;
+      RECT 4.485000  1.455000 6.415000 1.625000 ;
+      RECT 4.485000  1.625000 4.735000 2.295000 ;
+      RECT 4.905000  1.795000 5.155000 2.635000 ;
+      RECT 4.945000  0.085000 5.115000 0.555000 ;
+      RECT 5.285000  0.255000 5.615000 0.725000 ;
+      RECT 5.325000  1.625000 5.575000 2.465000 ;
+      RECT 5.745000  1.795000 5.995000 2.635000 ;
+      RECT 5.785000  0.085000 5.955000 0.555000 ;
+      RECT 6.125000  0.255000 6.455000 0.725000 ;
+      RECT 6.165000  1.625000 6.415000 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
 END sky130_fd_sc_hd__o21bai_4
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
index c5fcea6..11c4a2e 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_1.magic.lef
@@ -93,20 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 2.190000  0.085000 2.360000 0.555000 ;
-        RECT 3.030000  0.085000 3.200000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -116,41 +102,52 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.735000 1.795000 0.985000 2.635000 ;
-        RECT 2.890000 1.795000 3.220000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.240000 1.455000 1.325000 1.625000 ;
-      RECT 0.240000 1.625000 0.540000 2.465000 ;
-      RECT 0.245000 0.255000 0.575000 0.645000 ;
-      RECT 0.245000 0.645000 0.755000 0.825000 ;
-      RECT 0.585000 0.825000 0.755000 1.455000 ;
-      RECT 0.745000 0.305000 1.930000 0.475000 ;
-      RECT 1.155000 1.625000 1.325000 1.875000 ;
-      RECT 1.155000 1.875000 2.720000 2.045000 ;
-      RECT 1.160000 0.645000 1.545000 0.735000 ;
-      RECT 1.160000 0.735000 2.860000 0.905000 ;
-      RECT 1.575000 2.045000 2.380000 2.465000 ;
-      RECT 2.530000 0.270000 2.860000 0.735000 ;
-      RECT 2.550000 1.455000 3.470000 1.625000 ;
-      RECT 2.550000 1.625000 2.720000 1.875000 ;
-      RECT 3.300000 1.075000 3.635000 1.285000 ;
-      RECT 3.300000 1.285000 3.470000 1.455000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.240000  1.455000 1.325000 1.625000 ;
+      RECT 0.240000  1.625000 0.540000 2.465000 ;
+      RECT 0.245000  0.255000 0.575000 0.645000 ;
+      RECT 0.245000  0.645000 0.755000 0.825000 ;
+      RECT 0.585000  0.825000 0.755000 1.455000 ;
+      RECT 0.735000  1.795000 0.985000 2.635000 ;
+      RECT 0.745000  0.305000 1.930000 0.475000 ;
+      RECT 1.155000  1.625000 1.325000 1.875000 ;
+      RECT 1.155000  1.875000 2.720000 2.045000 ;
+      RECT 1.160000  0.645000 1.545000 0.735000 ;
+      RECT 1.160000  0.735000 2.860000 0.905000 ;
+      RECT 1.575000  2.045000 2.380000 2.465000 ;
+      RECT 2.190000  0.085000 2.360000 0.555000 ;
+      RECT 2.530000  0.270000 2.860000 0.735000 ;
+      RECT 2.550000  1.455000 3.470000 1.625000 ;
+      RECT 2.550000  1.625000 2.720000 1.875000 ;
+      RECT 2.890000  1.795000 3.220000 2.635000 ;
+      RECT 3.030000  0.085000 3.200000 0.905000 ;
+      RECT 3.300000  1.075000 3.635000 1.285000 ;
+      RECT 3.300000  1.285000 3.470000 1.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
index 910d071..76a3514 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_2.magic.lef
@@ -95,21 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 2.115000  0.085000 2.285000 0.555000 ;
-        RECT 2.955000  0.085000 3.125000 0.905000 ;
-        RECT 3.795000  0.085000 3.965000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -119,43 +104,55 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.750000 1.850000 0.990000 2.635000 ;
-        RECT 2.795000 1.795000 3.125000 2.635000 ;
-        RECT 3.715000 2.215000 4.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.255000 0.500000 0.635000 ;
-      RECT 0.170000 0.635000 0.715000 0.805000 ;
-      RECT 0.250000 1.495000 1.330000 1.670000 ;
-      RECT 0.250000 1.670000 0.580000 2.465000 ;
-      RECT 0.545000 0.805000 0.715000 1.445000 ;
-      RECT 0.545000 1.445000 1.330000 1.495000 ;
-      RECT 0.670000 0.295000 1.855000 0.465000 ;
-      RECT 1.085000 0.645000 1.470000 0.735000 ;
-      RECT 1.085000 0.735000 2.785000 0.905000 ;
-      RECT 1.160000 1.670000 1.330000 1.875000 ;
-      RECT 1.160000 1.875000 2.625000 2.045000 ;
-      RECT 1.550000 2.045000 2.305000 2.465000 ;
-      RECT 2.455000 0.270000 2.785000 0.735000 ;
-      RECT 2.455000 1.455000 3.415000 1.625000 ;
-      RECT 2.455000 1.625000 2.625000 1.875000 ;
-      RECT 3.245000 1.075000 3.575000 1.285000 ;
-      RECT 3.245000 1.285000 3.415000 1.455000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.170000  0.255000 0.500000 0.635000 ;
+      RECT 0.170000  0.635000 0.715000 0.805000 ;
+      RECT 0.250000  1.495000 1.330000 1.670000 ;
+      RECT 0.250000  1.670000 0.580000 2.465000 ;
+      RECT 0.545000  0.805000 0.715000 1.445000 ;
+      RECT 0.545000  1.445000 1.330000 1.495000 ;
+      RECT 0.670000  0.295000 1.855000 0.465000 ;
+      RECT 0.750000  1.850000 0.990000 2.635000 ;
+      RECT 1.085000  0.645000 1.470000 0.735000 ;
+      RECT 1.085000  0.735000 2.785000 0.905000 ;
+      RECT 1.160000  1.670000 1.330000 1.875000 ;
+      RECT 1.160000  1.875000 2.625000 2.045000 ;
+      RECT 1.550000  2.045000 2.305000 2.465000 ;
+      RECT 2.115000  0.085000 2.285000 0.555000 ;
+      RECT 2.455000  0.270000 2.785000 0.735000 ;
+      RECT 2.455000  1.455000 3.415000 1.625000 ;
+      RECT 2.455000  1.625000 2.625000 1.875000 ;
+      RECT 2.795000  1.795000 3.125000 2.635000 ;
+      RECT 2.955000  0.085000 3.125000 0.905000 ;
+      RECT 3.245000  1.075000 3.575000 1.285000 ;
+      RECT 3.245000  1.285000 3.415000 1.455000 ;
+      RECT 3.715000  2.215000 4.055000 2.635000 ;
+      RECT 3.795000  0.085000 3.965000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
index 4d6bfbc..ff6938f 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_4.magic.lef
@@ -103,30 +103,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 3.145000  0.085000 3.385000 0.545000 ;
-        RECT 4.055000  0.085000 4.225000 0.555000 ;
-        RECT 4.895000  0.085000 5.065000 0.905000 ;
-        RECT 5.735000  0.085000 5.905000 0.555000 ;
-        RECT 6.575000  0.085000 6.830000 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
@@ -136,61 +112,82 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.145000 1.455000 0.395000 2.635000 ;
-        RECT 0.985000 2.125000 1.235000 2.635000 ;
-        RECT 2.665000 2.125000 3.425000 2.635000 ;
-        RECT 4.855000 2.125000 5.105000 2.635000 ;
-        RECT 5.695000 2.125000 5.945000 2.635000 ;
-        RECT 6.535000 1.795000 6.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 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 2.955000 0.475000 ;
-      RECT 0.085000 0.475000 0.345000 0.895000 ;
-      RECT 0.515000 0.645000 0.845000 0.865000 ;
-      RECT 0.565000 1.445000 0.845000 1.785000 ;
-      RECT 0.565000 1.785000 5.145000 1.955000 ;
-      RECT 0.565000 1.955000 0.815000 2.465000 ;
-      RECT 0.610000 0.865000 0.845000 1.445000 ;
-      RECT 1.015000 0.475000 1.185000 0.905000 ;
-      RECT 1.355000 0.645000 2.535000 0.715000 ;
-      RECT 1.355000 0.715000 3.885000 0.725000 ;
-      RECT 1.355000 0.725000 4.725000 0.905000 ;
-      RECT 1.405000 2.125000 1.655000 2.295000 ;
-      RECT 1.405000 2.295000 2.495000 2.465000 ;
-      RECT 1.825000 1.955000 2.075000 2.125000 ;
-      RECT 2.245000 2.125000 2.495000 2.295000 ;
-      RECT 3.555000 0.255000 3.885000 0.715000 ;
-      RECT 3.595000 2.125000 3.845000 2.295000 ;
-      RECT 3.595000 2.295000 4.685000 2.465000 ;
-      RECT 4.015000 1.955000 4.265000 2.125000 ;
-      RECT 4.395000 0.255000 4.725000 0.725000 ;
-      RECT 4.435000 2.125000 4.685000 2.295000 ;
-      RECT 4.975000 1.445000 5.375000 1.615000 ;
-      RECT 4.975000 1.615000 5.145000 1.785000 ;
-      RECT 5.205000 1.075000 6.405000 1.275000 ;
-      RECT 5.205000 1.275000 5.375000 1.445000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.085000  0.255000 2.955000 0.475000 ;
+      RECT 0.085000  0.475000 0.345000 0.895000 ;
+      RECT 0.145000  1.455000 0.395000 2.635000 ;
+      RECT 0.515000  0.645000 0.845000 0.865000 ;
+      RECT 0.565000  1.445000 0.845000 1.785000 ;
+      RECT 0.565000  1.785000 5.145000 1.955000 ;
+      RECT 0.565000  1.955000 0.815000 2.465000 ;
+      RECT 0.610000  0.865000 0.845000 1.445000 ;
+      RECT 0.985000  2.125000 1.235000 2.635000 ;
+      RECT 1.015000  0.475000 1.185000 0.905000 ;
+      RECT 1.355000  0.645000 2.535000 0.715000 ;
+      RECT 1.355000  0.715000 3.885000 0.725000 ;
+      RECT 1.355000  0.725000 4.725000 0.905000 ;
+      RECT 1.405000  2.125000 1.655000 2.295000 ;
+      RECT 1.405000  2.295000 2.495000 2.465000 ;
+      RECT 1.825000  1.955000 2.075000 2.125000 ;
+      RECT 2.245000  2.125000 2.495000 2.295000 ;
+      RECT 2.665000  2.125000 3.425000 2.635000 ;
+      RECT 3.145000  0.085000 3.385000 0.545000 ;
+      RECT 3.555000  0.255000 3.885000 0.715000 ;
+      RECT 3.595000  2.125000 3.845000 2.295000 ;
+      RECT 3.595000  2.295000 4.685000 2.465000 ;
+      RECT 4.015000  1.955000 4.265000 2.125000 ;
+      RECT 4.055000  0.085000 4.225000 0.555000 ;
+      RECT 4.395000  0.255000 4.725000 0.725000 ;
+      RECT 4.435000  2.125000 4.685000 2.295000 ;
+      RECT 4.855000  2.125000 5.105000 2.635000 ;
+      RECT 4.895000  0.085000 5.065000 0.905000 ;
+      RECT 4.975000  1.445000 5.375000 1.615000 ;
+      RECT 4.975000  1.615000 5.145000 1.785000 ;
+      RECT 5.205000  1.075000 6.405000 1.275000 ;
+      RECT 5.205000  1.275000 5.375000 1.445000 ;
+      RECT 5.695000  2.125000 5.945000 2.635000 ;
+      RECT 5.735000  0.085000 5.905000 0.555000 ;
+      RECT 6.535000  1.795000 6.785000 2.635000 ;
+      RECT 6.575000  0.085000 6.830000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
   END
 END sky130_fd_sc_hd__o221a_4
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
index 7f279bf..1e0e46e 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.magic.lef
@@ -98,17 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 2.455000  0.085000 2.625000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -118,29 +107,37 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.550000 1.875000 1.340000 2.635000 ;
-        RECT 2.875000 1.455000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.305000 1.775000 0.475000 ;
-      RECT 1.010000 0.645000 2.220000 0.695000 ;
-      RECT 1.010000 0.695000 3.135000 0.825000 ;
-      RECT 1.945000 0.280000 2.220000 0.645000 ;
-      RECT 2.105000 0.825000 3.135000 0.865000 ;
-      RECT 2.795000 0.280000 3.135000 0.695000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.515000  0.305000 1.775000 0.475000 ;
+      RECT 0.550000  1.875000 1.340000 2.635000 ;
+      RECT 1.010000  0.645000 2.220000 0.695000 ;
+      RECT 1.010000  0.695000 3.135000 0.825000 ;
+      RECT 1.945000  0.280000 2.220000 0.645000 ;
+      RECT 2.105000  0.825000 3.135000 0.865000 ;
+      RECT 2.455000  0.085000 2.625000 0.525000 ;
+      RECT 2.795000  0.280000 3.135000 0.695000 ;
+      RECT 2.875000  1.455000 3.135000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
index 0a43ab3..fe03dd3 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.magic.lef
@@ -100,23 +100,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 3.720000  0.085000 3.890000 0.555000 ;
-        RECT 4.560000  0.085000 4.730000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -126,46 +109,60 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.140000 1.455000 0.390000 2.635000 ;
-        RECT 0.980000 2.125000 1.750000 2.635000 ;
-        RECT 3.180000 2.125000 3.510000 2.635000 ;
-        RECT 4.985000 1.455000 5.190000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.255000 1.270000 0.475000 ;
-      RECT 0.100000 0.475000 0.350000 0.895000 ;
-      RECT 1.020000 0.475000 1.270000 0.645000 ;
-      RECT 1.020000 0.645000 3.050000 0.905000 ;
-      RECT 1.460000 0.255000 3.550000 0.475000 ;
-      RECT 1.920000 2.125000 2.170000 2.295000 ;
-      RECT 1.920000 2.295000 3.010000 2.465000 ;
-      RECT 2.760000 2.125000 3.010000 2.295000 ;
-      RECT 3.220000 0.475000 3.550000 0.735000 ;
-      RECT 3.220000 0.735000 5.230000 0.905000 ;
-      RECT 3.680000 2.125000 3.930000 2.295000 ;
-      RECT 3.680000 2.295000 4.770000 2.465000 ;
-      RECT 4.060000 0.255000 4.390000 0.725000 ;
-      RECT 4.060000 0.725000 5.230000 0.735000 ;
-      RECT 4.520000 1.785000 4.770000 2.295000 ;
-      RECT 4.900000 0.255000 5.230000 0.725000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.100000  0.255000 1.270000 0.475000 ;
+      RECT 0.100000  0.475000 0.350000 0.895000 ;
+      RECT 0.140000  1.455000 0.390000 2.635000 ;
+      RECT 0.980000  2.125000 1.750000 2.635000 ;
+      RECT 1.020000  0.475000 1.270000 0.645000 ;
+      RECT 1.020000  0.645000 3.050000 0.905000 ;
+      RECT 1.460000  0.255000 3.550000 0.475000 ;
+      RECT 1.920000  2.125000 2.170000 2.295000 ;
+      RECT 1.920000  2.295000 3.010000 2.465000 ;
+      RECT 2.760000  2.125000 3.010000 2.295000 ;
+      RECT 3.180000  2.125000 3.510000 2.635000 ;
+      RECT 3.220000  0.475000 3.550000 0.735000 ;
+      RECT 3.220000  0.735000 5.230000 0.905000 ;
+      RECT 3.680000  2.125000 3.930000 2.295000 ;
+      RECT 3.680000  2.295000 4.770000 2.465000 ;
+      RECT 3.720000  0.085000 3.890000 0.555000 ;
+      RECT 4.060000  0.255000 4.390000 0.725000 ;
+      RECT 4.060000  0.725000 5.230000 0.735000 ;
+      RECT 4.520000  1.785000 4.770000 2.295000 ;
+      RECT 4.560000  0.085000 4.730000 0.555000 ;
+      RECT 4.900000  0.255000 5.230000 0.725000 ;
+      RECT 4.985000  1.455000 5.190000 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
 END sky130_fd_sc_hd__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
index ec0134d..5924142 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.magic.lef
@@ -108,34 +108,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 6.255000  0.085000 6.425000 0.555000 ;
-        RECT 7.095000  0.085000 7.265000 0.555000 ;
-        RECT 7.935000  0.085000 8.105000 0.555000 ;
-        RECT 8.775000  0.085000 8.945000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -145,67 +117,92 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.155000 1.485000 0.405000 2.635000 ;
-        RECT 0.995000 1.825000 1.245000 2.635000 ;
-        RECT 1.835000 2.125000 2.605000 2.635000 ;
-        RECT 3.195000 2.125000 3.445000 2.635000 ;
-        RECT 5.755000 2.175000 6.005000 2.635000 ;
-        RECT 8.315000 2.125000 8.565000 2.635000 ;
-        RECT 9.155000 1.445000 9.405000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 5.585000 0.475000 ;
-      RECT 0.115000 0.475000 0.365000 0.895000 ;
-      RECT 2.315000 0.645000 6.085000 0.735000 ;
-      RECT 2.315000 0.735000 9.445000 0.820000 ;
-      RECT 2.775000 1.785000 3.825000 1.955000 ;
-      RECT 2.775000 1.955000 3.025000 2.465000 ;
-      RECT 3.615000 1.955000 3.825000 2.295000 ;
-      RECT 3.615000 2.295000 5.585000 2.465000 ;
-      RECT 4.455000 2.175000 4.705000 2.295000 ;
-      RECT 5.255000 2.175000 5.585000 2.295000 ;
-      RECT 5.465000 0.820000 9.445000 0.905000 ;
-      RECT 5.755000 0.255000 6.085000 0.645000 ;
-      RECT 6.175000 2.175000 6.505000 2.295000 ;
-      RECT 6.175000 2.295000 8.145000 2.465000 ;
-      RECT 6.595000 0.255000 6.925000 0.725000 ;
-      RECT 6.595000 0.725000 7.765000 0.735000 ;
-      RECT 7.055000 2.125000 7.305000 2.295000 ;
-      RECT 7.435000 0.255000 7.765000 0.725000 ;
-      RECT 7.895000 1.785000 8.985000 1.955000 ;
-      RECT 7.895000 1.955000 8.145000 2.295000 ;
-      RECT 8.275000 0.255000 8.605000 0.725000 ;
-      RECT 8.275000 0.725000 9.445000 0.735000 ;
-      RECT 8.735000 1.445000 8.985000 1.785000 ;
-      RECT 8.735000 1.955000 8.985000 2.465000 ;
-      RECT 9.115000 0.255000 9.445000 0.725000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.115000  0.255000 5.585000 0.475000 ;
+      RECT 0.115000  0.475000 0.365000 0.895000 ;
+      RECT 0.155000  1.485000 0.405000 2.635000 ;
+      RECT 0.995000  1.825000 1.245000 2.635000 ;
+      RECT 1.835000  2.125000 2.605000 2.635000 ;
+      RECT 2.315000  0.645000 6.085000 0.735000 ;
+      RECT 2.315000  0.735000 9.445000 0.820000 ;
+      RECT 2.775000  1.785000 3.825000 1.955000 ;
+      RECT 2.775000  1.955000 3.025000 2.465000 ;
+      RECT 3.195000  2.125000 3.445000 2.635000 ;
+      RECT 3.615000  1.955000 3.825000 2.295000 ;
+      RECT 3.615000  2.295000 5.585000 2.465000 ;
+      RECT 4.455000  2.175000 4.705000 2.295000 ;
+      RECT 5.255000  2.175000 5.585000 2.295000 ;
+      RECT 5.465000  0.820000 9.445000 0.905000 ;
+      RECT 5.755000  0.255000 6.085000 0.645000 ;
+      RECT 5.755000  2.175000 6.005000 2.635000 ;
+      RECT 6.175000  2.175000 6.505000 2.295000 ;
+      RECT 6.175000  2.295000 8.145000 2.465000 ;
+      RECT 6.255000  0.085000 6.425000 0.555000 ;
+      RECT 6.595000  0.255000 6.925000 0.725000 ;
+      RECT 6.595000  0.725000 7.765000 0.735000 ;
+      RECT 7.055000  2.125000 7.305000 2.295000 ;
+      RECT 7.095000  0.085000 7.265000 0.555000 ;
+      RECT 7.435000  0.255000 7.765000 0.725000 ;
+      RECT 7.895000  1.785000 8.985000 1.955000 ;
+      RECT 7.895000  1.955000 8.145000 2.295000 ;
+      RECT 7.935000  0.085000 8.105000 0.555000 ;
+      RECT 8.275000  0.255000 8.605000 0.725000 ;
+      RECT 8.275000  0.725000 9.445000 0.735000 ;
+      RECT 8.315000  2.125000 8.565000 2.635000 ;
+      RECT 8.735000  1.445000 8.985000 1.785000 ;
+      RECT 8.735000  1.955000 8.985000 2.465000 ;
+      RECT 8.775000  0.085000 8.945000 0.555000 ;
+      RECT 9.115000  0.255000 9.445000 0.725000 ;
+      RECT 9.155000  1.445000 9.405000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
   END
 END sky130_fd_sc_hd__o221ai_4
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
index bb5e5fc..aa5ba34 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_1.magic.lef
@@ -83,18 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.545000 ;
-        RECT 2.455000  0.085000 2.625000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -104,33 +92,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.555000 1.875000 1.340000 2.635000 ;
-        RECT 2.815000 1.455000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 0.715000 1.785000 0.895000 ;
-      RECT 0.535000 0.895000 0.810000 1.495000 ;
-      RECT 0.535000 1.495000 2.145000 1.705000 ;
-      RECT 1.035000 0.295000 2.285000 0.475000 ;
-      RECT 1.420000 0.645000 1.785000 0.715000 ;
-      RECT 1.735000 1.705000 2.145000 1.805000 ;
-      RECT 1.735000 1.805000 2.120000 2.465000 ;
-      RECT 1.955000 0.475000 2.285000 0.695000 ;
-      RECT 1.955000 0.695000 3.135000 0.865000 ;
-      RECT 2.795000 0.280000 3.135000 0.695000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.535000  0.715000 1.785000 0.895000 ;
+      RECT 0.535000  0.895000 0.810000 1.495000 ;
+      RECT 0.535000  1.495000 2.145000 1.705000 ;
+      RECT 0.555000  1.875000 1.340000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.545000 ;
+      RECT 1.035000  0.295000 2.285000 0.475000 ;
+      RECT 1.420000  0.645000 1.785000 0.715000 ;
+      RECT 1.735000  1.705000 2.145000 1.805000 ;
+      RECT 1.735000  1.805000 2.120000 2.465000 ;
+      RECT 1.955000  0.475000 2.285000 0.695000 ;
+      RECT 1.955000  0.695000 3.135000 0.865000 ;
+      RECT 2.455000  0.085000 2.625000 0.525000 ;
+      RECT 2.795000  0.280000 3.135000 0.695000 ;
+      RECT 2.815000  1.455000 3.135000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
index e6cd7a0..fefbb9d 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_2.magic.lef
@@ -84,20 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.185000  0.085000 0.355000 0.885000 ;
-        RECT 1.025000  0.085000 1.205000 0.545000 ;
-        RECT 2.915000  0.085000 3.085000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -107,35 +93,46 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.115000 1.445000 0.365000 2.635000 ;
-        RECT 0.995000 1.875000 1.795000 2.635000 ;
-        RECT 3.270000 1.795000 3.590000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 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.975000 0.715000 2.215000 0.895000 ;
-      RECT 0.975000 0.895000 1.255000 1.495000 ;
-      RECT 0.975000 1.495000 2.575000 1.705000 ;
-      RECT 1.465000 0.295000 2.730000 0.475000 ;
-      RECT 1.850000 0.645000 2.215000 0.715000 ;
-      RECT 2.190000 1.705000 2.575000 2.465000 ;
-      RECT 2.390000 0.475000 2.730000 0.695000 ;
-      RECT 2.390000 0.695000 3.590000 0.825000 ;
-      RECT 2.560000 0.825000 3.590000 0.865000 ;
-      RECT 3.255000 0.280000 3.590000 0.695000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.115000  1.445000 0.365000 2.635000 ;
+      RECT 0.185000  0.085000 0.355000 0.885000 ;
+      RECT 0.975000  0.715000 2.215000 0.895000 ;
+      RECT 0.975000  0.895000 1.255000 1.495000 ;
+      RECT 0.975000  1.495000 2.575000 1.705000 ;
+      RECT 0.995000  1.875000 1.795000 2.635000 ;
+      RECT 1.025000  0.085000 1.205000 0.545000 ;
+      RECT 1.465000  0.295000 2.730000 0.475000 ;
+      RECT 1.850000  0.645000 2.215000 0.715000 ;
+      RECT 2.190000  1.705000 2.575000 2.465000 ;
+      RECT 2.390000  0.475000 2.730000 0.695000 ;
+      RECT 2.390000  0.695000 3.590000 0.825000 ;
+      RECT 2.560000  0.825000 3.590000 0.865000 ;
+      RECT 2.915000  0.085000 3.085000 0.525000 ;
+      RECT 3.255000  0.280000 3.590000 0.695000 ;
+      RECT 3.270000  1.795000 3.590000 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
 END sky130_fd_sc_hd__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
index 9887d64..6dc3a38 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_4.magic.lef
@@ -91,28 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.260000  0.085000 0.430000 0.555000 ;
-        RECT 1.100000  0.085000 1.270000 0.555000 ;
-        RECT 1.940000  0.085000 2.110000 0.555000 ;
-        RECT 4.640000  0.085000 4.810000 0.555000 ;
-        RECT 5.480000  0.085000 5.650000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -122,53 +100,72 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.220000 1.825000 0.470000 2.635000 ;
-        RECT 1.060000 1.795000 1.310000 2.635000 ;
-        RECT 1.900000 2.125000 2.670000 2.635000 ;
-        RECT 4.100000 2.125000 4.430000 2.635000 ;
-        RECT 5.905000 1.455000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.540000 1.075000 2.230000 1.275000 ;
-      RECT 1.900000 1.275000 2.230000 1.785000 ;
-      RECT 1.900000 1.785000 5.270000 1.955000 ;
-      RECT 1.940000 0.735000 3.970000 0.905000 ;
-      RECT 1.940000 0.905000 2.230000 1.075000 ;
-      RECT 2.380000 0.255000 4.470000 0.475000 ;
-      RECT 2.415000 0.645000 3.970000 0.735000 ;
-      RECT 2.840000 2.125000 3.090000 2.295000 ;
-      RECT 2.840000 2.295000 3.930000 2.465000 ;
-      RECT 3.260000 1.955000 3.510000 2.125000 ;
-      RECT 3.680000 2.125000 3.930000 2.295000 ;
-      RECT 4.140000 0.475000 4.470000 0.735000 ;
-      RECT 4.140000 0.735000 6.150000 0.905000 ;
-      RECT 4.600000 2.125000 4.850000 2.295000 ;
-      RECT 4.600000 2.295000 5.690000 2.465000 ;
-      RECT 4.980000 0.255000 5.310000 0.725000 ;
-      RECT 4.980000 0.725000 6.150000 0.735000 ;
-      RECT 5.020000 1.955000 5.270000 2.125000 ;
-      RECT 5.440000 1.785000 5.690000 2.295000 ;
-      RECT 5.820000 0.255000 6.150000 0.725000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 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.230000 1.275000 ;
+      RECT 1.060000  1.795000 1.310000 2.635000 ;
+      RECT 1.100000  0.085000 1.270000 0.555000 ;
+      RECT 1.900000  1.275000 2.230000 1.785000 ;
+      RECT 1.900000  1.785000 5.270000 1.955000 ;
+      RECT 1.900000  2.125000 2.670000 2.635000 ;
+      RECT 1.940000  0.085000 2.110000 0.555000 ;
+      RECT 1.940000  0.735000 3.970000 0.905000 ;
+      RECT 1.940000  0.905000 2.230000 1.075000 ;
+      RECT 2.380000  0.255000 4.470000 0.475000 ;
+      RECT 2.415000  0.645000 3.970000 0.735000 ;
+      RECT 2.840000  2.125000 3.090000 2.295000 ;
+      RECT 2.840000  2.295000 3.930000 2.465000 ;
+      RECT 3.260000  1.955000 3.510000 2.125000 ;
+      RECT 3.680000  2.125000 3.930000 2.295000 ;
+      RECT 4.100000  2.125000 4.430000 2.635000 ;
+      RECT 4.140000  0.475000 4.470000 0.735000 ;
+      RECT 4.140000  0.735000 6.150000 0.905000 ;
+      RECT 4.600000  2.125000 4.850000 2.295000 ;
+      RECT 4.600000  2.295000 5.690000 2.465000 ;
+      RECT 4.640000  0.085000 4.810000 0.555000 ;
+      RECT 4.980000  0.255000 5.310000 0.725000 ;
+      RECT 4.980000  0.725000 6.150000 0.735000 ;
+      RECT 5.020000  1.955000 5.270000 2.125000 ;
+      RECT 5.440000  1.785000 5.690000 2.295000 ;
+      RECT 5.480000  0.085000 5.650000 0.555000 ;
+      RECT 5.820000  0.255000 6.150000 0.725000 ;
+      RECT 5.905000  1.455000 6.110000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__o22a_4
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
index ec2c892..491bbcb 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.magic.lef
@@ -87,15 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 1.535000  0.085000 1.705000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -105,26 +96,32 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.135000 2.175000 0.345000 2.635000 ;
-        RECT 1.895000 1.455000 2.215000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.295000 1.345000 0.475000 ;
-      RECT 1.015000 0.475000 1.345000 0.695000 ;
-      RECT 1.015000 0.695000 2.215000 0.825000 ;
-      RECT 1.185000 0.825000 2.215000 0.865000 ;
-      RECT 1.875000 0.280000 2.215000 0.695000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.085000  0.295000 1.345000 0.475000 ;
+      RECT 0.135000  2.175000 0.345000 2.635000 ;
+      RECT 1.015000  0.475000 1.345000 0.695000 ;
+      RECT 1.015000  0.695000 2.215000 0.825000 ;
+      RECT 1.185000  0.825000 2.215000 0.865000 ;
+      RECT 1.535000  0.085000 1.705000 0.525000 ;
+      RECT 1.875000  0.280000 2.215000 0.695000 ;
+      RECT 1.895000  1.455000 2.215000 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
 END sky130_fd_sc_hd__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
index 2bd14b1..aa0cee5 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.magic.lef
@@ -86,21 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 2.855000  0.085000 3.025000 0.555000 ;
-        RECT 3.695000  0.085000 3.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 ;
-        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,42 +95,54 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.575000 1.795000 0.825000 2.635000 ;
-        RECT 3.655000 1.795000 3.905000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.305000 2.680000 0.475000 ;
-      RECT 0.090000 0.475000 0.365000 0.905000 ;
-      RECT 0.150000 1.455000 1.245000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 0.995000 1.625000 1.245000 2.295000 ;
-      RECT 0.995000 2.295000 2.085000 2.465000 ;
-      RECT 1.835000 1.795000 2.085000 2.295000 ;
-      RECT 2.395000 1.795000 2.645000 2.295000 ;
-      RECT 2.395000 2.295000 3.485000 2.465000 ;
-      RECT 2.510000 0.475000 2.680000 0.725000 ;
-      RECT 2.510000 0.725000 4.365000 0.905000 ;
-      RECT 3.195000 0.255000 3.525000 0.725000 ;
-      RECT 3.235000 1.455000 4.330000 1.625000 ;
-      RECT 3.235000 1.625000 3.485000 2.295000 ;
-      RECT 4.035000 0.255000 4.365000 0.725000 ;
-      RECT 4.075000 1.625000 4.330000 2.465000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.305000 2.680000 0.475000 ;
+      RECT 0.090000  0.475000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 1.245000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.575000  1.795000 0.825000 2.635000 ;
+      RECT 0.995000  1.625000 1.245000 2.295000 ;
+      RECT 0.995000  2.295000 2.085000 2.465000 ;
+      RECT 1.835000  1.795000 2.085000 2.295000 ;
+      RECT 2.395000  1.795000 2.645000 2.295000 ;
+      RECT 2.395000  2.295000 3.485000 2.465000 ;
+      RECT 2.510000  0.475000 2.680000 0.725000 ;
+      RECT 2.510000  0.725000 4.365000 0.905000 ;
+      RECT 2.855000  0.085000 3.025000 0.555000 ;
+      RECT 3.195000  0.255000 3.525000 0.725000 ;
+      RECT 3.235000  1.455000 4.330000 1.625000 ;
+      RECT 3.235000  1.625000 3.485000 2.295000 ;
+      RECT 3.655000  1.795000 3.905000 2.635000 ;
+      RECT 3.695000  0.085000 3.865000 0.555000 ;
+      RECT 4.035000  0.255000 4.365000 0.725000 ;
+      RECT 4.075000  1.625000 4.330000 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
 END sky130_fd_sc_hd__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
index 7be7316..cddf9d5 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.magic.lef
@@ -96,29 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.625000  0.085000 0.795000 0.555000 ;
-        RECT 1.465000  0.085000 1.635000 0.555000 ;
-        RECT 2.305000  0.085000 2.475000 0.555000 ;
-        RECT 3.145000  0.085000 3.315000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        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
@@ -128,58 +105,78 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.165000 1.445000 0.415000 2.635000 ;
-        RECT 1.005000 2.125000 1.255000 2.635000 ;
-        RECT 3.565000 2.125000 3.785000 2.635000 ;
-        RECT 4.425000 2.125000 4.665000 2.635000 ;
-        RECT 6.935000 2.125000 7.215000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 0.255000 0.455000 0.725000 ;
-      RECT 0.125000 0.725000 1.295000 0.735000 ;
-      RECT 0.125000 0.735000 3.785000 0.905000 ;
-      RECT 0.585000 1.445000 0.835000 1.785000 ;
-      RECT 0.585000 1.785000 1.675000 1.955000 ;
-      RECT 0.585000 1.955000 0.835000 2.465000 ;
-      RECT 0.965000 0.255000 1.295000 0.725000 ;
-      RECT 1.425000 1.955000 1.675000 2.295000 ;
-      RECT 1.425000 2.295000 3.395000 2.465000 ;
-      RECT 1.805000 0.255000 2.135000 0.725000 ;
-      RECT 1.805000 0.725000 2.975000 0.735000 ;
-      RECT 2.265000 2.125000 2.515000 2.295000 ;
-      RECT 2.645000 0.255000 2.975000 0.725000 ;
-      RECT 3.105000 2.125000 3.395000 2.295000 ;
-      RECT 3.485000 0.255000 7.245000 0.475000 ;
-      RECT 3.485000 0.475000 3.785000 0.735000 ;
-      RECT 3.955000 2.125000 4.255000 2.465000 ;
-      RECT 4.085000 1.785000 5.085000 1.955000 ;
-      RECT 4.085000 1.955000 4.255000 2.125000 ;
-      RECT 4.835000 1.955000 5.085000 2.295000 ;
-      RECT 4.835000 2.295000 6.765000 2.465000 ;
-      RECT 5.675000 2.125000 5.925000 2.295000 ;
-      RECT 6.515000 2.135000 6.765000 2.295000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.125000  0.255000 0.455000 0.725000 ;
+      RECT 0.125000  0.725000 1.295000 0.735000 ;
+      RECT 0.125000  0.735000 3.785000 0.905000 ;
+      RECT 0.165000  1.445000 0.415000 2.635000 ;
+      RECT 0.585000  1.445000 0.835000 1.785000 ;
+      RECT 0.585000  1.785000 1.675000 1.955000 ;
+      RECT 0.585000  1.955000 0.835000 2.465000 ;
+      RECT 0.625000  0.085000 0.795000 0.555000 ;
+      RECT 0.965000  0.255000 1.295000 0.725000 ;
+      RECT 1.005000  2.125000 1.255000 2.635000 ;
+      RECT 1.425000  1.955000 1.675000 2.295000 ;
+      RECT 1.425000  2.295000 3.395000 2.465000 ;
+      RECT 1.465000  0.085000 1.635000 0.555000 ;
+      RECT 1.805000  0.255000 2.135000 0.725000 ;
+      RECT 1.805000  0.725000 2.975000 0.735000 ;
+      RECT 2.265000  2.125000 2.515000 2.295000 ;
+      RECT 2.305000  0.085000 2.475000 0.555000 ;
+      RECT 2.645000  0.255000 2.975000 0.725000 ;
+      RECT 3.105000  2.125000 3.395000 2.295000 ;
+      RECT 3.145000  0.085000 3.315000 0.555000 ;
+      RECT 3.485000  0.255000 7.245000 0.475000 ;
+      RECT 3.485000  0.475000 3.785000 0.735000 ;
+      RECT 3.565000  2.125000 3.785000 2.635000 ;
+      RECT 3.955000  2.125000 4.255000 2.465000 ;
+      RECT 4.085000  1.785000 5.085000 1.955000 ;
+      RECT 4.085000  1.955000 4.255000 2.125000 ;
+      RECT 4.425000  2.125000 4.665000 2.635000 ;
+      RECT 4.835000  1.955000 5.085000 2.295000 ;
+      RECT 4.835000  2.295000 6.765000 2.465000 ;
+      RECT 5.675000  2.125000 5.925000 2.295000 ;
+      RECT 6.515000  2.135000 6.765000 2.295000 ;
+      RECT 6.935000  2.125000 7.215000 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
 END sky130_fd_sc_hd__o22ai_4
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
index 88ca9f1..ae31fe3 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.magic.lef
@@ -85,19 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.620000  0.085000 0.790000 0.750000 ;
-        RECT 2.915000  0.085000 3.085000 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
@@ -107,42 +94,52 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.235000 0.845000 2.635000 ;
-        RECT 1.715000 2.235000 2.115000 2.635000 ;
-        RECT 3.250000 1.815000 3.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.995000 0.600000 1.445000 ;
-      RECT 0.430000 1.445000 0.825000 1.615000 ;
-      RECT 0.655000 1.615000 0.825000 1.885000 ;
-      RECT 0.655000 1.885000 2.735000 2.055000 ;
-      RECT 0.995000 1.495000 2.010000 1.715000 ;
-      RECT 1.460000 0.395000 1.905000 0.565000 ;
-      RECT 1.735000 0.565000 1.905000 1.355000 ;
-      RECT 1.735000 1.355000 2.010000 1.495000 ;
-      RECT 2.075000 0.320000 2.325000 0.690000 ;
-      RECT 2.155000 0.690000 2.325000 1.075000 ;
-      RECT 2.155000 1.075000 2.350000 1.245000 ;
-      RECT 2.180000 1.245000 2.350000 1.495000 ;
-      RECT 2.180000 1.495000 2.735000 1.885000 ;
-      RECT 2.405000 2.055000 2.735000 2.290000 ;
-      RECT 2.495000 0.320000 2.745000 0.725000 ;
-      RECT 2.495000 0.725000 3.595000 0.905000 ;
-      RECT 3.255000 0.320000 3.595000 0.725000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.430000  0.995000 0.600000 1.445000 ;
+      RECT 0.430000  1.445000 0.825000 1.615000 ;
+      RECT 0.515000  2.235000 0.845000 2.635000 ;
+      RECT 0.620000  0.085000 0.790000 0.750000 ;
+      RECT 0.655000  1.615000 0.825000 1.885000 ;
+      RECT 0.655000  1.885000 2.735000 2.055000 ;
+      RECT 0.995000  1.495000 2.010000 1.715000 ;
+      RECT 1.460000  0.395000 1.905000 0.565000 ;
+      RECT 1.715000  2.235000 2.115000 2.635000 ;
+      RECT 1.735000  0.565000 1.905000 1.355000 ;
+      RECT 1.735000  1.355000 2.010000 1.495000 ;
+      RECT 2.075000  0.320000 2.325000 0.690000 ;
+      RECT 2.155000  0.690000 2.325000 1.075000 ;
+      RECT 2.155000  1.075000 2.350000 1.245000 ;
+      RECT 2.180000  1.245000 2.350000 1.495000 ;
+      RECT 2.180000  1.495000 2.735000 1.885000 ;
+      RECT 2.405000  2.055000 2.735000 2.290000 ;
+      RECT 2.495000  0.320000 2.745000 0.725000 ;
+      RECT 2.495000  0.725000 3.595000 0.905000 ;
+      RECT 2.915000  0.085000 3.085000 0.555000 ;
+      RECT 3.250000  1.815000 3.595000 2.635000 ;
+      RECT 3.255000  0.320000 3.595000 0.725000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
index 98cd8ae..e4d619b 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.magic.lef
@@ -86,21 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.110000  0.085000 0.365000 0.910000 ;
-        RECT 1.065000  0.085000 1.235000 0.750000 ;
-        RECT 3.375000  0.085000 3.545000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -110,44 +95,56 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.110000 1.410000 0.365000 2.635000 ;
-        RECT 0.960000 2.235000 1.290000 2.635000 ;
-        RECT 2.160000 2.235000 2.565000 2.635000 ;
-        RECT 3.730000 1.815000 4.045000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.875000 0.995000 1.045000 1.445000 ;
-      RECT 0.875000 1.445000 1.270000 1.615000 ;
-      RECT 1.100000 1.615000 1.270000 1.885000 ;
-      RECT 1.100000 1.885000 3.185000 2.055000 ;
-      RECT 1.440000 1.495000 2.460000 1.715000 ;
-      RECT 1.905000 0.395000 2.365000 0.565000 ;
-      RECT 2.195000 0.565000 2.365000 1.355000 ;
-      RECT 2.195000 1.355000 2.460000 1.495000 ;
-      RECT 2.535000 0.320000 2.780000 0.690000 ;
-      RECT 2.610000 0.690000 2.780000 1.075000 ;
-      RECT 2.610000 1.075000 2.800000 1.245000 ;
-      RECT 2.630000 1.245000 2.800000 1.495000 ;
-      RECT 2.630000 1.495000 3.185000 1.885000 ;
-      RECT 2.835000 2.055000 3.185000 2.425000 ;
-      RECT 2.955000 0.320000 3.185000 0.725000 ;
-      RECT 2.955000 0.725000 4.045000 0.905000 ;
-      RECT 3.715000 0.320000 4.045000 0.725000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.110000  0.085000 0.365000 0.910000 ;
+      RECT 0.110000  1.410000 0.365000 2.635000 ;
+      RECT 0.875000  0.995000 1.045000 1.445000 ;
+      RECT 0.875000  1.445000 1.270000 1.615000 ;
+      RECT 0.960000  2.235000 1.290000 2.635000 ;
+      RECT 1.065000  0.085000 1.235000 0.750000 ;
+      RECT 1.100000  1.615000 1.270000 1.885000 ;
+      RECT 1.100000  1.885000 3.185000 2.055000 ;
+      RECT 1.440000  1.495000 2.460000 1.715000 ;
+      RECT 1.905000  0.395000 2.365000 0.565000 ;
+      RECT 2.160000  2.235000 2.565000 2.635000 ;
+      RECT 2.195000  0.565000 2.365000 1.355000 ;
+      RECT 2.195000  1.355000 2.460000 1.495000 ;
+      RECT 2.535000  0.320000 2.780000 0.690000 ;
+      RECT 2.610000  0.690000 2.780000 1.075000 ;
+      RECT 2.610000  1.075000 2.800000 1.245000 ;
+      RECT 2.630000  1.245000 2.800000 1.495000 ;
+      RECT 2.630000  1.495000 3.185000 1.885000 ;
+      RECT 2.835000  2.055000 3.185000 2.425000 ;
+      RECT 2.955000  0.320000 3.185000 0.725000 ;
+      RECT 2.955000  0.725000 4.045000 0.905000 ;
+      RECT 3.375000  0.085000 3.545000 0.555000 ;
+      RECT 3.715000  0.320000 4.045000 0.725000 ;
+      RECT 3.730000  1.815000 4.045000 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
 END sky130_fd_sc_hd__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
index 0534ec4..7ea1bae 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.magic.lef
@@ -92,31 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.555000 ;
-        RECT 1.435000  0.085000 1.605000 0.555000 ;
-        RECT 3.215000  0.085000 3.385000 0.555000 ;
-        RECT 4.895000  0.085000 5.065000 0.895000 ;
-        RECT 5.735000  0.085000 5.905000 0.555000 ;
-        RECT 6.575000  0.085000 6.745000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -126,70 +101,91 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.140000 1.795000 0.345000 2.635000 ;
-        RECT 1.815000 2.125000 2.065000 2.635000 ;
-        RECT 2.695000 2.135000 3.425000 2.635000 ;
-        RECT 4.015000 2.135000 4.265000 2.635000 ;
-        RECT 4.855000 1.795000 5.105000 2.635000 ;
-        RECT 5.695000 2.165000 5.945000 2.635000 ;
-        RECT 6.535000 1.825000 6.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 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.425000 0.725000 ;
-      RECT 0.095000 0.725000 1.265000 0.735000 ;
-      RECT 0.095000 0.735000 2.025000 0.905000 ;
-      RECT 0.555000 1.785000 0.805000 2.295000 ;
-      RECT 0.555000 2.295000 1.645000 2.465000 ;
-      RECT 0.935000 0.255000 1.265000 0.725000 ;
-      RECT 0.975000 1.785000 2.615000 1.955000 ;
-      RECT 0.975000 1.955000 1.225000 2.125000 ;
-      RECT 1.395000 2.125000 1.645000 2.295000 ;
-      RECT 1.775000 0.255000 2.945000 0.475000 ;
-      RECT 1.775000 0.475000 2.025000 0.735000 ;
-      RECT 2.065000 1.075000 2.445000 1.415000 ;
-      RECT 2.065000 1.415000 2.615000 1.785000 ;
-      RECT 2.195000 0.645000 2.525000 0.815000 ;
-      RECT 2.195000 0.815000 2.445000 1.075000 ;
-      RECT 2.235000 1.955000 2.615000 1.965000 ;
-      RECT 2.235000 1.965000 2.525000 2.465000 ;
-      RECT 2.615000 1.075000 3.145000 1.245000 ;
-      RECT 2.955000 0.725000 4.305000 0.905000 ;
-      RECT 2.955000 0.905000 3.145000 1.075000 ;
-      RECT 2.955000 1.245000 3.145000 1.785000 ;
-      RECT 2.955000 1.785000 4.685000 1.965000 ;
-      RECT 3.555000 0.305000 4.725000 0.475000 ;
-      RECT 3.595000 1.965000 3.845000 2.125000 ;
-      RECT 3.975000 0.645000 4.305000 0.725000 ;
-      RECT 4.435000 1.965000 4.685000 2.465000 ;
-      RECT 4.475000 0.475000 4.725000 0.895000 ;
-      RECT 5.165000 1.075000 6.435000 1.245000 ;
-      RECT 5.165000 1.245000 5.455000 1.615000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.095000  0.255000 0.425000 0.725000 ;
+      RECT 0.095000  0.725000 1.265000 0.735000 ;
+      RECT 0.095000  0.735000 2.025000 0.905000 ;
+      RECT 0.140000  1.795000 0.345000 2.635000 ;
+      RECT 0.555000  1.785000 0.805000 2.295000 ;
+      RECT 0.555000  2.295000 1.645000 2.465000 ;
+      RECT 0.595000  0.085000 0.765000 0.555000 ;
+      RECT 0.935000  0.255000 1.265000 0.725000 ;
+      RECT 0.975000  1.785000 2.615000 1.955000 ;
+      RECT 0.975000  1.955000 1.225000 2.125000 ;
+      RECT 1.395000  2.125000 1.645000 2.295000 ;
+      RECT 1.435000  0.085000 1.605000 0.555000 ;
+      RECT 1.775000  0.255000 2.945000 0.475000 ;
+      RECT 1.775000  0.475000 2.025000 0.735000 ;
+      RECT 1.815000  2.125000 2.065000 2.635000 ;
+      RECT 2.065000  1.075000 2.445000 1.415000 ;
+      RECT 2.065000  1.415000 2.615000 1.785000 ;
+      RECT 2.195000  0.645000 2.525000 0.815000 ;
+      RECT 2.195000  0.815000 2.445000 1.075000 ;
+      RECT 2.235000  1.955000 2.615000 1.965000 ;
+      RECT 2.235000  1.965000 2.525000 2.465000 ;
+      RECT 2.615000  1.075000 3.145000 1.245000 ;
+      RECT 2.695000  2.135000 3.425000 2.635000 ;
+      RECT 2.955000  0.725000 4.305000 0.905000 ;
+      RECT 2.955000  0.905000 3.145000 1.075000 ;
+      RECT 2.955000  1.245000 3.145000 1.785000 ;
+      RECT 2.955000  1.785000 4.685000 1.965000 ;
+      RECT 3.215000  0.085000 3.385000 0.555000 ;
+      RECT 3.555000  0.305000 4.725000 0.475000 ;
+      RECT 3.595000  1.965000 3.845000 2.125000 ;
+      RECT 3.975000  0.645000 4.305000 0.725000 ;
+      RECT 4.015000  2.135000 4.265000 2.635000 ;
+      RECT 4.435000  1.965000 4.685000 2.465000 ;
+      RECT 4.475000  0.475000 4.725000 0.895000 ;
+      RECT 4.855000  1.795000 5.105000 2.635000 ;
+      RECT 4.895000  0.085000 5.065000 0.895000 ;
+      RECT 5.165000  1.075000 6.435000 1.245000 ;
+      RECT 5.165000  1.245000 5.455000 1.615000 ;
+      RECT 5.695000  2.165000 5.945000 2.635000 ;
+      RECT 5.735000  0.085000 5.905000 0.555000 ;
+      RECT 6.535000  1.825000 6.785000 2.635000 ;
+      RECT 6.575000  0.085000 6.745000 0.555000 ;
     LAYER mcon ;
-      RECT 2.445000 1.445000 2.615000 1.615000 ;
-      RECT 5.225000 1.445000 5.395000 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  1.445000 2.615000 1.615000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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.225000  1.445000 5.395000 1.615000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
     LAYER met1 ;
       RECT 2.385000 1.415000 2.675000 1.460000 ;
       RECT 2.385000 1.460000 5.455000 1.600000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
index 45fe408..ad262cf 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.magic.lef
@@ -85,18 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.815000 ;
-        RECT 2.440000  0.085000 2.610000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -106,33 +94,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.150000 1.455000 0.400000 2.635000 ;
-        RECT 0.990000 1.835000 1.770000 2.635000 ;
-        RECT 2.820000 1.455000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 1.495000 1.340000 1.665000 ;
-      RECT 0.570000 1.665000 0.820000 2.465000 ;
-      RECT 1.000000 0.280000 1.340000 0.825000 ;
-      RECT 1.170000 0.825000 1.340000 0.995000 ;
-      RECT 1.170000 0.995000 1.470000 1.325000 ;
-      RECT 1.170000 1.325000 1.340000 1.495000 ;
-      RECT 1.980000 0.425000 2.270000 0.725000 ;
-      RECT 1.980000 0.725000 3.110000 0.905000 ;
-      RECT 2.780000 0.275000 3.110000 0.725000 ;
+      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.815000 ;
+      RECT 0.150000  1.455000 0.400000 2.635000 ;
+      RECT 0.570000  1.495000 1.340000 1.665000 ;
+      RECT 0.570000  1.665000 0.820000 2.465000 ;
+      RECT 0.990000  1.835000 1.770000 2.635000 ;
+      RECT 1.000000  0.280000 1.340000 0.825000 ;
+      RECT 1.170000  0.825000 1.340000 0.995000 ;
+      RECT 1.170000  0.995000 1.470000 1.325000 ;
+      RECT 1.170000  1.325000 1.340000 1.495000 ;
+      RECT 1.980000  0.425000 2.270000 0.725000 ;
+      RECT 1.980000  0.725000 3.110000 0.905000 ;
+      RECT 2.440000  0.085000 2.610000 0.555000 ;
+      RECT 2.780000  0.275000 3.110000 0.725000 ;
+      RECT 2.820000  1.455000 3.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 ;
   END
 END sky130_fd_sc_hd__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
index 58a2c34..0b7ba98 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.magic.lef
@@ -88,25 +88,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.195000  0.085000 0.365000 0.895000 ;
-        RECT 1.875000  0.085000 2.045000 0.555000 ;
-        RECT 3.700000  0.085000 3.870000 0.555000 ;
-        RECT 4.540000  0.085000 4.710000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -116,51 +97,67 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.150000 1.795000 0.400000 2.635000 ;
-        RECT 0.995000 2.135000 1.245000 2.635000 ;
-        RECT 1.835000 2.135000 2.575000 2.635000 ;
-        RECT 3.205000 2.125000 3.490000 2.635000 ;
-        RECT 4.965000 1.795000 5.170000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 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.535000 0.305000 1.705000 0.475000 ;
-      RECT 0.535000 0.475000 0.785000 0.895000 ;
-      RECT 0.575000 1.785000 2.285000 1.965000 ;
-      RECT 0.575000 1.965000 0.825000 2.465000 ;
-      RECT 0.955000 0.645000 1.285000 0.725000 ;
-      RECT 0.955000 0.725000 2.285000 0.905000 ;
-      RECT 1.415000 1.965000 1.665000 2.125000 ;
-      RECT 2.115000 0.905000 2.285000 0.995000 ;
-      RECT 2.115000 0.995000 2.575000 1.325000 ;
-      RECT 2.115000 1.325000 2.285000 1.785000 ;
-      RECT 2.325000 0.255000 3.530000 0.475000 ;
-      RECT 2.325000 0.475000 2.575000 0.555000 ;
-      RECT 3.245000 0.475000 3.530000 0.735000 ;
-      RECT 3.245000 0.735000 5.210000 0.905000 ;
-      RECT 3.660000 2.125000 3.910000 2.295000 ;
-      RECT 3.660000 2.295000 4.750000 2.465000 ;
-      RECT 4.040000 0.255000 4.370000 0.725000 ;
-      RECT 4.040000 0.725000 5.210000 0.735000 ;
-      RECT 4.500000 1.785000 4.750000 2.295000 ;
-      RECT 4.880000 0.255000 5.210000 0.725000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.150000  1.795000 0.400000 2.635000 ;
+      RECT 0.195000  0.085000 0.365000 0.895000 ;
+      RECT 0.535000  0.305000 1.705000 0.475000 ;
+      RECT 0.535000  0.475000 0.785000 0.895000 ;
+      RECT 0.575000  1.785000 2.285000 1.965000 ;
+      RECT 0.575000  1.965000 0.825000 2.465000 ;
+      RECT 0.955000  0.645000 1.285000 0.725000 ;
+      RECT 0.955000  0.725000 2.285000 0.905000 ;
+      RECT 0.995000  2.135000 1.245000 2.635000 ;
+      RECT 1.415000  1.965000 1.665000 2.125000 ;
+      RECT 1.835000  2.135000 2.575000 2.635000 ;
+      RECT 1.875000  0.085000 2.045000 0.555000 ;
+      RECT 2.115000  0.905000 2.285000 0.995000 ;
+      RECT 2.115000  0.995000 2.575000 1.325000 ;
+      RECT 2.115000  1.325000 2.285000 1.785000 ;
+      RECT 2.325000  0.255000 3.530000 0.475000 ;
+      RECT 2.325000  0.475000 2.575000 0.555000 ;
+      RECT 3.205000  2.125000 3.490000 2.635000 ;
+      RECT 3.245000  0.475000 3.530000 0.735000 ;
+      RECT 3.245000  0.735000 5.210000 0.905000 ;
+      RECT 3.660000  2.125000 3.910000 2.295000 ;
+      RECT 3.660000  2.295000 4.750000 2.465000 ;
+      RECT 3.700000  0.085000 3.870000 0.555000 ;
+      RECT 4.040000  0.255000 4.370000 0.725000 ;
+      RECT 4.040000  0.725000 5.210000 0.735000 ;
+      RECT 4.500000  1.785000 4.750000 2.295000 ;
+      RECT 4.540000  0.085000 4.710000 0.555000 ;
+      RECT 4.880000  0.255000 5.210000 0.725000 ;
+      RECT 4.965000  1.795000 5.170000 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
 END sky130_fd_sc_hd__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
index 11acc86..01c9c11 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.magic.lef
@@ -86,37 +86,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 2.295000  0.085000  2.465000 0.555000 ;
-        RECT 3.135000  0.085000  3.305000 0.555000 ;
-        RECT 6.665000  0.085000  6.835000 0.555000 ;
-        RECT 7.505000  0.085000  7.675000 0.555000 ;
-        RECT 8.345000  0.085000  8.515000 0.555000 ;
-        RECT 9.185000  0.085000  9.355000 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
@@ -126,75 +95,103 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.155000 1.795000  0.405000 2.635000 ;
-        RECT 0.995000 1.795000  1.245000 2.635000 ;
-        RECT 1.835000 1.795000  2.085000 2.635000 ;
-        RECT 2.675000 1.795000  2.925000 2.635000 ;
-        RECT 3.515000 1.795000  4.255000 2.635000 ;
-        RECT 4.845000 1.795000  5.095000 2.635000 ;
-        RECT 5.685000 1.795000  5.935000 2.635000 ;
-        RECT 8.305000 1.795000  8.555000 2.635000 ;
-        RECT 9.145000 1.795000  9.395000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.645000 1.705000 0.905000 ;
-      RECT 0.085000 0.905000 0.255000 1.455000 ;
-      RECT 0.085000 1.455000 3.915000 1.625000 ;
-      RECT 0.100000 0.255000 2.125000 0.475000 ;
-      RECT 0.575000 1.625000 0.825000 2.465000 ;
-      RECT 1.415000 1.625000 1.665000 2.465000 ;
-      RECT 1.875000 0.475000 2.125000 0.725000 ;
-      RECT 1.875000 0.725000 3.805000 0.905000 ;
-      RECT 2.255000 1.625000 2.505000 2.465000 ;
-      RECT 2.635000 0.255000 2.965000 0.725000 ;
-      RECT 3.095000 1.625000 3.345000 2.465000 ;
-      RECT 3.475000 0.255000 3.805000 0.725000 ;
-      RECT 3.745000 1.075000 5.705000 1.285000 ;
-      RECT 3.745000 1.285000 3.915000 1.455000 ;
-      RECT 4.060000 0.255000 6.495000 0.475000 ;
-      RECT 4.060000 0.475000 4.245000 0.835000 ;
-      RECT 6.175000 1.795000 6.455000 2.295000 ;
-      RECT 6.175000 2.295000 8.135000 2.465000 ;
-      RECT 6.325000 0.475000 6.495000 0.735000 ;
-      RECT 6.325000 0.735000 9.855000 0.905000 ;
-      RECT 7.005000 0.255000 7.335000 0.725000 ;
-      RECT 7.005000 0.725000 9.855000 0.735000 ;
-      RECT 7.045000 1.795000 7.295000 2.295000 ;
-      RECT 7.845000 0.255000 8.175000 0.725000 ;
-      RECT 7.885000 1.455000 9.875000 1.625000 ;
-      RECT 7.885000 1.625000 8.135000 2.295000 ;
-      RECT 8.685000 0.255000 9.015000 0.725000 ;
-      RECT 8.725000 1.625000 8.975000 2.465000 ;
-      RECT 9.525000 0.255000 9.855000 0.725000 ;
-      RECT 9.565000 1.625000 9.875000 2.465000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.085000  0.645000  1.705000 0.905000 ;
+      RECT 0.085000  0.905000  0.255000 1.455000 ;
+      RECT 0.085000  1.455000  3.915000 1.625000 ;
+      RECT 0.100000  0.255000  2.125000 0.475000 ;
+      RECT 0.155000  1.795000  0.405000 2.635000 ;
+      RECT 0.575000  1.625000  0.825000 2.465000 ;
+      RECT 0.995000  1.795000  1.245000 2.635000 ;
+      RECT 1.415000  1.625000  1.665000 2.465000 ;
+      RECT 1.835000  1.795000  2.085000 2.635000 ;
+      RECT 1.875000  0.475000  2.125000 0.725000 ;
+      RECT 1.875000  0.725000  3.805000 0.905000 ;
+      RECT 2.255000  1.625000  2.505000 2.465000 ;
+      RECT 2.295000  0.085000  2.465000 0.555000 ;
+      RECT 2.635000  0.255000  2.965000 0.725000 ;
+      RECT 2.675000  1.795000  2.925000 2.635000 ;
+      RECT 3.095000  1.625000  3.345000 2.465000 ;
+      RECT 3.135000  0.085000  3.305000 0.555000 ;
+      RECT 3.475000  0.255000  3.805000 0.725000 ;
+      RECT 3.515000  1.795000  4.255000 2.635000 ;
+      RECT 3.745000  1.075000  5.705000 1.285000 ;
+      RECT 3.745000  1.285000  3.915000 1.455000 ;
+      RECT 4.060000  0.255000  6.495000 0.475000 ;
+      RECT 4.060000  0.475000  4.245000 0.835000 ;
+      RECT 4.845000  1.795000  5.095000 2.635000 ;
+      RECT 5.685000  1.795000  5.935000 2.635000 ;
+      RECT 6.175000  1.795000  6.455000 2.295000 ;
+      RECT 6.175000  2.295000  8.135000 2.465000 ;
+      RECT 6.325000  0.475000  6.495000 0.735000 ;
+      RECT 6.325000  0.735000  9.855000 0.905000 ;
+      RECT 6.665000  0.085000  6.835000 0.555000 ;
+      RECT 7.005000  0.255000  7.335000 0.725000 ;
+      RECT 7.005000  0.725000  9.855000 0.735000 ;
+      RECT 7.045000  1.795000  7.295000 2.295000 ;
+      RECT 7.505000  0.085000  7.675000 0.555000 ;
+      RECT 7.845000  0.255000  8.175000 0.725000 ;
+      RECT 7.885000  1.455000  9.875000 1.625000 ;
+      RECT 7.885000  1.625000  8.135000 2.295000 ;
+      RECT 8.305000  1.795000  8.555000 2.635000 ;
+      RECT 8.345000  0.085000  8.515000 0.555000 ;
+      RECT 8.685000  0.255000  9.015000 0.725000 ;
+      RECT 8.725000  1.625000  8.975000 2.465000 ;
+      RECT 9.145000  1.795000  9.395000 2.635000 ;
+      RECT 9.185000  0.085000  9.355000 0.555000 ;
+      RECT 9.525000  0.255000  9.855000 0.725000 ;
+      RECT 9.565000  1.625000  9.875000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
+      RECT 9.805000 -0.085000 9.975000 0.085000 ;
+      RECT 9.805000  2.635000 9.975000 2.805000 ;
   END
 END sky130_fd_sc_hd__o2bb2ai_4
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
index 147b288..a05c7f6 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_1.magic.lef
@@ -92,19 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.525000  0.085000 1.195000 0.825000 ;
-        RECT 1.840000  0.085000 2.215000 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
@@ -114,36 +101,46 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.605000 1.835000 1.010000 2.635000 ;
-        RECT 2.900000 1.835000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.605000 0.995000 0.775000 1.495000 ;
-      RECT 0.605000 1.495000 1.350000 1.665000 ;
-      RECT 1.180000 1.665000 1.350000 2.295000 ;
-      RECT 1.180000 2.295000 2.715000 2.465000 ;
-      RECT 1.365000 0.310000 1.660000 0.655000 ;
-      RECT 1.365000 0.655000 2.760000 0.825000 ;
-      RECT 2.385000 1.495000 3.595000 1.665000 ;
-      RECT 2.385000 1.665000 2.715000 2.295000 ;
-      RECT 2.430000 0.310000 2.760000 0.655000 ;
-      RECT 3.010000 0.255000 3.595000 0.825000 ;
-      RECT 3.010000 0.825000 3.180000 1.495000 ;
-      RECT 3.305000 1.665000 3.595000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.525000  0.085000 1.195000 0.825000 ;
+      RECT 0.605000  0.995000 0.775000 1.495000 ;
+      RECT 0.605000  1.495000 1.350000 1.665000 ;
+      RECT 0.605000  1.835000 1.010000 2.635000 ;
+      RECT 1.180000  1.665000 1.350000 2.295000 ;
+      RECT 1.180000  2.295000 2.715000 2.465000 ;
+      RECT 1.365000  0.310000 1.660000 0.655000 ;
+      RECT 1.365000  0.655000 2.760000 0.825000 ;
+      RECT 1.840000  0.085000 2.215000 0.485000 ;
+      RECT 2.385000  1.495000 3.595000 1.665000 ;
+      RECT 2.385000  1.665000 2.715000 2.295000 ;
+      RECT 2.430000  0.310000 2.760000 0.655000 ;
+      RECT 2.900000  1.835000 3.135000 2.635000 ;
+      RECT 3.010000  0.255000 3.595000 0.825000 ;
+      RECT 3.010000  0.825000 3.180000 1.495000 ;
+      RECT 3.305000  1.665000 3.595000 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
 END sky130_fd_sc_hd__o311a_1
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
index a6f93c4..6ef0c68 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_2.magic.lef
@@ -94,21 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.085000  0.085000 0.380000 0.885000 ;
-        RECT 0.995000  0.085000 1.665000 0.825000 ;
-        RECT 2.300000  0.085000 2.675000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -118,38 +103,50 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.085000 1.485000 0.380000 2.635000 ;
-        RECT 1.075000 1.835000 1.470000 2.635000 ;
-        RECT 3.360000 1.835000 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 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.075000 0.995000 1.245000 1.495000 ;
-      RECT 1.075000 1.495000 1.810000 1.665000 ;
-      RECT 1.640000 1.665000 1.810000 2.295000 ;
-      RECT 1.640000 2.295000 3.175000 2.465000 ;
-      RECT 1.835000 0.310000 2.120000 0.655000 ;
-      RECT 1.835000 0.655000 3.220000 0.825000 ;
-      RECT 2.845000 1.495000 4.055000 1.665000 ;
-      RECT 2.845000 1.665000 3.175000 2.295000 ;
-      RECT 2.890000 0.310000 3.220000 0.655000 ;
-      RECT 3.470000 0.255000 4.055000 0.825000 ;
-      RECT 3.470000 0.825000 3.640000 1.495000 ;
-      RECT 3.765000 1.665000 4.055000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.085000 0.380000 0.885000 ;
+      RECT 0.085000  1.485000 0.380000 2.635000 ;
+      RECT 0.995000  0.085000 1.665000 0.825000 ;
+      RECT 1.075000  0.995000 1.245000 1.495000 ;
+      RECT 1.075000  1.495000 1.810000 1.665000 ;
+      RECT 1.075000  1.835000 1.470000 2.635000 ;
+      RECT 1.640000  1.665000 1.810000 2.295000 ;
+      RECT 1.640000  2.295000 3.175000 2.465000 ;
+      RECT 1.835000  0.310000 2.120000 0.655000 ;
+      RECT 1.835000  0.655000 3.220000 0.825000 ;
+      RECT 2.300000  0.085000 2.675000 0.485000 ;
+      RECT 2.845000  1.495000 4.055000 1.665000 ;
+      RECT 2.845000  1.665000 3.175000 2.295000 ;
+      RECT 2.890000  0.310000 3.220000 0.655000 ;
+      RECT 3.360000  1.835000 3.595000 2.635000 ;
+      RECT 3.470000  0.255000 4.055000 0.825000 ;
+      RECT 3.470000  0.825000 3.640000 1.495000 ;
+      RECT 3.765000  1.665000 4.055000 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
 END sky130_fd_sc_hd__o311a_2
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
index e163134..2f0f6be 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_4.magic.lef
@@ -97,32 +97,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.085000  0.085000 0.425000 0.885000 ;
-        RECT 0.935000  0.085000 1.265000 0.545000 ;
-        RECT 1.775000  0.085000 2.025000 0.545000 ;
-        RECT 4.925000  0.085000 5.605000 0.505000 ;
-        RECT 6.115000  0.085000 6.445000 0.505000 ;
-        RECT 6.955000  0.085000 7.285000 0.505000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -132,61 +106,84 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.085000 1.485000 0.425000 2.635000 ;
-        RECT 0.935000 1.895000 1.265000 2.635000 ;
-        RECT 1.775000 1.895000 2.445000 2.635000 ;
-        RECT 2.955000 1.895000 3.285000 2.635000 ;
-        RECT 3.855000 1.895000 4.045000 2.635000 ;
-        RECT 6.955000 1.895000 7.285000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.935000 1.055000 1.945000 1.315000 ;
-      RECT 1.775000 0.715000 3.045000 0.885000 ;
-      RECT 1.775000 0.885000 1.945000 1.055000 ;
-      RECT 1.775000 1.315000 1.945000 1.485000 ;
-      RECT 1.775000 1.485000 5.005000 1.725000 ;
-      RECT 2.195000 0.255000 4.305000 0.505000 ;
-      RECT 2.195000 0.675000 3.045000 0.715000 ;
-      RECT 2.615000 1.725000 2.785000 2.465000 ;
-      RECT 3.215000 0.505000 3.385000 0.885000 ;
-      RECT 3.455000 1.725000 3.625000 2.465000 ;
-      RECT 3.555000 0.675000 7.735000 0.885000 ;
-      RECT 4.335000 1.895000 4.665000 2.295000 ;
-      RECT 4.335000 2.295000 6.445000 2.465000 ;
-      RECT 4.485000 0.255000 4.755000 0.675000 ;
-      RECT 4.835000 1.725000 5.005000 2.125000 ;
-      RECT 5.255000 1.485000 5.525000 2.295000 ;
-      RECT 5.695000 1.485000 7.735000 1.725000 ;
-      RECT 5.695000 1.725000 5.945000 2.125000 ;
-      RECT 5.775000 0.255000 5.945000 0.675000 ;
-      RECT 6.115000 1.895000 6.445000 2.295000 ;
-      RECT 6.615000 0.255000 6.785000 0.675000 ;
-      RECT 6.615000 1.725000 6.785000 2.125000 ;
-      RECT 7.455000 0.255000 7.735000 0.675000 ;
-      RECT 7.455000 1.725000 7.735000 2.465000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.085000 0.425000 0.885000 ;
+      RECT 0.085000  1.485000 0.425000 2.635000 ;
+      RECT 0.935000  0.085000 1.265000 0.545000 ;
+      RECT 0.935000  1.055000 1.945000 1.315000 ;
+      RECT 0.935000  1.895000 1.265000 2.635000 ;
+      RECT 1.775000  0.085000 2.025000 0.545000 ;
+      RECT 1.775000  0.715000 3.045000 0.885000 ;
+      RECT 1.775000  0.885000 1.945000 1.055000 ;
+      RECT 1.775000  1.315000 1.945000 1.485000 ;
+      RECT 1.775000  1.485000 5.005000 1.725000 ;
+      RECT 1.775000  1.895000 2.445000 2.635000 ;
+      RECT 2.195000  0.255000 4.305000 0.505000 ;
+      RECT 2.195000  0.675000 3.045000 0.715000 ;
+      RECT 2.615000  1.725000 2.785000 2.465000 ;
+      RECT 2.955000  1.895000 3.285000 2.635000 ;
+      RECT 3.215000  0.505000 3.385000 0.885000 ;
+      RECT 3.455000  1.725000 3.625000 2.465000 ;
+      RECT 3.555000  0.675000 7.735000 0.885000 ;
+      RECT 3.855000  1.895000 4.045000 2.635000 ;
+      RECT 4.335000  1.895000 4.665000 2.295000 ;
+      RECT 4.335000  2.295000 6.445000 2.465000 ;
+      RECT 4.485000  0.255000 4.755000 0.675000 ;
+      RECT 4.835000  1.725000 5.005000 2.125000 ;
+      RECT 4.925000  0.085000 5.605000 0.505000 ;
+      RECT 5.255000  1.485000 5.525000 2.295000 ;
+      RECT 5.695000  1.485000 7.735000 1.725000 ;
+      RECT 5.695000  1.725000 5.945000 2.125000 ;
+      RECT 5.775000  0.255000 5.945000 0.675000 ;
+      RECT 6.115000  0.085000 6.445000 0.505000 ;
+      RECT 6.115000  1.895000 6.445000 2.295000 ;
+      RECT 6.615000  0.255000 6.785000 0.675000 ;
+      RECT 6.615000  1.725000 6.785000 2.125000 ;
+      RECT 6.955000  0.085000 7.285000 0.505000 ;
+      RECT 6.955000  1.895000 7.285000 2.635000 ;
+      RECT 7.455000  0.255000 7.735000 0.675000 ;
+      RECT 7.455000  1.725000 7.735000 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 ;
   END
 END sky130_fd_sc_hd__o311a_4
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
index 0366b04..374036d 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.magic.lef
@@ -94,18 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.085000  0.085000 0.570000 0.595000 ;
-        RECT 1.080000  0.085000 1.410000 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
@@ -115,26 +103,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 1.795000 0.780000 2.635000 ;
-        RECT 2.150000 1.835000 2.480000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.740000 0.255000 0.910000 0.655000 ;
-      RECT 0.740000 0.655000 1.750000 0.825000 ;
-      RECT 1.580000 0.255000 1.750000 0.655000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.085000 0.570000 0.595000 ;
+      RECT 0.085000  1.795000 0.780000 2.635000 ;
+      RECT 0.740000  0.255000 0.910000 0.655000 ;
+      RECT 0.740000  0.655000 1.750000 0.825000 ;
+      RECT 1.080000  0.085000 1.410000 0.485000 ;
+      RECT 1.580000  0.255000 1.750000 0.655000 ;
+      RECT 2.150000  1.835000 2.480000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__o311ai_0
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
index 9d5c66e..a8355b4 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.magic.lef
@@ -93,18 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.085000  0.085000 0.570000 0.825000 ;
-        RECT 1.080000  0.085000 1.410000 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
@@ -114,26 +102,35 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 1.495000 0.780000 2.635000 ;
-        RECT 2.150000 1.835000 2.480000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.740000 0.255000 0.910000 0.655000 ;
-      RECT 0.740000 0.655000 1.750000 0.825000 ;
-      RECT 1.580000 0.255000 1.750000 0.655000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.085000 0.570000 0.825000 ;
+      RECT 0.085000  1.495000 0.780000 2.635000 ;
+      RECT 0.740000  0.255000 0.910000 0.655000 ;
+      RECT 0.740000  0.655000 1.750000 0.825000 ;
+      RECT 1.080000  0.085000 1.410000 0.485000 ;
+      RECT 1.580000  0.255000 1.750000 0.655000 ;
+      RECT 2.150000  1.835000 2.480000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__o311ai_1
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
index a44d09c..0470e87 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.magic.lef
@@ -96,25 +96,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.655000  0.085000 0.985000 0.485000 ;
-        RECT 1.495000  0.085000 1.825000 0.485000 ;
-        RECT 2.335000  0.085000 3.105000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -124,43 +105,59 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.635000 1.895000 0.965000 2.635000 ;
-        RECT 3.675000 1.895000 4.345000 2.635000 ;
-        RECT 4.995000 1.895000 5.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 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.485000 0.655000 ;
-      RECT 0.085000 0.655000 4.385000 0.885000 ;
-      RECT 0.085000 1.485000 2.225000 1.725000 ;
-      RECT 0.085000 1.725000 0.465000 2.465000 ;
-      RECT 1.135000 1.725000 1.305000 2.465000 ;
-      RECT 1.155000 0.255000 1.325000 0.655000 ;
-      RECT 1.475000 1.895000 1.805000 2.295000 ;
-      RECT 1.475000 2.295000 3.165000 2.465000 ;
-      RECT 1.975000 1.725000 2.225000 2.125000 ;
-      RECT 1.995000 0.255000 2.165000 0.655000 ;
-      RECT 2.835000 1.895000 3.165000 2.295000 ;
-      RECT 3.275000 0.255000 3.445000 0.655000 ;
-      RECT 3.615000 0.255000 5.345000 0.485000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.255000 0.485000 0.655000 ;
+      RECT 0.085000  0.655000 4.385000 0.885000 ;
+      RECT 0.085000  1.485000 2.225000 1.725000 ;
+      RECT 0.085000  1.725000 0.465000 2.465000 ;
+      RECT 0.635000  1.895000 0.965000 2.635000 ;
+      RECT 0.655000  0.085000 0.985000 0.485000 ;
+      RECT 1.135000  1.725000 1.305000 2.465000 ;
+      RECT 1.155000  0.255000 1.325000 0.655000 ;
+      RECT 1.475000  1.895000 1.805000 2.295000 ;
+      RECT 1.475000  2.295000 3.165000 2.465000 ;
+      RECT 1.495000  0.085000 1.825000 0.485000 ;
+      RECT 1.975000  1.725000 2.225000 2.125000 ;
+      RECT 1.995000  0.255000 2.165000 0.655000 ;
+      RECT 2.335000  0.085000 3.105000 0.485000 ;
+      RECT 2.835000  1.895000 3.165000 2.295000 ;
+      RECT 3.275000  0.255000 3.445000 0.655000 ;
+      RECT 3.615000  0.255000 5.345000 0.485000 ;
+      RECT 3.675000  1.895000 4.345000 2.635000 ;
+      RECT 4.995000  1.895000 5.325000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
 END sky130_fd_sc_hd__o311ai_2
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
index a1c981f..c487ba8 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.magic.lef
@@ -98,37 +98,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.085000  0.085000 0.505000 0.885000 ;
-        RECT 1.015000  0.085000 1.345000 0.485000 ;
-        RECT 1.855000  0.085000 2.185000 0.485000 ;
-        RECT 2.695000  0.085000 3.025000 0.485000 ;
-        RECT 3.535000  0.085000 3.885000 0.485000 ;
-        RECT 4.395000  0.085000 4.725000 0.485000 ;
-        RECT 5.235000  0.085000 5.585000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -138,61 +107,89 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.595000 1.895000 0.925000 2.635000 ;
-        RECT 1.435000 1.895000 1.765000 2.635000 ;
-        RECT 6.175000 1.895000 6.505000 2.635000 ;
-        RECT 7.015000 1.895000 7.345000 2.635000 ;
-        RECT 7.855000 1.895000 8.185000 2.635000 ;
-        RECT 8.695000 1.895000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.485000 3.865000 1.725000 ;
-      RECT 0.085000 1.725000 0.405000 2.465000 ;
-      RECT 0.675000 0.255000 0.845000 0.655000 ;
-      RECT 0.675000 0.655000 7.385000 0.885000 ;
-      RECT 1.095000 1.725000 1.265000 2.465000 ;
-      RECT 1.515000 0.255000 1.685000 0.655000 ;
-      RECT 1.935000 1.725000 2.105000 2.465000 ;
-      RECT 2.275000 1.895000 2.605000 2.295000 ;
-      RECT 2.275000 2.295000 5.645000 2.465000 ;
-      RECT 2.355000 0.255000 2.525000 0.655000 ;
-      RECT 2.775000 1.725000 2.945000 2.115000 ;
-      RECT 3.115000 1.895000 3.445000 2.295000 ;
-      RECT 3.195000 0.255000 3.365000 0.655000 ;
-      RECT 3.615000 1.725000 3.865000 2.115000 ;
-      RECT 4.055000 0.255000 4.225000 0.655000 ;
-      RECT 4.475000 1.895000 4.805000 2.295000 ;
-      RECT 4.895000 0.255000 5.065000 0.655000 ;
-      RECT 5.315000 1.895000 5.645000 2.295000 ;
-      RECT 5.755000 0.255000 9.575000 0.485000 ;
-      RECT 7.555000 0.485000 7.725000 0.885000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.085000  0.085000 0.505000 0.885000 ;
+      RECT 0.085000  1.485000 3.865000 1.725000 ;
+      RECT 0.085000  1.725000 0.405000 2.465000 ;
+      RECT 0.595000  1.895000 0.925000 2.635000 ;
+      RECT 0.675000  0.255000 0.845000 0.655000 ;
+      RECT 0.675000  0.655000 7.385000 0.885000 ;
+      RECT 1.015000  0.085000 1.345000 0.485000 ;
+      RECT 1.095000  1.725000 1.265000 2.465000 ;
+      RECT 1.435000  1.895000 1.765000 2.635000 ;
+      RECT 1.515000  0.255000 1.685000 0.655000 ;
+      RECT 1.855000  0.085000 2.185000 0.485000 ;
+      RECT 1.935000  1.725000 2.105000 2.465000 ;
+      RECT 2.275000  1.895000 2.605000 2.295000 ;
+      RECT 2.275000  2.295000 5.645000 2.465000 ;
+      RECT 2.355000  0.255000 2.525000 0.655000 ;
+      RECT 2.695000  0.085000 3.025000 0.485000 ;
+      RECT 2.775000  1.725000 2.945000 2.115000 ;
+      RECT 3.115000  1.895000 3.445000 2.295000 ;
+      RECT 3.195000  0.255000 3.365000 0.655000 ;
+      RECT 3.535000  0.085000 3.885000 0.485000 ;
+      RECT 3.615000  1.725000 3.865000 2.115000 ;
+      RECT 4.055000  0.255000 4.225000 0.655000 ;
+      RECT 4.395000  0.085000 4.725000 0.485000 ;
+      RECT 4.475000  1.895000 4.805000 2.295000 ;
+      RECT 4.895000  0.255000 5.065000 0.655000 ;
+      RECT 5.235000  0.085000 5.585000 0.485000 ;
+      RECT 5.315000  1.895000 5.645000 2.295000 ;
+      RECT 5.755000  0.255000 9.575000 0.485000 ;
+      RECT 6.175000  1.895000 6.505000 2.635000 ;
+      RECT 7.015000  1.895000 7.345000 2.635000 ;
+      RECT 7.555000  0.485000 7.725000 0.885000 ;
+      RECT 7.855000  1.895000 8.185000 2.635000 ;
+      RECT 8.695000  1.895000 9.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 ;
   END
 END sky130_fd_sc_hd__o311ai_4
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
index 3a261d2..a2d0155 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_1.magic.lef
@@ -83,18 +83,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.695000  0.085000 1.145000 0.825000 ;
-        RECT 1.655000  0.085000 2.075000 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
@@ -104,34 +92,43 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.700000 1.785000 1.015000 2.635000 ;
-        RECT 2.795000 1.835000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 0.995000 0.735000 1.445000 ;
-      RECT 0.565000 1.445000 1.355000 1.615000 ;
-      RECT 1.185000 1.615000 1.355000 2.295000 ;
-      RECT 1.185000 2.295000 2.615000 2.465000 ;
-      RECT 1.315000 0.255000 1.485000 0.655000 ;
-      RECT 1.315000 0.655000 2.475000 0.825000 ;
-      RECT 2.245000 0.255000 2.475000 0.655000 ;
-      RECT 2.365000 1.495000 3.135000 1.665000 ;
-      RECT 2.365000 1.665000 2.615000 2.295000 ;
-      RECT 2.645000 0.255000 3.135000 0.825000 ;
-      RECT 2.965000 0.825000 3.135000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.565000  0.995000 0.735000 1.445000 ;
+      RECT 0.565000  1.445000 1.355000 1.615000 ;
+      RECT 0.695000  0.085000 1.145000 0.825000 ;
+      RECT 0.700000  1.785000 1.015000 2.635000 ;
+      RECT 1.185000  1.615000 1.355000 2.295000 ;
+      RECT 1.185000  2.295000 2.615000 2.465000 ;
+      RECT 1.315000  0.255000 1.485000 0.655000 ;
+      RECT 1.315000  0.655000 2.475000 0.825000 ;
+      RECT 1.655000  0.085000 2.075000 0.485000 ;
+      RECT 2.245000  0.255000 2.475000 0.655000 ;
+      RECT 2.365000  1.495000 3.135000 1.665000 ;
+      RECT 2.365000  1.665000 2.615000 2.295000 ;
+      RECT 2.645000  0.255000 3.135000 0.825000 ;
+      RECT 2.795000  1.835000 3.125000 2.635000 ;
+      RECT 2.965000  0.825000 3.135000 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
 END sky130_fd_sc_hd__o31a_1
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
index e92511a..e774034 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_2.magic.lef
@@ -85,20 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 0.380000 0.905000 ;
-        RECT 1.160000  0.085000 1.610000 0.825000 ;
-        RECT 2.120000  0.085000 2.540000 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,36 +94,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.465000 0.380000 2.635000 ;
-        RECT 1.165000 1.785000 1.480000 2.635000 ;
-        RECT 3.255000 1.835000 3.590000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 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 1.030000 0.995000 1.200000 1.445000 ;
-      RECT 1.030000 1.445000 1.820000 1.615000 ;
-      RECT 1.650000 1.615000 1.820000 2.295000 ;
-      RECT 1.650000 2.295000 3.080000 2.465000 ;
-      RECT 1.780000 0.255000 1.950000 0.655000 ;
-      RECT 1.780000 0.655000 2.940000 0.825000 ;
-      RECT 2.710000 0.255000 2.940000 0.655000 ;
-      RECT 2.830000 1.495000 3.595000 1.665000 ;
-      RECT 2.830000 1.665000 3.080000 2.295000 ;
-      RECT 3.110000 0.255000 3.595000 0.825000 ;
-      RECT 3.425000 0.825000 3.595000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 0.380000 0.905000 ;
+      RECT 0.085000  1.465000 0.380000 2.635000 ;
+      RECT 1.030000  0.995000 1.200000 1.445000 ;
+      RECT 1.030000  1.445000 1.820000 1.615000 ;
+      RECT 1.160000  0.085000 1.610000 0.825000 ;
+      RECT 1.165000  1.785000 1.480000 2.635000 ;
+      RECT 1.650000  1.615000 1.820000 2.295000 ;
+      RECT 1.650000  2.295000 3.080000 2.465000 ;
+      RECT 1.780000  0.255000 1.950000 0.655000 ;
+      RECT 1.780000  0.655000 2.940000 0.825000 ;
+      RECT 2.120000  0.085000 2.540000 0.485000 ;
+      RECT 2.710000  0.255000 2.940000 0.655000 ;
+      RECT 2.830000  1.495000 3.595000 1.665000 ;
+      RECT 2.830000  1.665000 3.080000 2.295000 ;
+      RECT 3.110000  0.255000 3.595000 0.825000 ;
+      RECT 3.255000  1.835000 3.590000 2.635000 ;
+      RECT 3.425000  0.825000 3.595000 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
 END sky130_fd_sc_hd__o31a_2
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
index d202673..7c4eca6 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_4.magic.lef
@@ -91,29 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.085000  0.085000 0.510000 0.545000 ;
-        RECT 1.065000  0.085000 1.395000 0.485000 ;
-        RECT 1.935000  0.085000 2.250000 0.885000 ;
-        RECT 3.760000  0.085000 4.090000 0.445000 ;
-        RECT 4.600000  0.085000 4.930000 0.445000 ;
-        RECT 5.440000  0.085000 5.770000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -123,56 +100,75 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.085000 1.835000 0.510000 2.635000 ;
-        RECT 1.065000 1.835000 1.395000 2.635000 ;
-        RECT 1.920000 1.460000 2.250000 2.635000 ;
-        RECT 2.780000 2.240000 3.110000 2.635000 ;
-        RECT 5.020000 2.240000 5.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 ;
-        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.905000 1.055000 2.610000 1.290000 ;
-      RECT 2.440000 0.255000 3.570000 0.465000 ;
-      RECT 2.440000 0.635000 3.210000 0.885000 ;
-      RECT 2.440000 0.885000 2.610000 1.055000 ;
-      RECT 2.440000 1.290000 2.610000 1.870000 ;
-      RECT 2.440000 1.870000 4.090000 2.070000 ;
-      RECT 2.440000 2.070000 2.610000 2.465000 ;
-      RECT 3.320000 1.530000 4.510000 1.700000 ;
-      RECT 3.380000 0.465000 3.570000 0.635000 ;
-      RECT 3.380000 0.635000 6.355000 0.885000 ;
-      RECT 3.760000 2.070000 4.090000 2.465000 ;
-      RECT 4.260000 0.255000 4.430000 0.635000 ;
-      RECT 4.260000 1.700000 4.510000 2.465000 ;
-      RECT 4.680000 1.870000 5.720000 2.070000 ;
-      RECT 4.680000 2.070000 4.850000 2.465000 ;
-      RECT 5.100000 0.255000 5.270000 0.635000 ;
-      RECT 5.520000 2.070000 5.720000 2.465000 ;
-      RECT 5.890000 1.870000 6.355000 2.465000 ;
-      RECT 5.940000 0.255000 6.355000 0.635000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.085000 0.510000 0.545000 ;
+      RECT 0.085000  1.835000 0.510000 2.635000 ;
+      RECT 0.905000  1.055000 2.610000 1.290000 ;
+      RECT 1.065000  0.085000 1.395000 0.485000 ;
+      RECT 1.065000  1.835000 1.395000 2.635000 ;
+      RECT 1.920000  1.460000 2.250000 2.635000 ;
+      RECT 1.935000  0.085000 2.250000 0.885000 ;
+      RECT 2.440000  0.255000 3.570000 0.465000 ;
+      RECT 2.440000  0.635000 3.210000 0.885000 ;
+      RECT 2.440000  0.885000 2.610000 1.055000 ;
+      RECT 2.440000  1.290000 2.610000 1.870000 ;
+      RECT 2.440000  1.870000 4.090000 2.070000 ;
+      RECT 2.440000  2.070000 2.610000 2.465000 ;
+      RECT 2.780000  2.240000 3.110000 2.635000 ;
+      RECT 3.320000  1.530000 4.510000 1.700000 ;
+      RECT 3.380000  0.465000 3.570000 0.635000 ;
+      RECT 3.380000  0.635000 6.355000 0.885000 ;
+      RECT 3.760000  0.085000 4.090000 0.445000 ;
+      RECT 3.760000  2.070000 4.090000 2.465000 ;
+      RECT 4.260000  0.255000 4.430000 0.635000 ;
+      RECT 4.260000  1.700000 4.510000 2.465000 ;
+      RECT 4.600000  0.085000 4.930000 0.445000 ;
+      RECT 4.680000  1.870000 5.720000 2.070000 ;
+      RECT 4.680000  2.070000 4.850000 2.465000 ;
+      RECT 5.020000  2.240000 5.350000 2.635000 ;
+      RECT 5.100000  0.255000 5.270000 0.635000 ;
+      RECT 5.440000  0.085000 5.770000 0.445000 ;
+      RECT 5.520000  2.070000 5.720000 2.465000 ;
+      RECT 5.890000  1.870000 6.355000 2.465000 ;
+      RECT 5.940000  0.255000 6.355000 0.635000 ;
     LAYER mcon ;
-      RECT 4.285000 2.125000 4.455000 2.295000 ;
-      RECT 6.125000 2.125000 6.295000 2.295000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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.125000 4.455000 2.295000 ;
+      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.125000 6.295000 2.295000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 4.225000 2.095000 4.515000 2.140000 ;
       RECT 4.225000 2.140000 6.355000 2.280000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
index 08d7de5..5b602b9 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.magic.lef
@@ -82,17 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.905000 ;
-        RECT 1.015000  0.085000 1.185000 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
@@ -102,25 +91,33 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.090000 1.495000 0.440000 2.635000 ;
-        RECT 2.330000 1.495000 2.675000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.255000 0.845000 0.735000 ;
-      RECT 0.515000 0.735000 1.700000 0.905000 ;
-      RECT 1.370000 0.255000 1.700000 0.735000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  1.495000 0.440000 2.635000 ;
+      RECT 0.175000  0.085000 0.345000 0.905000 ;
+      RECT 0.515000  0.255000 0.845000 0.735000 ;
+      RECT 0.515000  0.735000 1.700000 0.905000 ;
+      RECT 1.015000  0.085000 1.185000 0.565000 ;
+      RECT 1.370000  0.255000 1.700000 0.735000 ;
+      RECT 2.330000  1.495000 2.675000 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
 END sky130_fd_sc_hd__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
index 9956882..0a4436f 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.magic.lef
@@ -84,22 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.615000  0.085000 0.785000 0.545000 ;
-        RECT 1.455000  0.085000 1.965000 0.545000 ;
-        RECT 2.675000  0.085000 3.005000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -109,40 +93,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.615000 1.835000 0.785000 2.635000 ;
-        RECT 3.675000 1.835000 4.005000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.445000 0.715000 ;
-      RECT 0.090000 0.715000 3.505000 0.885000 ;
-      RECT 0.090000 1.495000 2.125000 1.665000 ;
-      RECT 0.090000 1.665000 0.445000 2.465000 ;
-      RECT 0.955000 0.255000 1.285000 0.715000 ;
-      RECT 0.955000 1.665000 1.285000 2.465000 ;
-      RECT 1.455000 1.835000 1.625000 2.295000 ;
-      RECT 1.455000 2.295000 3.005000 2.465000 ;
-      RECT 1.795000 1.665000 2.125000 2.125000 ;
-      RECT 2.175000 0.255000 2.505000 0.715000 ;
-      RECT 2.835000 1.835000 3.005000 2.295000 ;
-      RECT 3.175000 0.255000 4.515000 0.425000 ;
-      RECT 3.175000 0.425000 3.505000 0.715000 ;
-      RECT 4.175000 0.425000 4.515000 0.585000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.255000 0.445000 0.715000 ;
+      RECT 0.090000  0.715000 3.505000 0.885000 ;
+      RECT 0.090000  1.495000 2.125000 1.665000 ;
+      RECT 0.090000  1.665000 0.445000 2.465000 ;
+      RECT 0.615000  0.085000 0.785000 0.545000 ;
+      RECT 0.615000  1.835000 0.785000 2.635000 ;
+      RECT 0.955000  0.255000 1.285000 0.715000 ;
+      RECT 0.955000  1.665000 1.285000 2.465000 ;
+      RECT 1.455000  0.085000 1.965000 0.545000 ;
+      RECT 1.455000  1.835000 1.625000 2.295000 ;
+      RECT 1.455000  2.295000 3.005000 2.465000 ;
+      RECT 1.795000  1.665000 2.125000 2.125000 ;
+      RECT 2.175000  0.255000 2.505000 0.715000 ;
+      RECT 2.675000  0.085000 3.005000 0.545000 ;
+      RECT 2.835000  1.835000 3.005000 2.295000 ;
+      RECT 3.175000  0.255000 4.515000 0.425000 ;
+      RECT 3.175000  0.425000 3.505000 0.715000 ;
+      RECT 3.675000  1.835000 4.005000 2.635000 ;
+      RECT 4.175000  0.425000 4.515000 0.585000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
 END sky130_fd_sc_hd__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
index 552f770..fec1aff 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.magic.lef
@@ -85,32 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.615000  0.085000 0.785000 0.545000 ;
-        RECT 1.455000  0.085000 1.625000 0.545000 ;
-        RECT 2.295000  0.085000 2.465000 0.545000 ;
-        RECT 3.135000  0.085000 3.305000 0.545000 ;
-        RECT 3.995000  0.085000 4.640000 0.545000 ;
-        RECT 5.150000  0.085000 5.600000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -120,56 +94,79 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.615000 2.065000 0.785000 2.635000 ;
-        RECT 1.455000 2.065000 1.625000 2.635000 ;
-        RECT 6.110000 1.890000 6.440000 2.635000 ;
-        RECT 6.950000 1.890000 7.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 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.445000 0.715000 ;
-      RECT 0.090000 0.715000 5.940000 0.885000 ;
-      RECT 0.090000 1.595000 2.125000 1.895000 ;
-      RECT 0.090000 1.895000 0.445000 2.465000 ;
-      RECT 0.955000 0.255000 1.285000 0.715000 ;
-      RECT 0.955000 1.895000 1.285000 2.465000 ;
-      RECT 1.795000 0.255000 2.125000 0.715000 ;
-      RECT 1.795000 1.895000 2.125000 2.205000 ;
-      RECT 1.795000 2.205000 3.885000 2.465000 ;
-      RECT 2.295000 1.595000 3.605000 1.765000 ;
-      RECT 2.295000 1.765000 2.465000 2.035000 ;
-      RECT 2.635000 0.255000 2.965000 0.715000 ;
-      RECT 2.635000 1.935000 2.965000 2.205000 ;
-      RECT 3.135000 1.765000 3.605000 1.865000 ;
-      RECT 3.135000 1.865000 5.600000 2.035000 ;
-      RECT 3.475000 0.255000 3.805000 0.715000 ;
-      RECT 4.080000 2.035000 5.600000 2.465000 ;
-      RECT 4.810000 0.395000 4.980000 0.715000 ;
-      RECT 5.770000 0.255000 7.735000 0.475000 ;
-      RECT 5.770000 0.475000 5.940000 0.715000 ;
-      RECT 7.450000 0.475000 7.735000 0.885000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.090000  0.255000 0.445000 0.715000 ;
+      RECT 0.090000  0.715000 5.940000 0.885000 ;
+      RECT 0.090000  1.595000 2.125000 1.895000 ;
+      RECT 0.090000  1.895000 0.445000 2.465000 ;
+      RECT 0.615000  0.085000 0.785000 0.545000 ;
+      RECT 0.615000  2.065000 0.785000 2.635000 ;
+      RECT 0.955000  0.255000 1.285000 0.715000 ;
+      RECT 0.955000  1.895000 1.285000 2.465000 ;
+      RECT 1.455000  0.085000 1.625000 0.545000 ;
+      RECT 1.455000  2.065000 1.625000 2.635000 ;
+      RECT 1.795000  0.255000 2.125000 0.715000 ;
+      RECT 1.795000  1.895000 2.125000 2.205000 ;
+      RECT 1.795000  2.205000 3.885000 2.465000 ;
+      RECT 2.295000  0.085000 2.465000 0.545000 ;
+      RECT 2.295000  1.595000 3.605000 1.765000 ;
+      RECT 2.295000  1.765000 2.465000 2.035000 ;
+      RECT 2.635000  0.255000 2.965000 0.715000 ;
+      RECT 2.635000  1.935000 2.965000 2.205000 ;
+      RECT 3.135000  0.085000 3.305000 0.545000 ;
+      RECT 3.135000  1.765000 3.605000 1.865000 ;
+      RECT 3.135000  1.865000 5.600000 2.035000 ;
+      RECT 3.475000  0.255000 3.805000 0.715000 ;
+      RECT 3.995000  0.085000 4.640000 0.545000 ;
+      RECT 4.080000  2.035000 5.600000 2.465000 ;
+      RECT 4.810000  0.395000 4.980000 0.715000 ;
+      RECT 5.150000  0.085000 5.600000 0.545000 ;
+      RECT 5.770000  0.255000 7.735000 0.475000 ;
+      RECT 5.770000  0.475000 5.940000 0.715000 ;
+      RECT 6.110000  1.890000 6.440000 2.635000 ;
+      RECT 6.950000  1.890000 7.280000 2.635000 ;
+      RECT 7.450000  0.475000 7.735000 0.885000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
   END
 END sky130_fd_sc_hd__o31ai_4
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
index 5ee1cfb..1dc9bdd 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_1.magic.lef
@@ -93,19 +93,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.765000  0.085000 0.935000 0.645000 ;
-        RECT 1.645000  0.085000 1.975000 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
@@ -115,39 +102,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.685000 1.835000 0.975000 2.635000 ;
-        RECT 3.305000 1.495000 3.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.445000 0.995000 0.635000 1.075000 ;
-      RECT 0.445000 1.075000 0.810000 1.325000 ;
-      RECT 0.640000 1.325000 0.810000 1.495000 ;
-      RECT 0.640000 1.495000 1.315000 1.665000 ;
-      RECT 1.140000 0.255000 1.470000 0.655000 ;
-      RECT 1.140000 0.655000 2.540000 0.825000 ;
-      RECT 1.145000 1.665000 1.315000 2.295000 ;
-      RECT 1.145000 2.295000 2.510000 2.465000 ;
-      RECT 2.180000 1.835000 3.135000 2.085000 ;
-      RECT 2.180000 2.085000 2.510000 2.295000 ;
-      RECT 2.210000 0.255000 3.595000 0.465000 ;
-      RECT 2.210000 0.465000 2.540000 0.655000 ;
-      RECT 2.710000 0.635000 3.135000 0.825000 ;
-      RECT 2.965000 0.825000 3.135000 1.835000 ;
-      RECT 3.305000 0.465000 3.595000 0.735000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.445000  0.995000 0.635000 1.075000 ;
+      RECT 0.445000  1.075000 0.810000 1.325000 ;
+      RECT 0.640000  1.325000 0.810000 1.495000 ;
+      RECT 0.640000  1.495000 1.315000 1.665000 ;
+      RECT 0.685000  1.835000 0.975000 2.635000 ;
+      RECT 0.765000  0.085000 0.935000 0.645000 ;
+      RECT 1.140000  0.255000 1.470000 0.655000 ;
+      RECT 1.140000  0.655000 2.540000 0.825000 ;
+      RECT 1.145000  1.665000 1.315000 2.295000 ;
+      RECT 1.145000  2.295000 2.510000 2.465000 ;
+      RECT 1.645000  0.085000 1.975000 0.485000 ;
+      RECT 2.180000  1.835000 3.135000 2.085000 ;
+      RECT 2.180000  2.085000 2.510000 2.295000 ;
+      RECT 2.210000  0.255000 3.595000 0.465000 ;
+      RECT 2.210000  0.465000 2.540000 0.655000 ;
+      RECT 2.710000  0.635000 3.135000 0.825000 ;
+      RECT 2.965000  0.825000 3.135000 1.835000 ;
+      RECT 3.305000  0.465000 3.595000 0.735000 ;
+      RECT 3.305000  1.495000 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
 END sky130_fd_sc_hd__o32a_1
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
index 245ce46..53da185 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_2.magic.lef
@@ -90,21 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.885000 ;
-        RECT 1.095000  0.085000 1.425000 0.825000 ;
-        RECT 2.195000  0.085000 2.525000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -114,36 +99,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 2.125000 1.525000 2.635000 ;
-        RECT 3.695000 1.495000 4.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.015000 0.995000 1.325000 1.785000 ;
-      RECT 1.015000 1.785000 3.525000 1.955000 ;
-      RECT 1.695000 0.255000 2.025000 0.655000 ;
-      RECT 1.695000 0.655000 3.025000 0.825000 ;
-      RECT 2.695000 0.255000 4.055000 0.425000 ;
-      RECT 2.695000 0.425000 3.025000 0.655000 ;
-      RECT 2.695000 1.955000 3.025000 2.465000 ;
-      RECT 3.195000 0.595000 3.525000 0.825000 ;
-      RECT 3.325000 0.825000 3.525000 1.785000 ;
-      RECT 3.695000 0.425000 4.055000 0.905000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.885000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 1.015000  0.995000 1.325000 1.785000 ;
+      RECT 1.015000  1.785000 3.525000 1.955000 ;
+      RECT 1.015000  2.125000 1.525000 2.635000 ;
+      RECT 1.095000  0.085000 1.425000 0.825000 ;
+      RECT 1.695000  0.255000 2.025000 0.655000 ;
+      RECT 1.695000  0.655000 3.025000 0.825000 ;
+      RECT 2.195000  0.085000 2.525000 0.485000 ;
+      RECT 2.695000  0.255000 4.055000 0.425000 ;
+      RECT 2.695000  0.425000 3.025000 0.655000 ;
+      RECT 2.695000  1.955000 3.025000 2.465000 ;
+      RECT 3.195000  0.595000 3.525000 0.825000 ;
+      RECT 3.325000  0.825000 3.525000 1.785000 ;
+      RECT 3.695000  0.425000 4.055000 0.905000 ;
+      RECT 3.695000  1.495000 4.055000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__o32a_2
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
index 7472b20..6899502 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_4.magic.lef
@@ -95,31 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 2.545000 0.465000 ;
-        RECT 5.965000  0.085000 6.135000 0.885000 ;
-        RECT 6.805000  0.085000 6.975000 0.545000 ;
-        RECT 7.645000  0.085000 7.900000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -129,67 +104,89 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.595000 1.835000 0.765000 2.635000 ;
-        RECT 4.155000 2.125000 4.325000 2.635000 ;
-        RECT 5.965000 1.835000 6.135000 2.635000 ;
-        RECT 6.805000 1.835000 6.975000 2.635000 ;
-        RECT 7.645000 1.835000 7.900000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.635000 ;
-      RECT 0.085000 0.635000 2.965000 0.885000 ;
-      RECT 0.085000 1.445000 1.265000 1.665000 ;
-      RECT 0.085000 1.665000 0.425000 2.465000 ;
-      RECT 0.935000 1.665000 1.265000 2.295000 ;
-      RECT 0.935000 2.295000 2.105000 2.465000 ;
-      RECT 1.435000 1.445000 2.625000 1.690000 ;
-      RECT 1.435000 1.690000 1.605000 2.045000 ;
-      RECT 1.775000 1.860000 2.105000 2.295000 ;
-      RECT 2.295000 1.690000 2.625000 2.295000 ;
-      RECT 2.295000 2.295000 3.465000 2.465000 ;
-      RECT 2.715000 0.255000 5.695000 0.465000 ;
-      RECT 2.715000 0.465000 2.965000 0.635000 ;
-      RECT 2.795000 1.105000 3.645000 1.275000 ;
-      RECT 2.795000 1.275000 2.965000 2.045000 ;
-      RECT 3.135000 1.445000 3.465000 2.295000 ;
-      RECT 3.455000 0.635000 5.775000 0.805000 ;
-      RECT 3.455000 0.805000 3.645000 1.105000 ;
-      RECT 3.655000 1.445000 3.985000 1.785000 ;
-      RECT 3.655000 1.785000 4.825000 1.955000 ;
-      RECT 3.655000 1.955000 3.985000 2.465000 ;
-      RECT 4.400000 0.805000 4.620000 1.445000 ;
-      RECT 4.400000 1.445000 5.195000 1.615000 ;
-      RECT 4.495000 1.955000 4.825000 2.285000 ;
-      RECT 4.495000 2.285000 5.695000 2.465000 ;
-      RECT 5.025000 1.615000 5.195000 2.115000 ;
-      RECT 5.365000 1.445000 5.695000 2.285000 ;
-      RECT 5.520000 0.805000 5.775000 1.075000 ;
-      RECT 5.520000 1.075000 7.475000 1.245000 ;
-      RECT 5.520000 1.245000 6.135000 1.265000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.635000 ;
+      RECT 0.085000  0.635000 2.965000 0.885000 ;
+      RECT 0.085000  1.445000 1.265000 1.665000 ;
+      RECT 0.085000  1.665000 0.425000 2.465000 ;
+      RECT 0.515000  0.085000 2.545000 0.465000 ;
+      RECT 0.595000  1.835000 0.765000 2.635000 ;
+      RECT 0.935000  1.665000 1.265000 2.295000 ;
+      RECT 0.935000  2.295000 2.105000 2.465000 ;
+      RECT 1.435000  1.445000 2.625000 1.690000 ;
+      RECT 1.435000  1.690000 1.605000 2.045000 ;
+      RECT 1.775000  1.860000 2.105000 2.295000 ;
+      RECT 2.295000  1.690000 2.625000 2.295000 ;
+      RECT 2.295000  2.295000 3.465000 2.465000 ;
+      RECT 2.715000  0.255000 5.695000 0.465000 ;
+      RECT 2.715000  0.465000 2.965000 0.635000 ;
+      RECT 2.795000  1.105000 3.645000 1.275000 ;
+      RECT 2.795000  1.275000 2.965000 2.045000 ;
+      RECT 3.135000  1.445000 3.465000 2.295000 ;
+      RECT 3.455000  0.635000 5.775000 0.805000 ;
+      RECT 3.455000  0.805000 3.645000 1.105000 ;
+      RECT 3.655000  1.445000 3.985000 1.785000 ;
+      RECT 3.655000  1.785000 4.825000 1.955000 ;
+      RECT 3.655000  1.955000 3.985000 2.465000 ;
+      RECT 4.155000  2.125000 4.325000 2.635000 ;
+      RECT 4.400000  0.805000 4.620000 1.445000 ;
+      RECT 4.400000  1.445000 5.195000 1.615000 ;
+      RECT 4.495000  1.955000 4.825000 2.285000 ;
+      RECT 4.495000  2.285000 5.695000 2.465000 ;
+      RECT 5.025000  1.615000 5.195000 2.115000 ;
+      RECT 5.365000  1.445000 5.695000 2.285000 ;
+      RECT 5.520000  0.805000 5.775000 1.075000 ;
+      RECT 5.520000  1.075000 7.475000 1.245000 ;
+      RECT 5.520000  1.245000 6.135000 1.265000 ;
+      RECT 5.965000  0.085000 6.135000 0.885000 ;
+      RECT 5.965000  1.835000 6.135000 2.635000 ;
+      RECT 6.805000  0.085000 6.975000 0.545000 ;
+      RECT 6.805000  1.835000 6.975000 2.635000 ;
+      RECT 7.645000  0.085000 7.900000 0.545000 ;
+      RECT 7.645000  1.835000 7.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 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__o32a_4
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
index 6bb72f5..676a89b 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.magic.lef
@@ -92,18 +92,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 1.515000  0.085000 2.185000 0.485000 ;
-        RECT 2.695000  0.085000 3.135000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -113,27 +101,36 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.090000 1.495000 0.360000 2.635000 ;
-        RECT 2.695000 1.495000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 1.345000 0.485000 ;
-      RECT 1.015000 0.485000 1.345000 0.655000 ;
-      RECT 1.015000 0.655000 2.525000 0.825000 ;
-      RECT 2.355000 0.375000 2.525000 0.655000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  0.255000 1.345000 0.485000 ;
+      RECT 0.090000  1.495000 0.360000 2.635000 ;
+      RECT 1.015000  0.485000 1.345000 0.655000 ;
+      RECT 1.015000  0.655000 2.525000 0.825000 ;
+      RECT 1.515000  0.085000 2.185000 0.485000 ;
+      RECT 2.355000  0.375000 2.525000 0.655000 ;
+      RECT 2.695000  0.085000 3.135000 0.825000 ;
+      RECT 2.695000  1.495000 3.135000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
index 532dd68..f7d16fc 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.magic.lef
@@ -94,25 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 2.620000  0.085000 2.950000 0.545000 ;
-        RECT 3.635000  0.085000 3.805000 0.545000 ;
-        RECT 4.905000  0.085000 5.235000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -122,49 +103,65 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 1.435000 2.175000 1.605000 2.635000 ;
-        RECT 4.620000 1.835000 4.825000 2.635000 ;
-        RECT 5.495000 1.495000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 2.405000 0.485000 ;
-      RECT 0.090000 0.485000 0.345000 0.905000 ;
-      RECT 0.090000 1.495000 0.345000 2.295000 ;
-      RECT 0.090000 2.295000 1.265000 2.465000 ;
-      RECT 1.015000 1.835000 2.105000 2.005000 ;
-      RECT 1.015000 2.005000 1.265000 2.295000 ;
-      RECT 1.775000 2.005000 2.105000 2.455000 ;
-      RECT 2.235000 0.485000 2.405000 0.715000 ;
-      RECT 2.235000 0.715000 5.755000 0.905000 ;
-      RECT 2.335000 1.835000 2.585000 2.255000 ;
-      RECT 2.335000 2.255000 4.385000 2.445000 ;
-      RECT 3.135000 0.255000 3.465000 0.715000 ;
-      RECT 3.275000 1.495000 3.445000 2.255000 ;
-      RECT 3.615000 1.495000 5.325000 1.665000 ;
-      RECT 3.615000 1.665000 3.945000 2.085000 ;
-      RECT 4.055000 0.255000 4.725000 0.715000 ;
-      RECT 4.135000 1.835000 4.385000 2.255000 ;
-      RECT 4.995000 1.665000 5.325000 2.460000 ;
-      RECT 5.425000 0.255000 5.755000 0.715000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.090000  0.255000 2.405000 0.485000 ;
+      RECT 0.090000  0.485000 0.345000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.295000 ;
+      RECT 0.090000  2.295000 1.265000 2.465000 ;
+      RECT 1.015000  1.835000 2.105000 2.005000 ;
+      RECT 1.015000  2.005000 1.265000 2.295000 ;
+      RECT 1.435000  2.175000 1.605000 2.635000 ;
+      RECT 1.775000  2.005000 2.105000 2.455000 ;
+      RECT 2.235000  0.485000 2.405000 0.715000 ;
+      RECT 2.235000  0.715000 5.755000 0.905000 ;
+      RECT 2.335000  1.835000 2.585000 2.255000 ;
+      RECT 2.335000  2.255000 4.385000 2.445000 ;
+      RECT 2.620000  0.085000 2.950000 0.545000 ;
+      RECT 3.135000  0.255000 3.465000 0.715000 ;
+      RECT 3.275000  1.495000 3.445000 2.255000 ;
+      RECT 3.615000  1.495000 5.325000 1.665000 ;
+      RECT 3.615000  1.665000 3.945000 2.085000 ;
+      RECT 3.635000  0.085000 3.805000 0.545000 ;
+      RECT 4.055000  0.255000 4.725000 0.715000 ;
+      RECT 4.135000  1.835000 4.385000 2.255000 ;
+      RECT 4.620000  1.835000 4.825000 2.635000 ;
+      RECT 4.905000  0.085000 5.235000 0.545000 ;
+      RECT 4.995000  1.665000 5.325000 2.460000 ;
+      RECT 5.425000  0.255000 5.755000 0.715000 ;
+      RECT 5.495000  1.495000 5.715000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
 END sky130_fd_sc_hd__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
index 8e8a814..00c5e98 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.magic.lef
@@ -95,37 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 3.970000  0.085000  4.140000 0.545000 ;
-        RECT 4.810000  0.085000  5.140000 0.545000 ;
-        RECT 6.170000  0.085000  6.340000 0.545000 ;
-        RECT 7.010000  0.085000  7.180000 0.545000 ;
-        RECT 8.370000  0.085000  8.540000 0.545000 ;
-        RECT 9.210000  0.085000  9.470000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -135,69 +104,97 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 2.210000 2.175000  2.540000 2.635000 ;
-        RECT 3.050000 2.175000  3.380000 2.635000 ;
-        RECT 7.870000 1.835000  8.120000 2.635000 ;
-        RECT 8.790000 1.835000  8.960000 2.635000 ;
-        RECT 9.630000 1.495000 10.035000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        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.255000  3.800000 0.465000 ;
-      RECT 0.090000 0.465000  0.345000 0.905000 ;
-      RECT 0.090000 1.495000  0.345000 2.255000 ;
-      RECT 0.090000 2.255000  2.040000 2.465000 ;
-      RECT 1.015000 1.835000  1.185000 2.255000 ;
-      RECT 1.870000 1.835000  3.800000 2.005000 ;
-      RECT 1.870000 2.005000  2.040000 2.255000 ;
-      RECT 2.710000 2.005000  2.880000 2.425000 ;
-      RECT 3.550000 0.465000  3.800000 0.735000 ;
-      RECT 3.550000 0.735000 10.035000 0.905000 ;
-      RECT 3.550000 2.005000  3.800000 2.465000 ;
-      RECT 3.990000 1.835000  4.240000 2.255000 ;
-      RECT 3.990000 2.255000  7.680000 2.465000 ;
-      RECT 4.310000 0.255000  4.640000 0.735000 ;
-      RECT 4.910000 1.835000  5.080000 2.255000 ;
-      RECT 5.310000 0.255000  5.980000 0.735000 ;
-      RECT 5.750000 1.835000  5.920000 2.255000 ;
-      RECT 6.090000 1.495000  9.460000 1.665000 ;
-      RECT 6.090000 1.665000  6.420000 2.085000 ;
-      RECT 6.510000 0.255000  6.840000 0.735000 ;
-      RECT 6.590000 1.835000  6.760000 2.255000 ;
-      RECT 6.930000 1.665000  7.260000 2.085000 ;
-      RECT 7.350000 0.255000  8.040000 0.735000 ;
-      RECT 7.430000 1.835000  7.680000 2.255000 ;
-      RECT 8.290000 1.665000  8.620000 2.465000 ;
-      RECT 8.710000 0.255000  9.040000 0.735000 ;
-      RECT 9.130000 1.665000  9.460000 2.465000 ;
-      RECT 9.645000 0.255000 10.035000 0.735000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.090000  0.255000  3.800000 0.465000 ;
+      RECT 0.090000  0.465000  0.345000 0.905000 ;
+      RECT 0.090000  1.495000  0.345000 2.255000 ;
+      RECT 0.090000  2.255000  2.040000 2.465000 ;
+      RECT 1.015000  1.835000  1.185000 2.255000 ;
+      RECT 1.870000  1.835000  3.800000 2.005000 ;
+      RECT 1.870000  2.005000  2.040000 2.255000 ;
+      RECT 2.210000  2.175000  2.540000 2.635000 ;
+      RECT 2.710000  2.005000  2.880000 2.425000 ;
+      RECT 3.050000  2.175000  3.380000 2.635000 ;
+      RECT 3.550000  0.465000  3.800000 0.735000 ;
+      RECT 3.550000  0.735000 10.035000 0.905000 ;
+      RECT 3.550000  2.005000  3.800000 2.465000 ;
+      RECT 3.970000  0.085000  4.140000 0.545000 ;
+      RECT 3.990000  1.835000  4.240000 2.255000 ;
+      RECT 3.990000  2.255000  7.680000 2.465000 ;
+      RECT 4.310000  0.255000  4.640000 0.735000 ;
+      RECT 4.810000  0.085000  5.140000 0.545000 ;
+      RECT 4.910000  1.835000  5.080000 2.255000 ;
+      RECT 5.310000  0.255000  5.980000 0.735000 ;
+      RECT 5.750000  1.835000  5.920000 2.255000 ;
+      RECT 6.090000  1.495000  9.460000 1.665000 ;
+      RECT 6.090000  1.665000  6.420000 2.085000 ;
+      RECT 6.170000  0.085000  6.340000 0.545000 ;
+      RECT 6.510000  0.255000  6.840000 0.735000 ;
+      RECT 6.590000  1.835000  6.760000 2.255000 ;
+      RECT 6.930000  1.665000  7.260000 2.085000 ;
+      RECT 7.010000  0.085000  7.180000 0.545000 ;
+      RECT 7.350000  0.255000  8.040000 0.735000 ;
+      RECT 7.430000  1.835000  7.680000 2.255000 ;
+      RECT 7.870000  1.835000  8.120000 2.635000 ;
+      RECT 8.290000  1.665000  8.620000 2.465000 ;
+      RECT 8.370000  0.085000  8.540000 0.545000 ;
+      RECT 8.710000  0.255000  9.040000 0.735000 ;
+      RECT 8.790000  1.835000  8.960000 2.635000 ;
+      RECT 9.130000  1.665000  9.460000 2.465000 ;
+      RECT 9.210000  0.085000  9.470000 0.545000 ;
+      RECT 9.630000  1.495000 10.035000 2.635000 ;
+      RECT 9.645000  0.255000 10.035000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      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
 END sky130_fd_sc_hd__o32ai_4
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
index a364341..0f86d5b 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_1.magic.lef
@@ -91,21 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.715000  0.085000 0.885000 0.545000 ;
-        RECT 2.050000  0.085000 2.380000 0.545000 ;
-        RECT 3.125000  0.085000 3.455000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -115,36 +100,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.845000 1.915000 1.175000 2.635000 ;
-        RECT 3.605000 1.515000 3.935000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.075000 1.105000 1.285000 ;
-      RECT 0.735000 0.715000 1.485000 0.905000 ;
-      RECT 0.735000 0.905000 1.105000 1.075000 ;
-      RECT 0.845000 1.285000 1.105000 1.455000 ;
-      RECT 0.845000 1.455000 1.595000 1.745000 ;
-      RECT 1.155000 0.270000 1.485000 0.715000 ;
-      RECT 1.345000 1.745000 1.595000 2.465000 ;
-      RECT 1.655000 0.415000 1.825000 0.735000 ;
-      RECT 1.655000 0.735000 3.955000 0.905000 ;
-      RECT 2.580000 0.255000 2.910000 0.735000 ;
-      RECT 3.625000 0.255000 3.955000 0.735000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.525000  1.075000 1.105000 1.285000 ;
+      RECT 0.715000  0.085000 0.885000 0.545000 ;
+      RECT 0.735000  0.715000 1.485000 0.905000 ;
+      RECT 0.735000  0.905000 1.105000 1.075000 ;
+      RECT 0.845000  1.285000 1.105000 1.455000 ;
+      RECT 0.845000  1.455000 1.595000 1.745000 ;
+      RECT 0.845000  1.915000 1.175000 2.635000 ;
+      RECT 1.155000  0.270000 1.485000 0.715000 ;
+      RECT 1.345000  1.745000 1.595000 2.465000 ;
+      RECT 1.655000  0.415000 1.825000 0.735000 ;
+      RECT 1.655000  0.735000 3.955000 0.905000 ;
+      RECT 2.050000  0.085000 2.380000 0.545000 ;
+      RECT 2.580000  0.255000 2.910000 0.735000 ;
+      RECT 3.125000  0.085000 3.455000 0.545000 ;
+      RECT 3.605000  1.515000 3.935000 2.635000 ;
+      RECT 3.625000  0.255000 3.955000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__o41a_1
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
index 20ae568..aa44daa 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_2.magic.lef
@@ -91,23 +91,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.885000 ;
-        RECT 1.015000  0.085000 1.260000 0.885000 ;
-        RECT 2.485000  0.085000 2.750000 0.545000 ;
-        RECT 3.505000  0.085000 3.775000 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
@@ -117,38 +100,52 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.495000 1.185000 1.835000 ;
-        RECT 1.015000 1.835000 1.525000 2.635000 ;
-        RECT 4.065000 1.495000 4.395000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.960000 1.075000 1.600000 1.325000 ;
-      RECT 1.355000 1.325000 1.600000 1.495000 ;
-      RECT 1.355000 1.495000 2.145000 1.665000 ;
-      RECT 1.430000 0.255000 1.785000 0.850000 ;
-      RECT 1.430000 0.850000 1.600000 1.075000 ;
-      RECT 1.695000 1.665000 2.145000 2.465000 ;
-      RECT 1.985000 0.255000 2.315000 0.715000 ;
-      RECT 1.985000 0.715000 4.395000 0.905000 ;
-      RECT 2.955000 0.255000 3.285000 0.715000 ;
-      RECT 4.065000 0.255000 4.395000 0.715000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.885000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.960000  1.075000 1.600000 1.325000 ;
+      RECT 1.015000  0.085000 1.260000 0.885000 ;
+      RECT 1.015000  1.495000 1.185000 1.835000 ;
+      RECT 1.015000  1.835000 1.525000 2.635000 ;
+      RECT 1.355000  1.325000 1.600000 1.495000 ;
+      RECT 1.355000  1.495000 2.145000 1.665000 ;
+      RECT 1.430000  0.255000 1.785000 0.850000 ;
+      RECT 1.430000  0.850000 1.600000 1.075000 ;
+      RECT 1.695000  1.665000 2.145000 2.465000 ;
+      RECT 1.985000  0.255000 2.315000 0.715000 ;
+      RECT 1.985000  0.715000 4.395000 0.905000 ;
+      RECT 2.485000  0.085000 2.750000 0.545000 ;
+      RECT 2.955000  0.255000 3.285000 0.715000 ;
+      RECT 3.505000  0.085000 3.775000 0.545000 ;
+      RECT 4.065000  0.255000 4.395000 0.715000 ;
+      RECT 4.065000  1.495000 4.395000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__o41a_2
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
index e9818e5..30e05e8 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_4.magic.lef
@@ -95,33 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.545000 ;
-        RECT 1.015000  0.085000 1.185000 0.545000 ;
-        RECT 1.855000  0.085000 2.105000 0.885000 ;
-        RECT 3.655000  0.085000 3.875000 0.545000 ;
-        RECT 4.445000  0.085000 4.715000 0.545000 ;
-        RECT 5.305000  0.085000 5.915000 0.545000 ;
-        RECT 6.685000  0.085000 6.955000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -131,63 +104,87 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.085000 1.835000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.185000 2.635000 ;
-        RECT 1.855000 1.465000 2.025000 2.635000 ;
-        RECT 2.715000 1.835000 2.965000 2.635000 ;
-        RECT 6.655000 1.785000 6.985000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.075000 2.665000 1.245000 ;
-      RECT 0.515000 1.245000 2.545000 1.295000 ;
-      RECT 2.195000 1.295000 2.545000 1.445000 ;
-      RECT 2.195000 1.445000 3.825000 1.615000 ;
-      RECT 2.195000 1.615000 2.545000 2.465000 ;
-      RECT 2.295000 0.255000 3.485000 0.465000 ;
-      RECT 2.295000 0.635000 3.045000 0.905000 ;
-      RECT 2.295000 0.905000 2.665000 1.075000 ;
-      RECT 3.135000 1.835000 3.405000 2.295000 ;
-      RECT 3.135000 2.295000 4.325000 2.465000 ;
-      RECT 3.235000 0.465000 3.485000 0.735000 ;
-      RECT 3.235000 0.735000 7.595000 0.905000 ;
-      RECT 3.575000 1.615000 3.825000 2.125000 ;
-      RECT 3.995000 1.445000 5.165000 1.615000 ;
-      RECT 3.995000 1.615000 4.325000 2.295000 ;
-      RECT 4.075000 0.255000 4.245000 0.735000 ;
-      RECT 4.495000 1.785000 4.665000 2.295000 ;
-      RECT 4.495000 2.295000 6.145000 2.465000 ;
-      RECT 4.835000 1.615000 5.165000 2.115000 ;
-      RECT 4.915000 0.255000 5.085000 0.735000 ;
-      RECT 5.395000 1.445000 7.595000 1.615000 ;
-      RECT 5.395000 1.615000 5.645000 2.115000 ;
-      RECT 5.815000 1.785000 6.145000 2.295000 ;
-      RECT 6.240000 0.255000 6.410000 0.735000 ;
-      RECT 6.315000 1.615000 6.485000 2.455000 ;
-      RECT 7.265000 0.255000 7.595000 0.735000 ;
-      RECT 7.265000 1.615000 7.595000 2.465000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.545000 ;
+      RECT 0.085000  1.835000 0.345000 2.635000 ;
+      RECT 0.515000  1.075000 2.665000 1.245000 ;
+      RECT 0.515000  1.245000 2.545000 1.295000 ;
+      RECT 1.015000  0.085000 1.185000 0.545000 ;
+      RECT 1.015000  1.835000 1.185000 2.635000 ;
+      RECT 1.855000  0.085000 2.105000 0.885000 ;
+      RECT 1.855000  1.465000 2.025000 2.635000 ;
+      RECT 2.195000  1.295000 2.545000 1.445000 ;
+      RECT 2.195000  1.445000 3.825000 1.615000 ;
+      RECT 2.195000  1.615000 2.545000 2.465000 ;
+      RECT 2.295000  0.255000 3.485000 0.465000 ;
+      RECT 2.295000  0.635000 3.045000 0.905000 ;
+      RECT 2.295000  0.905000 2.665000 1.075000 ;
+      RECT 2.715000  1.835000 2.965000 2.635000 ;
+      RECT 3.135000  1.835000 3.405000 2.295000 ;
+      RECT 3.135000  2.295000 4.325000 2.465000 ;
+      RECT 3.235000  0.465000 3.485000 0.735000 ;
+      RECT 3.235000  0.735000 7.595000 0.905000 ;
+      RECT 3.575000  1.615000 3.825000 2.125000 ;
+      RECT 3.655000  0.085000 3.875000 0.545000 ;
+      RECT 3.995000  1.445000 5.165000 1.615000 ;
+      RECT 3.995000  1.615000 4.325000 2.295000 ;
+      RECT 4.075000  0.255000 4.245000 0.735000 ;
+      RECT 4.445000  0.085000 4.715000 0.545000 ;
+      RECT 4.495000  1.785000 4.665000 2.295000 ;
+      RECT 4.495000  2.295000 6.145000 2.465000 ;
+      RECT 4.835000  1.615000 5.165000 2.115000 ;
+      RECT 4.915000  0.255000 5.085000 0.735000 ;
+      RECT 5.305000  0.085000 5.915000 0.545000 ;
+      RECT 5.395000  1.445000 7.595000 1.615000 ;
+      RECT 5.395000  1.615000 5.645000 2.115000 ;
+      RECT 5.815000  1.785000 6.145000 2.295000 ;
+      RECT 6.240000  0.255000 6.410000 0.735000 ;
+      RECT 6.315000  1.615000 6.485000 2.455000 ;
+      RECT 6.655000  1.785000 6.985000 2.635000 ;
+      RECT 6.685000  0.085000 6.955000 0.545000 ;
+      RECT 7.265000  0.255000 7.595000 0.735000 ;
+      RECT 7.265000  1.615000 7.595000 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 ;
   END
 END sky130_fd_sc_hd__o41a_4
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
index d58ea40..b9f4955 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.magic.lef
@@ -95,18 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 1.290000  0.085000 1.540000 0.565000 ;
-        RECT 2.210000  0.085000 2.460000 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
@@ -116,28 +104,37 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 1.445000 0.345000 2.635000 ;
-        RECT 2.630000 1.495000 2.960000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.790000 0.255000 1.120000 0.565000 ;
-      RECT 0.950000 0.565000 1.120000 0.735000 ;
-      RECT 0.950000 0.735000 2.960000 0.905000 ;
-      RECT 1.710000 0.255000 2.040000 0.735000 ;
-      RECT 2.630000 0.255000 2.960000 0.735000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.445000 0.345000 2.635000 ;
+      RECT 0.790000  0.255000 1.120000 0.565000 ;
+      RECT 0.950000  0.565000 1.120000 0.735000 ;
+      RECT 0.950000  0.735000 2.960000 0.905000 ;
+      RECT 1.290000  0.085000 1.540000 0.565000 ;
+      RECT 1.710000  0.255000 2.040000 0.735000 ;
+      RECT 2.210000  0.085000 2.460000 0.565000 ;
+      RECT 2.630000  0.255000 2.960000 0.735000 ;
+      RECT 2.630000  1.495000 2.960000 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
 END sky130_fd_sc_hd__o41ai_1
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
index 954f9e7..523b91a 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.magic.lef
@@ -94,27 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 1.455000  0.085000 1.705000 0.545000 ;
-        RECT 2.375000  0.085000 2.545000 0.545000 ;
-        RECT 3.215000  0.085000 3.450000 0.545000 ;
-        RECT 4.195000  0.085000 4.365000 0.545000 ;
-        RECT 5.035000  0.085000 5.205000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -124,51 +103,69 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.015000 1.835000 1.265000 2.635000 ;
-        RECT 4.955000 1.785000 5.285000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 1.265000 0.465000 ;
-      RECT 0.085000 0.465000 0.345000 0.905000 ;
-      RECT 1.015000 0.465000 1.265000 0.735000 ;
-      RECT 1.015000 0.735000 5.705000 0.905000 ;
-      RECT 1.455000 1.835000 1.705000 2.295000 ;
-      RECT 1.455000 2.295000 2.545000 2.465000 ;
-      RECT 1.875000 0.255000 2.205000 0.735000 ;
-      RECT 2.375000 1.445000 3.465000 1.615000 ;
-      RECT 2.375000 1.615000 2.545000 2.295000 ;
-      RECT 2.715000 0.255000 3.045000 0.735000 ;
-      RECT 2.715000 1.835000 3.045000 2.295000 ;
-      RECT 2.715000 2.295000 4.445000 2.465000 ;
-      RECT 3.215000 1.615000 3.465000 2.125000 ;
-      RECT 3.695000 0.255000 4.025000 0.735000 ;
-      RECT 3.695000 1.445000 5.705000 1.615000 ;
-      RECT 3.695000 1.615000 3.945000 2.125000 ;
-      RECT 4.115000 1.835000 4.445000 2.295000 ;
-      RECT 4.535000 0.255000 4.865000 0.735000 ;
-      RECT 4.615000 1.615000 4.785000 2.465000 ;
-      RECT 5.375000 0.255000 5.705000 0.735000 ;
-      RECT 5.455000 1.615000 5.705000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.255000 1.265000 0.465000 ;
+      RECT 0.085000  0.465000 0.345000 0.905000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 1.015000  0.465000 1.265000 0.735000 ;
+      RECT 1.015000  0.735000 5.705000 0.905000 ;
+      RECT 1.015000  1.835000 1.265000 2.635000 ;
+      RECT 1.455000  0.085000 1.705000 0.545000 ;
+      RECT 1.455000  1.835000 1.705000 2.295000 ;
+      RECT 1.455000  2.295000 2.545000 2.465000 ;
+      RECT 1.875000  0.255000 2.205000 0.735000 ;
+      RECT 2.375000  0.085000 2.545000 0.545000 ;
+      RECT 2.375000  1.445000 3.465000 1.615000 ;
+      RECT 2.375000  1.615000 2.545000 2.295000 ;
+      RECT 2.715000  0.255000 3.045000 0.735000 ;
+      RECT 2.715000  1.835000 3.045000 2.295000 ;
+      RECT 2.715000  2.295000 4.445000 2.465000 ;
+      RECT 3.215000  0.085000 3.450000 0.545000 ;
+      RECT 3.215000  1.615000 3.465000 2.125000 ;
+      RECT 3.695000  0.255000 4.025000 0.735000 ;
+      RECT 3.695000  1.445000 5.705000 1.615000 ;
+      RECT 3.695000  1.615000 3.945000 2.125000 ;
+      RECT 4.115000  1.835000 4.445000 2.295000 ;
+      RECT 4.195000  0.085000 4.365000 0.545000 ;
+      RECT 4.535000  0.255000 4.865000 0.735000 ;
+      RECT 4.615000  1.615000 4.785000 2.465000 ;
+      RECT 4.955000  1.785000 5.285000 2.635000 ;
+      RECT 5.035000  0.085000 5.205000 0.545000 ;
+      RECT 5.375000  0.255000 5.705000 0.735000 ;
+      RECT 5.455000  1.615000 5.705000 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
 END sky130_fd_sc_hd__o41ai_2
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
index d979959..946fd5d 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.magic.lef
@@ -95,39 +95,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 2.795000  0.085000  2.965000 0.545000 ;
-        RECT 3.635000  0.085000  3.805000 0.545000 ;
-        RECT 4.475000  0.085000  4.645000 0.545000 ;
-        RECT 5.315000  0.085000  5.485000 0.545000 ;
-        RECT 6.675000  0.085000  6.845000 0.545000 ;
-        RECT 7.515000  0.085000  7.685000 0.545000 ;
-        RECT 8.355000  0.085000  8.525000 0.545000 ;
-        RECT 9.195000  0.085000  9.365000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -137,72 +104,102 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.085000 1.445000  0.345000 2.635000 ;
-        RECT 1.015000 1.835000  1.185000 2.635000 ;
-        RECT 1.855000 1.835000  2.105000 2.635000 ;
-        RECT 8.355000 1.835000  8.525000 2.635000 ;
-        RECT 9.195000 1.835000  9.365000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 2.625000 0.465000 ;
-      RECT 0.085000 0.465000 0.345000 0.905000 ;
-      RECT 2.295000 1.785000 2.545000 2.295000 ;
-      RECT 2.295000 2.295000 4.225000 2.465000 ;
-      RECT 2.350000 0.465000 2.625000 0.735000 ;
-      RECT 2.350000 0.735000 9.865000 0.905000 ;
-      RECT 3.135000 0.255000 3.465000 0.735000 ;
-      RECT 3.215000 1.785000 3.385000 2.295000 ;
-      RECT 3.975000 0.255000 4.305000 0.735000 ;
-      RECT 4.055000 1.445000 5.985000 1.615000 ;
-      RECT 4.055000 1.615000 4.225000 2.295000 ;
-      RECT 4.395000 1.785000 4.645000 2.295000 ;
-      RECT 4.395000 2.295000 7.685000 2.465000 ;
-      RECT 4.815000 0.255000 5.145000 0.735000 ;
-      RECT 4.815000 1.615000 5.145000 2.125000 ;
-      RECT 5.315000 1.785000 5.485000 2.295000 ;
-      RECT 5.655000 0.255000 5.985000 0.735000 ;
-      RECT 5.655000 1.615000 5.985000 2.125000 ;
-      RECT 6.175000 0.260000 6.505000 0.735000 ;
-      RECT 6.175000 1.445000 9.865000 1.615000 ;
-      RECT 6.175000 1.615000 6.505000 2.125000 ;
-      RECT 6.675000 1.785000 6.845000 2.295000 ;
-      RECT 7.015000 0.260000 7.345000 0.735000 ;
-      RECT 7.015000 1.615000 7.345000 2.125000 ;
-      RECT 7.515000 1.785000 7.685000 2.295000 ;
-      RECT 7.855000 0.260000 8.185000 0.735000 ;
-      RECT 7.855000 1.615000 8.185000 2.465000 ;
-      RECT 8.695000 0.260000 9.025000 0.735000 ;
-      RECT 8.695000 1.615000 9.025000 2.465000 ;
-      RECT 9.535000 0.260000 9.865000 0.735000 ;
-      RECT 9.535000 1.615000 9.865000 2.465000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.085000  0.255000  2.625000 0.465000 ;
+      RECT 0.085000  0.465000  0.345000 0.905000 ;
+      RECT 0.085000  1.445000  0.345000 2.635000 ;
+      RECT 1.015000  1.835000  1.185000 2.635000 ;
+      RECT 1.855000  1.835000  2.105000 2.635000 ;
+      RECT 2.295000  1.785000  2.545000 2.295000 ;
+      RECT 2.295000  2.295000  4.225000 2.465000 ;
+      RECT 2.350000  0.465000  2.625000 0.735000 ;
+      RECT 2.350000  0.735000  9.865000 0.905000 ;
+      RECT 2.795000  0.085000  2.965000 0.545000 ;
+      RECT 3.135000  0.255000  3.465000 0.735000 ;
+      RECT 3.215000  1.785000  3.385000 2.295000 ;
+      RECT 3.635000  0.085000  3.805000 0.545000 ;
+      RECT 3.975000  0.255000  4.305000 0.735000 ;
+      RECT 4.055000  1.445000  5.985000 1.615000 ;
+      RECT 4.055000  1.615000  4.225000 2.295000 ;
+      RECT 4.395000  1.785000  4.645000 2.295000 ;
+      RECT 4.395000  2.295000  7.685000 2.465000 ;
+      RECT 4.475000  0.085000  4.645000 0.545000 ;
+      RECT 4.815000  0.255000  5.145000 0.735000 ;
+      RECT 4.815000  1.615000  5.145000 2.125000 ;
+      RECT 5.315000  0.085000  5.485000 0.545000 ;
+      RECT 5.315000  1.785000  5.485000 2.295000 ;
+      RECT 5.655000  0.255000  5.985000 0.735000 ;
+      RECT 5.655000  1.615000  5.985000 2.125000 ;
+      RECT 6.175000  0.260000  6.505000 0.735000 ;
+      RECT 6.175000  1.445000  9.865000 1.615000 ;
+      RECT 6.175000  1.615000  6.505000 2.125000 ;
+      RECT 6.675000  0.085000  6.845000 0.545000 ;
+      RECT 6.675000  1.785000  6.845000 2.295000 ;
+      RECT 7.015000  0.260000  7.345000 0.735000 ;
+      RECT 7.015000  1.615000  7.345000 2.125000 ;
+      RECT 7.515000  0.085000  7.685000 0.545000 ;
+      RECT 7.515000  1.785000  7.685000 2.295000 ;
+      RECT 7.855000  0.260000  8.185000 0.735000 ;
+      RECT 7.855000  1.615000  8.185000 2.465000 ;
+      RECT 8.355000  0.085000  8.525000 0.545000 ;
+      RECT 8.355000  1.835000  8.525000 2.635000 ;
+      RECT 8.695000  0.260000  9.025000 0.735000 ;
+      RECT 8.695000  1.615000  9.025000 2.465000 ;
+      RECT 9.195000  0.085000  9.365000 0.545000 ;
+      RECT 9.195000  1.835000  9.365000 2.635000 ;
+      RECT 9.535000  0.260000  9.865000 0.735000 ;
+      RECT 9.535000  1.615000  9.865000 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 ;
   END
 END sky130_fd_sc_hd__o41ai_4
diff --git a/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
index 0e06df6..01cff77 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_0.magic.lef
@@ -64,16 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.250000  0.085000 0.490000 0.825000 ;
-        RECT 1.180000  0.085000 1.395000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -83,25 +73,32 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.145000 2.125000 1.475000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.270000 1.785000 1.695000 1.955000 ;
-      RECT 0.270000 1.955000 0.660000 2.130000 ;
-      RECT 0.670000 0.425000 0.950000 0.825000 ;
-      RECT 0.670000 0.825000 0.840000 1.785000 ;
-      RECT 1.525000 0.995000 1.695000 1.785000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.250000  0.085000 0.490000 0.825000 ;
+      RECT 0.270000  1.785000 1.695000 1.955000 ;
+      RECT 0.270000  1.955000 0.660000 2.130000 ;
+      RECT 0.670000  0.425000 0.950000 0.825000 ;
+      RECT 0.670000  0.825000 0.840000 1.785000 ;
+      RECT 1.145000  2.125000 1.475000 2.635000 ;
+      RECT 1.180000  0.085000 1.395000 0.825000 ;
+      RECT 1.525000  0.995000 1.695000 1.785000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__or2_0
diff --git a/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
index d27ceaf..326d975 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_1.magic.lef
@@ -64,16 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.250000  0.085000 0.490000 0.595000 ;
-        RECT 1.180000  0.085000 1.395000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -83,25 +73,32 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.145000 1.835000 1.475000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.270000 1.495000 1.695000 1.665000 ;
-      RECT 0.270000 1.665000 0.660000 1.840000 ;
-      RECT 0.670000 0.265000 0.950000 0.595000 ;
-      RECT 0.670000 0.595000 0.840000 1.495000 ;
-      RECT 1.525000 0.995000 1.695000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.250000  0.085000 0.490000 0.595000 ;
+      RECT 0.270000  1.495000 1.695000 1.665000 ;
+      RECT 0.270000  1.665000 0.660000 1.840000 ;
+      RECT 0.670000  0.265000 0.950000 0.595000 ;
+      RECT 0.670000  0.595000 0.840000 1.495000 ;
+      RECT 1.145000  1.835000 1.475000 2.635000 ;
+      RECT 1.180000  0.085000 1.395000 0.595000 ;
+      RECT 1.525000  0.995000 1.695000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__or2_1
diff --git a/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
index e4fd0c1..4a22a9d 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_2.magic.lef
@@ -66,17 +66,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.595000 ;
-        RECT 1.035000  0.085000 1.350000 0.595000 ;
-        RECT 1.860000  0.085000 2.190000 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
@@ -86,26 +75,34 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.100000 1.835000 1.270000 2.635000 ;
-        RECT 1.940000 2.175000 2.110000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 1.495000 1.615000 1.665000 ;
-      RECT 0.155000 1.665000 0.515000 1.840000 ;
-      RECT 0.515000 0.255000 0.805000 0.595000 ;
-      RECT 0.515000 0.595000 0.695000 1.495000 ;
-      RECT 1.445000 0.995000 1.615000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.105000  0.085000 0.345000 0.595000 ;
+      RECT 0.155000  1.495000 1.615000 1.665000 ;
+      RECT 0.155000  1.665000 0.515000 1.840000 ;
+      RECT 0.515000  0.255000 0.805000 0.595000 ;
+      RECT 0.515000  0.595000 0.695000 1.495000 ;
+      RECT 1.035000  0.085000 1.350000 0.595000 ;
+      RECT 1.100000  1.835000 1.270000 2.635000 ;
+      RECT 1.445000  0.995000 1.615000 1.495000 ;
+      RECT 1.860000  0.085000 2.190000 0.485000 ;
+      RECT 1.940000  2.175000 2.110000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__or2_2
diff --git a/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
index 6890e1e..6ca0117 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hd__or2_4.magic.lef
@@ -70,20 +70,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.595000 ;
-        RECT 1.060000  0.085000 1.230000 0.825000 ;
-        RECT 1.940000  0.085000 2.110000 0.565000 ;
-        RECT 2.780000  0.085000 2.950000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -93,30 +79,41 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.060000 1.835000 1.230000 2.635000 ;
-        RECT 1.940000 2.175000 2.110000 2.635000 ;
-        RECT 2.780000 1.835000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 1.495000 1.615000 1.665000 ;
-      RECT 0.155000 1.665000 0.515000 2.465000 ;
-      RECT 0.515000 0.290000 0.845000 0.825000 ;
-      RECT 0.515000 0.825000 0.695000 1.495000 ;
-      RECT 1.410000 1.075000 2.620000 1.245000 ;
-      RECT 1.410000 1.245000 1.615000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.105000  0.085000 0.345000 0.595000 ;
+      RECT 0.155000  1.495000 1.615000 1.665000 ;
+      RECT 0.155000  1.665000 0.515000 2.465000 ;
+      RECT 0.515000  0.290000 0.845000 0.825000 ;
+      RECT 0.515000  0.825000 0.695000 1.495000 ;
+      RECT 1.060000  0.085000 1.230000 0.825000 ;
+      RECT 1.060000  1.835000 1.230000 2.635000 ;
+      RECT 1.410000  1.075000 2.620000 1.245000 ;
+      RECT 1.410000  1.245000 1.615000 1.495000 ;
+      RECT 1.940000  0.085000 2.110000 0.565000 ;
+      RECT 1.940000  2.175000 2.110000 2.635000 ;
+      RECT 2.780000  0.085000 2.950000 0.565000 ;
+      RECT 2.780000  1.835000 2.950000 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
 END sky130_fd_sc_hd__or2_4
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
index 1dc2a61..9dd7ff6 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_1.magic.lef
@@ -64,17 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.590000  0.085000 1.325000 0.565000 ;
-        RECT 1.835000  0.085000 2.215000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -84,34 +73,42 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.915000 1.835000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.265000 0.420000 0.735000 ;
-      RECT 0.110000 0.735000 0.845000 0.905000 ;
-      RECT 0.595000 0.905000 0.845000 0.995000 ;
-      RECT 0.595000 0.995000 1.335000 1.325000 ;
-      RECT 0.595000 1.325000 0.765000 1.885000 ;
-      RECT 0.990000 1.495000 2.235000 1.665000 ;
-      RECT 0.990000 1.665000 1.410000 1.915000 ;
-      RECT 1.495000 0.305000 1.665000 0.655000 ;
-      RECT 1.495000 0.655000 2.235000 0.825000 ;
-      RECT 2.065000 0.825000 2.235000 0.995000 ;
-      RECT 2.065000 0.995000 2.295000 1.325000 ;
-      RECT 2.065000 1.325000 2.235000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.110000  0.265000 0.420000 0.735000 ;
+      RECT 0.110000  0.735000 0.845000 0.905000 ;
+      RECT 0.590000  0.085000 1.325000 0.565000 ;
+      RECT 0.595000  0.905000 0.845000 0.995000 ;
+      RECT 0.595000  0.995000 1.335000 1.325000 ;
+      RECT 0.595000  1.325000 0.765000 1.885000 ;
+      RECT 0.990000  1.495000 2.235000 1.665000 ;
+      RECT 0.990000  1.665000 1.410000 1.915000 ;
+      RECT 1.495000  0.305000 1.665000 0.655000 ;
+      RECT 1.495000  0.655000 2.235000 0.825000 ;
+      RECT 1.835000  0.085000 2.215000 0.485000 ;
+      RECT 1.915000  1.835000 2.195000 2.635000 ;
+      RECT 2.065000  0.825000 2.235000 0.995000 ;
+      RECT 2.065000  0.995000 2.295000 1.325000 ;
+      RECT 2.065000  1.325000 2.235000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
index f6aaeaf..b9809b8 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_2.magic.lef
@@ -64,19 +64,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.590000  0.085000 1.320000 0.565000 ;
-        RECT 1.830000  0.085000 2.210000 0.485000 ;
-        RECT 2.800000  0.085000 3.055000 0.925000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -86,36 +73,46 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.910000 1.835000 2.190000 2.635000 ;
-        RECT 2.800000 1.460000 3.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.265000 0.420000 0.735000 ;
-      RECT 0.105000 0.735000 0.840000 0.905000 ;
-      RECT 0.595000 0.905000 0.840000 0.995000 ;
-      RECT 0.595000 0.995000 1.330000 1.325000 ;
-      RECT 0.595000 1.325000 0.765000 1.885000 ;
-      RECT 0.985000 1.495000 2.230000 1.665000 ;
-      RECT 0.985000 1.665000 1.405000 1.915000 ;
-      RECT 1.490000 0.305000 1.660000 0.655000 ;
-      RECT 1.490000 0.655000 2.230000 0.825000 ;
-      RECT 2.060000 0.825000 2.230000 0.995000 ;
-      RECT 2.060000 0.995000 2.290000 1.325000 ;
-      RECT 2.060000 1.325000 2.230000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.105000  0.265000 0.420000 0.735000 ;
+      RECT 0.105000  0.735000 0.840000 0.905000 ;
+      RECT 0.590000  0.085000 1.320000 0.565000 ;
+      RECT 0.595000  0.905000 0.840000 0.995000 ;
+      RECT 0.595000  0.995000 1.330000 1.325000 ;
+      RECT 0.595000  1.325000 0.765000 1.885000 ;
+      RECT 0.985000  1.495000 2.230000 1.665000 ;
+      RECT 0.985000  1.665000 1.405000 1.915000 ;
+      RECT 1.490000  0.305000 1.660000 0.655000 ;
+      RECT 1.490000  0.655000 2.230000 0.825000 ;
+      RECT 1.830000  0.085000 2.210000 0.485000 ;
+      RECT 1.910000  1.835000 2.190000 2.635000 ;
+      RECT 2.060000  0.825000 2.230000 0.995000 ;
+      RECT 2.060000  0.995000 2.290000 1.325000 ;
+      RECT 2.060000  1.325000 2.230000 1.495000 ;
+      RECT 2.800000  0.085000 3.055000 0.925000 ;
+      RECT 2.800000  1.460000 3.055000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
index 69498b0..395bd89 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_4.magic.lef
@@ -70,22 +70,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.590000  0.085000 1.245000 0.565000 ;
-        RECT 1.980000  0.085000 2.155000 0.905000 ;
-        RECT 2.825000  0.085000 2.995000 0.550000 ;
-        RECT 3.665000  0.085000 3.835000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -95,40 +79,53 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 2.125000 0.345000 2.635000 ;
-        RECT 1.915000 1.835000 2.195000 2.635000 ;
-        RECT 2.785000 2.135000 3.035000 2.635000 ;
-        RECT 3.625000 1.795000 3.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.265000 0.420000 0.735000 ;
-      RECT 0.110000 0.735000 0.845000 0.905000 ;
-      RECT 0.595000 0.905000 0.845000 0.995000 ;
-      RECT 0.595000 0.995000 1.120000 1.325000 ;
-      RECT 0.595000 1.325000 0.765000 2.465000 ;
-      RECT 0.990000 1.495000 2.660000 1.615000 ;
-      RECT 0.990000 1.615000 1.460000 2.465000 ;
-      RECT 1.290000 0.735000 1.745000 0.905000 ;
-      RECT 1.290000 0.905000 1.460000 1.445000 ;
-      RECT 1.290000 1.445000 2.660000 1.495000 ;
-      RECT 1.415000 0.305000 1.745000 0.735000 ;
-      RECT 2.490000 1.075000 3.500000 1.245000 ;
-      RECT 2.490000 1.245000 2.660000 1.445000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  2.125000 0.345000 2.635000 ;
+      RECT 0.110000  0.265000 0.420000 0.735000 ;
+      RECT 0.110000  0.735000 0.845000 0.905000 ;
+      RECT 0.590000  0.085000 1.245000 0.565000 ;
+      RECT 0.595000  0.905000 0.845000 0.995000 ;
+      RECT 0.595000  0.995000 1.120000 1.325000 ;
+      RECT 0.595000  1.325000 0.765000 2.465000 ;
+      RECT 0.990000  1.495000 2.660000 1.615000 ;
+      RECT 0.990000  1.615000 1.460000 2.465000 ;
+      RECT 1.290000  0.735000 1.745000 0.905000 ;
+      RECT 1.290000  0.905000 1.460000 1.445000 ;
+      RECT 1.290000  1.445000 2.660000 1.495000 ;
+      RECT 1.415000  0.305000 1.745000 0.735000 ;
+      RECT 1.915000  1.835000 2.195000 2.635000 ;
+      RECT 1.980000  0.085000 2.155000 0.905000 ;
+      RECT 2.490000  1.075000 3.500000 1.245000 ;
+      RECT 2.490000  1.245000 2.660000 1.445000 ;
+      RECT 2.785000  2.135000 3.035000 2.635000 ;
+      RECT 2.825000  0.085000 2.995000 0.550000 ;
+      RECT 3.625000  1.795000 3.875000 2.635000 ;
+      RECT 3.665000  0.085000 3.835000 0.550000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__or2b_4
diff --git a/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
index bcb8f8c..3ad4e87 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_1.magic.lef
@@ -74,16 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.485000 ;
-        RECT 1.365000  0.085000 1.745000 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
@@ -93,30 +83,37 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.445000 1.835000 1.725000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.305000 0.355000 0.655000 ;
-      RECT 0.100000 0.655000 1.765000 0.825000 ;
-      RECT 0.105000 1.495000 0.430000 1.785000 ;
-      RECT 0.105000 1.785000 1.275000 1.955000 ;
-      RECT 1.025000 0.305000 1.195000 0.655000 ;
-      RECT 1.105000 1.495000 1.765000 1.665000 ;
-      RECT 1.105000 1.665000 1.275000 1.785000 ;
-      RECT 1.595000 0.825000 1.765000 0.995000 ;
-      RECT 1.595000 0.995000 1.870000 1.325000 ;
-      RECT 1.595000 1.325000 1.765000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.100000  0.305000 0.355000 0.655000 ;
+      RECT 0.100000  0.655000 1.765000 0.825000 ;
+      RECT 0.105000  1.495000 0.430000 1.785000 ;
+      RECT 0.105000  1.785000 1.275000 1.955000 ;
+      RECT 0.525000  0.085000 0.855000 0.485000 ;
+      RECT 1.025000  0.305000 1.195000 0.655000 ;
+      RECT 1.105000  1.495000 1.765000 1.665000 ;
+      RECT 1.105000  1.665000 1.275000 1.785000 ;
+      RECT 1.365000  0.085000 1.745000 0.485000 ;
+      RECT 1.445000  1.835000 1.725000 2.635000 ;
+      RECT 1.595000  0.825000 1.765000 0.995000 ;
+      RECT 1.595000  0.995000 1.870000 1.325000 ;
+      RECT 1.595000  1.325000 1.765000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
 END sky130_fd_sc_hd__or3_1
diff --git a/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
index bf400c1..9b9eee5 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_2.magic.lef
@@ -74,18 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.530000  0.085000 0.860000 0.485000 ;
-        RECT 1.370000  0.085000 1.750000 0.485000 ;
-        RECT 2.385000  0.085000 2.675000 0.915000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -95,32 +83,41 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 1.450000 1.835000 1.730000 2.635000 ;
-        RECT 2.385000 1.430000 2.675000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.305000 0.360000 0.655000 ;
-      RECT 0.105000 0.655000 1.770000 0.825000 ;
-      RECT 0.105000 1.495000 0.435000 1.785000 ;
-      RECT 0.105000 1.785000 1.270000 1.955000 ;
-      RECT 1.030000 0.305000 1.200000 0.655000 ;
-      RECT 1.100000 1.495000 1.770000 1.665000 ;
-      RECT 1.100000 1.665000 1.270000 1.785000 ;
-      RECT 1.600000 0.825000 1.770000 0.995000 ;
-      RECT 1.600000 0.995000 1.875000 1.325000 ;
-      RECT 1.600000 1.325000 1.770000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.105000  0.305000 0.360000 0.655000 ;
+      RECT 0.105000  0.655000 1.770000 0.825000 ;
+      RECT 0.105000  1.495000 0.435000 1.785000 ;
+      RECT 0.105000  1.785000 1.270000 1.955000 ;
+      RECT 0.530000  0.085000 0.860000 0.485000 ;
+      RECT 1.030000  0.305000 1.200000 0.655000 ;
+      RECT 1.100000  1.495000 1.770000 1.665000 ;
+      RECT 1.100000  1.665000 1.270000 1.785000 ;
+      RECT 1.370000  0.085000 1.750000 0.485000 ;
+      RECT 1.450000  1.835000 1.730000 2.635000 ;
+      RECT 1.600000  0.825000 1.770000 0.995000 ;
+      RECT 1.600000  0.995000 1.875000 1.325000 ;
+      RECT 1.600000  1.325000 1.770000 1.495000 ;
+      RECT 2.385000  0.085000 2.675000 0.915000 ;
+      RECT 2.385000  1.430000 2.675000 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
 END sky130_fd_sc_hd__or3_2
diff --git a/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
index a299d9e..482ddb2 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hd__or3_4.magic.lef
@@ -78,22 +78,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.555000 ;
-        RECT 1.435000  0.085000 2.135000 0.555000 ;
-        RECT 2.805000  0.085000 2.975000 0.555000 ;
-        RECT 3.645000  0.085000 3.815000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -103,36 +87,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 1.435000 1.835000 2.135000 2.635000 ;
-        RECT 2.765000 1.795000 3.015000 2.635000 ;
-        RECT 3.605000 1.795000 3.855000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 0.725000 ;
-      RECT 0.085000 0.725000 2.090000 0.905000 ;
-      RECT 0.085000 1.495000 0.425000 2.295000 ;
-      RECT 0.085000 2.295000 1.265000 2.465000 ;
-      RECT 0.935000 0.255000 1.265000 0.725000 ;
-      RECT 1.000000 1.495000 2.090000 1.665000 ;
-      RECT 1.000000 1.665000 1.265000 2.295000 ;
-      RECT 1.870000 0.905000 2.090000 1.075000 ;
-      RECT 1.870000 1.075000 3.595000 1.245000 ;
-      RECT 1.870000 1.245000 2.090000 1.495000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.255000 0.425000 0.725000 ;
+      RECT 0.085000  0.725000 2.090000 0.905000 ;
+      RECT 0.085000  1.495000 0.425000 2.295000 ;
+      RECT 0.085000  2.295000 1.265000 2.465000 ;
+      RECT 0.595000  0.085000 0.765000 0.555000 ;
+      RECT 0.935000  0.255000 1.265000 0.725000 ;
+      RECT 1.000000  1.495000 2.090000 1.665000 ;
+      RECT 1.000000  1.665000 1.265000 2.295000 ;
+      RECT 1.435000  0.085000 2.135000 0.555000 ;
+      RECT 1.435000  1.835000 2.135000 2.635000 ;
+      RECT 1.870000  0.905000 2.090000 1.075000 ;
+      RECT 1.870000  1.075000 3.595000 1.245000 ;
+      RECT 1.870000  1.245000 2.090000 1.495000 ;
+      RECT 2.765000  1.795000 3.015000 2.635000 ;
+      RECT 2.805000  0.085000 2.975000 0.555000 ;
+      RECT 3.605000  1.795000 3.855000 2.635000 ;
+      RECT 3.645000  0.085000 3.815000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__or3_4
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
index a5ec6fa..9111980 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_1.magic.lef
@@ -74,19 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.905000 ;
-        RECT 1.455000  0.085000 1.785000 0.485000 ;
-        RECT 2.295000  0.085000 2.670000 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
@@ -96,37 +83,47 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 2.370000 1.835000 2.650000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.485000 0.845000 0.905000 ;
-      RECT 0.595000 0.905000 0.845000 0.995000 ;
-      RECT 0.595000 0.995000 1.310000 1.325000 ;
-      RECT 0.595000 1.325000 0.765000 1.885000 ;
-      RECT 1.025000 0.255000 1.285000 0.655000 ;
-      RECT 1.025000 0.655000 2.690000 0.825000 ;
-      RECT 1.025000 1.495000 1.355000 1.785000 ;
-      RECT 1.025000 1.785000 2.200000 1.955000 ;
-      RECT 1.955000 0.305000 2.125000 0.655000 ;
-      RECT 2.030000 1.495000 2.690000 1.665000 ;
-      RECT 2.030000 1.665000 2.200000 1.785000 ;
-      RECT 2.520000 0.825000 2.690000 0.995000 ;
-      RECT 2.520000 0.995000 2.795000 1.325000 ;
-      RECT 2.520000 1.325000 2.690000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.905000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.515000  0.485000 0.845000 0.905000 ;
+      RECT 0.595000  0.905000 0.845000 0.995000 ;
+      RECT 0.595000  0.995000 1.310000 1.325000 ;
+      RECT 0.595000  1.325000 0.765000 1.885000 ;
+      RECT 1.025000  0.255000 1.285000 0.655000 ;
+      RECT 1.025000  0.655000 2.690000 0.825000 ;
+      RECT 1.025000  1.495000 1.355000 1.785000 ;
+      RECT 1.025000  1.785000 2.200000 1.955000 ;
+      RECT 1.455000  0.085000 1.785000 0.485000 ;
+      RECT 1.955000  0.305000 2.125000 0.655000 ;
+      RECT 2.030000  1.495000 2.690000 1.665000 ;
+      RECT 2.030000  1.665000 2.200000 1.785000 ;
+      RECT 2.295000  0.085000 2.670000 0.485000 ;
+      RECT 2.370000  1.835000 2.650000 2.635000 ;
+      RECT 2.520000  0.825000 2.690000 0.995000 ;
+      RECT 2.520000  0.995000 2.795000 1.325000 ;
+      RECT 2.520000  1.325000 2.690000 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
 END sky130_fd_sc_hd__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
index af4742b..60c1ddd 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_2.magic.lef
@@ -73,19 +73,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.565000 ;
-        RECT 1.520000  0.085000 1.690000 0.565000 ;
-        RECT 2.330000  0.085000 2.660000 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
@@ -95,44 +82,54 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.550000 2.210000 0.910000 2.635000 ;
-        RECT 1.425000 2.210000 1.755000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.290000 0.345000 0.735000 ;
-      RECT 0.085000 0.735000 0.765000 0.905000 ;
-      RECT 0.085000 1.810000 0.765000 1.870000 ;
-      RECT 0.085000 1.870000 2.660000 1.955000 ;
-      RECT 0.085000 1.955000 1.720000 2.040000 ;
-      RECT 0.085000 2.040000 0.345000 2.220000 ;
-      RECT 0.595000 0.905000 0.765000 1.810000 ;
-      RECT 1.275000 0.765000 3.135000 0.825000 ;
-      RECT 1.275000 0.825000 2.160000 0.905000 ;
-      RECT 1.275000 0.905000 1.595000 0.935000 ;
-      RECT 1.275000 0.935000 1.445000 1.325000 ;
-      RECT 1.425000 0.735000 3.135000 0.765000 ;
-      RECT 1.550000 1.785000 2.660000 1.870000 ;
-      RECT 1.990000 0.305000 2.160000 0.655000 ;
-      RECT 1.990000 0.655000 3.135000 0.735000 ;
-      RECT 2.490000 0.995000 2.790000 1.325000 ;
-      RECT 2.490000 1.325000 2.660000 1.785000 ;
-      RECT 2.830000 0.305000 3.085000 0.605000 ;
-      RECT 2.830000 0.605000 3.135000 0.655000 ;
-      RECT 2.830000 1.495000 3.135000 1.925000 ;
-      RECT 2.965000 0.825000 3.135000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.290000 0.345000 0.735000 ;
+      RECT 0.085000  0.735000 0.765000 0.905000 ;
+      RECT 0.085000  1.810000 0.765000 1.870000 ;
+      RECT 0.085000  1.870000 2.660000 1.955000 ;
+      RECT 0.085000  1.955000 1.720000 2.040000 ;
+      RECT 0.085000  2.040000 0.345000 2.220000 ;
+      RECT 0.550000  2.210000 0.910000 2.635000 ;
+      RECT 0.595000  0.085000 0.765000 0.565000 ;
+      RECT 0.595000  0.905000 0.765000 1.810000 ;
+      RECT 1.275000  0.765000 3.135000 0.825000 ;
+      RECT 1.275000  0.825000 2.160000 0.905000 ;
+      RECT 1.275000  0.905000 1.595000 0.935000 ;
+      RECT 1.275000  0.935000 1.445000 1.325000 ;
+      RECT 1.425000  0.735000 3.135000 0.765000 ;
+      RECT 1.425000  2.210000 1.755000 2.635000 ;
+      RECT 1.520000  0.085000 1.690000 0.565000 ;
+      RECT 1.550000  1.785000 2.660000 1.870000 ;
+      RECT 1.990000  0.305000 2.160000 0.655000 ;
+      RECT 1.990000  0.655000 3.135000 0.735000 ;
+      RECT 2.330000  0.085000 2.660000 0.485000 ;
+      RECT 2.490000  0.995000 2.790000 1.325000 ;
+      RECT 2.490000  1.325000 2.660000 1.785000 ;
+      RECT 2.830000  0.305000 3.085000 0.605000 ;
+      RECT 2.830000  0.605000 3.135000 0.655000 ;
+      RECT 2.830000  1.495000 3.135000 1.925000 ;
+      RECT 2.965000  0.825000 3.135000 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
 END sky130_fd_sc_hd__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
index d6afe32..4e935c5 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_4.magic.lef
@@ -77,22 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.620000  0.085000 0.790000 0.565000 ;
-        RECT 1.500000  0.085000 1.670000 0.565000 ;
-        RECT 2.260000  0.085000 2.590000 0.485000 ;
-        RECT 3.100000  0.085000 3.490000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -102,44 +86,57 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.550000 2.210000 0.910000 2.635000 ;
-        RECT 1.420000 2.210000 1.750000 2.635000 ;
-        RECT 2.255000 2.210000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.290000 0.345000 0.735000 ;
-      RECT 0.085000 0.735000 0.765000 0.905000 ;
-      RECT 0.085000 1.810000 0.765000 1.870000 ;
-      RECT 0.085000 1.870000 3.620000 2.040000 ;
-      RECT 0.085000 2.040000 0.345000 2.220000 ;
-      RECT 0.595000 0.905000 0.765000 1.810000 ;
-      RECT 1.275000 1.075000 2.365000 1.245000 ;
-      RECT 2.195000 0.720000 4.055000 0.825000 ;
-      RECT 2.195000 0.825000 2.400000 0.890000 ;
-      RECT 2.195000 0.890000 2.365000 1.075000 ;
-      RECT 2.250000 0.655000 4.055000 0.720000 ;
-      RECT 2.760000 0.305000 2.930000 0.655000 ;
-      RECT 3.390000 0.995000 3.680000 1.325000 ;
-      RECT 3.390000 1.325000 3.620000 1.870000 ;
-      RECT 3.520000 2.210000 4.055000 2.425000 ;
-      RECT 3.660000 0.305000 3.915000 0.605000 ;
-      RECT 3.660000 0.605000 4.055000 0.655000 ;
-      RECT 3.850000 0.825000 4.055000 2.210000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.290000 0.345000 0.735000 ;
+      RECT 0.085000  0.735000 0.765000 0.905000 ;
+      RECT 0.085000  1.810000 0.765000 1.870000 ;
+      RECT 0.085000  1.870000 3.620000 2.040000 ;
+      RECT 0.085000  2.040000 0.345000 2.220000 ;
+      RECT 0.550000  2.210000 0.910000 2.635000 ;
+      RECT 0.595000  0.905000 0.765000 1.810000 ;
+      RECT 0.620000  0.085000 0.790000 0.565000 ;
+      RECT 1.275000  1.075000 2.365000 1.245000 ;
+      RECT 1.420000  2.210000 1.750000 2.635000 ;
+      RECT 1.500000  0.085000 1.670000 0.565000 ;
+      RECT 2.195000  0.720000 4.055000 0.825000 ;
+      RECT 2.195000  0.825000 2.400000 0.890000 ;
+      RECT 2.195000  0.890000 2.365000 1.075000 ;
+      RECT 2.250000  0.655000 4.055000 0.720000 ;
+      RECT 2.255000  2.210000 2.595000 2.635000 ;
+      RECT 2.260000  0.085000 2.590000 0.485000 ;
+      RECT 2.760000  0.305000 2.930000 0.655000 ;
+      RECT 3.100000  0.085000 3.490000 0.485000 ;
+      RECT 3.390000  0.995000 3.680000 1.325000 ;
+      RECT 3.390000  1.325000 3.620000 1.870000 ;
+      RECT 3.520000  2.210000 4.055000 2.425000 ;
+      RECT 3.660000  0.305000 3.915000 0.605000 ;
+      RECT 3.660000  0.605000 4.055000 0.655000 ;
+      RECT 3.850000  0.825000 4.055000 2.210000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__or3b_4
diff --git a/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
index de33c0e..cf39c7d 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_1.magic.lef
@@ -82,18 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.585000 ;
-        RECT 0.995000  0.085000 1.325000 0.485000 ;
-        RECT 1.835000  0.085000 2.215000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -103,31 +91,40 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 1.915000 1.835000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.495000 0.410000 1.785000 ;
-      RECT 0.090000 1.785000 1.680000 1.955000 ;
-      RECT 0.625000 0.305000 0.795000 0.655000 ;
-      RECT 0.625000 0.655000 2.235000 0.825000 ;
-      RECT 1.495000 0.305000 1.665000 0.655000 ;
-      RECT 1.510000 1.495000 2.235000 1.665000 ;
-      RECT 1.510000 1.665000 1.680000 1.785000 ;
-      RECT 2.065000 0.825000 2.235000 0.995000 ;
-      RECT 2.065000 0.995000 2.335000 1.325000 ;
-      RECT 2.065000 1.325000 2.235000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  1.495000 0.410000 1.785000 ;
+      RECT 0.090000  1.785000 1.680000 1.955000 ;
+      RECT 0.095000  0.085000 0.425000 0.585000 ;
+      RECT 0.625000  0.305000 0.795000 0.655000 ;
+      RECT 0.625000  0.655000 2.235000 0.825000 ;
+      RECT 0.995000  0.085000 1.325000 0.485000 ;
+      RECT 1.495000  0.305000 1.665000 0.655000 ;
+      RECT 1.510000  1.495000 2.235000 1.665000 ;
+      RECT 1.510000  1.665000 1.680000 1.785000 ;
+      RECT 1.835000  0.085000 2.215000 0.485000 ;
+      RECT 1.915000  1.835000 2.195000 2.635000 ;
+      RECT 2.065000  0.825000 2.235000 0.995000 ;
+      RECT 2.065000  0.995000 2.335000 1.325000 ;
+      RECT 2.065000  1.325000 2.235000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
 END sky130_fd_sc_hd__or4_1
diff --git a/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
index 8be5bcf..4c3dce3 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_2.magic.lef
@@ -82,20 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.585000 ;
-        RECT 0.995000  0.085000 1.325000 0.485000 ;
-        RECT 1.835000  0.085000 2.215000 0.485000 ;
-        RECT 2.850000  0.085000 3.020000 1.000000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -105,33 +91,44 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.915000 1.835000 2.195000 2.635000 ;
-        RECT 2.850000 1.455000 3.020000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.495000 0.410000 1.785000 ;
-      RECT 0.085000 1.785000 1.680000 1.955000 ;
-      RECT 0.625000 0.305000 0.795000 0.655000 ;
-      RECT 0.625000 0.655000 2.235000 0.825000 ;
-      RECT 1.495000 0.305000 1.665000 0.655000 ;
-      RECT 1.510000 1.495000 2.235000 1.665000 ;
-      RECT 1.510000 1.665000 1.680000 1.785000 ;
-      RECT 2.065000 0.825000 2.235000 0.995000 ;
-      RECT 2.065000 0.995000 2.340000 1.325000 ;
-      RECT 2.065000 1.325000 2.235000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.495000 0.410000 1.785000 ;
+      RECT 0.085000  1.785000 1.680000 1.955000 ;
+      RECT 0.090000  0.085000 0.425000 0.585000 ;
+      RECT 0.625000  0.305000 0.795000 0.655000 ;
+      RECT 0.625000  0.655000 2.235000 0.825000 ;
+      RECT 0.995000  0.085000 1.325000 0.485000 ;
+      RECT 1.495000  0.305000 1.665000 0.655000 ;
+      RECT 1.510000  1.495000 2.235000 1.665000 ;
+      RECT 1.510000  1.665000 1.680000 1.785000 ;
+      RECT 1.835000  0.085000 2.215000 0.485000 ;
+      RECT 1.915000  1.835000 2.195000 2.635000 ;
+      RECT 2.065000  0.825000 2.235000 0.995000 ;
+      RECT 2.065000  0.995000 2.340000 1.325000 ;
+      RECT 2.065000  1.325000 2.235000 1.495000 ;
+      RECT 2.850000  0.085000 3.020000 1.000000 ;
+      RECT 2.850000  1.455000 3.020000 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
 END sky130_fd_sc_hd__or4_2
diff --git a/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
index 6712e79..00feb91 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hd__or4_4.magic.lef
@@ -90,23 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.120000  0.085000 0.370000 0.585000 ;
-        RECT 1.070000  0.085000 1.400000 0.485000 ;
-        RECT 1.960000  0.085000 2.340000 0.485000 ;
-        RECT 2.940000  0.085000 3.110000 0.555000 ;
-        RECT 3.780000  0.085000 3.950000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -116,34 +99,48 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 2.005000 1.795000 2.255000 2.635000 ;
-        RECT 2.900000 1.795000 3.150000 2.635000 ;
-        RECT 3.740000 1.795000 3.990000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.495000 0.710000 1.665000 ;
-      RECT 0.115000 1.665000 0.450000 2.450000 ;
-      RECT 0.540000 0.655000 2.350000 0.825000 ;
-      RECT 0.540000 0.825000 0.710000 1.495000 ;
-      RECT 0.700000 0.305000 0.870000 0.655000 ;
-      RECT 1.570000 0.305000 1.740000 0.655000 ;
-      RECT 2.180000 0.825000 2.350000 1.075000 ;
-      RECT 2.180000 1.075000 3.640000 1.245000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.115000  1.495000 0.710000 1.665000 ;
+      RECT 0.115000  1.665000 0.450000 2.450000 ;
+      RECT 0.120000  0.085000 0.370000 0.585000 ;
+      RECT 0.540000  0.655000 2.350000 0.825000 ;
+      RECT 0.540000  0.825000 0.710000 1.495000 ;
+      RECT 0.700000  0.305000 0.870000 0.655000 ;
+      RECT 1.070000  0.085000 1.400000 0.485000 ;
+      RECT 1.570000  0.305000 1.740000 0.655000 ;
+      RECT 1.960000  0.085000 2.340000 0.485000 ;
+      RECT 2.005000  1.795000 2.255000 2.635000 ;
+      RECT 2.180000  0.825000 2.350000 1.075000 ;
+      RECT 2.180000  1.075000 3.640000 1.245000 ;
+      RECT 2.900000  1.795000 3.150000 2.635000 ;
+      RECT 2.940000  0.085000 3.110000 0.555000 ;
+      RECT 3.740000  1.795000 3.990000 2.635000 ;
+      RECT 3.780000  0.085000 3.950000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__or4_4
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
index a8bd79c..c3199dd 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_1.magic.lef
@@ -82,21 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 0.425000 0.585000 ;
-        RECT 1.035000  0.085000 1.365000 0.585000 ;
-        RECT 1.910000  0.085000 2.240000 0.485000 ;
-        RECT 2.750000  0.085000 3.130000 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
@@ -106,37 +91,49 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.560000 0.425000 2.635000 ;
-        RECT 2.830000 1.835000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 0.305000 0.840000 0.995000 ;
-      RECT 0.595000 0.995000 1.250000 1.325000 ;
-      RECT 0.595000 1.325000 0.835000 1.920000 ;
-      RECT 1.030000 1.495000 1.350000 1.785000 ;
-      RECT 1.030000 1.785000 2.660000 1.955000 ;
-      RECT 1.565000 0.305000 1.735000 0.655000 ;
-      RECT 1.565000 0.655000 3.150000 0.825000 ;
-      RECT 2.410000 0.305000 2.580000 0.655000 ;
-      RECT 2.490000 1.495000 3.150000 1.665000 ;
-      RECT 2.490000 1.665000 2.660000 1.785000 ;
-      RECT 2.980000 0.825000 3.150000 0.995000 ;
-      RECT 2.980000 0.995000 3.255000 1.325000 ;
-      RECT 2.980000 1.325000 3.150000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 0.425000 0.585000 ;
+      RECT 0.085000  1.560000 0.425000 2.635000 ;
+      RECT 0.595000  0.305000 0.840000 0.995000 ;
+      RECT 0.595000  0.995000 1.250000 1.325000 ;
+      RECT 0.595000  1.325000 0.835000 1.920000 ;
+      RECT 1.030000  1.495000 1.350000 1.785000 ;
+      RECT 1.030000  1.785000 2.660000 1.955000 ;
+      RECT 1.035000  0.085000 1.365000 0.585000 ;
+      RECT 1.565000  0.305000 1.735000 0.655000 ;
+      RECT 1.565000  0.655000 3.150000 0.825000 ;
+      RECT 1.910000  0.085000 2.240000 0.485000 ;
+      RECT 2.410000  0.305000 2.580000 0.655000 ;
+      RECT 2.490000  1.495000 3.150000 1.665000 ;
+      RECT 2.490000  1.665000 2.660000 1.785000 ;
+      RECT 2.750000  0.085000 3.130000 0.485000 ;
+      RECT 2.830000  1.835000 3.110000 2.635000 ;
+      RECT 2.980000  0.825000 3.150000 0.995000 ;
+      RECT 2.980000  0.995000 3.255000 1.325000 ;
+      RECT 2.980000  1.325000 3.150000 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
 END sky130_fd_sc_hd__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
index 54c1bc7..3cdf40b 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_2.magic.lef
@@ -84,21 +84,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.630000  0.085000 0.800000 0.565000 ;
-        RECT 1.435000  0.085000 1.815000 0.485000 ;
-        RECT 2.385000  0.085000 2.715000 0.485000 ;
-        RECT 3.225000  0.085000 3.555000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -108,51 +93,63 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.335000 0.845000 2.635000 ;
-        RECT 1.480000 2.335000 1.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.325000 0.350000 0.735000 ;
-      RECT 0.085000 0.735000 0.765000 0.905000 ;
-      RECT 0.085000 1.605000 0.765000 1.890000 ;
-      RECT 0.510000 1.890000 0.765000 1.995000 ;
-      RECT 0.510000 1.995000 1.715000 2.165000 ;
-      RECT 0.595000 0.905000 0.765000 1.605000 ;
-      RECT 1.290000 0.995000 1.585000 1.325000 ;
-      RECT 1.415000 0.735000 3.055000 0.905000 ;
-      RECT 1.415000 0.905000 1.585000 0.995000 ;
-      RECT 1.415000 1.325000 1.585000 1.355000 ;
-      RECT 1.415000 1.355000 1.600000 1.370000 ;
-      RECT 1.415000 1.370000 1.610000 1.380000 ;
-      RECT 1.415000 1.380000 1.620000 1.390000 ;
-      RECT 1.415000 1.390000 1.625000 1.400000 ;
-      RECT 1.415000 1.400000 1.630000 1.410000 ;
-      RECT 1.415000 1.410000 1.645000 1.420000 ;
-      RECT 1.415000 1.420000 1.655000 1.425000 ;
-      RECT 1.415000 1.425000 1.665000 1.445000 ;
-      RECT 1.415000 1.445000 3.560000 1.450000 ;
-      RECT 1.420000 1.450000 3.560000 1.615000 ;
-      RECT 1.440000 1.785000 3.030000 1.955000 ;
-      RECT 1.440000 1.955000 1.715000 1.995000 ;
-      RECT 1.985000 0.305000 2.155000 0.735000 ;
-      RECT 2.860000 1.955000 3.030000 2.215000 ;
-      RECT 2.860000 2.215000 3.345000 2.385000 ;
-      RECT 2.885000 0.305000 3.055000 0.735000 ;
-      RECT 3.225000 1.615000 3.560000 1.815000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.325000 0.350000 0.735000 ;
+      RECT 0.085000  0.735000 0.765000 0.905000 ;
+      RECT 0.085000  1.605000 0.765000 1.890000 ;
+      RECT 0.510000  1.890000 0.765000 1.995000 ;
+      RECT 0.510000  1.995000 1.715000 2.165000 ;
+      RECT 0.515000  2.335000 0.845000 2.635000 ;
+      RECT 0.595000  0.905000 0.765000 1.605000 ;
+      RECT 0.630000  0.085000 0.800000 0.565000 ;
+      RECT 1.290000  0.995000 1.585000 1.325000 ;
+      RECT 1.415000  0.735000 3.055000 0.905000 ;
+      RECT 1.415000  0.905000 1.585000 0.995000 ;
+      RECT 1.415000  1.325000 1.585000 1.355000 ;
+      RECT 1.415000  1.355000 1.600000 1.370000 ;
+      RECT 1.415000  1.370000 1.610000 1.380000 ;
+      RECT 1.415000  1.380000 1.620000 1.390000 ;
+      RECT 1.415000  1.390000 1.625000 1.400000 ;
+      RECT 1.415000  1.400000 1.630000 1.410000 ;
+      RECT 1.415000  1.410000 1.645000 1.420000 ;
+      RECT 1.415000  1.420000 1.655000 1.425000 ;
+      RECT 1.415000  1.425000 1.665000 1.445000 ;
+      RECT 1.415000  1.445000 3.560000 1.450000 ;
+      RECT 1.420000  1.450000 3.560000 1.615000 ;
+      RECT 1.435000  0.085000 1.815000 0.485000 ;
+      RECT 1.440000  1.785000 3.030000 1.955000 ;
+      RECT 1.440000  1.955000 1.715000 1.995000 ;
+      RECT 1.480000  2.335000 1.815000 2.635000 ;
+      RECT 1.985000  0.305000 2.155000 0.735000 ;
+      RECT 2.385000  0.085000 2.715000 0.485000 ;
+      RECT 2.860000  1.955000 3.030000 2.215000 ;
+      RECT 2.860000  2.215000 3.345000 2.385000 ;
+      RECT 2.885000  0.305000 3.055000 0.735000 ;
+      RECT 3.225000  0.085000 3.555000 0.585000 ;
+      RECT 3.225000  1.615000 3.560000 1.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 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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
 END sky130_fd_sc_hd__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
index 14f8832..95c3b80 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_4.magic.lef
@@ -90,26 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.825000 ;
-        RECT 1.035000  0.085000 1.285000 0.585000 ;
-        RECT 1.985000  0.085000 2.315000 0.485000 ;
-        RECT 2.875000  0.085000 3.255000 0.485000 ;
-        RECT 3.855000  0.085000 4.025000 0.555000 ;
-        RECT 4.695000  0.085000 4.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 ;
-        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
@@ -119,42 +99,59 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.085000 2.135000 0.365000 2.635000 ;
-        RECT 2.920000 1.795000 3.170000 2.635000 ;
-        RECT 3.815000 1.795000 4.065000 2.635000 ;
-        RECT 4.655000 1.795000 4.905000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 0.435000 0.785000 0.905000 ;
-      RECT 0.595000 2.065000 0.785000 2.455000 ;
-      RECT 0.615000 0.905000 0.785000 0.995000 ;
-      RECT 0.615000 0.995000 1.215000 1.325000 ;
-      RECT 0.615000 1.325000 0.785000 2.065000 ;
-      RECT 1.035000 1.575000 1.625000 1.745000 ;
-      RECT 1.035000 1.745000 1.365000 2.450000 ;
-      RECT 1.455000 0.655000 3.265000 0.825000 ;
-      RECT 1.455000 0.825000 1.625000 1.575000 ;
-      RECT 1.615000 0.305000 1.785000 0.655000 ;
-      RECT 2.485000 0.305000 2.655000 0.655000 ;
-      RECT 3.095000 0.825000 3.265000 1.075000 ;
-      RECT 3.095000 1.075000 4.555000 1.245000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.825000 ;
+      RECT 0.085000  2.135000 0.365000 2.635000 ;
+      RECT 0.595000  0.435000 0.785000 0.905000 ;
+      RECT 0.595000  2.065000 0.785000 2.455000 ;
+      RECT 0.615000  0.905000 0.785000 0.995000 ;
+      RECT 0.615000  0.995000 1.215000 1.325000 ;
+      RECT 0.615000  1.325000 0.785000 2.065000 ;
+      RECT 1.035000  0.085000 1.285000 0.585000 ;
+      RECT 1.035000  1.575000 1.625000 1.745000 ;
+      RECT 1.035000  1.745000 1.365000 2.450000 ;
+      RECT 1.455000  0.655000 3.265000 0.825000 ;
+      RECT 1.455000  0.825000 1.625000 1.575000 ;
+      RECT 1.615000  0.305000 1.785000 0.655000 ;
+      RECT 1.985000  0.085000 2.315000 0.485000 ;
+      RECT 2.485000  0.305000 2.655000 0.655000 ;
+      RECT 2.875000  0.085000 3.255000 0.485000 ;
+      RECT 2.920000  1.795000 3.170000 2.635000 ;
+      RECT 3.095000  0.825000 3.265000 1.075000 ;
+      RECT 3.095000  1.075000 4.555000 1.245000 ;
+      RECT 3.815000  1.795000 4.065000 2.635000 ;
+      RECT 3.855000  0.085000 4.025000 0.555000 ;
+      RECT 4.655000  1.795000 4.905000 2.635000 ;
+      RECT 4.695000  0.085000 4.865000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
 END sky130_fd_sc_hd__or4b_4
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
index c905e94..7ab9e5c 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.magic.lef
@@ -82,22 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.655000  0.085000 0.825000 0.825000 ;
-        RECT 1.470000  0.085000 1.845000 0.485000 ;
-        RECT 2.370000  0.085000 2.700000 0.485000 ;
-        RECT 3.210000  0.085000 3.590000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -107,49 +91,62 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.205000 0.845000 2.635000 ;
-        RECT 3.290000 1.835000 3.570000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.400000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.865000 ;
-      RECT 0.085000 1.865000 1.915000 2.035000 ;
-      RECT 0.085000 2.035000 0.345000 2.455000 ;
-      RECT 0.990000 1.525000 1.575000 1.695000 ;
-      RECT 1.075000 0.450000 1.245000 0.655000 ;
-      RECT 1.075000 0.655000 1.575000 0.825000 ;
-      RECT 1.405000 0.825000 1.575000 1.075000 ;
-      RECT 1.405000 1.075000 1.830000 1.245000 ;
-      RECT 1.405000 1.245000 1.575000 1.525000 ;
-      RECT 1.510000 2.205000 2.255000 2.375000 ;
-      RECT 1.745000 1.415000 2.395000 1.585000 ;
-      RECT 1.745000 1.585000 1.915000 1.865000 ;
-      RECT 2.015000 0.305000 2.185000 0.655000 ;
-      RECT 2.015000 0.655000 3.610000 0.825000 ;
-      RECT 2.085000 1.785000 3.120000 1.955000 ;
-      RECT 2.085000 1.955000 2.255000 2.205000 ;
-      RECT 2.225000 0.995000 2.395000 1.415000 ;
-      RECT 2.870000 0.305000 3.040000 0.655000 ;
-      RECT 2.950000 1.495000 3.610000 1.665000 ;
-      RECT 2.950000 1.665000 3.120000 1.785000 ;
-      RECT 3.440000 0.825000 3.610000 0.995000 ;
-      RECT 3.440000 0.995000 3.715000 1.325000 ;
-      RECT 3.440000 1.325000 3.610000 1.495000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.450000 0.400000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.865000 ;
+      RECT 0.085000  1.865000 1.915000 2.035000 ;
+      RECT 0.085000  2.035000 0.345000 2.455000 ;
+      RECT 0.515000  2.205000 0.845000 2.635000 ;
+      RECT 0.655000  0.085000 0.825000 0.825000 ;
+      RECT 0.990000  1.525000 1.575000 1.695000 ;
+      RECT 1.075000  0.450000 1.245000 0.655000 ;
+      RECT 1.075000  0.655000 1.575000 0.825000 ;
+      RECT 1.405000  0.825000 1.575000 1.075000 ;
+      RECT 1.405000  1.075000 1.830000 1.245000 ;
+      RECT 1.405000  1.245000 1.575000 1.525000 ;
+      RECT 1.470000  0.085000 1.845000 0.485000 ;
+      RECT 1.510000  2.205000 2.255000 2.375000 ;
+      RECT 1.745000  1.415000 2.395000 1.585000 ;
+      RECT 1.745000  1.585000 1.915000 1.865000 ;
+      RECT 2.015000  0.305000 2.185000 0.655000 ;
+      RECT 2.015000  0.655000 3.610000 0.825000 ;
+      RECT 2.085000  1.785000 3.120000 1.955000 ;
+      RECT 2.085000  1.955000 2.255000 2.205000 ;
+      RECT 2.225000  0.995000 2.395000 1.415000 ;
+      RECT 2.370000  0.085000 2.700000 0.485000 ;
+      RECT 2.870000  0.305000 3.040000 0.655000 ;
+      RECT 2.950000  1.495000 3.610000 1.665000 ;
+      RECT 2.950000  1.665000 3.120000 1.785000 ;
+      RECT 3.210000  0.085000 3.590000 0.485000 ;
+      RECT 3.290000  1.835000 3.570000 2.635000 ;
+      RECT 3.440000  0.825000 3.610000 0.995000 ;
+      RECT 3.440000  0.995000 3.715000 1.325000 ;
+      RECT 3.440000  1.325000 3.610000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
 END sky130_fd_sc_hd__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
index 0c81aa7..803f248 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.magic.lef
@@ -82,24 +82,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.660000  0.085000 0.830000 0.825000 ;
-        RECT 1.495000  0.085000 1.850000 0.485000 ;
-        RECT 2.395000  0.085000 2.725000 0.485000 ;
-        RECT 3.235000  0.085000 3.615000 0.485000 ;
-        RECT 4.250000  0.085000 4.420000 1.025000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -109,51 +91,66 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.515000 2.205000 0.845000 2.635000 ;
-        RECT 3.315000 1.835000 3.595000 2.635000 ;
-        RECT 4.250000 1.440000 4.420000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.405000 0.825000 ;
-      RECT 0.085000 0.825000 0.260000 1.865000 ;
-      RECT 0.085000 1.865000 1.940000 2.035000 ;
-      RECT 0.085000 2.035000 0.345000 2.455000 ;
-      RECT 0.995000 1.525000 1.600000 1.695000 ;
-      RECT 1.080000 0.450000 1.250000 0.655000 ;
-      RECT 1.080000 0.655000 1.600000 0.825000 ;
-      RECT 1.410000 0.825000 1.600000 1.075000 ;
-      RECT 1.410000 1.075000 1.855000 1.245000 ;
-      RECT 1.410000 1.245000 1.600000 1.525000 ;
-      RECT 1.535000 2.205000 2.280000 2.375000 ;
-      RECT 1.770000 1.415000 2.420000 1.585000 ;
-      RECT 1.770000 1.585000 1.940000 1.865000 ;
-      RECT 2.025000 0.305000 2.195000 0.655000 ;
-      RECT 2.025000 0.655000 3.635000 0.825000 ;
-      RECT 2.110000 1.785000 3.145000 1.955000 ;
-      RECT 2.110000 1.955000 2.280000 2.205000 ;
-      RECT 2.250000 0.995000 2.420000 1.415000 ;
-      RECT 2.895000 0.305000 3.065000 0.655000 ;
-      RECT 2.975000 1.495000 3.635000 1.665000 ;
-      RECT 2.975000 1.665000 3.145000 1.785000 ;
-      RECT 3.465000 0.825000 3.635000 0.995000 ;
-      RECT 3.465000 0.995000 3.740000 1.325000 ;
-      RECT 3.465000 1.325000 3.635000 1.495000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.450000 0.405000 0.825000 ;
+      RECT 0.085000  0.825000 0.260000 1.865000 ;
+      RECT 0.085000  1.865000 1.940000 2.035000 ;
+      RECT 0.085000  2.035000 0.345000 2.455000 ;
+      RECT 0.515000  2.205000 0.845000 2.635000 ;
+      RECT 0.660000  0.085000 0.830000 0.825000 ;
+      RECT 0.995000  1.525000 1.600000 1.695000 ;
+      RECT 1.080000  0.450000 1.250000 0.655000 ;
+      RECT 1.080000  0.655000 1.600000 0.825000 ;
+      RECT 1.410000  0.825000 1.600000 1.075000 ;
+      RECT 1.410000  1.075000 1.855000 1.245000 ;
+      RECT 1.410000  1.245000 1.600000 1.525000 ;
+      RECT 1.495000  0.085000 1.850000 0.485000 ;
+      RECT 1.535000  2.205000 2.280000 2.375000 ;
+      RECT 1.770000  1.415000 2.420000 1.585000 ;
+      RECT 1.770000  1.585000 1.940000 1.865000 ;
+      RECT 2.025000  0.305000 2.195000 0.655000 ;
+      RECT 2.025000  0.655000 3.635000 0.825000 ;
+      RECT 2.110000  1.785000 3.145000 1.955000 ;
+      RECT 2.110000  1.955000 2.280000 2.205000 ;
+      RECT 2.250000  0.995000 2.420000 1.415000 ;
+      RECT 2.395000  0.085000 2.725000 0.485000 ;
+      RECT 2.895000  0.305000 3.065000 0.655000 ;
+      RECT 2.975000  1.495000 3.635000 1.665000 ;
+      RECT 2.975000  1.665000 3.145000 1.785000 ;
+      RECT 3.235000  0.085000 3.615000 0.485000 ;
+      RECT 3.315000  1.835000 3.595000 2.635000 ;
+      RECT 3.465000  0.825000 3.635000 0.995000 ;
+      RECT 3.465000  0.995000 3.740000 1.325000 ;
+      RECT 3.465000  1.325000 3.635000 1.495000 ;
+      RECT 4.250000  0.085000 4.420000 1.025000 ;
+      RECT 4.250000  1.440000 4.420000 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
 END sky130_fd_sc_hd__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
index 4e4f8a9..f0205a3 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.magic.lef
@@ -89,27 +89,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.655000  0.085000 0.825000 0.825000 ;
-        RECT 1.515000  0.085000 1.845000 0.480000 ;
-        RECT 2.465000  0.085000 2.795000 0.485000 ;
-        RECT 3.355000  0.085000 3.735000 0.485000 ;
-        RECT 4.335000  0.085000 4.505000 0.555000 ;
-        RECT 5.175000  0.085000 5.345000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -119,50 +98,68 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 2.205000 0.845000 2.635000 ;
-        RECT 3.400000 1.795000 3.650000 2.635000 ;
-        RECT 4.295000 1.795000 4.545000 2.635000 ;
-        RECT 5.135000 1.795000 5.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 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.400000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.865000 ;
-      RECT 0.085000 1.865000 1.295000 2.035000 ;
-      RECT 0.085000 2.035000 0.345000 2.455000 ;
-      RECT 0.990000 1.525000 1.595000 1.695000 ;
-      RECT 1.075000 0.450000 1.245000 0.655000 ;
-      RECT 1.075000 0.655000 1.595000 0.825000 ;
-      RECT 1.125000 2.035000 1.295000 2.295000 ;
-      RECT 1.125000 2.295000 2.445000 2.465000 ;
-      RECT 1.405000 0.825000 1.595000 0.995000 ;
-      RECT 1.405000 0.995000 1.695000 1.325000 ;
-      RECT 1.405000 1.325000 1.595000 1.525000 ;
-      RECT 1.510000 1.955000 2.105000 2.125000 ;
-      RECT 1.935000 0.655000 3.745000 0.825000 ;
-      RECT 1.935000 0.825000 2.105000 1.955000 ;
-      RECT 2.095000 0.305000 2.265000 0.655000 ;
-      RECT 2.275000 0.995000 2.445000 2.295000 ;
-      RECT 2.965000 0.305000 3.135000 0.655000 ;
-      RECT 3.575000 0.825000 3.745000 1.075000 ;
-      RECT 3.575000 1.075000 5.035000 1.245000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.450000 0.400000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.865000 ;
+      RECT 0.085000  1.865000 1.295000 2.035000 ;
+      RECT 0.085000  2.035000 0.345000 2.455000 ;
+      RECT 0.515000  2.205000 0.845000 2.635000 ;
+      RECT 0.655000  0.085000 0.825000 0.825000 ;
+      RECT 0.990000  1.525000 1.595000 1.695000 ;
+      RECT 1.075000  0.450000 1.245000 0.655000 ;
+      RECT 1.075000  0.655000 1.595000 0.825000 ;
+      RECT 1.125000  2.035000 1.295000 2.295000 ;
+      RECT 1.125000  2.295000 2.445000 2.465000 ;
+      RECT 1.405000  0.825000 1.595000 0.995000 ;
+      RECT 1.405000  0.995000 1.695000 1.325000 ;
+      RECT 1.405000  1.325000 1.595000 1.525000 ;
+      RECT 1.510000  1.955000 2.105000 2.125000 ;
+      RECT 1.515000  0.085000 1.845000 0.480000 ;
+      RECT 1.935000  0.655000 3.745000 0.825000 ;
+      RECT 1.935000  0.825000 2.105000 1.955000 ;
+      RECT 2.095000  0.305000 2.265000 0.655000 ;
+      RECT 2.275000  0.995000 2.445000 2.295000 ;
+      RECT 2.465000  0.085000 2.795000 0.485000 ;
+      RECT 2.965000  0.305000 3.135000 0.655000 ;
+      RECT 3.355000  0.085000 3.735000 0.485000 ;
+      RECT 3.400000  1.795000 3.650000 2.635000 ;
+      RECT 3.575000  0.825000 3.745000 1.075000 ;
+      RECT 3.575000  1.075000 5.035000 1.245000 ;
+      RECT 4.295000  1.795000 4.545000 2.635000 ;
+      RECT 4.335000  0.085000 4.505000 0.555000 ;
+      RECT 5.135000  1.795000 5.385000 2.635000 ;
+      RECT 5.175000  0.085000 5.345000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
 END sky130_fd_sc_hd__or4bb_4
diff --git a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
index e6e6691..ef5c223 100644
--- a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.magic.lef
@@ -44,46 +44,8 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.855000 0.255000 2.025000 0.735000 ;
-        RECT 1.855000 0.735000 4.545000 0.905000 ;
-        RECT 1.855000 1.445000 4.545000 1.615000 ;
-        RECT 1.855000 1.615000 2.025000 2.465000 ;
-        RECT 2.695000 0.255000 2.865000 0.735000 ;
-        RECT 2.695000 1.615000 2.865000 2.465000 ;
-        RECT 3.535000 0.255000 3.705000 0.735000 ;
-        RECT 3.535000 1.615000 3.705000 2.465000 ;
-        RECT 4.290000 0.905000 4.545000 1.055000 ;
-        RECT 4.290000 1.055000 4.885000 1.315000 ;
-        RECT 4.290000 1.315000 4.545000 1.445000 ;
-        RECT 4.375000 0.255000 4.545000 0.735000 ;
-        RECT 4.375000 1.615000 4.545000 2.465000 ;
-      LAYER mcon ;
-        RECT 4.320000 1.105000 4.490000 1.275000 ;
-        RECT 4.680000 1.105000 4.850000 1.275000 ;
-      LAYER met1 ;
-        RECT 3.465000 1.060000 4.105000 1.075000 ;
-        RECT 3.465000 1.075000 4.910000 1.305000 ;
-        RECT 3.465000 1.305000 4.105000 1.320000 ;
-      LAYER met2 ;
-        RECT 3.445000 1.005000 4.125000 1.375000 ;
-      LAYER met3 ;
-        RECT 3.395000 1.025000 4.175000 1.355000 ;
-      LAYER met4 ;
-        RECT 1.370000 0.680000 4.150000 1.860000 ;
       LAYER met5 ;
         RECT 1.250000 0.560000 4.270000 2.160000 ;
-      LAYER via ;
-        RECT 3.495000 1.060000 3.755000 1.320000 ;
-        RECT 3.815000 1.060000 4.075000 1.320000 ;
-      LAYER via2 ;
-        RECT 3.445000 1.050000 3.725000 1.330000 ;
-        RECT 3.845000 1.050000 4.125000 1.330000 ;
-      LAYER via3 ;
-        RECT 3.425000 1.030000 3.745000 1.350000 ;
-        RECT 3.825000 1.030000 4.145000 1.350000 ;
-      LAYER via4 ;
-        RECT 2.970000 0.680000 4.150000 1.860000 ;
     END
   END X
   PIN VGND
@@ -91,27 +53,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.565000 ;
-        RECT 1.355000  0.085000 1.685000 0.565000 ;
-        RECT 2.195000  0.085000 2.525000 0.565000 ;
-        RECT 3.035000  0.085000 3.365000 0.565000 ;
-        RECT 3.875000  0.085000 4.205000 0.565000 ;
-        RECT 4.715000  0.085000 5.045000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -121,41 +62,95 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.595000 1.835000 0.765000 2.635000 ;
-        RECT 1.435000 1.835000 1.605000 2.635000 ;
-        RECT 2.195000 1.835000 2.525000 2.635000 ;
-        RECT 3.035000 1.835000 3.365000 2.635000 ;
-        RECT 3.875000 1.835000 4.205000 2.635000 ;
-        RECT 4.715000 1.485000 5.045000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.445000 1.595000 1.615000 ;
-      RECT 0.095000 1.615000 0.425000 2.465000 ;
-      RECT 0.175000 0.255000 0.345000 0.735000 ;
-      RECT 0.175000 0.735000 1.595000 0.905000 ;
-      RECT 0.935000 1.615000 1.265000 2.465000 ;
-      RECT 1.015000 0.260000 1.185000 0.735000 ;
-      RECT 1.420000 0.905000 1.595000 1.075000 ;
-      RECT 1.420000 1.075000 4.045000 1.245000 ;
-      RECT 1.420000 1.245000 1.595000 1.445000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.095000  1.445000 1.595000 1.615000 ;
+      RECT 0.095000  1.615000 0.425000 2.465000 ;
+      RECT 0.175000  0.255000 0.345000 0.735000 ;
+      RECT 0.175000  0.735000 1.595000 0.905000 ;
+      RECT 0.515000  0.085000 0.845000 0.565000 ;
+      RECT 0.595000  1.835000 0.765000 2.635000 ;
+      RECT 0.935000  1.615000 1.265000 2.465000 ;
+      RECT 1.015000  0.260000 1.185000 0.735000 ;
+      RECT 1.355000  0.085000 1.685000 0.565000 ;
+      RECT 1.420000  0.905000 1.595000 1.075000 ;
+      RECT 1.420000  1.075000 4.045000 1.245000 ;
+      RECT 1.420000  1.245000 1.595000 1.445000 ;
+      RECT 1.435000  1.835000 1.605000 2.635000 ;
+      RECT 1.855000  0.255000 2.025000 0.735000 ;
+      RECT 1.855000  0.735000 4.545000 0.905000 ;
+      RECT 1.855000  1.445000 4.545000 1.615000 ;
+      RECT 1.855000  1.615000 2.025000 2.465000 ;
+      RECT 2.195000  0.085000 2.525000 0.565000 ;
+      RECT 2.195000  1.835000 2.525000 2.635000 ;
+      RECT 2.695000  0.255000 2.865000 0.735000 ;
+      RECT 2.695000  1.615000 2.865000 2.465000 ;
+      RECT 3.035000  0.085000 3.365000 0.565000 ;
+      RECT 3.035000  1.835000 3.365000 2.635000 ;
+      RECT 3.535000  0.255000 3.705000 0.735000 ;
+      RECT 3.535000  1.615000 3.705000 2.465000 ;
+      RECT 3.875000  0.085000 4.205000 0.565000 ;
+      RECT 3.875000  1.835000 4.205000 2.635000 ;
+      RECT 4.290000  0.905000 4.545000 1.055000 ;
+      RECT 4.290000  1.055000 4.885000 1.315000 ;
+      RECT 4.290000  1.315000 4.545000 1.445000 ;
+      RECT 4.375000  0.255000 4.545000 0.735000 ;
+      RECT 4.375000  1.615000 4.545000 2.465000 ;
+      RECT 4.715000  0.085000 5.045000 0.885000 ;
+      RECT 4.715000  1.485000 5.045000 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.320000  1.105000 4.490000 1.275000 ;
+      RECT 4.680000  1.105000 4.850000 1.275000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+    LAYER met1 ;
+      RECT 3.465000 1.060000 4.105000 1.075000 ;
+      RECT 3.465000 1.075000 4.910000 1.305000 ;
+      RECT 3.465000 1.305000 4.105000 1.320000 ;
+    LAYER met2 ;
+      RECT 3.445000 1.005000 4.125000 1.375000 ;
+    LAYER met3 ;
+      RECT 3.395000 1.025000 4.175000 1.355000 ;
+    LAYER met4 ;
+      RECT 1.370000 0.680000 4.150000 1.860000 ;
+    LAYER via ;
+      RECT 3.495000 1.060000 3.755000 1.320000 ;
+      RECT 3.815000 1.060000 4.075000 1.320000 ;
+    LAYER via2 ;
+      RECT 3.445000 1.050000 3.725000 1.330000 ;
+      RECT 3.845000 1.050000 4.125000 1.330000 ;
+    LAYER via3 ;
+      RECT 3.425000 1.030000 3.745000 1.350000 ;
+      RECT 3.825000 1.030000 4.145000 1.350000 ;
+    LAYER via4 ;
+      RECT 2.970000 0.680000 4.150000 1.860000 ;
   END
 END sky130_fd_sc_hd__probe_p_8
diff --git a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
index 93a32ee..ed6da3e 100644
--- a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.magic.lef
@@ -44,52 +44,15 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.855000 0.255000 2.025000 0.735000 ;
-        RECT 1.855000 0.735000 4.545000 0.905000 ;
-        RECT 1.855000 1.445000 4.545000 1.615000 ;
-        RECT 1.855000 1.615000 2.025000 2.465000 ;
-        RECT 2.695000 0.255000 2.865000 0.735000 ;
-        RECT 2.695000 1.615000 2.865000 2.465000 ;
-        RECT 3.535000 0.255000 3.705000 0.735000 ;
-        RECT 3.535000 1.615000 3.705000 2.465000 ;
-        RECT 4.290000 0.905000 4.545000 1.055000 ;
-        RECT 4.290000 1.055000 4.870000 1.315000 ;
-        RECT 4.290000 1.315000 4.545000 1.445000 ;
-        RECT 4.375000 0.255000 4.545000 0.735000 ;
-        RECT 4.375000 1.615000 4.545000 2.465000 ;
-      LAYER mcon ;
-        RECT 4.305000 1.105000 4.475000 1.275000 ;
-        RECT 4.665000 1.105000 4.835000 1.275000 ;
-      LAYER met1 ;
-        RECT 2.020000 1.060000 2.660000 1.120000 ;
-        RECT 2.020000 1.120000 4.895000 1.260000 ;
-        RECT 2.020000 1.260000 2.660000 1.320000 ;
-        RECT 4.245000 1.075000 4.895000 1.120000 ;
-        RECT 4.245000 1.260000 4.895000 1.305000 ;
-      LAYER met2 ;
-        RECT 1.890000 1.050000 2.660000 1.330000 ;
-      LAYER met3 ;
-        RECT -0.715000 1.030000 0.065000 1.350000 ;
-        RECT  1.885000 1.025000 2.665000 1.355000 ;
       LAYER met4 ;
         RECT -1.140000 0.770000 0.040000 1.950000 ;
         RECT  1.460000 0.770000 2.640000 1.950000 ;
+    END
+    PORT
       LAYER met5 ;
         RECT -1.260000  0.560000 2.760000 2.160000 ;
         RECT  1.160000 -1.105000 2.760000 0.560000 ;
         RECT  1.160000  2.160000 2.760000 3.825000 ;
-      LAYER via ;
-        RECT 2.050000 1.060000 2.310000 1.320000 ;
-        RECT 2.370000 1.060000 2.630000 1.320000 ;
-      LAYER via2 ;
-        RECT 1.935000 1.050000 2.215000 1.330000 ;
-        RECT 2.335000 1.050000 2.615000 1.330000 ;
-      LAYER via3 ;
-        RECT -0.685000 1.030000 -0.365000 1.350000 ;
-        RECT -0.285000 1.030000  0.035000 1.350000 ;
-        RECT  1.915000 1.030000  2.235000 1.350000 ;
-        RECT  2.315000 1.030000  2.635000 1.350000 ;
     END
   END X
   PIN VGND
@@ -97,48 +60,8 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.565000 ;
-        RECT 1.355000  0.085000 1.685000 0.565000 ;
-        RECT 2.195000  0.085000 2.525000 0.565000 ;
-        RECT 3.035000  0.085000 3.365000 0.565000 ;
-        RECT 3.875000  0.085000 4.205000 0.565000 ;
-        RECT 4.715000  0.085000 5.045000 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 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 -0.130000 ;
-        RECT 0.000000 -0.130000 5.840000  0.130000 ;
-        RECT 0.000000  0.130000 5.520000  0.240000 ;
-      LAYER met2 ;
-        RECT 5.135000 -0.140000 5.905000 0.140000 ;
-      LAYER met3 ;
-        RECT 5.130000 -0.165000 5.910000 0.165000 ;
-      LAYER met4 ;
-        RECT 4.930000 -0.895000 6.110000 0.285000 ;
       LAYER met5 ;
         RECT 4.360000 -1.170000 6.675000 0.560000 ;
-      LAYER via ;
-        RECT 5.230000 -0.130000 5.490000 0.130000 ;
-        RECT 5.550000 -0.130000 5.810000 0.130000 ;
-      LAYER via2 ;
-        RECT 5.180000 -0.140000 5.460000 0.140000 ;
-        RECT 5.580000 -0.140000 5.860000 0.140000 ;
-      LAYER via3 ;
-        RECT 5.160000 -0.160000 5.480000 0.160000 ;
-        RECT 5.560000 -0.160000 5.880000 0.160000 ;
     END
   END VGND
   PIN VPWR
@@ -146,60 +69,121 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.595000 1.835000 0.765000 2.635000 ;
-        RECT 1.435000 1.835000 1.605000 2.635000 ;
-        RECT 2.195000 1.835000 2.525000 2.635000 ;
-        RECT 3.035000 1.835000 3.365000 2.635000 ;
-        RECT 3.875000 1.835000 4.205000 2.635000 ;
-        RECT 4.715000 1.485000 5.045000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.590000 ;
-        RECT 0.000000 2.590000 5.840000 2.850000 ;
-        RECT 0.000000 2.850000 5.520000 2.960000 ;
-      LAYER met2 ;
-        RECT 5.135000 2.580000 5.905000 2.860000 ;
-      LAYER met3 ;
-        RECT 5.130000 2.555000 5.910000 2.885000 ;
-      LAYER met4 ;
-        RECT 4.930000 2.435000 6.110000 3.615000 ;
       LAYER met5 ;
         RECT 4.360000 2.160000 6.675000 3.890000 ;
-      LAYER via ;
-        RECT 5.230000 2.590000 5.490000 2.850000 ;
-        RECT 5.550000 2.590000 5.810000 2.850000 ;
-      LAYER via2 ;
-        RECT 5.180000 2.580000 5.460000 2.860000 ;
-        RECT 5.580000 2.580000 5.860000 2.860000 ;
-      LAYER via3 ;
-        RECT 5.160000 2.560000 5.480000 2.880000 ;
-        RECT 5.560000 2.560000 5.880000 2.880000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.445000 1.595000 1.615000 ;
-      RECT 0.095000 1.615000 0.425000 2.465000 ;
-      RECT 0.175000 0.255000 0.345000 0.735000 ;
-      RECT 0.175000 0.735000 1.595000 0.905000 ;
-      RECT 0.935000 1.615000 1.265000 2.465000 ;
-      RECT 1.015000 0.260000 1.185000 0.735000 ;
-      RECT 1.420000 0.905000 1.595000 1.075000 ;
-      RECT 1.420000 1.075000 4.045000 1.245000 ;
-      RECT 1.420000 1.245000 1.595000 1.445000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.095000  1.445000 1.595000 1.615000 ;
+      RECT 0.095000  1.615000 0.425000 2.465000 ;
+      RECT 0.175000  0.255000 0.345000 0.735000 ;
+      RECT 0.175000  0.735000 1.595000 0.905000 ;
+      RECT 0.515000  0.085000 0.845000 0.565000 ;
+      RECT 0.595000  1.835000 0.765000 2.635000 ;
+      RECT 0.935000  1.615000 1.265000 2.465000 ;
+      RECT 1.015000  0.260000 1.185000 0.735000 ;
+      RECT 1.355000  0.085000 1.685000 0.565000 ;
+      RECT 1.420000  0.905000 1.595000 1.075000 ;
+      RECT 1.420000  1.075000 4.045000 1.245000 ;
+      RECT 1.420000  1.245000 1.595000 1.445000 ;
+      RECT 1.435000  1.835000 1.605000 2.635000 ;
+      RECT 1.855000  0.255000 2.025000 0.735000 ;
+      RECT 1.855000  0.735000 4.545000 0.905000 ;
+      RECT 1.855000  1.445000 4.545000 1.615000 ;
+      RECT 1.855000  1.615000 2.025000 2.465000 ;
+      RECT 2.195000  0.085000 2.525000 0.565000 ;
+      RECT 2.195000  1.835000 2.525000 2.635000 ;
+      RECT 2.695000  0.255000 2.865000 0.735000 ;
+      RECT 2.695000  1.615000 2.865000 2.465000 ;
+      RECT 3.035000  0.085000 3.365000 0.565000 ;
+      RECT 3.035000  1.835000 3.365000 2.635000 ;
+      RECT 3.535000  0.255000 3.705000 0.735000 ;
+      RECT 3.535000  1.615000 3.705000 2.465000 ;
+      RECT 3.875000  0.085000 4.205000 0.565000 ;
+      RECT 3.875000  1.835000 4.205000 2.635000 ;
+      RECT 4.290000  0.905000 4.545000 1.055000 ;
+      RECT 4.290000  1.055000 4.870000 1.315000 ;
+      RECT 4.290000  1.315000 4.545000 1.445000 ;
+      RECT 4.375000  0.255000 4.545000 0.735000 ;
+      RECT 4.375000  1.615000 4.545000 2.465000 ;
+      RECT 4.715000  0.085000 5.045000 0.885000 ;
+      RECT 4.715000  1.485000 5.045000 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.305000  1.105000 4.475000 1.275000 ;
+      RECT 4.665000  1.105000 4.835000 1.275000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+    LAYER met1 ;
+      RECT 0.000000 -0.240000 5.520000 -0.130000 ;
+      RECT 0.000000 -0.130000 5.840000  0.130000 ;
+      RECT 0.000000  0.130000 5.520000  0.240000 ;
+      RECT 0.000000  2.480000 5.520000  2.590000 ;
+      RECT 0.000000  2.590000 5.840000  2.850000 ;
+      RECT 0.000000  2.850000 5.520000  2.960000 ;
+      RECT 2.020000  1.060000 2.660000  1.120000 ;
+      RECT 2.020000  1.120000 4.895000  1.260000 ;
+      RECT 2.020000  1.260000 2.660000  1.320000 ;
+      RECT 4.245000  1.075000 4.895000  1.120000 ;
+      RECT 4.245000  1.260000 4.895000  1.305000 ;
+    LAYER met2 ;
+      RECT 1.890000  1.050000 2.660000 1.330000 ;
+      RECT 5.135000 -0.140000 5.905000 0.140000 ;
+      RECT 5.135000  2.580000 5.905000 2.860000 ;
+    LAYER met3 ;
+      RECT -0.715000  1.030000 0.065000 1.350000 ;
+      RECT  1.885000  1.025000 2.665000 1.355000 ;
+      RECT  5.130000 -0.165000 5.910000 0.165000 ;
+      RECT  5.130000  2.555000 5.910000 2.885000 ;
+    LAYER met4 ;
+      RECT 4.930000 -0.895000 6.110000 0.285000 ;
+      RECT 4.930000  2.435000 6.110000 3.615000 ;
+    LAYER via ;
+      RECT 2.050000  1.060000 2.310000 1.320000 ;
+      RECT 2.370000  1.060000 2.630000 1.320000 ;
+      RECT 5.230000 -0.130000 5.490000 0.130000 ;
+      RECT 5.230000  2.590000 5.490000 2.850000 ;
+      RECT 5.550000 -0.130000 5.810000 0.130000 ;
+      RECT 5.550000  2.590000 5.810000 2.850000 ;
+    LAYER via2 ;
+      RECT 1.935000  1.050000 2.215000 1.330000 ;
+      RECT 2.335000  1.050000 2.615000 1.330000 ;
+      RECT 5.180000 -0.140000 5.460000 0.140000 ;
+      RECT 5.180000  2.580000 5.460000 2.860000 ;
+      RECT 5.580000 -0.140000 5.860000 0.140000 ;
+      RECT 5.580000  2.580000 5.860000 2.860000 ;
+    LAYER via3 ;
+      RECT -0.685000  1.030000 -0.365000 1.350000 ;
+      RECT -0.285000  1.030000  0.035000 1.350000 ;
+      RECT  1.915000  1.030000  2.235000 1.350000 ;
+      RECT  2.315000  1.030000  2.635000 1.350000 ;
+      RECT  5.160000 -0.160000  5.480000 0.160000 ;
+      RECT  5.160000  2.560000  5.480000 2.880000 ;
+      RECT  5.560000 -0.160000  5.880000 0.160000 ;
+      RECT  5.560000  2.560000  5.880000 2.880000 ;
   END
 END sky130_fd_sc_hd__probec_p_8
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
index a03ed16..40042de 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.magic.lef
@@ -98,12 +98,18 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 5.870000 0.735000  6.295000 0.965000 ;
-        RECT 5.870000 0.965000  6.215000 1.065000 ;
-        RECT 9.755000 0.735000 10.130000 1.065000 ;
+        RECT 5.870000 0.735000 6.295000 0.965000 ;
+        RECT 5.870000 0.965000 6.215000 1.065000 ;
       LAYER mcon ;
         RECT 6.125000 0.765000 6.295000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.755000 0.735000 10.130000 1.065000 ;
+      LAYER mcon ;
         RECT 9.805000 0.765000 9.975000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.065000 0.735000  6.355000 0.780000 ;
         RECT 6.065000 0.780000 10.035000 0.920000 ;
@@ -126,48 +132,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.430000  0.085000  1.705000 0.635000 ;
-        RECT  3.225000  0.085000  3.555000 0.445000 ;
-        RECT  5.835000  0.085000  6.005000 0.525000 ;
-        RECT  7.620000  0.085000  7.975000 0.465000 ;
-        RECT  9.560000  0.085000  9.820000 0.525000 ;
-        RECT 12.000000  0.085000 12.330000 0.805000 ;
-        RECT 13.455000  0.085000 13.745000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -177,154 +141,192 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.260000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.430000 1.885000  1.785000 2.635000 ;
-        RECT  3.310000 2.215000  3.640000 2.635000 ;
-        RECT  5.705000 2.205000  6.085000 2.635000 ;
-        RECT  7.175000 1.915000  7.505000 2.635000 ;
-        RECT  9.620000 2.255000 10.000000 2.635000 ;
-        RECT 10.940000 2.255000 12.330000 2.635000 ;
-        RECT 13.455000 1.765000 13.740000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.835000 0.805000 ;
-      RECT  0.095000 1.795000  0.835000 1.965000 ;
-      RECT  0.095000 1.965000  0.345000 2.465000 ;
-      RECT  0.605000 0.805000  0.835000 1.795000 ;
-      RECT  1.015000 0.345000  1.235000 2.465000 ;
-      RECT  2.215000 1.875000  2.575000 2.385000 ;
-      RECT  2.325000 0.265000  2.655000 0.595000 ;
-      RECT  2.405000 1.295000  3.075000 1.405000 ;
-      RECT  2.405000 1.405000  2.670000 1.430000 ;
-      RECT  2.405000 1.430000  2.630000 1.465000 ;
-      RECT  2.405000 1.465000  2.605000 1.505000 ;
-      RECT  2.405000 1.505000  2.575000 1.875000 ;
-      RECT  2.460000 1.255000  3.075000 1.295000 ;
-      RECT  2.485000 0.595000  2.655000 1.075000 ;
-      RECT  2.485000 1.075000  3.075000 1.255000 ;
-      RECT  2.760000 1.575000  3.605000 1.745000 ;
-      RECT  2.760000 1.745000  3.140000 1.905000 ;
-      RECT  2.870000 0.305000  3.040000 0.625000 ;
-      RECT  2.870000 0.625000  3.645000 0.765000 ;
-      RECT  2.870000 0.765000  3.770000 0.795000 ;
-      RECT  2.970000 1.905000  3.140000 2.465000 ;
-      RECT  3.430000 0.795000  3.770000 1.095000 ;
-      RECT  3.430000 1.095000  3.605000 1.575000 ;
-      RECT  3.950000 0.425000  4.330000 0.595000 ;
-      RECT  3.950000 0.595000  4.120000 1.065000 ;
-      RECT  3.950000 1.065000  4.400000 1.105000 ;
-      RECT  3.950000 1.105000  4.410000 1.175000 ;
-      RECT  3.950000 1.175000  4.445000 1.235000 ;
-      RECT  4.160000 0.265000  4.330000 0.425000 ;
-      RECT  4.225000 1.235000  4.445000 1.275000 ;
-      RECT  4.230000 2.135000  4.445000 2.465000 ;
-      RECT  4.245000 1.275000  4.445000 1.305000 ;
-      RECT  4.275000 1.305000  4.445000 2.135000 ;
-      RECT  4.555000 0.265000  5.655000 0.465000 ;
-      RECT  4.570000 0.705000  4.790000 1.035000 ;
-      RECT  4.615000 1.035000  4.790000 1.575000 ;
-      RECT  4.615000 1.575000  5.125000 1.955000 ;
-      RECT  4.635000 2.250000  5.465000 2.420000 ;
-      RECT  5.000000 0.735000  5.330000 1.015000 ;
-      RECT  5.295000 1.195000  5.670000 1.235000 ;
-      RECT  5.295000 1.235000  6.645000 1.405000 ;
-      RECT  5.295000 1.405000  5.465000 2.250000 ;
-      RECT  5.485000 0.465000  5.655000 0.585000 ;
-      RECT  5.485000 0.585000  5.670000 0.655000 ;
-      RECT  5.500000 0.655000  5.670000 1.195000 ;
-      RECT  5.635000 1.575000  5.885000 1.785000 ;
-      RECT  5.635000 1.785000  6.985000 2.035000 ;
-      RECT  6.260000 0.255000  7.350000 0.425000 ;
-      RECT  6.260000 0.425000  6.590000 0.465000 ;
-      RECT  6.385000 2.035000  6.555000 2.375000 ;
-      RECT  6.395000 1.405000  6.645000 1.485000 ;
-      RECT  6.425000 1.155000  6.645000 1.235000 ;
-      RECT  6.680000 0.610000  7.010000 0.780000 ;
-      RECT  6.810000 0.780000  7.010000 0.895000 ;
-      RECT  6.810000 0.895000  8.125000 1.060000 ;
-      RECT  6.815000 1.060000  8.125000 1.065000 ;
-      RECT  6.815000 1.065000  6.985000 1.785000 ;
-      RECT  7.155000 1.235000  7.485000 1.415000 ;
-      RECT  7.155000 1.415000  8.160000 1.655000 ;
-      RECT  7.180000 0.425000  7.350000 0.715000 ;
-      RECT  7.795000 1.065000  8.125000 1.235000 ;
-      RECT  8.360000 1.575000  8.595000 1.985000 ;
-      RECT  8.420000 0.705000  8.705000 1.125000 ;
-      RECT  8.420000 1.125000  9.040000 1.305000 ;
-      RECT  8.550000 2.250000  9.380000 2.420000 ;
-      RECT  8.615000 0.265000  9.380000 0.465000 ;
-      RECT  8.835000 1.305000  9.040000 1.905000 ;
-      RECT  9.210000 0.465000  9.380000 1.235000 ;
-      RECT  9.210000 1.235000 10.560000 1.405000 ;
-      RECT  9.210000 1.405000  9.380000 2.250000 ;
-      RECT  9.550000 1.575000  9.800000 1.915000 ;
-      RECT  9.550000 1.915000 12.330000 2.085000 ;
-      RECT 10.080000 0.255000 11.250000 0.425000 ;
-      RECT 10.080000 0.425000 10.410000 0.545000 ;
-      RECT 10.240000 2.085000 10.410000 2.375000 ;
-      RECT 10.340000 1.075000 10.560000 1.235000 ;
-      RECT 10.575000 0.595000 10.905000 0.780000 ;
-      RECT 10.730000 0.780000 10.905000 1.915000 ;
-      RECT 11.075000 0.425000 11.250000 0.585000 ;
-      RECT 11.080000 0.755000 11.775000 0.925000 ;
-      RECT 11.080000 0.925000 11.355000 1.575000 ;
-      RECT 11.080000 1.575000 11.855000 1.745000 ;
-      RECT 11.565000 0.265000 11.775000 0.755000 ;
-      RECT 12.160000 0.995000 12.425000 1.325000 ;
-      RECT 12.160000 1.325000 12.330000 1.915000 ;
-      RECT 12.960000 0.255000 13.275000 0.995000 ;
-      RECT 12.960000 0.995000 13.795000 1.325000 ;
-      RECT 12.960000 1.325000 13.275000 2.415000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.835000 0.805000 ;
+      RECT  0.095000  1.795000  0.835000 1.965000 ;
+      RECT  0.095000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.605000  0.805000  0.835000 1.795000 ;
+      RECT  1.015000  0.345000  1.235000 2.465000 ;
+      RECT  1.430000  0.085000  1.705000 0.635000 ;
+      RECT  1.430000  1.885000  1.785000 2.635000 ;
+      RECT  2.215000  1.875000  2.575000 2.385000 ;
+      RECT  2.325000  0.265000  2.655000 0.595000 ;
+      RECT  2.405000  1.295000  3.075000 1.405000 ;
+      RECT  2.405000  1.405000  2.670000 1.430000 ;
+      RECT  2.405000  1.430000  2.630000 1.465000 ;
+      RECT  2.405000  1.465000  2.605000 1.505000 ;
+      RECT  2.405000  1.505000  2.575000 1.875000 ;
+      RECT  2.460000  1.255000  3.075000 1.295000 ;
+      RECT  2.485000  0.595000  2.655000 1.075000 ;
+      RECT  2.485000  1.075000  3.075000 1.255000 ;
+      RECT  2.760000  1.575000  3.605000 1.745000 ;
+      RECT  2.760000  1.745000  3.140000 1.905000 ;
+      RECT  2.870000  0.305000  3.040000 0.625000 ;
+      RECT  2.870000  0.625000  3.645000 0.765000 ;
+      RECT  2.870000  0.765000  3.770000 0.795000 ;
+      RECT  2.970000  1.905000  3.140000 2.465000 ;
+      RECT  3.225000  0.085000  3.555000 0.445000 ;
+      RECT  3.310000  2.215000  3.640000 2.635000 ;
+      RECT  3.430000  0.795000  3.770000 1.095000 ;
+      RECT  3.430000  1.095000  3.605000 1.575000 ;
+      RECT  3.950000  0.425000  4.330000 0.595000 ;
+      RECT  3.950000  0.595000  4.120000 1.065000 ;
+      RECT  3.950000  1.065000  4.400000 1.105000 ;
+      RECT  3.950000  1.105000  4.410000 1.175000 ;
+      RECT  3.950000  1.175000  4.445000 1.235000 ;
+      RECT  4.160000  0.265000  4.330000 0.425000 ;
+      RECT  4.225000  1.235000  4.445000 1.275000 ;
+      RECT  4.230000  2.135000  4.445000 2.465000 ;
+      RECT  4.245000  1.275000  4.445000 1.305000 ;
+      RECT  4.275000  1.305000  4.445000 2.135000 ;
+      RECT  4.555000  0.265000  5.655000 0.465000 ;
+      RECT  4.570000  0.705000  4.790000 1.035000 ;
+      RECT  4.615000  1.035000  4.790000 1.575000 ;
+      RECT  4.615000  1.575000  5.125000 1.955000 ;
+      RECT  4.635000  2.250000  5.465000 2.420000 ;
+      RECT  5.000000  0.735000  5.330000 1.015000 ;
+      RECT  5.295000  1.195000  5.670000 1.235000 ;
+      RECT  5.295000  1.235000  6.645000 1.405000 ;
+      RECT  5.295000  1.405000  5.465000 2.250000 ;
+      RECT  5.485000  0.465000  5.655000 0.585000 ;
+      RECT  5.485000  0.585000  5.670000 0.655000 ;
+      RECT  5.500000  0.655000  5.670000 1.195000 ;
+      RECT  5.635000  1.575000  5.885000 1.785000 ;
+      RECT  5.635000  1.785000  6.985000 2.035000 ;
+      RECT  5.705000  2.205000  6.085000 2.635000 ;
+      RECT  5.835000  0.085000  6.005000 0.525000 ;
+      RECT  6.260000  0.255000  7.350000 0.425000 ;
+      RECT  6.260000  0.425000  6.590000 0.465000 ;
+      RECT  6.385000  2.035000  6.555000 2.375000 ;
+      RECT  6.395000  1.405000  6.645000 1.485000 ;
+      RECT  6.425000  1.155000  6.645000 1.235000 ;
+      RECT  6.680000  0.610000  7.010000 0.780000 ;
+      RECT  6.810000  0.780000  7.010000 0.895000 ;
+      RECT  6.810000  0.895000  8.125000 1.060000 ;
+      RECT  6.815000  1.060000  8.125000 1.065000 ;
+      RECT  6.815000  1.065000  6.985000 1.785000 ;
+      RECT  7.155000  1.235000  7.485000 1.415000 ;
+      RECT  7.155000  1.415000  8.160000 1.655000 ;
+      RECT  7.175000  1.915000  7.505000 2.635000 ;
+      RECT  7.180000  0.425000  7.350000 0.715000 ;
+      RECT  7.620000  0.085000  7.975000 0.465000 ;
+      RECT  7.795000  1.065000  8.125000 1.235000 ;
+      RECT  8.360000  1.575000  8.595000 1.985000 ;
+      RECT  8.420000  0.705000  8.705000 1.125000 ;
+      RECT  8.420000  1.125000  9.040000 1.305000 ;
+      RECT  8.550000  2.250000  9.380000 2.420000 ;
+      RECT  8.615000  0.265000  9.380000 0.465000 ;
+      RECT  8.835000  1.305000  9.040000 1.905000 ;
+      RECT  9.210000  0.465000  9.380000 1.235000 ;
+      RECT  9.210000  1.235000 10.560000 1.405000 ;
+      RECT  9.210000  1.405000  9.380000 2.250000 ;
+      RECT  9.550000  1.575000  9.800000 1.915000 ;
+      RECT  9.550000  1.915000 12.330000 2.085000 ;
+      RECT  9.560000  0.085000  9.820000 0.525000 ;
+      RECT  9.620000  2.255000 10.000000 2.635000 ;
+      RECT 10.080000  0.255000 11.250000 0.425000 ;
+      RECT 10.080000  0.425000 10.410000 0.545000 ;
+      RECT 10.240000  2.085000 10.410000 2.375000 ;
+      RECT 10.340000  1.075000 10.560000 1.235000 ;
+      RECT 10.575000  0.595000 10.905000 0.780000 ;
+      RECT 10.730000  0.780000 10.905000 1.915000 ;
+      RECT 10.940000  2.255000 12.330000 2.635000 ;
+      RECT 11.075000  0.425000 11.250000 0.585000 ;
+      RECT 11.080000  0.755000 11.775000 0.925000 ;
+      RECT 11.080000  0.925000 11.355000 1.575000 ;
+      RECT 11.080000  1.575000 11.855000 1.745000 ;
+      RECT 11.565000  0.265000 11.775000 0.755000 ;
+      RECT 12.000000  0.085000 12.330000 0.805000 ;
+      RECT 12.160000  0.995000 12.425000 1.325000 ;
+      RECT 12.160000  1.325000 12.330000 1.915000 ;
+      RECT 12.960000  0.255000 13.275000 0.995000 ;
+      RECT 12.960000  0.995000 13.795000 1.325000 ;
+      RECT 12.960000  1.325000 13.275000 2.415000 ;
+      RECT 13.455000  0.085000 13.745000 0.545000 ;
+      RECT 13.455000  1.765000 13.740000 2.635000 ;
     LAYER mcon ;
-      RECT  0.605000 0.765000  0.775000 0.935000 ;
-      RECT  1.065000 1.785000  1.235000 1.955000 ;
-      RECT  2.905000 1.105000  3.075000 1.275000 ;
-      RECT  4.230000 1.105000  4.400000 1.275000 ;
-      RECT  4.745000 1.785000  4.915000 1.955000 ;
-      RECT  5.155000 0.765000  5.325000 0.935000 ;
-      RECT  7.965000 1.445000  8.135000 1.615000 ;
-      RECT  8.425000 1.105000  8.595000 1.275000 ;
-      RECT  8.425000 1.785000  8.595000 1.955000 ;
-      RECT 11.185000 1.445000 11.355000 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  0.765000  0.775000 0.935000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  1.785000  1.235000 1.955000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  1.105000  3.075000 1.275000 ;
+      RECT  2.905000  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.230000  1.105000  4.400000 1.275000 ;
+      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  1.785000  4.915000 1.955000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.155000  0.765000  5.325000 0.935000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.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  1.445000  8.135000 1.615000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  1.105000  8.595000 1.275000 ;
+      RECT  8.425000  1.785000  8.595000 1.955000 ;
+      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  1.445000 11.355000 1.615000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT  0.545000 0.735000  0.835000 0.780000 ;
       RECT  0.545000 0.780000  5.385000 0.920000 ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
index 5c0a148..819b419 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.magic.lef
@@ -96,12 +96,18 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 5.885000 0.735000  6.295000 0.965000 ;
-        RECT 5.885000 0.965000  6.215000 1.065000 ;
-        RECT 9.755000 0.735000 10.130000 1.065000 ;
+        RECT 5.885000 0.735000 6.295000 0.965000 ;
+        RECT 5.885000 0.965000 6.215000 1.065000 ;
       LAYER mcon ;
         RECT 6.125000 0.765000 6.295000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.755000 0.735000 10.130000 1.065000 ;
+      LAYER mcon ;
         RECT 9.805000 0.765000 9.975000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.065000 0.735000  6.355000 0.780000 ;
         RECT 6.065000 0.780000 10.035000 0.920000 ;
@@ -124,52 +130,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.180000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.430000  0.085000  1.705000 0.635000 ;
-        RECT  3.370000  0.085000  3.700000 0.445000 ;
-        RECT  5.885000  0.085000  6.055000 0.525000 ;
-        RECT  7.645000  0.085000  7.975000 0.465000 ;
-        RECT  9.560000  0.085000  9.820000 0.525000 ;
-        RECT 12.080000  0.085000 12.410000 0.805000 ;
-        RECT 13.000000  0.085000 13.235000 0.885000 ;
-        RECT 13.950000  0.085000 14.245000 0.545000 ;
-        RECT 14.835000  0.085000 15.075000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
@@ -179,142 +139,184 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 15.180000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.430000 1.885000  1.785000 2.635000 ;
-        RECT  3.295000 2.215000  3.640000 2.635000 ;
-        RECT  5.705000 2.205000  6.085000 2.635000 ;
-        RECT  7.175000 1.915000  7.505000 2.635000 ;
-        RECT  9.620000 2.255000 10.000000 2.635000 ;
-        RECT 10.940000 2.255000 12.410000 2.635000 ;
-        RECT 13.000000 1.495000 13.235000 2.635000 ;
-        RECT 13.950000 1.765000 14.245000 2.635000 ;
-        RECT 14.835000 1.495000 15.075000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.170000 0.345000  0.345000 0.635000 ;
-      RECT  0.170000 0.635000  0.835000 0.805000 ;
-      RECT  0.170000 1.795000  0.835000 1.965000 ;
-      RECT  0.170000 1.965000  0.345000 2.465000 ;
-      RECT  0.605000 0.805000  0.835000 1.795000 ;
-      RECT  1.015000 0.345000  1.235000 2.465000 ;
-      RECT  2.215000 1.875000  2.575000 2.385000 ;
-      RECT  2.315000 0.265000  2.730000 0.595000 ;
-      RECT  2.405000 1.250000  3.075000 1.405000 ;
-      RECT  2.405000 1.405000  2.575000 1.875000 ;
-      RECT  2.435000 1.235000  3.075000 1.250000 ;
-      RECT  2.560000 0.595000  2.730000 1.075000 ;
-      RECT  2.560000 1.075000  3.075000 1.235000 ;
-      RECT  2.745000 1.575000  3.645000 1.745000 ;
-      RECT  2.745000 1.745000  3.065000 1.905000 ;
-      RECT  2.895000 1.905000  3.065000 2.465000 ;
-      RECT  2.955000 0.305000  3.125000 0.625000 ;
-      RECT  2.955000 0.625000  3.645000 0.765000 ;
-      RECT  2.955000 0.765000  3.770000 0.795000 ;
-      RECT  3.475000 0.795000  3.770000 1.095000 ;
-      RECT  3.475000 1.095000  3.645000 1.575000 ;
-      RECT  4.230000 0.305000  4.455000 2.465000 ;
-      RECT  4.625000 0.705000  4.845000 1.575000 ;
-      RECT  4.625000 1.575000  5.125000 1.955000 ;
-      RECT  4.635000 2.250000  5.465000 2.420000 ;
-      RECT  4.700000 0.265000  5.715000 0.465000 ;
-      RECT  5.025000 0.645000  5.375000 1.015000 ;
-      RECT  5.295000 1.195000  5.715000 1.235000 ;
-      RECT  5.295000 1.235000  6.645000 1.405000 ;
-      RECT  5.295000 1.405000  5.465000 2.250000 ;
-      RECT  5.545000 0.465000  5.715000 1.195000 ;
-      RECT  5.635000 1.575000  5.885000 1.785000 ;
-      RECT  5.635000 1.785000  6.985000 2.035000 ;
-      RECT  6.225000 0.255000  7.375000 0.425000 ;
-      RECT  6.225000 0.425000  6.555000 0.505000 ;
-      RECT  6.385000 2.035000  6.555000 2.375000 ;
-      RECT  6.395000 1.405000  6.645000 1.485000 ;
-      RECT  6.425000 1.155000  6.645000 1.235000 ;
-      RECT  6.705000 0.595000  7.035000 0.765000 ;
-      RECT  6.815000 0.765000  7.035000 0.895000 ;
-      RECT  6.815000 0.895000  8.125000 1.065000 ;
-      RECT  6.815000 1.065000  6.985000 1.785000 ;
-      RECT  7.155000 1.235000  7.485000 1.415000 ;
-      RECT  7.155000 1.415000  8.160000 1.655000 ;
-      RECT  7.205000 0.425000  7.375000 0.715000 ;
-      RECT  7.795000 1.065000  8.125000 1.235000 ;
-      RECT  8.360000 1.575000  8.595000 1.985000 ;
-      RECT  8.420000 0.705000  8.705000 1.125000 ;
-      RECT  8.420000 1.125000  9.040000 1.305000 ;
-      RECT  8.550000 2.250000  9.380000 2.420000 ;
-      RECT  8.615000 0.265000  9.380000 0.465000 ;
-      RECT  8.835000 1.305000  9.040000 1.905000 ;
-      RECT  9.210000 0.465000  9.380000 1.235000 ;
-      RECT  9.210000 1.235000 10.560000 1.405000 ;
-      RECT  9.210000 1.405000  9.380000 2.250000 ;
-      RECT  9.550000 1.575000  9.800000 1.915000 ;
-      RECT  9.550000 1.915000 12.410000 2.085000 ;
-      RECT 10.080000 0.255000 11.250000 0.425000 ;
-      RECT 10.080000 0.425000 10.410000 0.545000 ;
-      RECT 10.240000 2.085000 10.410000 2.375000 ;
-      RECT 10.340000 1.075000 10.560000 1.235000 ;
-      RECT 10.580000 0.595000 10.910000 0.780000 ;
-      RECT 10.730000 0.780000 10.910000 1.915000 ;
-      RECT 11.080000 0.425000 11.250000 0.585000 ;
-      RECT 11.080000 0.755000 11.845000 0.925000 ;
-      RECT 11.080000 0.925000 11.355000 1.575000 ;
-      RECT 11.080000 1.575000 11.925000 1.745000 ;
-      RECT 11.620000 0.265000 11.845000 0.755000 ;
-      RECT 12.240000 0.995000 12.480000 1.325000 ;
-      RECT 12.240000 1.325000 12.410000 1.915000 ;
-      RECT 13.455000 0.255000 13.770000 0.995000 ;
-      RECT 13.455000 0.995000 14.290000 1.325000 ;
-      RECT 13.455000 1.325000 13.770000 2.415000 ;
+      RECT  0.000000 -0.085000 15.180000 0.085000 ;
+      RECT  0.000000  2.635000 15.180000 2.805000 ;
+      RECT  0.170000  0.345000  0.345000 0.635000 ;
+      RECT  0.170000  0.635000  0.835000 0.805000 ;
+      RECT  0.170000  1.795000  0.835000 1.965000 ;
+      RECT  0.170000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.605000  0.805000  0.835000 1.795000 ;
+      RECT  1.015000  0.345000  1.235000 2.465000 ;
+      RECT  1.430000  0.085000  1.705000 0.635000 ;
+      RECT  1.430000  1.885000  1.785000 2.635000 ;
+      RECT  2.215000  1.875000  2.575000 2.385000 ;
+      RECT  2.315000  0.265000  2.730000 0.595000 ;
+      RECT  2.405000  1.250000  3.075000 1.405000 ;
+      RECT  2.405000  1.405000  2.575000 1.875000 ;
+      RECT  2.435000  1.235000  3.075000 1.250000 ;
+      RECT  2.560000  0.595000  2.730000 1.075000 ;
+      RECT  2.560000  1.075000  3.075000 1.235000 ;
+      RECT  2.745000  1.575000  3.645000 1.745000 ;
+      RECT  2.745000  1.745000  3.065000 1.905000 ;
+      RECT  2.895000  1.905000  3.065000 2.465000 ;
+      RECT  2.955000  0.305000  3.125000 0.625000 ;
+      RECT  2.955000  0.625000  3.645000 0.765000 ;
+      RECT  2.955000  0.765000  3.770000 0.795000 ;
+      RECT  3.295000  2.215000  3.640000 2.635000 ;
+      RECT  3.370000  0.085000  3.700000 0.445000 ;
+      RECT  3.475000  0.795000  3.770000 1.095000 ;
+      RECT  3.475000  1.095000  3.645000 1.575000 ;
+      RECT  4.230000  0.305000  4.455000 2.465000 ;
+      RECT  4.625000  0.705000  4.845000 1.575000 ;
+      RECT  4.625000  1.575000  5.125000 1.955000 ;
+      RECT  4.635000  2.250000  5.465000 2.420000 ;
+      RECT  4.700000  0.265000  5.715000 0.465000 ;
+      RECT  5.025000  0.645000  5.375000 1.015000 ;
+      RECT  5.295000  1.195000  5.715000 1.235000 ;
+      RECT  5.295000  1.235000  6.645000 1.405000 ;
+      RECT  5.295000  1.405000  5.465000 2.250000 ;
+      RECT  5.545000  0.465000  5.715000 1.195000 ;
+      RECT  5.635000  1.575000  5.885000 1.785000 ;
+      RECT  5.635000  1.785000  6.985000 2.035000 ;
+      RECT  5.705000  2.205000  6.085000 2.635000 ;
+      RECT  5.885000  0.085000  6.055000 0.525000 ;
+      RECT  6.225000  0.255000  7.375000 0.425000 ;
+      RECT  6.225000  0.425000  6.555000 0.505000 ;
+      RECT  6.385000  2.035000  6.555000 2.375000 ;
+      RECT  6.395000  1.405000  6.645000 1.485000 ;
+      RECT  6.425000  1.155000  6.645000 1.235000 ;
+      RECT  6.705000  0.595000  7.035000 0.765000 ;
+      RECT  6.815000  0.765000  7.035000 0.895000 ;
+      RECT  6.815000  0.895000  8.125000 1.065000 ;
+      RECT  6.815000  1.065000  6.985000 1.785000 ;
+      RECT  7.155000  1.235000  7.485000 1.415000 ;
+      RECT  7.155000  1.415000  8.160000 1.655000 ;
+      RECT  7.175000  1.915000  7.505000 2.635000 ;
+      RECT  7.205000  0.425000  7.375000 0.715000 ;
+      RECT  7.645000  0.085000  7.975000 0.465000 ;
+      RECT  7.795000  1.065000  8.125000 1.235000 ;
+      RECT  8.360000  1.575000  8.595000 1.985000 ;
+      RECT  8.420000  0.705000  8.705000 1.125000 ;
+      RECT  8.420000  1.125000  9.040000 1.305000 ;
+      RECT  8.550000  2.250000  9.380000 2.420000 ;
+      RECT  8.615000  0.265000  9.380000 0.465000 ;
+      RECT  8.835000  1.305000  9.040000 1.905000 ;
+      RECT  9.210000  0.465000  9.380000 1.235000 ;
+      RECT  9.210000  1.235000 10.560000 1.405000 ;
+      RECT  9.210000  1.405000  9.380000 2.250000 ;
+      RECT  9.550000  1.575000  9.800000 1.915000 ;
+      RECT  9.550000  1.915000 12.410000 2.085000 ;
+      RECT  9.560000  0.085000  9.820000 0.525000 ;
+      RECT  9.620000  2.255000 10.000000 2.635000 ;
+      RECT 10.080000  0.255000 11.250000 0.425000 ;
+      RECT 10.080000  0.425000 10.410000 0.545000 ;
+      RECT 10.240000  2.085000 10.410000 2.375000 ;
+      RECT 10.340000  1.075000 10.560000 1.235000 ;
+      RECT 10.580000  0.595000 10.910000 0.780000 ;
+      RECT 10.730000  0.780000 10.910000 1.915000 ;
+      RECT 10.940000  2.255000 12.410000 2.635000 ;
+      RECT 11.080000  0.425000 11.250000 0.585000 ;
+      RECT 11.080000  0.755000 11.845000 0.925000 ;
+      RECT 11.080000  0.925000 11.355000 1.575000 ;
+      RECT 11.080000  1.575000 11.925000 1.745000 ;
+      RECT 11.620000  0.265000 11.845000 0.755000 ;
+      RECT 12.080000  0.085000 12.410000 0.805000 ;
+      RECT 12.240000  0.995000 12.480000 1.325000 ;
+      RECT 12.240000  1.325000 12.410000 1.915000 ;
+      RECT 13.000000  0.085000 13.235000 0.885000 ;
+      RECT 13.000000  1.495000 13.235000 2.635000 ;
+      RECT 13.455000  0.255000 13.770000 0.995000 ;
+      RECT 13.455000  0.995000 14.290000 1.325000 ;
+      RECT 13.455000  1.325000 13.770000 2.415000 ;
+      RECT 13.950000  0.085000 14.245000 0.545000 ;
+      RECT 13.950000  1.765000 14.245000 2.635000 ;
+      RECT 14.835000  0.085000 15.075000 0.885000 ;
+      RECT 14.835000  1.495000 15.075000 2.635000 ;
     LAYER mcon ;
-      RECT  0.605000 0.765000  0.775000 0.935000 ;
-      RECT  1.065000 1.785000  1.235000 1.955000 ;
-      RECT  2.905000 1.105000  3.075000 1.275000 ;
-      RECT  4.285000 1.105000  4.455000 1.275000 ;
-      RECT  4.745000 1.785000  4.915000 1.955000 ;
-      RECT  5.205000 0.765000  5.375000 0.935000 ;
-      RECT  7.965000 1.445000  8.135000 1.615000 ;
-      RECT  8.425000 1.105000  8.595000 1.275000 ;
-      RECT  8.425000 1.785000  8.595000 1.955000 ;
-      RECT 11.185000 1.445000 11.355000 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  0.765000  0.775000 0.935000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  1.785000  1.235000 1.955000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  1.105000  3.075000 1.275000 ;
+      RECT  2.905000  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.105000  4.455000 1.275000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  1.785000  4.915000 1.955000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  0.765000  5.375000 0.935000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.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  1.445000  8.135000 1.615000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  1.105000  8.595000 1.275000 ;
+      RECT  8.425000  1.785000  8.595000 1.955000 ;
+      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  1.445000 11.355000 1.615000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
     LAYER met1 ;
       RECT  0.545000 0.735000  0.835000 0.780000 ;
       RECT  0.545000 0.780000  5.435000 0.920000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
index 7c64d00..54394d2 100644
--- a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.magic.lef
@@ -96,12 +96,18 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 5.885000 0.735000  6.295000 0.965000 ;
-        RECT 5.885000 0.965000  6.215000 1.065000 ;
-        RECT 9.755000 0.735000 10.130000 1.065000 ;
+        RECT 5.885000 0.735000 6.295000 0.965000 ;
+        RECT 5.885000 0.965000 6.215000 1.065000 ;
       LAYER mcon ;
         RECT 6.125000 0.765000 6.295000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.755000 0.735000 10.130000 1.065000 ;
+      LAYER mcon ;
         RECT 9.805000 0.765000 9.975000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.065000 0.735000  6.355000 0.780000 ;
         RECT 6.065000 0.780000 10.035000 0.920000 ;
@@ -124,48 +130,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.455000  0.085000  1.705000 0.635000 ;
-        RECT  3.370000  0.085000  3.700000 0.445000 ;
-        RECT  5.885000  0.085000  6.055000 0.525000 ;
-        RECT  7.640000  0.085000  7.975000 0.465000 ;
-        RECT  9.560000  0.085000  9.820000 0.525000 ;
-        RECT 12.000000  0.085000 12.330000 0.805000 ;
-        RECT 13.455000  0.085000 13.745000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -175,137 +139,175 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.260000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.455000 1.885000  1.785000 2.635000 ;
-        RECT  3.310000 2.215000  3.640000 2.635000 ;
-        RECT  5.705000 2.205000  6.085000 2.635000 ;
-        RECT  7.175000 1.915000  7.505000 2.635000 ;
-        RECT  9.620000 2.255000 10.000000 2.635000 ;
-        RECT 10.940000 2.255000 12.330000 2.635000 ;
-        RECT 13.450000 1.765000 13.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 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.170000 0.345000  0.345000 0.635000 ;
-      RECT  0.170000 0.635000  0.835000 0.805000 ;
-      RECT  0.170000 1.795000  0.835000 1.965000 ;
-      RECT  0.170000 1.965000  0.345000 2.465000 ;
-      RECT  0.605000 0.805000  0.835000 1.795000 ;
-      RECT  1.015000 0.345000  1.240000 2.465000 ;
-      RECT  2.235000 1.875000  2.565000 2.385000 ;
-      RECT  2.350000 0.265000  2.755000 0.595000 ;
-      RECT  2.350000 1.185000  3.075000 1.365000 ;
-      RECT  2.350000 1.365000  2.565000 1.875000 ;
-      RECT  2.585000 0.595000  2.755000 1.075000 ;
-      RECT  2.585000 1.075000  3.075000 1.185000 ;
-      RECT  2.745000 1.575000  3.645000 1.745000 ;
-      RECT  2.745000 1.745000  3.065000 1.905000 ;
-      RECT  2.895000 1.905000  3.065000 2.465000 ;
-      RECT  2.925000 0.305000  3.125000 0.625000 ;
-      RECT  2.925000 0.625000  3.645000 0.765000 ;
-      RECT  2.925000 0.765000  3.770000 0.795000 ;
-      RECT  3.475000 0.795000  3.770000 1.095000 ;
-      RECT  3.475000 1.095000  3.645000 1.575000 ;
-      RECT  4.230000 0.305000  4.455000 2.465000 ;
-      RECT  4.625000 0.705000  4.845000 1.575000 ;
-      RECT  4.625000 1.575000  5.125000 1.955000 ;
-      RECT  4.635000 2.250000  5.465000 2.420000 ;
-      RECT  4.700000 0.265000  5.715000 0.465000 ;
-      RECT  5.025000 0.645000  5.375000 1.015000 ;
-      RECT  5.295000 1.195000  5.715000 1.235000 ;
-      RECT  5.295000 1.235000  6.645000 1.405000 ;
-      RECT  5.295000 1.405000  5.465000 2.250000 ;
-      RECT  5.545000 0.465000  5.715000 1.195000 ;
-      RECT  5.635000 1.575000  5.885000 1.785000 ;
-      RECT  5.635000 1.785000  6.985000 2.035000 ;
-      RECT  6.225000 0.255000  7.395000 0.425000 ;
-      RECT  6.225000 0.425000  6.555000 0.465000 ;
-      RECT  6.385000 2.035000  6.555000 2.375000 ;
-      RECT  6.395000 1.405000  6.645000 1.485000 ;
-      RECT  6.425000 1.155000  6.645000 1.235000 ;
-      RECT  6.700000 0.595000  7.030000 0.765000 ;
-      RECT  6.815000 0.765000  7.030000 0.895000 ;
-      RECT  6.815000 0.895000  8.125000 1.065000 ;
-      RECT  6.815000 1.065000  6.985000 1.785000 ;
-      RECT  7.155000 1.235000  7.485000 1.415000 ;
-      RECT  7.155000 1.415000  8.160000 1.655000 ;
-      RECT  7.200000 0.425000  7.395000 0.715000 ;
-      RECT  7.795000 1.065000  8.125000 1.235000 ;
-      RECT  8.360000 1.575000  8.595000 1.985000 ;
-      RECT  8.420000 0.705000  8.705000 1.125000 ;
-      RECT  8.420000 1.125000  9.040000 1.305000 ;
-      RECT  8.550000 2.250000  9.380000 2.420000 ;
-      RECT  8.615000 0.265000  9.380000 0.465000 ;
-      RECT  8.835000 1.305000  9.040000 1.905000 ;
-      RECT  9.210000 0.465000  9.380000 1.235000 ;
-      RECT  9.210000 1.235000 10.560000 1.405000 ;
-      RECT  9.210000 1.405000  9.380000 2.250000 ;
-      RECT  9.550000 1.575000  9.800000 1.915000 ;
-      RECT  9.550000 1.915000 12.330000 2.085000 ;
-      RECT 10.080000 0.255000 11.250000 0.425000 ;
-      RECT 10.080000 0.425000 10.430000 0.465000 ;
-      RECT 10.240000 2.085000 10.410000 2.375000 ;
-      RECT 10.340000 1.075000 10.560000 1.235000 ;
-      RECT 10.575000 0.645000 10.905000 0.815000 ;
-      RECT 10.730000 0.815000 10.905000 1.915000 ;
-      RECT 11.075000 0.425000 11.250000 0.585000 ;
-      RECT 11.080000 0.755000 11.765000 0.925000 ;
-      RECT 11.080000 0.925000 11.355000 1.575000 ;
-      RECT 11.080000 1.575000 11.855000 1.745000 ;
-      RECT 11.565000 0.265000 11.765000 0.755000 ;
-      RECT 12.160000 0.995000 12.425000 1.325000 ;
-      RECT 12.160000 1.325000 12.330000 1.915000 ;
-      RECT 12.960000 0.255000 13.275000 0.995000 ;
-      RECT 12.960000 0.995000 13.795000 1.325000 ;
-      RECT 12.960000 1.325000 13.275000 2.415000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.170000  0.345000  0.345000 0.635000 ;
+      RECT  0.170000  0.635000  0.835000 0.805000 ;
+      RECT  0.170000  1.795000  0.835000 1.965000 ;
+      RECT  0.170000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.605000  0.805000  0.835000 1.795000 ;
+      RECT  1.015000  0.345000  1.240000 2.465000 ;
+      RECT  1.455000  0.085000  1.705000 0.635000 ;
+      RECT  1.455000  1.885000  1.785000 2.635000 ;
+      RECT  2.235000  1.875000  2.565000 2.385000 ;
+      RECT  2.350000  0.265000  2.755000 0.595000 ;
+      RECT  2.350000  1.185000  3.075000 1.365000 ;
+      RECT  2.350000  1.365000  2.565000 1.875000 ;
+      RECT  2.585000  0.595000  2.755000 1.075000 ;
+      RECT  2.585000  1.075000  3.075000 1.185000 ;
+      RECT  2.745000  1.575000  3.645000 1.745000 ;
+      RECT  2.745000  1.745000  3.065000 1.905000 ;
+      RECT  2.895000  1.905000  3.065000 2.465000 ;
+      RECT  2.925000  0.305000  3.125000 0.625000 ;
+      RECT  2.925000  0.625000  3.645000 0.765000 ;
+      RECT  2.925000  0.765000  3.770000 0.795000 ;
+      RECT  3.310000  2.215000  3.640000 2.635000 ;
+      RECT  3.370000  0.085000  3.700000 0.445000 ;
+      RECT  3.475000  0.795000  3.770000 1.095000 ;
+      RECT  3.475000  1.095000  3.645000 1.575000 ;
+      RECT  4.230000  0.305000  4.455000 2.465000 ;
+      RECT  4.625000  0.705000  4.845000 1.575000 ;
+      RECT  4.625000  1.575000  5.125000 1.955000 ;
+      RECT  4.635000  2.250000  5.465000 2.420000 ;
+      RECT  4.700000  0.265000  5.715000 0.465000 ;
+      RECT  5.025000  0.645000  5.375000 1.015000 ;
+      RECT  5.295000  1.195000  5.715000 1.235000 ;
+      RECT  5.295000  1.235000  6.645000 1.405000 ;
+      RECT  5.295000  1.405000  5.465000 2.250000 ;
+      RECT  5.545000  0.465000  5.715000 1.195000 ;
+      RECT  5.635000  1.575000  5.885000 1.785000 ;
+      RECT  5.635000  1.785000  6.985000 2.035000 ;
+      RECT  5.705000  2.205000  6.085000 2.635000 ;
+      RECT  5.885000  0.085000  6.055000 0.525000 ;
+      RECT  6.225000  0.255000  7.395000 0.425000 ;
+      RECT  6.225000  0.425000  6.555000 0.465000 ;
+      RECT  6.385000  2.035000  6.555000 2.375000 ;
+      RECT  6.395000  1.405000  6.645000 1.485000 ;
+      RECT  6.425000  1.155000  6.645000 1.235000 ;
+      RECT  6.700000  0.595000  7.030000 0.765000 ;
+      RECT  6.815000  0.765000  7.030000 0.895000 ;
+      RECT  6.815000  0.895000  8.125000 1.065000 ;
+      RECT  6.815000  1.065000  6.985000 1.785000 ;
+      RECT  7.155000  1.235000  7.485000 1.415000 ;
+      RECT  7.155000  1.415000  8.160000 1.655000 ;
+      RECT  7.175000  1.915000  7.505000 2.635000 ;
+      RECT  7.200000  0.425000  7.395000 0.715000 ;
+      RECT  7.640000  0.085000  7.975000 0.465000 ;
+      RECT  7.795000  1.065000  8.125000 1.235000 ;
+      RECT  8.360000  1.575000  8.595000 1.985000 ;
+      RECT  8.420000  0.705000  8.705000 1.125000 ;
+      RECT  8.420000  1.125000  9.040000 1.305000 ;
+      RECT  8.550000  2.250000  9.380000 2.420000 ;
+      RECT  8.615000  0.265000  9.380000 0.465000 ;
+      RECT  8.835000  1.305000  9.040000 1.905000 ;
+      RECT  9.210000  0.465000  9.380000 1.235000 ;
+      RECT  9.210000  1.235000 10.560000 1.405000 ;
+      RECT  9.210000  1.405000  9.380000 2.250000 ;
+      RECT  9.550000  1.575000  9.800000 1.915000 ;
+      RECT  9.550000  1.915000 12.330000 2.085000 ;
+      RECT  9.560000  0.085000  9.820000 0.525000 ;
+      RECT  9.620000  2.255000 10.000000 2.635000 ;
+      RECT 10.080000  0.255000 11.250000 0.425000 ;
+      RECT 10.080000  0.425000 10.430000 0.465000 ;
+      RECT 10.240000  2.085000 10.410000 2.375000 ;
+      RECT 10.340000  1.075000 10.560000 1.235000 ;
+      RECT 10.575000  0.645000 10.905000 0.815000 ;
+      RECT 10.730000  0.815000 10.905000 1.915000 ;
+      RECT 10.940000  2.255000 12.330000 2.635000 ;
+      RECT 11.075000  0.425000 11.250000 0.585000 ;
+      RECT 11.080000  0.755000 11.765000 0.925000 ;
+      RECT 11.080000  0.925000 11.355000 1.575000 ;
+      RECT 11.080000  1.575000 11.855000 1.745000 ;
+      RECT 11.565000  0.265000 11.765000 0.755000 ;
+      RECT 12.000000  0.085000 12.330000 0.805000 ;
+      RECT 12.160000  0.995000 12.425000 1.325000 ;
+      RECT 12.160000  1.325000 12.330000 1.915000 ;
+      RECT 12.960000  0.255000 13.275000 0.995000 ;
+      RECT 12.960000  0.995000 13.795000 1.325000 ;
+      RECT 12.960000  1.325000 13.275000 2.415000 ;
+      RECT 13.450000  1.765000 13.745000 2.635000 ;
+      RECT 13.455000  0.085000 13.745000 0.545000 ;
     LAYER mcon ;
-      RECT  0.605000 1.785000  0.775000 1.955000 ;
-      RECT  1.065000 0.765000  1.235000 0.935000 ;
-      RECT  2.905000 1.105000  3.075000 1.275000 ;
-      RECT  4.285000 1.105000  4.455000 1.275000 ;
-      RECT  4.745000 1.785000  4.915000 1.955000 ;
-      RECT  5.205000 0.765000  5.375000 0.935000 ;
-      RECT  7.965000 1.445000  8.135000 1.615000 ;
-      RECT  8.425000 1.105000  8.595000 1.275000 ;
-      RECT  8.425000 1.785000  8.595000 1.955000 ;
-      RECT 11.185000 1.445000 11.355000 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  1.785000  0.775000 1.955000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  0.765000  1.235000 0.935000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  1.105000  3.075000 1.275000 ;
+      RECT  2.905000  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.105000  4.455000 1.275000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  1.785000  4.915000 1.955000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  0.765000  5.375000 0.935000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.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  1.445000  8.135000 1.615000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  1.105000  8.595000 1.275000 ;
+      RECT  8.425000  1.785000  8.595000 1.955000 ;
+      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  1.445000 11.355000 1.615000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT  0.545000 1.755000  0.835000 1.800000 ;
       RECT  0.545000 1.800000  8.655000 1.940000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
index e774868..7e18721 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.magic.lef
@@ -69,13 +69,19 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 6.505000 0.765000  7.035000 1.045000 ;
+        RECT 6.505000 0.765000 7.035000 1.045000 ;
+      LAYER mcon ;
+        RECT 6.865000 0.765000 7.035000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 9.525000 1.065000 10.115000 1.275000 ;
         RECT 9.825000 0.635000 10.115000 1.065000 ;
       LAYER mcon ;
-        RECT 6.865000 0.765000  7.035000 0.935000 ;
         RECT 9.690000 1.105000  9.860000 1.275000 ;
         RECT 9.945000 0.765000 10.115000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.445000 0.735000  7.095000 0.780000 ;
         RECT 6.445000 0.780000 10.175000 0.920000 ;
@@ -119,45 +125,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.880000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.875000  0.085000  2.205000 0.560000 ;
-        RECT  2.395000  0.085000  2.725000 0.825000 ;
-        RECT  4.445000  0.085000  4.775000 0.540000 ;
-        RECT  6.915000  0.085000  7.245000 0.545000 ;
-        RECT  9.085000  0.085000  9.255000 0.525000 ;
-        RECT 10.720000  0.085000 10.890000 0.545000 ;
-        RECT 12.010000  0.085000 12.340000 0.465000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
@@ -167,144 +134,179 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.880000 2.805000 ;
-        RECT  0.530000 2.135000  0.860000 2.635000 ;
-        RECT  2.320000 2.040000  2.490000 2.635000 ;
-        RECT  4.300000 2.275000  4.630000 2.635000 ;
-        RECT  6.410000 2.355000  6.740000 2.635000 ;
-        RECT  7.375000 2.175000  7.745000 2.635000 ;
-        RECT  9.360000 2.195000  9.610000 2.635000 ;
-        RECT 10.120000 2.255000 10.450000 2.635000 ;
-        RECT 10.720000 1.495000 10.970000 2.635000 ;
-        RECT 12.010000 1.875000 12.340000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.865000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.835000 0.805000 ;
-      RECT  0.660000 0.805000  0.835000 0.995000 ;
-      RECT  0.660000 0.995000  0.975000 1.325000 ;
-      RECT  0.660000 1.325000  0.865000 1.795000 ;
-      RECT  1.015000 0.345000  1.315000 0.675000 ;
-      RECT  1.035000 1.730000  1.315000 1.900000 ;
-      RECT  1.035000 1.900000  1.205000 2.465000 ;
-      RECT  1.145000 0.675000  1.315000 1.730000 ;
-      RECT  1.535000 0.395000  1.705000 0.730000 ;
-      RECT  1.535000 0.730000  2.225000 0.900000 ;
-      RECT  1.900000 2.055000  2.150000 2.400000 ;
-      RECT  1.980000 1.260000  2.470000 1.455000 ;
-      RECT  1.980000 1.455000  2.150000 2.055000 ;
-      RECT  2.055000 0.900000  2.225000 0.995000 ;
-      RECT  2.055000 0.995000  3.085000 1.185000 ;
-      RECT  2.055000 1.185000  2.470000 1.260000 ;
-      RECT  2.915000 0.255000  3.850000 0.425000 ;
-      RECT  2.915000 0.425000  3.085000 0.995000 ;
-      RECT  3.255000 0.675000  3.425000 1.015000 ;
-      RECT  3.255000 1.015000  3.460000 1.185000 ;
-      RECT  3.290000 1.185000  3.460000 1.935000 ;
-      RECT  3.290000 1.935000  5.075000 2.105000 ;
-      RECT  3.460000 2.105000  3.630000 2.465000 ;
-      RECT  3.680000 0.425000  3.850000 1.685000 ;
-      RECT  4.565000 0.715000  5.145000 0.895000 ;
-      RECT  4.565000 0.895000  4.735000 1.935000 ;
-      RECT  4.905000 1.065000  5.075000 1.395000 ;
-      RECT  4.905000 2.105000  5.075000 2.185000 ;
-      RECT  4.905000 2.185000  5.275000 2.435000 ;
-      RECT  4.975000 0.335000  5.315000 0.505000 ;
-      RECT  4.975000 0.505000  5.145000 0.715000 ;
-      RECT  5.245000 1.575000  5.495000 1.955000 ;
-      RECT  5.325000 0.705000  5.975000 1.035000 ;
-      RECT  5.325000 1.035000  5.495000 1.575000 ;
-      RECT  5.470000 2.135000  5.835000 2.465000 ;
-      RECT  5.485000 0.305000  6.335000 0.475000 ;
-      RECT  5.665000 1.215000  7.375000 1.385000 ;
-      RECT  5.665000 1.385000  5.835000 2.135000 ;
-      RECT  6.005000 1.935000  7.165000 2.105000 ;
-      RECT  6.005000 2.105000  6.175000 2.375000 ;
-      RECT  6.165000 0.475000  6.335000 1.215000 ;
-      RECT  6.285000 1.595000  7.715000 1.765000 ;
-      RECT  6.995000 2.105000  7.165000 2.375000 ;
-      RECT  7.205000 1.005000  7.375000 1.215000 ;
-      RECT  7.455000 0.275000  7.785000 0.445000 ;
-      RECT  7.455000 0.445000  7.715000 0.835000 ;
-      RECT  7.455000 1.765000  7.715000 1.835000 ;
-      RECT  7.455000 1.835000  8.140000 2.005000 ;
-      RECT  7.545000 0.835000  7.715000 1.595000 ;
-      RECT  7.885000 0.705000  8.095000 1.495000 ;
-      RECT  7.885000 1.495000  8.520000 1.655000 ;
-      RECT  7.885000 1.655000  8.870000 1.665000 ;
-      RECT  7.970000 2.005000  8.140000 2.465000 ;
-      RECT  8.005000 0.255000  8.915000 0.535000 ;
-      RECT  8.310000 1.665000  8.870000 1.935000 ;
-      RECT  8.310000 1.935000  8.840000 1.955000 ;
-      RECT  8.320000 2.125000  9.190000 2.465000 ;
-      RECT  8.405000 0.920000  8.575000 1.325000 ;
-      RECT  8.745000 0.535000  8.915000 1.315000 ;
-      RECT  8.745000 1.315000  9.210000 1.485000 ;
-      RECT  9.015000 2.035000  9.210000 2.115000 ;
-      RECT  9.015000 2.115000  9.190000 2.125000 ;
-      RECT  9.040000 1.485000  9.210000 1.575000 ;
-      RECT  9.040000 1.575000 10.205000 1.745000 ;
-      RECT  9.040000 1.745000  9.210000 2.035000 ;
-      RECT  9.125000 0.695000  9.655000 0.865000 ;
-      RECT  9.125000 0.865000  9.295000 1.145000 ;
-      RECT  9.485000 0.295000 10.515000 0.465000 ;
-      RECT  9.485000 0.465000  9.655000 0.695000 ;
-      RECT  9.780000 1.915000 10.545000 2.085000 ;
-      RECT  9.780000 2.085000  9.950000 2.375000 ;
-      RECT 10.345000 0.465000 10.515000 0.995000 ;
-      RECT 10.345000 0.995000 11.020000 1.295000 ;
-      RECT 10.375000 1.295000 11.020000 1.325000 ;
-      RECT 10.375000 1.325000 10.545000 1.915000 ;
-      RECT 11.650000 1.535000 12.325000 1.705000 ;
-      RECT 11.650000 1.705000 11.830000 2.465000 ;
-      RECT 11.660000 0.255000 11.830000 0.635000 ;
-      RECT 11.660000 0.635000 12.325000 0.805000 ;
-      RECT 12.155000 0.805000 12.325000 1.060000 ;
-      RECT 12.155000 1.060000 12.430000 1.390000 ;
-      RECT 12.155000 1.390000 12.325000 1.535000 ;
+      RECT  0.000000 -0.085000 12.880000 0.085000 ;
+      RECT  0.000000  2.635000 12.880000 2.805000 ;
+      RECT  0.090000  1.795000  0.865000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.835000 0.805000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.530000  2.135000  0.860000 2.635000 ;
+      RECT  0.660000  0.805000  0.835000 0.995000 ;
+      RECT  0.660000  0.995000  0.975000 1.325000 ;
+      RECT  0.660000  1.325000  0.865000 1.795000 ;
+      RECT  1.015000  0.345000  1.315000 0.675000 ;
+      RECT  1.035000  1.730000  1.315000 1.900000 ;
+      RECT  1.035000  1.900000  1.205000 2.465000 ;
+      RECT  1.145000  0.675000  1.315000 1.730000 ;
+      RECT  1.535000  0.395000  1.705000 0.730000 ;
+      RECT  1.535000  0.730000  2.225000 0.900000 ;
+      RECT  1.875000  0.085000  2.205000 0.560000 ;
+      RECT  1.900000  2.055000  2.150000 2.400000 ;
+      RECT  1.980000  1.260000  2.470000 1.455000 ;
+      RECT  1.980000  1.455000  2.150000 2.055000 ;
+      RECT  2.055000  0.900000  2.225000 0.995000 ;
+      RECT  2.055000  0.995000  3.085000 1.185000 ;
+      RECT  2.055000  1.185000  2.470000 1.260000 ;
+      RECT  2.320000  2.040000  2.490000 2.635000 ;
+      RECT  2.395000  0.085000  2.725000 0.825000 ;
+      RECT  2.915000  0.255000  3.850000 0.425000 ;
+      RECT  2.915000  0.425000  3.085000 0.995000 ;
+      RECT  3.255000  0.675000  3.425000 1.015000 ;
+      RECT  3.255000  1.015000  3.460000 1.185000 ;
+      RECT  3.290000  1.185000  3.460000 1.935000 ;
+      RECT  3.290000  1.935000  5.075000 2.105000 ;
+      RECT  3.460000  2.105000  3.630000 2.465000 ;
+      RECT  3.680000  0.425000  3.850000 1.685000 ;
+      RECT  4.300000  2.275000  4.630000 2.635000 ;
+      RECT  4.445000  0.085000  4.775000 0.540000 ;
+      RECT  4.565000  0.715000  5.145000 0.895000 ;
+      RECT  4.565000  0.895000  4.735000 1.935000 ;
+      RECT  4.905000  1.065000  5.075000 1.395000 ;
+      RECT  4.905000  2.105000  5.075000 2.185000 ;
+      RECT  4.905000  2.185000  5.275000 2.435000 ;
+      RECT  4.975000  0.335000  5.315000 0.505000 ;
+      RECT  4.975000  0.505000  5.145000 0.715000 ;
+      RECT  5.245000  1.575000  5.495000 1.955000 ;
+      RECT  5.325000  0.705000  5.975000 1.035000 ;
+      RECT  5.325000  1.035000  5.495000 1.575000 ;
+      RECT  5.470000  2.135000  5.835000 2.465000 ;
+      RECT  5.485000  0.305000  6.335000 0.475000 ;
+      RECT  5.665000  1.215000  7.375000 1.385000 ;
+      RECT  5.665000  1.385000  5.835000 2.135000 ;
+      RECT  6.005000  1.935000  7.165000 2.105000 ;
+      RECT  6.005000  2.105000  6.175000 2.375000 ;
+      RECT  6.165000  0.475000  6.335000 1.215000 ;
+      RECT  6.285000  1.595000  7.715000 1.765000 ;
+      RECT  6.410000  2.355000  6.740000 2.635000 ;
+      RECT  6.915000  0.085000  7.245000 0.545000 ;
+      RECT  6.995000  2.105000  7.165000 2.375000 ;
+      RECT  7.205000  1.005000  7.375000 1.215000 ;
+      RECT  7.375000  2.175000  7.745000 2.635000 ;
+      RECT  7.455000  0.275000  7.785000 0.445000 ;
+      RECT  7.455000  0.445000  7.715000 0.835000 ;
+      RECT  7.455000  1.765000  7.715000 1.835000 ;
+      RECT  7.455000  1.835000  8.140000 2.005000 ;
+      RECT  7.545000  0.835000  7.715000 1.595000 ;
+      RECT  7.885000  0.705000  8.095000 1.495000 ;
+      RECT  7.885000  1.495000  8.520000 1.655000 ;
+      RECT  7.885000  1.655000  8.870000 1.665000 ;
+      RECT  7.970000  2.005000  8.140000 2.465000 ;
+      RECT  8.005000  0.255000  8.915000 0.535000 ;
+      RECT  8.310000  1.665000  8.870000 1.935000 ;
+      RECT  8.310000  1.935000  8.840000 1.955000 ;
+      RECT  8.320000  2.125000  9.190000 2.465000 ;
+      RECT  8.405000  0.920000  8.575000 1.325000 ;
+      RECT  8.745000  0.535000  8.915000 1.315000 ;
+      RECT  8.745000  1.315000  9.210000 1.485000 ;
+      RECT  9.015000  2.035000  9.210000 2.115000 ;
+      RECT  9.015000  2.115000  9.190000 2.125000 ;
+      RECT  9.040000  1.485000  9.210000 1.575000 ;
+      RECT  9.040000  1.575000 10.205000 1.745000 ;
+      RECT  9.040000  1.745000  9.210000 2.035000 ;
+      RECT  9.085000  0.085000  9.255000 0.525000 ;
+      RECT  9.125000  0.695000  9.655000 0.865000 ;
+      RECT  9.125000  0.865000  9.295000 1.145000 ;
+      RECT  9.360000  2.195000  9.610000 2.635000 ;
+      RECT  9.485000  0.295000 10.515000 0.465000 ;
+      RECT  9.485000  0.465000  9.655000 0.695000 ;
+      RECT  9.780000  1.915000 10.545000 2.085000 ;
+      RECT  9.780000  2.085000  9.950000 2.375000 ;
+      RECT 10.120000  2.255000 10.450000 2.635000 ;
+      RECT 10.345000  0.465000 10.515000 0.995000 ;
+      RECT 10.345000  0.995000 11.020000 1.295000 ;
+      RECT 10.375000  1.295000 11.020000 1.325000 ;
+      RECT 10.375000  1.325000 10.545000 1.915000 ;
+      RECT 10.720000  0.085000 10.890000 0.545000 ;
+      RECT 10.720000  1.495000 10.970000 2.635000 ;
+      RECT 11.650000  1.535000 12.325000 1.705000 ;
+      RECT 11.650000  1.705000 11.830000 2.465000 ;
+      RECT 11.660000  0.255000 11.830000 0.635000 ;
+      RECT 11.660000  0.635000 12.325000 0.805000 ;
+      RECT 12.010000  0.085000 12.340000 0.465000 ;
+      RECT 12.010000  1.875000 12.340000 2.635000 ;
+      RECT 12.155000  0.805000 12.325000 1.060000 ;
+      RECT 12.155000  1.060000 12.430000 1.390000 ;
+      RECT 12.155000  1.390000 12.325000 1.535000 ;
     LAYER mcon ;
-      RECT 0.805000 1.105000 0.975000 1.275000 ;
-      RECT 1.035000 1.785000 1.205000 1.955000 ;
-      RECT 4.905000 1.105000 5.075000 1.275000 ;
-      RECT 5.325000 1.785000 5.495000 1.955000 ;
-      RECT 8.405000 1.105000 8.575000 1.275000 ;
-      RECT 8.445000 1.785000 8.615000 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.805000  1.105000  0.975000 1.275000 ;
+      RECT  1.035000  1.785000  1.205000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  4.905000  1.105000  5.075000 1.275000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.325000  1.785000  5.495000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.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.405000  1.105000  8.575000 1.275000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.445000  1.785000  8.615000 1.955000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.745000 1.075000 1.035000 1.120000 ;
       RECT 0.745000 1.120000 8.635000 1.260000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
index 3d41a87..d2637c3 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.magic.lef
@@ -67,13 +67,19 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 6.505000 0.765000  7.035000 1.045000 ;
+        RECT 6.505000 0.765000 7.035000 1.045000 ;
+      LAYER mcon ;
+        RECT 6.865000 0.765000 7.035000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 9.525000 1.065000 10.115000 1.275000 ;
         RECT 9.825000 0.635000 10.115000 1.065000 ;
       LAYER mcon ;
-        RECT 6.865000 0.765000  7.035000 0.935000 ;
         RECT 9.690000 1.105000  9.860000 1.275000 ;
         RECT 9.945000 0.765000 10.115000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.445000 0.735000  7.095000 0.780000 ;
         RECT 6.445000 0.780000 10.175000 0.920000 ;
@@ -117,47 +123,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.340000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.875000  0.085000  2.205000 0.560000 ;
-        RECT  2.395000  0.085000  2.725000 0.825000 ;
-        RECT  4.445000  0.085000  4.775000 0.540000 ;
-        RECT  6.915000  0.085000  7.245000 0.545000 ;
-        RECT  9.085000  0.085000  9.255000 0.525000 ;
-        RECT 11.090000  0.085000 11.365000 0.545000 ;
-        RECT 12.105000  0.085000 12.275000 0.825000 ;
-        RECT 12.995000  0.085000 13.165000 0.930000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -167,148 +132,185 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.340000 2.805000 ;
-        RECT  0.530000 2.135000  0.860000 2.635000 ;
-        RECT  2.320000 2.040000  2.490000 2.635000 ;
-        RECT  4.300000 2.275000  4.630000 2.635000 ;
-        RECT  6.410000 2.355000  6.740000 2.635000 ;
-        RECT  7.375000 2.175000  7.745000 2.635000 ;
-        RECT  9.360000 2.195000  9.610000 2.635000 ;
-        RECT 10.120000 2.255000 10.450000 2.635000 ;
-        RECT 11.090000 2.205000 11.420000 2.635000 ;
-        RECT 12.025000 2.255000 12.355000 2.635000 ;
-        RECT 12.995000 1.495000 13.245000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.865000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.835000 0.805000 ;
-      RECT  0.660000 0.805000  0.835000 0.995000 ;
-      RECT  0.660000 0.995000  0.975000 1.325000 ;
-      RECT  0.660000 1.325000  0.865000 1.795000 ;
-      RECT  1.015000 0.345000  1.315000 0.675000 ;
-      RECT  1.035000 1.730000  1.315000 1.900000 ;
-      RECT  1.035000 1.900000  1.205000 2.465000 ;
-      RECT  1.145000 0.675000  1.315000 1.730000 ;
-      RECT  1.535000 0.395000  1.705000 0.730000 ;
-      RECT  1.535000 0.730000  2.225000 0.900000 ;
-      RECT  1.900000 2.055000  2.150000 2.400000 ;
-      RECT  1.980000 1.260000  2.470000 1.455000 ;
-      RECT  1.980000 1.455000  2.150000 2.055000 ;
-      RECT  2.055000 0.900000  2.225000 0.995000 ;
-      RECT  2.055000 0.995000  3.085000 1.185000 ;
-      RECT  2.055000 1.185000  2.470000 1.260000 ;
-      RECT  2.915000 0.255000  3.850000 0.425000 ;
-      RECT  2.915000 0.425000  3.085000 0.995000 ;
-      RECT  3.255000 0.675000  3.425000 1.015000 ;
-      RECT  3.255000 1.015000  3.460000 1.185000 ;
-      RECT  3.290000 1.185000  3.460000 1.935000 ;
-      RECT  3.290000 1.935000  5.075000 2.105000 ;
-      RECT  3.460000 2.105000  3.630000 2.465000 ;
-      RECT  3.680000 0.425000  3.850000 1.685000 ;
-      RECT  4.565000 0.715000  5.145000 0.895000 ;
-      RECT  4.565000 0.895000  4.735000 1.935000 ;
-      RECT  4.905000 1.065000  5.075000 1.395000 ;
-      RECT  4.905000 2.105000  5.075000 2.185000 ;
-      RECT  4.905000 2.185000  5.275000 2.435000 ;
-      RECT  4.975000 0.335000  5.315000 0.505000 ;
-      RECT  4.975000 0.505000  5.145000 0.715000 ;
-      RECT  5.245000 1.575000  5.495000 1.955000 ;
-      RECT  5.325000 0.705000  5.975000 1.035000 ;
-      RECT  5.325000 1.035000  5.495000 1.575000 ;
-      RECT  5.470000 2.135000  5.835000 2.465000 ;
-      RECT  5.485000 0.305000  6.335000 0.475000 ;
-      RECT  5.665000 1.215000  7.375000 1.385000 ;
-      RECT  5.665000 1.385000  5.835000 2.135000 ;
-      RECT  6.005000 1.935000  7.165000 2.105000 ;
-      RECT  6.005000 2.105000  6.175000 2.375000 ;
-      RECT  6.165000 0.475000  6.335000 1.215000 ;
-      RECT  6.285000 1.595000  7.715000 1.765000 ;
-      RECT  6.995000 2.105000  7.165000 2.375000 ;
-      RECT  7.205000 1.005000  7.375000 1.215000 ;
-      RECT  7.455000 0.275000  7.785000 0.445000 ;
-      RECT  7.455000 0.445000  7.715000 0.835000 ;
-      RECT  7.455000 1.765000  7.715000 1.835000 ;
-      RECT  7.455000 1.835000  8.140000 2.005000 ;
-      RECT  7.545000 0.835000  7.715000 1.595000 ;
-      RECT  7.885000 0.705000  8.095000 1.495000 ;
-      RECT  7.885000 1.495000  8.520000 1.655000 ;
-      RECT  7.885000 1.655000  8.870000 1.665000 ;
-      RECT  7.970000 2.005000  8.140000 2.465000 ;
-      RECT  8.005000 0.255000  8.915000 0.535000 ;
-      RECT  8.310000 1.665000  8.870000 1.935000 ;
-      RECT  8.310000 1.935000  8.840000 1.955000 ;
-      RECT  8.320000 2.125000  9.190000 2.465000 ;
-      RECT  8.405000 0.920000  8.575000 1.325000 ;
-      RECT  8.745000 0.535000  8.915000 1.315000 ;
-      RECT  8.745000 1.315000  9.210000 1.485000 ;
-      RECT  9.015000 2.035000  9.210000 2.115000 ;
-      RECT  9.015000 2.115000  9.190000 2.125000 ;
-      RECT  9.040000 1.485000  9.210000 1.575000 ;
-      RECT  9.040000 1.575000 10.205000 1.745000 ;
-      RECT  9.040000 1.745000  9.210000 2.035000 ;
-      RECT  9.125000 0.695000  9.655000 0.865000 ;
-      RECT  9.125000 0.865000  9.295000 1.145000 ;
-      RECT  9.485000 0.295000 10.515000 0.465000 ;
-      RECT  9.485000 0.465000  9.655000 0.695000 ;
-      RECT  9.780000 1.915000 10.545000 2.085000 ;
-      RECT  9.780000 2.085000  9.950000 2.375000 ;
-      RECT 10.345000 0.465000 10.515000 1.055000 ;
-      RECT 10.345000 1.055000 11.060000 1.295000 ;
-      RECT 10.375000 1.295000 11.060000 1.325000 ;
-      RECT 10.375000 1.325000 10.545000 1.915000 ;
-      RECT 10.715000 0.345000 10.885000 0.715000 ;
-      RECT 10.715000 0.715000 11.405000 0.885000 ;
-      RECT 10.715000 1.795000 11.405000 1.865000 ;
-      RECT 10.715000 1.865000 12.265000 2.035000 ;
-      RECT 10.715000 2.035000 10.890000 2.465000 ;
-      RECT 11.230000 0.885000 11.405000 1.795000 ;
-      RECT 11.550000 2.035000 12.265000 2.085000 ;
-      RECT 12.095000 0.995000 12.485000 1.325000 ;
-      RECT 12.095000 1.325000 12.265000 1.865000 ;
+      RECT  0.000000 -0.085000 13.340000 0.085000 ;
+      RECT  0.000000  2.635000 13.340000 2.805000 ;
+      RECT  0.090000  1.795000  0.865000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.835000 0.805000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.530000  2.135000  0.860000 2.635000 ;
+      RECT  0.660000  0.805000  0.835000 0.995000 ;
+      RECT  0.660000  0.995000  0.975000 1.325000 ;
+      RECT  0.660000  1.325000  0.865000 1.795000 ;
+      RECT  1.015000  0.345000  1.315000 0.675000 ;
+      RECT  1.035000  1.730000  1.315000 1.900000 ;
+      RECT  1.035000  1.900000  1.205000 2.465000 ;
+      RECT  1.145000  0.675000  1.315000 1.730000 ;
+      RECT  1.535000  0.395000  1.705000 0.730000 ;
+      RECT  1.535000  0.730000  2.225000 0.900000 ;
+      RECT  1.875000  0.085000  2.205000 0.560000 ;
+      RECT  1.900000  2.055000  2.150000 2.400000 ;
+      RECT  1.980000  1.260000  2.470000 1.455000 ;
+      RECT  1.980000  1.455000  2.150000 2.055000 ;
+      RECT  2.055000  0.900000  2.225000 0.995000 ;
+      RECT  2.055000  0.995000  3.085000 1.185000 ;
+      RECT  2.055000  1.185000  2.470000 1.260000 ;
+      RECT  2.320000  2.040000  2.490000 2.635000 ;
+      RECT  2.395000  0.085000  2.725000 0.825000 ;
+      RECT  2.915000  0.255000  3.850000 0.425000 ;
+      RECT  2.915000  0.425000  3.085000 0.995000 ;
+      RECT  3.255000  0.675000  3.425000 1.015000 ;
+      RECT  3.255000  1.015000  3.460000 1.185000 ;
+      RECT  3.290000  1.185000  3.460000 1.935000 ;
+      RECT  3.290000  1.935000  5.075000 2.105000 ;
+      RECT  3.460000  2.105000  3.630000 2.465000 ;
+      RECT  3.680000  0.425000  3.850000 1.685000 ;
+      RECT  4.300000  2.275000  4.630000 2.635000 ;
+      RECT  4.445000  0.085000  4.775000 0.540000 ;
+      RECT  4.565000  0.715000  5.145000 0.895000 ;
+      RECT  4.565000  0.895000  4.735000 1.935000 ;
+      RECT  4.905000  1.065000  5.075000 1.395000 ;
+      RECT  4.905000  2.105000  5.075000 2.185000 ;
+      RECT  4.905000  2.185000  5.275000 2.435000 ;
+      RECT  4.975000  0.335000  5.315000 0.505000 ;
+      RECT  4.975000  0.505000  5.145000 0.715000 ;
+      RECT  5.245000  1.575000  5.495000 1.955000 ;
+      RECT  5.325000  0.705000  5.975000 1.035000 ;
+      RECT  5.325000  1.035000  5.495000 1.575000 ;
+      RECT  5.470000  2.135000  5.835000 2.465000 ;
+      RECT  5.485000  0.305000  6.335000 0.475000 ;
+      RECT  5.665000  1.215000  7.375000 1.385000 ;
+      RECT  5.665000  1.385000  5.835000 2.135000 ;
+      RECT  6.005000  1.935000  7.165000 2.105000 ;
+      RECT  6.005000  2.105000  6.175000 2.375000 ;
+      RECT  6.165000  0.475000  6.335000 1.215000 ;
+      RECT  6.285000  1.595000  7.715000 1.765000 ;
+      RECT  6.410000  2.355000  6.740000 2.635000 ;
+      RECT  6.915000  0.085000  7.245000 0.545000 ;
+      RECT  6.995000  2.105000  7.165000 2.375000 ;
+      RECT  7.205000  1.005000  7.375000 1.215000 ;
+      RECT  7.375000  2.175000  7.745000 2.635000 ;
+      RECT  7.455000  0.275000  7.785000 0.445000 ;
+      RECT  7.455000  0.445000  7.715000 0.835000 ;
+      RECT  7.455000  1.765000  7.715000 1.835000 ;
+      RECT  7.455000  1.835000  8.140000 2.005000 ;
+      RECT  7.545000  0.835000  7.715000 1.595000 ;
+      RECT  7.885000  0.705000  8.095000 1.495000 ;
+      RECT  7.885000  1.495000  8.520000 1.655000 ;
+      RECT  7.885000  1.655000  8.870000 1.665000 ;
+      RECT  7.970000  2.005000  8.140000 2.465000 ;
+      RECT  8.005000  0.255000  8.915000 0.535000 ;
+      RECT  8.310000  1.665000  8.870000 1.935000 ;
+      RECT  8.310000  1.935000  8.840000 1.955000 ;
+      RECT  8.320000  2.125000  9.190000 2.465000 ;
+      RECT  8.405000  0.920000  8.575000 1.325000 ;
+      RECT  8.745000  0.535000  8.915000 1.315000 ;
+      RECT  8.745000  1.315000  9.210000 1.485000 ;
+      RECT  9.015000  2.035000  9.210000 2.115000 ;
+      RECT  9.015000  2.115000  9.190000 2.125000 ;
+      RECT  9.040000  1.485000  9.210000 1.575000 ;
+      RECT  9.040000  1.575000 10.205000 1.745000 ;
+      RECT  9.040000  1.745000  9.210000 2.035000 ;
+      RECT  9.085000  0.085000  9.255000 0.525000 ;
+      RECT  9.125000  0.695000  9.655000 0.865000 ;
+      RECT  9.125000  0.865000  9.295000 1.145000 ;
+      RECT  9.360000  2.195000  9.610000 2.635000 ;
+      RECT  9.485000  0.295000 10.515000 0.465000 ;
+      RECT  9.485000  0.465000  9.655000 0.695000 ;
+      RECT  9.780000  1.915000 10.545000 2.085000 ;
+      RECT  9.780000  2.085000  9.950000 2.375000 ;
+      RECT 10.120000  2.255000 10.450000 2.635000 ;
+      RECT 10.345000  0.465000 10.515000 1.055000 ;
+      RECT 10.345000  1.055000 11.060000 1.295000 ;
+      RECT 10.375000  1.295000 11.060000 1.325000 ;
+      RECT 10.375000  1.325000 10.545000 1.915000 ;
+      RECT 10.715000  0.345000 10.885000 0.715000 ;
+      RECT 10.715000  0.715000 11.405000 0.885000 ;
+      RECT 10.715000  1.795000 11.405000 1.865000 ;
+      RECT 10.715000  1.865000 12.265000 2.035000 ;
+      RECT 10.715000  2.035000 10.890000 2.465000 ;
+      RECT 11.090000  0.085000 11.365000 0.545000 ;
+      RECT 11.090000  2.205000 11.420000 2.635000 ;
+      RECT 11.230000  0.885000 11.405000 1.795000 ;
+      RECT 11.550000  2.035000 12.265000 2.085000 ;
+      RECT 12.025000  2.255000 12.355000 2.635000 ;
+      RECT 12.095000  0.995000 12.485000 1.325000 ;
+      RECT 12.095000  1.325000 12.265000 1.865000 ;
+      RECT 12.105000  0.085000 12.275000 0.825000 ;
+      RECT 12.995000  0.085000 13.165000 0.930000 ;
+      RECT 12.995000  1.495000 13.245000 2.635000 ;
     LAYER mcon ;
-      RECT 0.805000 1.105000 0.975000 1.275000 ;
-      RECT 1.035000 1.785000 1.205000 1.955000 ;
-      RECT 4.905000 1.105000 5.075000 1.275000 ;
-      RECT 5.325000 1.785000 5.495000 1.955000 ;
-      RECT 8.405000 1.105000 8.575000 1.275000 ;
-      RECT 8.445000 1.785000 8.615000 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.805000  1.105000  0.975000 1.275000 ;
+      RECT  1.035000  1.785000  1.205000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  4.905000  1.105000  5.075000 1.275000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.325000  1.785000  5.495000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.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.405000  1.105000  8.575000 1.275000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.445000  1.785000  8.615000 1.955000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
     LAYER met1 ;
       RECT 0.745000 1.075000 1.035000 1.120000 ;
       RECT 0.745000 1.120000 8.635000 1.260000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
index 313c19c..3ce6972 100644
--- a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.magic.lef
@@ -58,13 +58,19 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 6.505000 0.765000  7.035000 1.045000 ;
+        RECT 6.505000 0.765000 7.035000 1.045000 ;
+      LAYER mcon ;
+        RECT 6.865000 0.765000 7.035000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 9.525000 1.065000 10.115000 1.275000 ;
         RECT 9.825000 0.635000 10.115000 1.065000 ;
       LAYER mcon ;
-        RECT 6.865000 0.765000  7.035000 0.935000 ;
         RECT 9.690000 1.105000  9.860000 1.275000 ;
         RECT 9.945000 0.765000 10.115000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.445000 0.735000  7.095000 0.780000 ;
         RECT 6.445000 0.780000 10.175000 0.920000 ;
@@ -108,41 +114,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.500000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.875000  0.085000  2.205000 0.560000 ;
-        RECT  2.395000  0.085000  2.725000 0.825000 ;
-        RECT  4.445000  0.085000  4.775000 0.540000 ;
-        RECT  6.915000  0.085000  7.245000 0.545000 ;
-        RECT  9.085000  0.085000  9.255000 0.525000 ;
-        RECT 10.720000  0.085000 10.890000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
@@ -152,133 +123,164 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.500000 2.805000 ;
-        RECT  0.530000 2.135000  0.860000 2.635000 ;
-        RECT  2.320000 2.040000  2.490000 2.635000 ;
-        RECT  4.300000 2.275000  4.630000 2.635000 ;
-        RECT  6.410000 2.355000  6.740000 2.635000 ;
-        RECT  7.375000 2.175000  7.745000 2.635000 ;
-        RECT  9.360000 2.195000  9.610000 2.635000 ;
-        RECT 10.120000 2.255000 10.450000 2.635000 ;
-        RECT 10.720000 1.495000 10.970000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        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 1.795000  0.865000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.835000 0.805000 ;
-      RECT  0.660000 0.805000  0.835000 0.995000 ;
-      RECT  0.660000 0.995000  0.975000 1.325000 ;
-      RECT  0.660000 1.325000  0.865000 1.795000 ;
-      RECT  1.015000 0.345000  1.315000 0.675000 ;
-      RECT  1.035000 1.730000  1.315000 1.900000 ;
-      RECT  1.035000 1.900000  1.205000 2.465000 ;
-      RECT  1.145000 0.675000  1.315000 1.730000 ;
-      RECT  1.535000 0.395000  1.705000 0.730000 ;
-      RECT  1.535000 0.730000  2.225000 0.900000 ;
-      RECT  1.900000 2.055000  2.150000 2.400000 ;
-      RECT  1.980000 1.260000  2.470000 1.455000 ;
-      RECT  1.980000 1.455000  2.150000 2.055000 ;
-      RECT  2.055000 0.900000  2.225000 0.995000 ;
-      RECT  2.055000 0.995000  3.085000 1.185000 ;
-      RECT  2.055000 1.185000  2.470000 1.260000 ;
-      RECT  2.915000 0.255000  3.850000 0.425000 ;
-      RECT  2.915000 0.425000  3.085000 0.995000 ;
-      RECT  3.255000 0.675000  3.425000 1.015000 ;
-      RECT  3.255000 1.015000  3.460000 1.185000 ;
-      RECT  3.290000 1.185000  3.460000 1.935000 ;
-      RECT  3.290000 1.935000  5.075000 2.105000 ;
-      RECT  3.460000 2.105000  3.630000 2.465000 ;
-      RECT  3.680000 0.425000  3.850000 1.685000 ;
-      RECT  4.565000 0.715000  5.145000 0.895000 ;
-      RECT  4.565000 0.895000  4.735000 1.935000 ;
-      RECT  4.905000 1.065000  5.075000 1.395000 ;
-      RECT  4.905000 2.105000  5.075000 2.185000 ;
-      RECT  4.905000 2.185000  5.275000 2.435000 ;
-      RECT  4.975000 0.335000  5.315000 0.505000 ;
-      RECT  4.975000 0.505000  5.145000 0.715000 ;
-      RECT  5.245000 1.575000  5.495000 1.955000 ;
-      RECT  5.325000 0.705000  5.975000 1.035000 ;
-      RECT  5.325000 1.035000  5.495000 1.575000 ;
-      RECT  5.470000 2.135000  5.835000 2.465000 ;
-      RECT  5.485000 0.305000  6.335000 0.475000 ;
-      RECT  5.665000 1.215000  7.375000 1.385000 ;
-      RECT  5.665000 1.385000  5.835000 2.135000 ;
-      RECT  6.005000 1.935000  7.165000 2.105000 ;
-      RECT  6.005000 2.105000  6.175000 2.375000 ;
-      RECT  6.165000 0.475000  6.335000 1.215000 ;
-      RECT  6.285000 1.595000  7.715000 1.765000 ;
-      RECT  6.995000 2.105000  7.165000 2.375000 ;
-      RECT  7.205000 1.005000  7.375000 1.215000 ;
-      RECT  7.455000 0.275000  7.785000 0.445000 ;
-      RECT  7.455000 0.445000  7.715000 0.835000 ;
-      RECT  7.455000 1.765000  7.715000 1.835000 ;
-      RECT  7.455000 1.835000  8.140000 2.005000 ;
-      RECT  7.545000 0.835000  7.715000 1.595000 ;
-      RECT  7.885000 0.705000  8.095000 1.495000 ;
-      RECT  7.885000 1.495000  8.520000 1.655000 ;
-      RECT  7.885000 1.655000  8.870000 1.665000 ;
-      RECT  7.970000 2.005000  8.140000 2.465000 ;
-      RECT  8.005000 0.255000  8.915000 0.535000 ;
-      RECT  8.310000 1.665000  8.870000 1.935000 ;
-      RECT  8.310000 1.935000  8.840000 1.955000 ;
-      RECT  8.320000 2.125000  9.190000 2.465000 ;
-      RECT  8.405000 0.920000  8.575000 1.325000 ;
-      RECT  8.745000 0.535000  8.915000 1.315000 ;
-      RECT  8.745000 1.315000  9.210000 1.485000 ;
-      RECT  9.015000 2.035000  9.210000 2.115000 ;
-      RECT  9.015000 2.115000  9.190000 2.125000 ;
-      RECT  9.040000 1.485000  9.210000 1.575000 ;
-      RECT  9.040000 1.575000 10.205000 1.745000 ;
-      RECT  9.040000 1.745000  9.210000 2.035000 ;
-      RECT  9.125000 0.695000  9.655000 0.865000 ;
-      RECT  9.125000 0.865000  9.295000 1.145000 ;
-      RECT  9.485000 0.295000 10.515000 0.465000 ;
-      RECT  9.485000 0.465000  9.655000 0.695000 ;
-      RECT  9.780000 1.915000 10.545000 2.085000 ;
-      RECT  9.780000 2.085000  9.950000 2.375000 ;
-      RECT 10.345000 0.465000 10.515000 0.995000 ;
-      RECT 10.345000 0.995000 11.020000 1.295000 ;
-      RECT 10.375000 1.295000 11.020000 1.325000 ;
-      RECT 10.375000 1.325000 10.545000 1.915000 ;
+      RECT  0.000000 -0.085000 11.500000 0.085000 ;
+      RECT  0.000000  2.635000 11.500000 2.805000 ;
+      RECT  0.090000  1.795000  0.865000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.835000 0.805000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.530000  2.135000  0.860000 2.635000 ;
+      RECT  0.660000  0.805000  0.835000 0.995000 ;
+      RECT  0.660000  0.995000  0.975000 1.325000 ;
+      RECT  0.660000  1.325000  0.865000 1.795000 ;
+      RECT  1.015000  0.345000  1.315000 0.675000 ;
+      RECT  1.035000  1.730000  1.315000 1.900000 ;
+      RECT  1.035000  1.900000  1.205000 2.465000 ;
+      RECT  1.145000  0.675000  1.315000 1.730000 ;
+      RECT  1.535000  0.395000  1.705000 0.730000 ;
+      RECT  1.535000  0.730000  2.225000 0.900000 ;
+      RECT  1.875000  0.085000  2.205000 0.560000 ;
+      RECT  1.900000  2.055000  2.150000 2.400000 ;
+      RECT  1.980000  1.260000  2.470000 1.455000 ;
+      RECT  1.980000  1.455000  2.150000 2.055000 ;
+      RECT  2.055000  0.900000  2.225000 0.995000 ;
+      RECT  2.055000  0.995000  3.085000 1.185000 ;
+      RECT  2.055000  1.185000  2.470000 1.260000 ;
+      RECT  2.320000  2.040000  2.490000 2.635000 ;
+      RECT  2.395000  0.085000  2.725000 0.825000 ;
+      RECT  2.915000  0.255000  3.850000 0.425000 ;
+      RECT  2.915000  0.425000  3.085000 0.995000 ;
+      RECT  3.255000  0.675000  3.425000 1.015000 ;
+      RECT  3.255000  1.015000  3.460000 1.185000 ;
+      RECT  3.290000  1.185000  3.460000 1.935000 ;
+      RECT  3.290000  1.935000  5.075000 2.105000 ;
+      RECT  3.460000  2.105000  3.630000 2.465000 ;
+      RECT  3.680000  0.425000  3.850000 1.685000 ;
+      RECT  4.300000  2.275000  4.630000 2.635000 ;
+      RECT  4.445000  0.085000  4.775000 0.540000 ;
+      RECT  4.565000  0.715000  5.145000 0.895000 ;
+      RECT  4.565000  0.895000  4.735000 1.935000 ;
+      RECT  4.905000  1.065000  5.075000 1.395000 ;
+      RECT  4.905000  2.105000  5.075000 2.185000 ;
+      RECT  4.905000  2.185000  5.275000 2.435000 ;
+      RECT  4.975000  0.335000  5.315000 0.505000 ;
+      RECT  4.975000  0.505000  5.145000 0.715000 ;
+      RECT  5.245000  1.575000  5.495000 1.955000 ;
+      RECT  5.325000  0.705000  5.975000 1.035000 ;
+      RECT  5.325000  1.035000  5.495000 1.575000 ;
+      RECT  5.470000  2.135000  5.835000 2.465000 ;
+      RECT  5.485000  0.305000  6.335000 0.475000 ;
+      RECT  5.665000  1.215000  7.375000 1.385000 ;
+      RECT  5.665000  1.385000  5.835000 2.135000 ;
+      RECT  6.005000  1.935000  7.165000 2.105000 ;
+      RECT  6.005000  2.105000  6.175000 2.375000 ;
+      RECT  6.165000  0.475000  6.335000 1.215000 ;
+      RECT  6.285000  1.595000  7.715000 1.765000 ;
+      RECT  6.410000  2.355000  6.740000 2.635000 ;
+      RECT  6.915000  0.085000  7.245000 0.545000 ;
+      RECT  6.995000  2.105000  7.165000 2.375000 ;
+      RECT  7.205000  1.005000  7.375000 1.215000 ;
+      RECT  7.375000  2.175000  7.745000 2.635000 ;
+      RECT  7.455000  0.275000  7.785000 0.445000 ;
+      RECT  7.455000  0.445000  7.715000 0.835000 ;
+      RECT  7.455000  1.765000  7.715000 1.835000 ;
+      RECT  7.455000  1.835000  8.140000 2.005000 ;
+      RECT  7.545000  0.835000  7.715000 1.595000 ;
+      RECT  7.885000  0.705000  8.095000 1.495000 ;
+      RECT  7.885000  1.495000  8.520000 1.655000 ;
+      RECT  7.885000  1.655000  8.870000 1.665000 ;
+      RECT  7.970000  2.005000  8.140000 2.465000 ;
+      RECT  8.005000  0.255000  8.915000 0.535000 ;
+      RECT  8.310000  1.665000  8.870000 1.935000 ;
+      RECT  8.310000  1.935000  8.840000 1.955000 ;
+      RECT  8.320000  2.125000  9.190000 2.465000 ;
+      RECT  8.405000  0.920000  8.575000 1.325000 ;
+      RECT  8.745000  0.535000  8.915000 1.315000 ;
+      RECT  8.745000  1.315000  9.210000 1.485000 ;
+      RECT  9.015000  2.035000  9.210000 2.115000 ;
+      RECT  9.015000  2.115000  9.190000 2.125000 ;
+      RECT  9.040000  1.485000  9.210000 1.575000 ;
+      RECT  9.040000  1.575000 10.205000 1.745000 ;
+      RECT  9.040000  1.745000  9.210000 2.035000 ;
+      RECT  9.085000  0.085000  9.255000 0.525000 ;
+      RECT  9.125000  0.695000  9.655000 0.865000 ;
+      RECT  9.125000  0.865000  9.295000 1.145000 ;
+      RECT  9.360000  2.195000  9.610000 2.635000 ;
+      RECT  9.485000  0.295000 10.515000 0.465000 ;
+      RECT  9.485000  0.465000  9.655000 0.695000 ;
+      RECT  9.780000  1.915000 10.545000 2.085000 ;
+      RECT  9.780000  2.085000  9.950000 2.375000 ;
+      RECT 10.120000  2.255000 10.450000 2.635000 ;
+      RECT 10.345000  0.465000 10.515000 0.995000 ;
+      RECT 10.345000  0.995000 11.020000 1.295000 ;
+      RECT 10.375000  1.295000 11.020000 1.325000 ;
+      RECT 10.375000  1.325000 10.545000 1.915000 ;
+      RECT 10.720000  0.085000 10.890000 0.545000 ;
+      RECT 10.720000  1.495000 10.970000 2.635000 ;
     LAYER mcon ;
-      RECT 0.675000 1.785000 0.845000 1.955000 ;
-      RECT 1.145000 1.105000 1.315000 1.275000 ;
-      RECT 4.905000 1.105000 5.075000 1.275000 ;
-      RECT 5.325000 1.785000 5.495000 1.955000 ;
-      RECT 8.405000 1.105000 8.575000 1.275000 ;
-      RECT 8.445000 1.785000 8.615000 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.675000  1.785000  0.845000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.145000  1.105000  1.315000 1.275000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  4.905000  1.105000  5.075000 1.275000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.325000  1.785000  5.495000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.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.405000  1.105000  8.575000 1.275000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.445000  1.785000  8.615000 1.955000 ;
+      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.615000 1.755000 0.915000 1.800000 ;
       RECT 0.615000 1.800000 8.675000 1.940000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
index 0fc9adf..5061a9a 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.magic.lef
@@ -58,13 +58,19 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 6.505000 0.765000  7.035000 1.045000 ;
+        RECT 6.505000 0.765000 7.035000 1.045000 ;
+      LAYER mcon ;
+        RECT 6.865000 0.765000 7.035000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 9.525000 1.065000 10.115000 1.275000 ;
         RECT 9.825000 0.635000 10.115000 1.065000 ;
       LAYER mcon ;
-        RECT 6.865000 0.765000  7.035000 0.935000 ;
         RECT 9.690000 1.105000  9.860000 1.275000 ;
         RECT 9.945000 0.765000 10.115000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.445000 0.735000  7.095000 0.780000 ;
         RECT 6.445000 0.780000 10.175000 0.920000 ;
@@ -108,41 +114,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.500000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.875000  0.085000  2.205000 0.560000 ;
-        RECT  2.395000  0.085000  2.725000 0.825000 ;
-        RECT  4.445000  0.085000  4.775000 0.540000 ;
-        RECT  6.915000  0.085000  7.245000 0.545000 ;
-        RECT  9.085000  0.085000  9.255000 0.525000 ;
-        RECT 10.720000  0.085000 10.890000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
@@ -152,133 +123,164 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.500000 2.805000 ;
-        RECT  0.530000 2.135000  0.860000 2.635000 ;
-        RECT  2.320000 2.040000  2.490000 2.635000 ;
-        RECT  4.300000 2.275000  4.630000 2.635000 ;
-        RECT  6.410000 2.355000  6.740000 2.635000 ;
-        RECT  7.375000 2.175000  7.745000 2.635000 ;
-        RECT  9.360000 2.195000  9.610000 2.635000 ;
-        RECT 10.120000 2.255000 10.450000 2.635000 ;
-        RECT 10.720000 1.495000 10.970000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        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 1.795000  0.865000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.835000 0.805000 ;
-      RECT  0.660000 0.805000  0.835000 0.995000 ;
-      RECT  0.660000 0.995000  0.975000 1.325000 ;
-      RECT  0.660000 1.325000  0.865000 1.795000 ;
-      RECT  1.015000 0.345000  1.315000 0.675000 ;
-      RECT  1.035000 1.730000  1.315000 1.900000 ;
-      RECT  1.035000 1.900000  1.205000 2.465000 ;
-      RECT  1.145000 0.675000  1.315000 1.730000 ;
-      RECT  1.535000 0.395000  1.705000 0.730000 ;
-      RECT  1.535000 0.730000  2.225000 0.900000 ;
-      RECT  1.900000 2.055000  2.150000 2.400000 ;
-      RECT  1.980000 1.260000  2.470000 1.455000 ;
-      RECT  1.980000 1.455000  2.150000 2.055000 ;
-      RECT  2.055000 0.900000  2.225000 0.995000 ;
-      RECT  2.055000 0.995000  3.085000 1.185000 ;
-      RECT  2.055000 1.185000  2.470000 1.260000 ;
-      RECT  2.915000 0.255000  3.850000 0.425000 ;
-      RECT  2.915000 0.425000  3.085000 0.995000 ;
-      RECT  3.255000 0.675000  3.425000 1.015000 ;
-      RECT  3.255000 1.015000  3.460000 1.185000 ;
-      RECT  3.290000 1.185000  3.460000 1.935000 ;
-      RECT  3.290000 1.935000  5.075000 2.105000 ;
-      RECT  3.460000 2.105000  3.630000 2.465000 ;
-      RECT  3.680000 0.425000  3.850000 1.685000 ;
-      RECT  4.565000 0.715000  5.145000 0.895000 ;
-      RECT  4.565000 0.895000  4.735000 1.935000 ;
-      RECT  4.905000 1.065000  5.075000 1.395000 ;
-      RECT  4.905000 2.105000  5.075000 2.185000 ;
-      RECT  4.905000 2.185000  5.275000 2.435000 ;
-      RECT  4.975000 0.335000  5.315000 0.505000 ;
-      RECT  4.975000 0.505000  5.145000 0.715000 ;
-      RECT  5.245000 1.575000  5.495000 1.955000 ;
-      RECT  5.325000 0.705000  5.975000 1.035000 ;
-      RECT  5.325000 1.035000  5.495000 1.575000 ;
-      RECT  5.470000 2.135000  5.835000 2.465000 ;
-      RECT  5.485000 0.305000  6.335000 0.475000 ;
-      RECT  5.665000 1.215000  7.375000 1.385000 ;
-      RECT  5.665000 1.385000  5.835000 2.135000 ;
-      RECT  6.005000 1.935000  7.165000 2.105000 ;
-      RECT  6.005000 2.105000  6.175000 2.375000 ;
-      RECT  6.165000 0.475000  6.335000 1.215000 ;
-      RECT  6.285000 1.595000  7.715000 1.765000 ;
-      RECT  6.995000 2.105000  7.165000 2.375000 ;
-      RECT  7.205000 1.005000  7.375000 1.215000 ;
-      RECT  7.455000 0.275000  7.785000 0.445000 ;
-      RECT  7.455000 0.445000  7.715000 0.835000 ;
-      RECT  7.455000 1.765000  7.715000 1.835000 ;
-      RECT  7.455000 1.835000  8.140000 2.005000 ;
-      RECT  7.545000 0.835000  7.715000 1.595000 ;
-      RECT  7.885000 0.705000  8.095000 1.495000 ;
-      RECT  7.885000 1.495000  8.520000 1.655000 ;
-      RECT  7.885000 1.655000  8.870000 1.665000 ;
-      RECT  7.970000 2.005000  8.140000 2.465000 ;
-      RECT  8.005000 0.255000  8.915000 0.535000 ;
-      RECT  8.310000 1.665000  8.870000 1.935000 ;
-      RECT  8.310000 1.935000  8.840000 1.955000 ;
-      RECT  8.320000 2.125000  9.190000 2.465000 ;
-      RECT  8.405000 0.920000  8.575000 1.325000 ;
-      RECT  8.745000 0.535000  8.915000 1.315000 ;
-      RECT  8.745000 1.315000  9.210000 1.485000 ;
-      RECT  9.015000 2.035000  9.210000 2.115000 ;
-      RECT  9.015000 2.115000  9.190000 2.125000 ;
-      RECT  9.040000 1.485000  9.210000 1.575000 ;
-      RECT  9.040000 1.575000 10.205000 1.745000 ;
-      RECT  9.040000 1.745000  9.210000 2.035000 ;
-      RECT  9.125000 0.695000  9.655000 0.865000 ;
-      RECT  9.125000 0.865000  9.295000 1.145000 ;
-      RECT  9.485000 0.295000 10.515000 0.465000 ;
-      RECT  9.485000 0.465000  9.655000 0.695000 ;
-      RECT  9.780000 1.915000 10.545000 2.085000 ;
-      RECT  9.780000 2.085000  9.950000 2.375000 ;
-      RECT 10.345000 0.465000 10.515000 0.995000 ;
-      RECT 10.345000 0.995000 11.020000 1.295000 ;
-      RECT 10.375000 1.295000 11.020000 1.325000 ;
-      RECT 10.375000 1.325000 10.545000 1.915000 ;
+      RECT  0.000000 -0.085000 11.500000 0.085000 ;
+      RECT  0.000000  2.635000 11.500000 2.805000 ;
+      RECT  0.090000  1.795000  0.865000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.835000 0.805000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.530000  2.135000  0.860000 2.635000 ;
+      RECT  0.660000  0.805000  0.835000 0.995000 ;
+      RECT  0.660000  0.995000  0.975000 1.325000 ;
+      RECT  0.660000  1.325000  0.865000 1.795000 ;
+      RECT  1.015000  0.345000  1.315000 0.675000 ;
+      RECT  1.035000  1.730000  1.315000 1.900000 ;
+      RECT  1.035000  1.900000  1.205000 2.465000 ;
+      RECT  1.145000  0.675000  1.315000 1.730000 ;
+      RECT  1.535000  0.395000  1.705000 0.730000 ;
+      RECT  1.535000  0.730000  2.225000 0.900000 ;
+      RECT  1.875000  0.085000  2.205000 0.560000 ;
+      RECT  1.900000  2.055000  2.150000 2.400000 ;
+      RECT  1.980000  1.260000  2.470000 1.455000 ;
+      RECT  1.980000  1.455000  2.150000 2.055000 ;
+      RECT  2.055000  0.900000  2.225000 0.995000 ;
+      RECT  2.055000  0.995000  3.085000 1.185000 ;
+      RECT  2.055000  1.185000  2.470000 1.260000 ;
+      RECT  2.320000  2.040000  2.490000 2.635000 ;
+      RECT  2.395000  0.085000  2.725000 0.825000 ;
+      RECT  2.915000  0.255000  3.850000 0.425000 ;
+      RECT  2.915000  0.425000  3.085000 0.995000 ;
+      RECT  3.255000  0.675000  3.425000 1.015000 ;
+      RECT  3.255000  1.015000  3.460000 1.185000 ;
+      RECT  3.290000  1.185000  3.460000 1.935000 ;
+      RECT  3.290000  1.935000  5.075000 2.105000 ;
+      RECT  3.460000  2.105000  3.630000 2.465000 ;
+      RECT  3.680000  0.425000  3.850000 1.685000 ;
+      RECT  4.300000  2.275000  4.630000 2.635000 ;
+      RECT  4.445000  0.085000  4.775000 0.540000 ;
+      RECT  4.565000  0.715000  5.145000 0.895000 ;
+      RECT  4.565000  0.895000  4.735000 1.935000 ;
+      RECT  4.905000  1.065000  5.075000 1.395000 ;
+      RECT  4.905000  2.105000  5.075000 2.185000 ;
+      RECT  4.905000  2.185000  5.275000 2.435000 ;
+      RECT  4.975000  0.335000  5.315000 0.505000 ;
+      RECT  4.975000  0.505000  5.145000 0.715000 ;
+      RECT  5.245000  1.575000  5.495000 1.955000 ;
+      RECT  5.325000  0.705000  5.975000 1.035000 ;
+      RECT  5.325000  1.035000  5.495000 1.575000 ;
+      RECT  5.470000  2.135000  5.835000 2.465000 ;
+      RECT  5.485000  0.305000  6.335000 0.475000 ;
+      RECT  5.665000  1.215000  7.375000 1.385000 ;
+      RECT  5.665000  1.385000  5.835000 2.135000 ;
+      RECT  6.005000  1.935000  7.165000 2.105000 ;
+      RECT  6.005000  2.105000  6.175000 2.375000 ;
+      RECT  6.165000  0.475000  6.335000 1.215000 ;
+      RECT  6.285000  1.595000  7.715000 1.765000 ;
+      RECT  6.410000  2.355000  6.740000 2.635000 ;
+      RECT  6.915000  0.085000  7.245000 0.545000 ;
+      RECT  6.995000  2.105000  7.165000 2.375000 ;
+      RECT  7.205000  1.005000  7.375000 1.215000 ;
+      RECT  7.375000  2.175000  7.745000 2.635000 ;
+      RECT  7.455000  0.275000  7.785000 0.445000 ;
+      RECT  7.455000  0.445000  7.715000 0.835000 ;
+      RECT  7.455000  1.765000  7.715000 1.835000 ;
+      RECT  7.455000  1.835000  8.140000 2.005000 ;
+      RECT  7.545000  0.835000  7.715000 1.595000 ;
+      RECT  7.885000  0.705000  8.095000 1.495000 ;
+      RECT  7.885000  1.495000  8.520000 1.655000 ;
+      RECT  7.885000  1.655000  8.870000 1.665000 ;
+      RECT  7.970000  2.005000  8.140000 2.465000 ;
+      RECT  8.005000  0.255000  8.915000 0.535000 ;
+      RECT  8.310000  1.665000  8.870000 1.935000 ;
+      RECT  8.310000  1.935000  8.840000 1.955000 ;
+      RECT  8.320000  2.125000  9.190000 2.465000 ;
+      RECT  8.405000  0.920000  8.575000 1.325000 ;
+      RECT  8.745000  0.535000  8.915000 1.315000 ;
+      RECT  8.745000  1.315000  9.210000 1.485000 ;
+      RECT  9.015000  2.035000  9.210000 2.115000 ;
+      RECT  9.015000  2.115000  9.190000 2.125000 ;
+      RECT  9.040000  1.485000  9.210000 1.575000 ;
+      RECT  9.040000  1.575000 10.205000 1.745000 ;
+      RECT  9.040000  1.745000  9.210000 2.035000 ;
+      RECT  9.085000  0.085000  9.255000 0.525000 ;
+      RECT  9.125000  0.695000  9.655000 0.865000 ;
+      RECT  9.125000  0.865000  9.295000 1.145000 ;
+      RECT  9.360000  2.195000  9.610000 2.635000 ;
+      RECT  9.485000  0.295000 10.515000 0.465000 ;
+      RECT  9.485000  0.465000  9.655000 0.695000 ;
+      RECT  9.780000  1.915000 10.545000 2.085000 ;
+      RECT  9.780000  2.085000  9.950000 2.375000 ;
+      RECT 10.120000  2.255000 10.450000 2.635000 ;
+      RECT 10.345000  0.465000 10.515000 0.995000 ;
+      RECT 10.345000  0.995000 11.020000 1.295000 ;
+      RECT 10.375000  1.295000 11.020000 1.325000 ;
+      RECT 10.375000  1.325000 10.545000 1.915000 ;
+      RECT 10.720000  0.085000 10.890000 0.545000 ;
+      RECT 10.720000  1.495000 10.970000 2.635000 ;
     LAYER mcon ;
-      RECT 0.805000 1.105000 0.975000 1.275000 ;
-      RECT 1.035000 1.785000 1.205000 1.955000 ;
-      RECT 4.905000 1.105000 5.075000 1.275000 ;
-      RECT 5.325000 1.785000 5.495000 1.955000 ;
-      RECT 8.405000 1.105000 8.575000 1.275000 ;
-      RECT 8.445000 1.785000 8.615000 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.805000  1.105000  0.975000 1.275000 ;
+      RECT  1.035000  1.785000  1.205000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  4.905000  1.105000  5.075000 1.275000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.325000  1.785000  5.495000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.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.405000  1.105000  8.575000 1.275000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.445000  1.785000  8.615000 1.955000 ;
+      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.745000 1.075000 1.035000 1.120000 ;
       RECT 0.745000 1.120000 8.635000 1.260000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
index e48da9a..1d550d8 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.magic.lef
@@ -58,13 +58,19 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 6.505000 0.765000  7.035000 1.045000 ;
+        RECT 6.505000 0.765000 7.035000 1.045000 ;
+      LAYER mcon ;
+        RECT 6.865000 0.765000 7.035000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 9.525000 1.065000 10.115000 1.275000 ;
         RECT 9.825000 0.635000 10.115000 1.065000 ;
       LAYER mcon ;
-        RECT 6.865000 0.765000  7.035000 0.935000 ;
         RECT 9.690000 1.105000  9.860000 1.275000 ;
         RECT 9.945000 0.765000 10.115000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.445000 0.735000  7.095000 0.780000 ;
         RECT 6.445000 0.780000 10.175000 0.920000 ;
@@ -108,43 +114,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.875000  0.085000  2.205000 0.560000 ;
-        RECT  2.395000  0.085000  2.725000 0.825000 ;
-        RECT  4.445000  0.085000  4.775000 0.540000 ;
-        RECT  6.915000  0.085000  7.245000 0.545000 ;
-        RECT  9.085000  0.085000  9.255000 0.525000 ;
-        RECT 10.720000  0.085000 10.890000 0.545000 ;
-        RECT 11.570000  0.085000 11.740000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -154,135 +123,168 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.530000 2.135000  0.860000 2.635000 ;
-        RECT  2.320000 2.040000  2.490000 2.635000 ;
-        RECT  4.300000 2.275000  4.630000 2.635000 ;
-        RECT  6.410000 2.355000  6.740000 2.635000 ;
-        RECT  7.375000 2.175000  7.745000 2.635000 ;
-        RECT  9.360000 2.195000  9.610000 2.635000 ;
-        RECT 10.120000 2.255000 10.450000 2.635000 ;
-        RECT 10.720000 1.495000 10.970000 2.635000 ;
-        RECT 11.570000 1.495000 11.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 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.865000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.835000 0.805000 ;
-      RECT  0.660000 0.805000  0.835000 0.995000 ;
-      RECT  0.660000 0.995000  0.975000 1.325000 ;
-      RECT  0.660000 1.325000  0.865000 1.795000 ;
-      RECT  1.015000 0.345000  1.315000 0.675000 ;
-      RECT  1.035000 1.730000  1.315000 1.900000 ;
-      RECT  1.035000 1.900000  1.205000 2.465000 ;
-      RECT  1.145000 0.675000  1.315000 1.730000 ;
-      RECT  1.535000 0.395000  1.705000 0.730000 ;
-      RECT  1.535000 0.730000  2.225000 0.900000 ;
-      RECT  1.900000 2.055000  2.150000 2.400000 ;
-      RECT  1.980000 1.260000  2.470000 1.455000 ;
-      RECT  1.980000 1.455000  2.150000 2.055000 ;
-      RECT  2.055000 0.900000  2.225000 0.995000 ;
-      RECT  2.055000 0.995000  3.085000 1.185000 ;
-      RECT  2.055000 1.185000  2.470000 1.260000 ;
-      RECT  2.915000 0.255000  3.850000 0.425000 ;
-      RECT  2.915000 0.425000  3.085000 0.995000 ;
-      RECT  3.255000 0.675000  3.425000 1.015000 ;
-      RECT  3.255000 1.015000  3.460000 1.185000 ;
-      RECT  3.290000 1.185000  3.460000 1.935000 ;
-      RECT  3.290000 1.935000  5.075000 2.105000 ;
-      RECT  3.460000 2.105000  3.630000 2.465000 ;
-      RECT  3.680000 0.425000  3.850000 1.685000 ;
-      RECT  4.565000 0.715000  5.145000 0.895000 ;
-      RECT  4.565000 0.895000  4.735000 1.935000 ;
-      RECT  4.905000 1.065000  5.075000 1.395000 ;
-      RECT  4.905000 2.105000  5.075000 2.185000 ;
-      RECT  4.905000 2.185000  5.275000 2.435000 ;
-      RECT  4.975000 0.335000  5.315000 0.505000 ;
-      RECT  4.975000 0.505000  5.145000 0.715000 ;
-      RECT  5.245000 1.575000  5.495000 1.955000 ;
-      RECT  5.325000 0.705000  5.975000 1.035000 ;
-      RECT  5.325000 1.035000  5.495000 1.575000 ;
-      RECT  5.470000 2.135000  5.835000 2.465000 ;
-      RECT  5.485000 0.305000  6.335000 0.475000 ;
-      RECT  5.665000 1.215000  7.375000 1.385000 ;
-      RECT  5.665000 1.385000  5.835000 2.135000 ;
-      RECT  6.005000 1.935000  7.165000 2.105000 ;
-      RECT  6.005000 2.105000  6.175000 2.375000 ;
-      RECT  6.165000 0.475000  6.335000 1.215000 ;
-      RECT  6.285000 1.595000  7.715000 1.765000 ;
-      RECT  6.995000 2.105000  7.165000 2.375000 ;
-      RECT  7.205000 1.005000  7.375000 1.215000 ;
-      RECT  7.455000 0.275000  7.785000 0.445000 ;
-      RECT  7.455000 0.445000  7.715000 0.835000 ;
-      RECT  7.455000 1.765000  7.715000 1.835000 ;
-      RECT  7.455000 1.835000  8.140000 2.005000 ;
-      RECT  7.545000 0.835000  7.715000 1.595000 ;
-      RECT  7.885000 0.705000  8.095000 1.495000 ;
-      RECT  7.885000 1.495000  8.520000 1.655000 ;
-      RECT  7.885000 1.655000  8.870000 1.665000 ;
-      RECT  7.970000 2.005000  8.140000 2.465000 ;
-      RECT  8.005000 0.255000  8.915000 0.535000 ;
-      RECT  8.310000 1.665000  8.870000 1.935000 ;
-      RECT  8.310000 1.935000  8.840000 1.955000 ;
-      RECT  8.320000 2.125000  9.190000 2.465000 ;
-      RECT  8.405000 0.920000  8.575000 1.325000 ;
-      RECT  8.745000 0.535000  8.915000 1.315000 ;
-      RECT  8.745000 1.315000  9.210000 1.485000 ;
-      RECT  9.015000 2.035000  9.210000 2.115000 ;
-      RECT  9.015000 2.115000  9.190000 2.125000 ;
-      RECT  9.040000 1.485000  9.210000 1.575000 ;
-      RECT  9.040000 1.575000 10.205000 1.745000 ;
-      RECT  9.040000 1.745000  9.210000 2.035000 ;
-      RECT  9.125000 0.695000  9.655000 0.865000 ;
-      RECT  9.125000 0.865000  9.295000 1.145000 ;
-      RECT  9.485000 0.295000 10.515000 0.465000 ;
-      RECT  9.485000 0.465000  9.655000 0.695000 ;
-      RECT  9.780000 1.915000 10.545000 2.085000 ;
-      RECT  9.780000 2.085000  9.950000 2.375000 ;
-      RECT 10.345000 0.465000 10.515000 0.995000 ;
-      RECT 10.345000 0.995000 11.020000 1.295000 ;
-      RECT 10.375000 1.295000 11.020000 1.325000 ;
-      RECT 10.375000 1.325000 10.545000 1.915000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.090000  1.795000  0.865000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.835000 0.805000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.530000  2.135000  0.860000 2.635000 ;
+      RECT  0.660000  0.805000  0.835000 0.995000 ;
+      RECT  0.660000  0.995000  0.975000 1.325000 ;
+      RECT  0.660000  1.325000  0.865000 1.795000 ;
+      RECT  1.015000  0.345000  1.315000 0.675000 ;
+      RECT  1.035000  1.730000  1.315000 1.900000 ;
+      RECT  1.035000  1.900000  1.205000 2.465000 ;
+      RECT  1.145000  0.675000  1.315000 1.730000 ;
+      RECT  1.535000  0.395000  1.705000 0.730000 ;
+      RECT  1.535000  0.730000  2.225000 0.900000 ;
+      RECT  1.875000  0.085000  2.205000 0.560000 ;
+      RECT  1.900000  2.055000  2.150000 2.400000 ;
+      RECT  1.980000  1.260000  2.470000 1.455000 ;
+      RECT  1.980000  1.455000  2.150000 2.055000 ;
+      RECT  2.055000  0.900000  2.225000 0.995000 ;
+      RECT  2.055000  0.995000  3.085000 1.185000 ;
+      RECT  2.055000  1.185000  2.470000 1.260000 ;
+      RECT  2.320000  2.040000  2.490000 2.635000 ;
+      RECT  2.395000  0.085000  2.725000 0.825000 ;
+      RECT  2.915000  0.255000  3.850000 0.425000 ;
+      RECT  2.915000  0.425000  3.085000 0.995000 ;
+      RECT  3.255000  0.675000  3.425000 1.015000 ;
+      RECT  3.255000  1.015000  3.460000 1.185000 ;
+      RECT  3.290000  1.185000  3.460000 1.935000 ;
+      RECT  3.290000  1.935000  5.075000 2.105000 ;
+      RECT  3.460000  2.105000  3.630000 2.465000 ;
+      RECT  3.680000  0.425000  3.850000 1.685000 ;
+      RECT  4.300000  2.275000  4.630000 2.635000 ;
+      RECT  4.445000  0.085000  4.775000 0.540000 ;
+      RECT  4.565000  0.715000  5.145000 0.895000 ;
+      RECT  4.565000  0.895000  4.735000 1.935000 ;
+      RECT  4.905000  1.065000  5.075000 1.395000 ;
+      RECT  4.905000  2.105000  5.075000 2.185000 ;
+      RECT  4.905000  2.185000  5.275000 2.435000 ;
+      RECT  4.975000  0.335000  5.315000 0.505000 ;
+      RECT  4.975000  0.505000  5.145000 0.715000 ;
+      RECT  5.245000  1.575000  5.495000 1.955000 ;
+      RECT  5.325000  0.705000  5.975000 1.035000 ;
+      RECT  5.325000  1.035000  5.495000 1.575000 ;
+      RECT  5.470000  2.135000  5.835000 2.465000 ;
+      RECT  5.485000  0.305000  6.335000 0.475000 ;
+      RECT  5.665000  1.215000  7.375000 1.385000 ;
+      RECT  5.665000  1.385000  5.835000 2.135000 ;
+      RECT  6.005000  1.935000  7.165000 2.105000 ;
+      RECT  6.005000  2.105000  6.175000 2.375000 ;
+      RECT  6.165000  0.475000  6.335000 1.215000 ;
+      RECT  6.285000  1.595000  7.715000 1.765000 ;
+      RECT  6.410000  2.355000  6.740000 2.635000 ;
+      RECT  6.915000  0.085000  7.245000 0.545000 ;
+      RECT  6.995000  2.105000  7.165000 2.375000 ;
+      RECT  7.205000  1.005000  7.375000 1.215000 ;
+      RECT  7.375000  2.175000  7.745000 2.635000 ;
+      RECT  7.455000  0.275000  7.785000 0.445000 ;
+      RECT  7.455000  0.445000  7.715000 0.835000 ;
+      RECT  7.455000  1.765000  7.715000 1.835000 ;
+      RECT  7.455000  1.835000  8.140000 2.005000 ;
+      RECT  7.545000  0.835000  7.715000 1.595000 ;
+      RECT  7.885000  0.705000  8.095000 1.495000 ;
+      RECT  7.885000  1.495000  8.520000 1.655000 ;
+      RECT  7.885000  1.655000  8.870000 1.665000 ;
+      RECT  7.970000  2.005000  8.140000 2.465000 ;
+      RECT  8.005000  0.255000  8.915000 0.535000 ;
+      RECT  8.310000  1.665000  8.870000 1.935000 ;
+      RECT  8.310000  1.935000  8.840000 1.955000 ;
+      RECT  8.320000  2.125000  9.190000 2.465000 ;
+      RECT  8.405000  0.920000  8.575000 1.325000 ;
+      RECT  8.745000  0.535000  8.915000 1.315000 ;
+      RECT  8.745000  1.315000  9.210000 1.485000 ;
+      RECT  9.015000  2.035000  9.210000 2.115000 ;
+      RECT  9.015000  2.115000  9.190000 2.125000 ;
+      RECT  9.040000  1.485000  9.210000 1.575000 ;
+      RECT  9.040000  1.575000 10.205000 1.745000 ;
+      RECT  9.040000  1.745000  9.210000 2.035000 ;
+      RECT  9.085000  0.085000  9.255000 0.525000 ;
+      RECT  9.125000  0.695000  9.655000 0.865000 ;
+      RECT  9.125000  0.865000  9.295000 1.145000 ;
+      RECT  9.360000  2.195000  9.610000 2.635000 ;
+      RECT  9.485000  0.295000 10.515000 0.465000 ;
+      RECT  9.485000  0.465000  9.655000 0.695000 ;
+      RECT  9.780000  1.915000 10.545000 2.085000 ;
+      RECT  9.780000  2.085000  9.950000 2.375000 ;
+      RECT 10.120000  2.255000 10.450000 2.635000 ;
+      RECT 10.345000  0.465000 10.515000 0.995000 ;
+      RECT 10.345000  0.995000 11.020000 1.295000 ;
+      RECT 10.375000  1.295000 11.020000 1.325000 ;
+      RECT 10.375000  1.325000 10.545000 1.915000 ;
+      RECT 10.720000  0.085000 10.890000 0.545000 ;
+      RECT 10.720000  1.495000 10.970000 2.635000 ;
+      RECT 11.570000  0.085000 11.740000 0.545000 ;
+      RECT 11.570000  1.495000 11.820000 2.635000 ;
     LAYER mcon ;
-      RECT 0.805000 1.105000 0.975000 1.275000 ;
-      RECT 1.035000 1.785000 1.205000 1.955000 ;
-      RECT 4.905000 1.105000 5.075000 1.275000 ;
-      RECT 5.325000 1.785000 5.495000 1.955000 ;
-      RECT 8.405000 1.105000 8.575000 1.275000 ;
-      RECT 8.445000 1.785000 8.615000 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.805000  1.105000  0.975000 1.275000 ;
+      RECT  1.035000  1.785000  1.205000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  4.905000  1.105000  5.075000 1.275000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.325000  1.785000  5.495000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.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.405000  1.105000  8.575000 1.275000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.445000  1.785000  8.615000 1.955000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
     LAYER met1 ;
       RECT 0.745000 1.075000 1.035000 1.120000 ;
       RECT 0.745000 1.120000 8.635000 1.260000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
index 5a7dfbd..f377f94 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.magic.lef
@@ -62,13 +62,19 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 6.505000 0.765000  7.035000 1.045000 ;
+        RECT 6.505000 0.765000 7.035000 1.045000 ;
+      LAYER mcon ;
+        RECT 6.865000 0.765000 7.035000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 9.525000 1.065000 10.115000 1.275000 ;
         RECT 9.825000 0.635000 10.115000 1.065000 ;
       LAYER mcon ;
-        RECT 6.865000 0.765000  7.035000 0.935000 ;
         RECT 9.690000 1.105000  9.860000 1.275000 ;
         RECT 9.945000 0.765000 10.115000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.445000 0.735000  7.095000 0.780000 ;
         RECT 6.445000 0.780000 10.175000 0.920000 ;
@@ -112,46 +118,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.880000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.875000  0.085000  2.205000 0.560000 ;
-        RECT  2.395000  0.085000  2.725000 0.825000 ;
-        RECT  4.445000  0.085000  4.775000 0.540000 ;
-        RECT  6.915000  0.085000  7.245000 0.545000 ;
-        RECT  9.085000  0.085000  9.255000 0.525000 ;
-        RECT 10.720000  0.085000 10.890000 0.545000 ;
-        RECT 11.570000  0.085000 11.740000 0.545000 ;
-        RECT 12.410000  0.085000 12.580000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
@@ -161,138 +127,174 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.880000 2.805000 ;
-        RECT  0.530000 2.135000  0.860000 2.635000 ;
-        RECT  2.320000 2.040000  2.490000 2.635000 ;
-        RECT  4.300000 2.275000  4.630000 2.635000 ;
-        RECT  6.410000 2.355000  6.740000 2.635000 ;
-        RECT  7.375000 2.175000  7.745000 2.635000 ;
-        RECT  9.360000 2.195000  9.610000 2.635000 ;
-        RECT 10.120000 2.255000 10.450000 2.635000 ;
-        RECT 10.720000 1.495000 10.970000 2.635000 ;
-        RECT 11.570000 1.495000 11.820000 2.635000 ;
-        RECT 12.410000 1.495000 12.660000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.865000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.835000 0.805000 ;
-      RECT  0.660000 0.805000  0.835000 0.995000 ;
-      RECT  0.660000 0.995000  0.975000 1.325000 ;
-      RECT  0.660000 1.325000  0.865000 1.795000 ;
-      RECT  1.015000 0.345000  1.315000 0.675000 ;
-      RECT  1.035000 1.730000  1.315000 1.900000 ;
-      RECT  1.035000 1.900000  1.205000 2.465000 ;
-      RECT  1.145000 0.675000  1.315000 1.730000 ;
-      RECT  1.535000 0.395000  1.705000 0.730000 ;
-      RECT  1.535000 0.730000  2.225000 0.900000 ;
-      RECT  1.900000 2.055000  2.150000 2.400000 ;
-      RECT  1.980000 1.260000  2.470000 1.455000 ;
-      RECT  1.980000 1.455000  2.150000 2.055000 ;
-      RECT  2.055000 0.900000  2.225000 0.995000 ;
-      RECT  2.055000 0.995000  3.085000 1.185000 ;
-      RECT  2.055000 1.185000  2.470000 1.260000 ;
-      RECT  2.915000 0.255000  3.850000 0.425000 ;
-      RECT  2.915000 0.425000  3.085000 0.995000 ;
-      RECT  3.255000 0.675000  3.425000 1.015000 ;
-      RECT  3.255000 1.015000  3.460000 1.185000 ;
-      RECT  3.290000 1.185000  3.460000 1.935000 ;
-      RECT  3.290000 1.935000  5.075000 2.105000 ;
-      RECT  3.460000 2.105000  3.630000 2.465000 ;
-      RECT  3.680000 0.425000  3.850000 1.685000 ;
-      RECT  4.565000 0.715000  5.145000 0.895000 ;
-      RECT  4.565000 0.895000  4.735000 1.935000 ;
-      RECT  4.905000 1.065000  5.075000 1.395000 ;
-      RECT  4.905000 2.105000  5.075000 2.185000 ;
-      RECT  4.905000 2.185000  5.275000 2.435000 ;
-      RECT  4.975000 0.335000  5.315000 0.505000 ;
-      RECT  4.975000 0.505000  5.145000 0.715000 ;
-      RECT  5.245000 1.575000  5.495000 1.955000 ;
-      RECT  5.325000 0.705000  5.975000 1.035000 ;
-      RECT  5.325000 1.035000  5.495000 1.575000 ;
-      RECT  5.470000 2.135000  5.835000 2.465000 ;
-      RECT  5.485000 0.305000  6.335000 0.475000 ;
-      RECT  5.665000 1.215000  7.375000 1.385000 ;
-      RECT  5.665000 1.385000  5.835000 2.135000 ;
-      RECT  6.005000 1.935000  7.165000 2.105000 ;
-      RECT  6.005000 2.105000  6.175000 2.375000 ;
-      RECT  6.165000 0.475000  6.335000 1.215000 ;
-      RECT  6.285000 1.595000  7.715000 1.765000 ;
-      RECT  6.995000 2.105000  7.165000 2.375000 ;
-      RECT  7.205000 1.005000  7.375000 1.215000 ;
-      RECT  7.455000 0.275000  7.785000 0.445000 ;
-      RECT  7.455000 0.445000  7.715000 0.835000 ;
-      RECT  7.455000 1.765000  7.715000 1.835000 ;
-      RECT  7.455000 1.835000  8.140000 2.005000 ;
-      RECT  7.545000 0.835000  7.715000 1.595000 ;
-      RECT  7.885000 0.705000  8.095000 1.495000 ;
-      RECT  7.885000 1.495000  8.520000 1.655000 ;
-      RECT  7.885000 1.655000  8.870000 1.665000 ;
-      RECT  7.970000 2.005000  8.140000 2.465000 ;
-      RECT  8.005000 0.255000  8.915000 0.535000 ;
-      RECT  8.310000 1.665000  8.870000 1.935000 ;
-      RECT  8.310000 1.935000  8.840000 1.955000 ;
-      RECT  8.320000 2.125000  9.190000 2.465000 ;
-      RECT  8.405000 0.920000  8.575000 1.325000 ;
-      RECT  8.745000 0.535000  8.915000 1.315000 ;
-      RECT  8.745000 1.315000  9.210000 1.485000 ;
-      RECT  9.015000 2.035000  9.210000 2.115000 ;
-      RECT  9.015000 2.115000  9.190000 2.125000 ;
-      RECT  9.040000 1.485000  9.210000 1.575000 ;
-      RECT  9.040000 1.575000 10.205000 1.745000 ;
-      RECT  9.040000 1.745000  9.210000 2.035000 ;
-      RECT  9.125000 0.695000  9.655000 0.865000 ;
-      RECT  9.125000 0.865000  9.295000 1.145000 ;
-      RECT  9.485000 0.295000 10.515000 0.465000 ;
-      RECT  9.485000 0.465000  9.655000 0.695000 ;
-      RECT  9.780000 1.915000 10.545000 2.085000 ;
-      RECT  9.780000 2.085000  9.950000 2.375000 ;
-      RECT 10.345000 0.465000 10.515000 0.995000 ;
-      RECT 10.345000 0.995000 11.020000 1.295000 ;
-      RECT 10.375000 1.295000 11.020000 1.325000 ;
-      RECT 10.375000 1.325000 10.545000 1.915000 ;
+      RECT  0.000000 -0.085000 12.880000 0.085000 ;
+      RECT  0.000000  2.635000 12.880000 2.805000 ;
+      RECT  0.090000  1.795000  0.865000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.835000 0.805000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.530000  2.135000  0.860000 2.635000 ;
+      RECT  0.660000  0.805000  0.835000 0.995000 ;
+      RECT  0.660000  0.995000  0.975000 1.325000 ;
+      RECT  0.660000  1.325000  0.865000 1.795000 ;
+      RECT  1.015000  0.345000  1.315000 0.675000 ;
+      RECT  1.035000  1.730000  1.315000 1.900000 ;
+      RECT  1.035000  1.900000  1.205000 2.465000 ;
+      RECT  1.145000  0.675000  1.315000 1.730000 ;
+      RECT  1.535000  0.395000  1.705000 0.730000 ;
+      RECT  1.535000  0.730000  2.225000 0.900000 ;
+      RECT  1.875000  0.085000  2.205000 0.560000 ;
+      RECT  1.900000  2.055000  2.150000 2.400000 ;
+      RECT  1.980000  1.260000  2.470000 1.455000 ;
+      RECT  1.980000  1.455000  2.150000 2.055000 ;
+      RECT  2.055000  0.900000  2.225000 0.995000 ;
+      RECT  2.055000  0.995000  3.085000 1.185000 ;
+      RECT  2.055000  1.185000  2.470000 1.260000 ;
+      RECT  2.320000  2.040000  2.490000 2.635000 ;
+      RECT  2.395000  0.085000  2.725000 0.825000 ;
+      RECT  2.915000  0.255000  3.850000 0.425000 ;
+      RECT  2.915000  0.425000  3.085000 0.995000 ;
+      RECT  3.255000  0.675000  3.425000 1.015000 ;
+      RECT  3.255000  1.015000  3.460000 1.185000 ;
+      RECT  3.290000  1.185000  3.460000 1.935000 ;
+      RECT  3.290000  1.935000  5.075000 2.105000 ;
+      RECT  3.460000  2.105000  3.630000 2.465000 ;
+      RECT  3.680000  0.425000  3.850000 1.685000 ;
+      RECT  4.300000  2.275000  4.630000 2.635000 ;
+      RECT  4.445000  0.085000  4.775000 0.540000 ;
+      RECT  4.565000  0.715000  5.145000 0.895000 ;
+      RECT  4.565000  0.895000  4.735000 1.935000 ;
+      RECT  4.905000  1.065000  5.075000 1.395000 ;
+      RECT  4.905000  2.105000  5.075000 2.185000 ;
+      RECT  4.905000  2.185000  5.275000 2.435000 ;
+      RECT  4.975000  0.335000  5.315000 0.505000 ;
+      RECT  4.975000  0.505000  5.145000 0.715000 ;
+      RECT  5.245000  1.575000  5.495000 1.955000 ;
+      RECT  5.325000  0.705000  5.975000 1.035000 ;
+      RECT  5.325000  1.035000  5.495000 1.575000 ;
+      RECT  5.470000  2.135000  5.835000 2.465000 ;
+      RECT  5.485000  0.305000  6.335000 0.475000 ;
+      RECT  5.665000  1.215000  7.375000 1.385000 ;
+      RECT  5.665000  1.385000  5.835000 2.135000 ;
+      RECT  6.005000  1.935000  7.165000 2.105000 ;
+      RECT  6.005000  2.105000  6.175000 2.375000 ;
+      RECT  6.165000  0.475000  6.335000 1.215000 ;
+      RECT  6.285000  1.595000  7.715000 1.765000 ;
+      RECT  6.410000  2.355000  6.740000 2.635000 ;
+      RECT  6.915000  0.085000  7.245000 0.545000 ;
+      RECT  6.995000  2.105000  7.165000 2.375000 ;
+      RECT  7.205000  1.005000  7.375000 1.215000 ;
+      RECT  7.375000  2.175000  7.745000 2.635000 ;
+      RECT  7.455000  0.275000  7.785000 0.445000 ;
+      RECT  7.455000  0.445000  7.715000 0.835000 ;
+      RECT  7.455000  1.765000  7.715000 1.835000 ;
+      RECT  7.455000  1.835000  8.140000 2.005000 ;
+      RECT  7.545000  0.835000  7.715000 1.595000 ;
+      RECT  7.885000  0.705000  8.095000 1.495000 ;
+      RECT  7.885000  1.495000  8.520000 1.655000 ;
+      RECT  7.885000  1.655000  8.870000 1.665000 ;
+      RECT  7.970000  2.005000  8.140000 2.465000 ;
+      RECT  8.005000  0.255000  8.915000 0.535000 ;
+      RECT  8.310000  1.665000  8.870000 1.935000 ;
+      RECT  8.310000  1.935000  8.840000 1.955000 ;
+      RECT  8.320000  2.125000  9.190000 2.465000 ;
+      RECT  8.405000  0.920000  8.575000 1.325000 ;
+      RECT  8.745000  0.535000  8.915000 1.315000 ;
+      RECT  8.745000  1.315000  9.210000 1.485000 ;
+      RECT  9.015000  2.035000  9.210000 2.115000 ;
+      RECT  9.015000  2.115000  9.190000 2.125000 ;
+      RECT  9.040000  1.485000  9.210000 1.575000 ;
+      RECT  9.040000  1.575000 10.205000 1.745000 ;
+      RECT  9.040000  1.745000  9.210000 2.035000 ;
+      RECT  9.085000  0.085000  9.255000 0.525000 ;
+      RECT  9.125000  0.695000  9.655000 0.865000 ;
+      RECT  9.125000  0.865000  9.295000 1.145000 ;
+      RECT  9.360000  2.195000  9.610000 2.635000 ;
+      RECT  9.485000  0.295000 10.515000 0.465000 ;
+      RECT  9.485000  0.465000  9.655000 0.695000 ;
+      RECT  9.780000  1.915000 10.545000 2.085000 ;
+      RECT  9.780000  2.085000  9.950000 2.375000 ;
+      RECT 10.120000  2.255000 10.450000 2.635000 ;
+      RECT 10.345000  0.465000 10.515000 0.995000 ;
+      RECT 10.345000  0.995000 11.020000 1.295000 ;
+      RECT 10.375000  1.295000 11.020000 1.325000 ;
+      RECT 10.375000  1.325000 10.545000 1.915000 ;
+      RECT 10.720000  0.085000 10.890000 0.545000 ;
+      RECT 10.720000  1.495000 10.970000 2.635000 ;
+      RECT 11.570000  0.085000 11.740000 0.545000 ;
+      RECT 11.570000  1.495000 11.820000 2.635000 ;
+      RECT 12.410000  0.085000 12.580000 0.545000 ;
+      RECT 12.410000  1.495000 12.660000 2.635000 ;
     LAYER mcon ;
-      RECT 0.805000 1.105000 0.975000 1.275000 ;
-      RECT 1.035000 1.785000 1.205000 1.955000 ;
-      RECT 4.905000 1.105000 5.075000 1.275000 ;
-      RECT 5.325000 1.785000 5.495000 1.955000 ;
-      RECT 8.405000 1.105000 8.575000 1.275000 ;
-      RECT 8.445000 1.785000 8.615000 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.805000  1.105000  0.975000 1.275000 ;
+      RECT  1.035000  1.785000  1.205000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  4.905000  1.105000  5.075000 1.275000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.325000  1.785000  5.495000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.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.405000  1.105000  8.575000 1.275000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.445000  1.785000  8.615000 1.955000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.745000 1.075000 1.035000 1.120000 ;
       RECT 0.745000 1.120000 8.635000 1.260000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
index ff9153c..2b1998d 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.magic.lef
@@ -75,10 +75,16 @@
     PORT
       LAYER li1 ;
         RECT 0.545000 0.765000 0.825000 1.675000 ;
-        RECT 2.370000 1.075000 2.700000 1.600000 ;
       LAYER mcon ;
         RECT 0.610000 1.105000 0.780000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.370000 1.075000 2.700000 1.600000 ;
+      LAYER mcon ;
         RECT 2.445000 1.105000 2.615000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.550000 1.075000 0.840000 1.120000 ;
         RECT 0.550000 1.120000 2.675000 1.260000 ;
@@ -93,11 +99,16 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 6.640000 1.445000  7.015000 1.765000 ;
+        RECT 6.640000 1.445000 7.015000 1.765000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 8.885000 1.415000  9.110000 1.525000 ;
         RECT 8.885000 1.525000 10.075000 1.725000 ;
       LAYER mcon ;
         RECT 8.885000 1.445000 9.055000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.580000 1.415000 6.870000 1.460000 ;
         RECT 6.580000 1.460000 9.115000 1.600000 ;
@@ -122,47 +133,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.340000 0.085000 ;
-        RECT  0.085000  0.085000  0.480000 0.595000 ;
-        RECT  1.825000  0.085000  2.005000 0.545000 ;
-        RECT  2.690000  0.085000  3.030000 0.555000 ;
-        RECT  3.630000  0.085000  3.940000 0.545000 ;
-        RECT  5.610000  0.085000  6.095000 0.465000 ;
-        RECT  6.735000  0.085000  7.630000 0.805000 ;
-        RECT 10.220000  0.085000 10.390000 0.545000 ;
-        RECT 11.120000  0.085000 11.330000 0.885000 ;
-        RECT 12.540000  0.085000 12.745000 0.825000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -172,135 +142,172 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.340000 2.805000 ;
-        RECT  0.515000 2.195000  0.765000 2.635000 ;
-        RECT  2.690000 2.140000  3.030000 2.635000 ;
-        RECT  3.595000 2.275000  3.925000 2.635000 ;
-        RECT  5.945000 2.275000  6.275000 2.635000 ;
-        RECT  7.005000 2.125000  7.960000 2.635000 ;
-        RECT  9.195000 2.235000  9.525000 2.635000 ;
-        RECT 10.135000 2.235000 10.465000 2.635000 ;
-        RECT 11.120000 1.485000 11.330000 2.635000 ;
-        RECT 12.575000 1.575000 12.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 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.105000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.875000 0.280000  1.655000 0.560000 ;
-      RECT  0.935000 2.025000  1.105000 2.255000 ;
-      RECT  0.935000 2.255000  2.045000 2.465000 ;
-      RECT  1.295000 1.870000  1.695000 2.075000 ;
-      RECT  1.380000 0.560000  1.655000 0.590000 ;
-      RECT  1.380000 0.590000  1.660000 0.600000 ;
-      RECT  1.395000 0.600000  1.660000 0.605000 ;
-      RECT  1.405000 0.605000  1.660000 0.610000 ;
-      RECT  1.420000 0.610000  1.660000 0.615000 ;
-      RECT  1.430000 0.615000  1.670000 0.620000 ;
-      RECT  1.440000 0.620000  1.670000 0.630000 ;
-      RECT  1.445000 0.630000  1.670000 0.635000 ;
-      RECT  1.460000 0.635000  1.670000 0.645000 ;
-      RECT  1.475000 0.645000  1.670000 0.655000 ;
-      RECT  1.475000 0.655000  1.695000 0.665000 ;
-      RECT  1.495000 0.665000  1.695000 0.705000 ;
-      RECT  1.505000 0.705000  1.695000 1.870000 ;
-      RECT  1.865000 0.715000  2.515000 0.905000 ;
-      RECT  1.865000 0.905000  2.200000 1.770000 ;
-      RECT  1.865000 1.770000  2.520000 2.085000 ;
-      RECT  2.260000 0.255000  2.515000 0.715000 ;
-      RECT  2.270000 2.085000  2.520000 2.465000 ;
-      RECT  3.255000 1.775000  3.995000 1.955000 ;
-      RECT  3.255000 1.955000  3.425000 2.325000 ;
-      RECT  3.270000 0.255000  3.455000 0.715000 ;
-      RECT  3.270000 0.715000  3.995000 0.885000 ;
-      RECT  3.735000 0.885000  3.995000 1.775000 ;
-      RECT  4.095000 2.135000  4.440000 2.465000 ;
-      RECT  4.110000 0.255000  4.335000 0.585000 ;
-      RECT  4.165000 0.585000  4.335000 1.090000 ;
-      RECT  4.165000 1.090000  4.490000 1.420000 ;
-      RECT  4.165000 1.420000  4.440000 2.135000 ;
-      RECT  4.505000 0.255000  4.830000 0.920000 ;
-      RECT  4.610000 1.590000  4.915000 1.615000 ;
-      RECT  4.610000 1.615000  4.830000 2.465000 ;
-      RECT  4.660000 0.920000  4.830000 1.445000 ;
-      RECT  4.660000 1.445000  4.915000 1.590000 ;
-      RECT  5.000000 0.255000  5.440000 1.225000 ;
-      RECT  5.000000 1.225000  7.660000 1.275000 ;
-      RECT  5.030000 2.135000  5.755000 2.465000 ;
-      RECT  5.085000 1.275000  6.435000 1.395000 ;
-      RECT  5.205000 1.575000  5.415000 1.955000 ;
-      RECT  5.585000 1.395000  5.755000 2.135000 ;
-      RECT  5.610000 0.635000  6.535000 0.805000 ;
-      RECT  5.610000 0.805000  5.975000 1.015000 ;
-      RECT  5.925000 1.575000  6.095000 1.935000 ;
-      RECT  5.925000 1.935000  6.765000 2.105000 ;
-      RECT  6.250000 0.975000  7.660000 1.225000 ;
-      RECT  6.275000 0.255000  6.535000 0.635000 ;
-      RECT  6.550000 2.105000  6.765000 2.450000 ;
-      RECT  7.190000 1.495000  8.005000 1.955000 ;
-      RECT  7.300000 1.275000  7.660000 1.325000 ;
-      RECT  7.835000 0.695000  9.040000 0.895000 ;
-      RECT  7.835000 0.895000  8.005000 1.495000 ;
-      RECT  8.130000 2.125000  8.935000 2.460000 ;
-      RECT  8.365000 1.075000  8.595000 1.905000 ;
-      RECT  8.410000 0.275000  9.825000 0.445000 ;
-      RECT  8.765000 1.895000 10.465000 2.065000 ;
-      RECT  8.765000 2.065000  8.935000 2.125000 ;
-      RECT  8.810000 0.895000  9.040000 1.245000 ;
-      RECT  9.290000 0.855000  9.465000 1.185000 ;
-      RECT  9.290000 1.185000 10.895000 1.355000 ;
-      RECT  9.655000 0.445000  9.825000 0.845000 ;
-      RECT  9.655000 0.845000 10.545000 1.015000 ;
-      RECT  9.695000 2.065000  9.910000 2.450000 ;
-      RECT 10.245000 1.525000 10.465000 1.895000 ;
-      RECT 10.560000 0.255000 10.895000 0.540000 ;
-      RECT 10.635000 1.355000 10.895000 2.465000 ;
-      RECT 10.715000 0.540000 10.895000 1.185000 ;
-      RECT 12.060000 0.255000 12.270000 0.995000 ;
-      RECT 12.060000 0.995000 12.900000 1.325000 ;
-      RECT 12.060000 1.325000 12.270000 2.465000 ;
+      RECT  0.000000 -0.085000 13.340000 0.085000 ;
+      RECT  0.000000  2.635000 13.340000 2.805000 ;
+      RECT  0.085000  0.085000  0.480000 0.595000 ;
+      RECT  0.085000  1.845000  1.105000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.765000 2.635000 ;
+      RECT  0.875000  0.280000  1.655000 0.560000 ;
+      RECT  0.935000  2.025000  1.105000 2.255000 ;
+      RECT  0.935000  2.255000  2.045000 2.465000 ;
+      RECT  1.295000  1.870000  1.695000 2.075000 ;
+      RECT  1.380000  0.560000  1.655000 0.590000 ;
+      RECT  1.380000  0.590000  1.660000 0.600000 ;
+      RECT  1.395000  0.600000  1.660000 0.605000 ;
+      RECT  1.405000  0.605000  1.660000 0.610000 ;
+      RECT  1.420000  0.610000  1.660000 0.615000 ;
+      RECT  1.430000  0.615000  1.670000 0.620000 ;
+      RECT  1.440000  0.620000  1.670000 0.630000 ;
+      RECT  1.445000  0.630000  1.670000 0.635000 ;
+      RECT  1.460000  0.635000  1.670000 0.645000 ;
+      RECT  1.475000  0.645000  1.670000 0.655000 ;
+      RECT  1.475000  0.655000  1.695000 0.665000 ;
+      RECT  1.495000  0.665000  1.695000 0.705000 ;
+      RECT  1.505000  0.705000  1.695000 1.870000 ;
+      RECT  1.825000  0.085000  2.005000 0.545000 ;
+      RECT  1.865000  0.715000  2.515000 0.905000 ;
+      RECT  1.865000  0.905000  2.200000 1.770000 ;
+      RECT  1.865000  1.770000  2.520000 2.085000 ;
+      RECT  2.260000  0.255000  2.515000 0.715000 ;
+      RECT  2.270000  2.085000  2.520000 2.465000 ;
+      RECT  2.690000  0.085000  3.030000 0.555000 ;
+      RECT  2.690000  2.140000  3.030000 2.635000 ;
+      RECT  3.255000  1.775000  3.995000 1.955000 ;
+      RECT  3.255000  1.955000  3.425000 2.325000 ;
+      RECT  3.270000  0.255000  3.455000 0.715000 ;
+      RECT  3.270000  0.715000  3.995000 0.885000 ;
+      RECT  3.595000  2.275000  3.925000 2.635000 ;
+      RECT  3.630000  0.085000  3.940000 0.545000 ;
+      RECT  3.735000  0.885000  3.995000 1.775000 ;
+      RECT  4.095000  2.135000  4.440000 2.465000 ;
+      RECT  4.110000  0.255000  4.335000 0.585000 ;
+      RECT  4.165000  0.585000  4.335000 1.090000 ;
+      RECT  4.165000  1.090000  4.490000 1.420000 ;
+      RECT  4.165000  1.420000  4.440000 2.135000 ;
+      RECT  4.505000  0.255000  4.830000 0.920000 ;
+      RECT  4.610000  1.590000  4.915000 1.615000 ;
+      RECT  4.610000  1.615000  4.830000 2.465000 ;
+      RECT  4.660000  0.920000  4.830000 1.445000 ;
+      RECT  4.660000  1.445000  4.915000 1.590000 ;
+      RECT  5.000000  0.255000  5.440000 1.225000 ;
+      RECT  5.000000  1.225000  7.660000 1.275000 ;
+      RECT  5.030000  2.135000  5.755000 2.465000 ;
+      RECT  5.085000  1.275000  6.435000 1.395000 ;
+      RECT  5.205000  1.575000  5.415000 1.955000 ;
+      RECT  5.585000  1.395000  5.755000 2.135000 ;
+      RECT  5.610000  0.085000  6.095000 0.465000 ;
+      RECT  5.610000  0.635000  6.535000 0.805000 ;
+      RECT  5.610000  0.805000  5.975000 1.015000 ;
+      RECT  5.925000  1.575000  6.095000 1.935000 ;
+      RECT  5.925000  1.935000  6.765000 2.105000 ;
+      RECT  5.945000  2.275000  6.275000 2.635000 ;
+      RECT  6.250000  0.975000  7.660000 1.225000 ;
+      RECT  6.275000  0.255000  6.535000 0.635000 ;
+      RECT  6.550000  2.105000  6.765000 2.450000 ;
+      RECT  6.735000  0.085000  7.630000 0.805000 ;
+      RECT  7.005000  2.125000  7.960000 2.635000 ;
+      RECT  7.190000  1.495000  8.005000 1.955000 ;
+      RECT  7.300000  1.275000  7.660000 1.325000 ;
+      RECT  7.835000  0.695000  9.040000 0.895000 ;
+      RECT  7.835000  0.895000  8.005000 1.495000 ;
+      RECT  8.130000  2.125000  8.935000 2.460000 ;
+      RECT  8.365000  1.075000  8.595000 1.905000 ;
+      RECT  8.410000  0.275000  9.825000 0.445000 ;
+      RECT  8.765000  1.895000 10.465000 2.065000 ;
+      RECT  8.765000  2.065000  8.935000 2.125000 ;
+      RECT  8.810000  0.895000  9.040000 1.245000 ;
+      RECT  9.195000  2.235000  9.525000 2.635000 ;
+      RECT  9.290000  0.855000  9.465000 1.185000 ;
+      RECT  9.290000  1.185000 10.895000 1.355000 ;
+      RECT  9.655000  0.445000  9.825000 0.845000 ;
+      RECT  9.655000  0.845000 10.545000 1.015000 ;
+      RECT  9.695000  2.065000  9.910000 2.450000 ;
+      RECT 10.135000  2.235000 10.465000 2.635000 ;
+      RECT 10.220000  0.085000 10.390000 0.545000 ;
+      RECT 10.245000  1.525000 10.465000 1.895000 ;
+      RECT 10.560000  0.255000 10.895000 0.540000 ;
+      RECT 10.635000  1.355000 10.895000 2.465000 ;
+      RECT 10.715000  0.540000 10.895000 1.185000 ;
+      RECT 11.120000  0.085000 11.330000 0.885000 ;
+      RECT 11.120000  1.485000 11.330000 2.635000 ;
+      RECT 12.060000  0.255000 12.270000 0.995000 ;
+      RECT 12.060000  0.995000 12.900000 1.325000 ;
+      RECT 12.060000  1.325000 12.270000 2.465000 ;
+      RECT 12.540000  0.085000 12.745000 0.825000 ;
+      RECT 12.575000  1.575000 12.745000 2.635000 ;
     LAYER mcon ;
-      RECT 1.525000 1.445000 1.695000 1.615000 ;
-      RECT 3.825000 1.785000 3.995000 1.955000 ;
-      RECT 4.285000 1.105000 4.455000 1.275000 ;
-      RECT 4.745000 1.445000 4.915000 1.615000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 7.505000 1.785000 7.675000 1.955000 ;
-      RECT 8.425000 1.105000 8.595000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  1.445000  1.695000 1.615000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  1.785000  3.995000 1.955000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  1.105000  4.455000 1.275000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  1.445000  4.915000 1.615000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  1.785000  7.675000 1.955000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  1.105000  8.595000 1.275000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
     LAYER met1 ;
       RECT 1.465000 1.415000 1.755000 1.460000 ;
       RECT 1.465000 1.460000 4.975000 1.600000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
index 964c318..a2455ad 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.magic.lef
@@ -75,10 +75,16 @@
     PORT
       LAYER li1 ;
         RECT 0.540000 0.765000 0.820000 1.675000 ;
-        RECT 2.405000 1.075000 2.735000 1.590000 ;
       LAYER mcon ;
         RECT 0.605000 1.105000 0.775000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.405000 1.075000 2.735000 1.590000 ;
+      LAYER mcon ;
         RECT 2.445000 1.105000 2.615000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.545000 1.075000 0.835000 1.120000 ;
         RECT 0.545000 1.120000 2.675000 1.260000 ;
@@ -94,10 +100,15 @@
     PORT
       LAYER li1 ;
         RECT 6.640000 1.445000 7.065000 1.765000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 8.880000 1.435000 9.115000 1.525000 ;
         RECT 8.880000 1.525000 9.935000 1.725000 ;
       LAYER mcon ;
         RECT 8.940000 1.445000 9.110000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.580000 1.415000 6.870000 1.460000 ;
         RECT 6.580000 1.460000 9.170000 1.600000 ;
@@ -122,51 +133,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.085000  0.085000  0.700000 0.595000 ;
-        RECT  1.840000  0.085000  2.090000 0.545000 ;
-        RECT  2.700000  0.085000  3.100000 0.555000 ;
-        RECT  3.640000  0.085000  3.940000 0.545000 ;
-        RECT  5.665000  0.085000  6.165000 0.465000 ;
-        RECT  6.720000  0.085000  7.705000 0.805000 ;
-        RECT 10.035000  0.085000 10.285000 0.545000 ;
-        RECT 11.120000  0.085000 11.290000 0.885000 ;
-        RECT 12.025000  0.085000 12.315000 0.885000 ;
-        RECT 12.885000  0.085000 13.240000 0.825000 ;
-        RECT 13.910000  0.085000 14.175000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -176,130 +142,171 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.260000 2.805000 ;
-        RECT  0.515000 2.275000  0.845000 2.635000 ;
-        RECT  2.705000 2.140000  3.100000 2.635000 ;
-        RECT  3.645000 2.275000  3.975000 2.635000 ;
-        RECT  6.000000 2.275000  6.330000 2.635000 ;
-        RECT  7.060000 2.125000  8.015000 2.635000 ;
-        RECT  9.160000 2.235000  9.490000 2.635000 ;
-        RECT 10.100000 2.235000 10.430000 2.635000 ;
-        RECT 11.080000 1.485000 11.290000 2.635000 ;
-        RECT 12.025000 1.485000 12.315000 2.635000 ;
-        RECT 12.885000 1.635000 13.240000 2.635000 ;
-        RECT 13.910000 1.485000 14.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 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.185000 2.075000 ;
-      RECT  0.085000 2.075000  0.345000 2.465000 ;
-      RECT  0.870000 0.255000  1.670000 0.595000 ;
-      RECT  1.015000 2.075000  1.185000 2.255000 ;
-      RECT  1.015000 2.255000  2.105000 2.465000 ;
-      RECT  1.355000 1.845000  1.695000 2.085000 ;
-      RECT  1.495000 0.595000  1.670000 0.645000 ;
-      RECT  1.495000 0.645000  1.695000 0.705000 ;
-      RECT  1.500000 0.705000  1.695000 0.720000 ;
-      RECT  1.505000 0.720000  1.695000 1.845000 ;
-      RECT  1.980000 0.715000  2.530000 0.905000 ;
-      RECT  1.980000 0.905000  2.235000 1.760000 ;
-      RECT  1.980000 1.760000  2.535000 2.085000 ;
-      RECT  2.260000 0.255000  2.530000 0.715000 ;
-      RECT  2.275000 2.085000  2.535000 2.465000 ;
-      RECT  3.270000 0.255000  3.470000 0.715000 ;
-      RECT  3.270000 0.715000  3.995000 0.885000 ;
-      RECT  3.270000 1.830000  3.995000 2.000000 ;
-      RECT  3.270000 2.000000  3.475000 2.325000 ;
-      RECT  3.735000 0.885000  3.995000 1.830000 ;
-      RECT  4.110000 0.255000  4.335000 0.585000 ;
-      RECT  4.145000 2.135000  4.440000 2.465000 ;
-      RECT  4.165000 0.585000  4.335000 1.090000 ;
-      RECT  4.165000 1.090000  4.490000 1.420000 ;
-      RECT  4.165000 1.420000  4.440000 2.135000 ;
-      RECT  4.505000 0.255000  4.885000 0.920000 ;
-      RECT  4.665000 1.590000  4.970000 1.615000 ;
-      RECT  4.665000 1.615000  4.890000 2.465000 ;
-      RECT  4.715000 0.920000  4.885000 1.445000 ;
-      RECT  4.715000 1.445000  4.970000 1.590000 ;
-      RECT  5.055000 0.255000  5.450000 1.225000 ;
-      RECT  5.055000 1.225000  7.705000 1.275000 ;
-      RECT  5.060000 2.135000  5.805000 2.465000 ;
-      RECT  5.140000 1.275000  6.475000 1.395000 ;
-      RECT  5.205000 1.575000  5.465000 1.955000 ;
-      RECT  5.620000 0.635000  6.550000 0.805000 ;
-      RECT  5.620000 0.805000  6.015000 1.015000 ;
-      RECT  5.635000 1.395000  5.805000 2.135000 ;
-      RECT  5.975000 1.575000  6.145000 1.935000 ;
-      RECT  5.975000 1.935000  6.820000 2.105000 ;
-      RECT  6.305000 0.975000  7.705000 1.225000 ;
-      RECT  6.335000 0.255000  6.550000 0.635000 ;
-      RECT  6.605000 2.105000  6.820000 2.450000 ;
-      RECT  7.355000 1.275000  7.705000 1.325000 ;
-      RECT  7.385000 1.705000  8.055000 1.955000 ;
-      RECT  7.885000 0.695000  9.085000 0.895000 ;
-      RECT  7.885000 0.895000  8.055000 1.705000 ;
-      RECT  8.185000 2.125000  8.990000 2.460000 ;
-      RECT  8.420000 1.075000  8.650000 1.905000 ;
-      RECT  8.465000 0.275000  9.855000 0.515000 ;
-      RECT  8.820000 1.895000 10.430000 2.065000 ;
-      RECT  8.820000 2.065000  8.990000 2.125000 ;
-      RECT  8.830000 0.895000  9.085000 1.265000 ;
-      RECT  9.285000 0.855000  9.515000 1.185000 ;
-      RECT  9.285000 1.185000 10.910000 1.355000 ;
-      RECT  9.660000 2.065000  9.930000 2.450000 ;
-      RECT  9.685000 0.515000  9.855000 0.845000 ;
-      RECT  9.685000 0.845000 10.560000 1.015000 ;
-      RECT 10.105000 1.525000 10.430000 1.895000 ;
-      RECT 10.465000 0.255000 10.910000 0.585000 ;
-      RECT 10.600000 1.355000 10.845000 2.465000 ;
-      RECT 10.730000 0.585000 10.910000 1.185000 ;
-      RECT 12.530000 0.255000 12.715000 0.995000 ;
-      RECT 12.530000 0.995000 13.345000 1.325000 ;
-      RECT 12.530000 1.325000 12.715000 2.465000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.085000  0.085000  0.700000 0.595000 ;
+      RECT  0.085000  1.845000  1.185000 2.075000 ;
+      RECT  0.085000  2.075000  0.345000 2.465000 ;
+      RECT  0.515000  2.275000  0.845000 2.635000 ;
+      RECT  0.870000  0.255000  1.670000 0.595000 ;
+      RECT  1.015000  2.075000  1.185000 2.255000 ;
+      RECT  1.015000  2.255000  2.105000 2.465000 ;
+      RECT  1.355000  1.845000  1.695000 2.085000 ;
+      RECT  1.495000  0.595000  1.670000 0.645000 ;
+      RECT  1.495000  0.645000  1.695000 0.705000 ;
+      RECT  1.500000  0.705000  1.695000 0.720000 ;
+      RECT  1.505000  0.720000  1.695000 1.845000 ;
+      RECT  1.840000  0.085000  2.090000 0.545000 ;
+      RECT  1.980000  0.715000  2.530000 0.905000 ;
+      RECT  1.980000  0.905000  2.235000 1.760000 ;
+      RECT  1.980000  1.760000  2.535000 2.085000 ;
+      RECT  2.260000  0.255000  2.530000 0.715000 ;
+      RECT  2.275000  2.085000  2.535000 2.465000 ;
+      RECT  2.700000  0.085000  3.100000 0.555000 ;
+      RECT  2.705000  2.140000  3.100000 2.635000 ;
+      RECT  3.270000  0.255000  3.470000 0.715000 ;
+      RECT  3.270000  0.715000  3.995000 0.885000 ;
+      RECT  3.270000  1.830000  3.995000 2.000000 ;
+      RECT  3.270000  2.000000  3.475000 2.325000 ;
+      RECT  3.640000  0.085000  3.940000 0.545000 ;
+      RECT  3.645000  2.275000  3.975000 2.635000 ;
+      RECT  3.735000  0.885000  3.995000 1.830000 ;
+      RECT  4.110000  0.255000  4.335000 0.585000 ;
+      RECT  4.145000  2.135000  4.440000 2.465000 ;
+      RECT  4.165000  0.585000  4.335000 1.090000 ;
+      RECT  4.165000  1.090000  4.490000 1.420000 ;
+      RECT  4.165000  1.420000  4.440000 2.135000 ;
+      RECT  4.505000  0.255000  4.885000 0.920000 ;
+      RECT  4.665000  1.590000  4.970000 1.615000 ;
+      RECT  4.665000  1.615000  4.890000 2.465000 ;
+      RECT  4.715000  0.920000  4.885000 1.445000 ;
+      RECT  4.715000  1.445000  4.970000 1.590000 ;
+      RECT  5.055000  0.255000  5.450000 1.225000 ;
+      RECT  5.055000  1.225000  7.705000 1.275000 ;
+      RECT  5.060000  2.135000  5.805000 2.465000 ;
+      RECT  5.140000  1.275000  6.475000 1.395000 ;
+      RECT  5.205000  1.575000  5.465000 1.955000 ;
+      RECT  5.620000  0.635000  6.550000 0.805000 ;
+      RECT  5.620000  0.805000  6.015000 1.015000 ;
+      RECT  5.635000  1.395000  5.805000 2.135000 ;
+      RECT  5.665000  0.085000  6.165000 0.465000 ;
+      RECT  5.975000  1.575000  6.145000 1.935000 ;
+      RECT  5.975000  1.935000  6.820000 2.105000 ;
+      RECT  6.000000  2.275000  6.330000 2.635000 ;
+      RECT  6.305000  0.975000  7.705000 1.225000 ;
+      RECT  6.335000  0.255000  6.550000 0.635000 ;
+      RECT  6.605000  2.105000  6.820000 2.450000 ;
+      RECT  6.720000  0.085000  7.705000 0.805000 ;
+      RECT  7.060000  2.125000  8.015000 2.635000 ;
+      RECT  7.355000  1.275000  7.705000 1.325000 ;
+      RECT  7.385000  1.705000  8.055000 1.955000 ;
+      RECT  7.885000  0.695000  9.085000 0.895000 ;
+      RECT  7.885000  0.895000  8.055000 1.705000 ;
+      RECT  8.185000  2.125000  8.990000 2.460000 ;
+      RECT  8.420000  1.075000  8.650000 1.905000 ;
+      RECT  8.465000  0.275000  9.855000 0.515000 ;
+      RECT  8.820000  1.895000 10.430000 2.065000 ;
+      RECT  8.820000  2.065000  8.990000 2.125000 ;
+      RECT  8.830000  0.895000  9.085000 1.265000 ;
+      RECT  9.160000  2.235000  9.490000 2.635000 ;
+      RECT  9.285000  0.855000  9.515000 1.185000 ;
+      RECT  9.285000  1.185000 10.910000 1.355000 ;
+      RECT  9.660000  2.065000  9.930000 2.450000 ;
+      RECT  9.685000  0.515000  9.855000 0.845000 ;
+      RECT  9.685000  0.845000 10.560000 1.015000 ;
+      RECT 10.035000  0.085000 10.285000 0.545000 ;
+      RECT 10.100000  2.235000 10.430000 2.635000 ;
+      RECT 10.105000  1.525000 10.430000 1.895000 ;
+      RECT 10.465000  0.255000 10.910000 0.585000 ;
+      RECT 10.600000  1.355000 10.845000 2.465000 ;
+      RECT 10.730000  0.585000 10.910000 1.185000 ;
+      RECT 11.080000  1.485000 11.290000 2.635000 ;
+      RECT 11.120000  0.085000 11.290000 0.885000 ;
+      RECT 12.025000  0.085000 12.315000 0.885000 ;
+      RECT 12.025000  1.485000 12.315000 2.635000 ;
+      RECT 12.530000  0.255000 12.715000 0.995000 ;
+      RECT 12.530000  0.995000 13.345000 1.325000 ;
+      RECT 12.530000  1.325000 12.715000 2.465000 ;
+      RECT 12.885000  0.085000 13.240000 0.825000 ;
+      RECT 12.885000  1.635000 13.240000 2.635000 ;
+      RECT 13.910000  0.085000 14.175000 0.885000 ;
+      RECT 13.910000  1.485000 14.175000 2.635000 ;
     LAYER mcon ;
-      RECT 1.525000 1.445000 1.695000 1.615000 ;
-      RECT 3.825000 1.785000 3.995000 1.955000 ;
-      RECT 4.285000 1.105000 4.455000 1.275000 ;
-      RECT 4.800000 1.445000 4.970000 1.615000 ;
-      RECT 5.260000 1.785000 5.430000 1.955000 ;
-      RECT 7.560000 1.785000 7.730000 1.955000 ;
-      RECT 8.480000 1.105000 8.650000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  1.445000  1.695000 1.615000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  1.785000  3.995000 1.955000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  1.105000  4.455000 1.275000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  4.800000  1.445000  4.970000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.260000  1.785000  5.430000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.560000  1.785000  7.730000 1.955000 ;
+      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.480000  1.105000  8.650000 1.275000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT 1.465000 1.415000 1.755000 1.460000 ;
       RECT 1.465000 1.460000 5.030000 1.600000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
index 432d2ac..8be3544 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.magic.lef
@@ -66,10 +66,16 @@
     PORT
       LAYER li1 ;
         RECT 0.540000 0.765000 0.820000 1.675000 ;
-        RECT 2.370000 1.075000 2.700000 1.600000 ;
       LAYER mcon ;
         RECT 0.605000 1.105000 0.775000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.370000 1.075000 2.700000 1.600000 ;
+      LAYER mcon ;
         RECT 2.445000 1.105000 2.615000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.545000 1.075000 0.835000 1.120000 ;
         RECT 0.545000 1.120000 2.675000 1.260000 ;
@@ -85,10 +91,15 @@
     PORT
       LAYER li1 ;
         RECT 6.640000 1.445000 7.065000 1.765000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 8.880000 1.425000 9.135000 1.545000 ;
         RECT 8.880000 1.545000 9.945000 1.725000 ;
       LAYER mcon ;
         RECT 8.940000 1.445000 9.110000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.580000 1.415000 6.870000 1.460000 ;
         RECT 6.580000 1.460000 9.170000 1.600000 ;
@@ -113,44 +124,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.420000 0.085000 ;
-        RECT  0.085000  0.085000  0.700000 0.595000 ;
-        RECT  1.825000  0.085000  2.090000 0.545000 ;
-        RECT  2.690000  0.085000  3.100000 0.555000 ;
-        RECT  3.625000  0.085000  3.955000 0.545000 ;
-        RECT  5.610000  0.085000  6.095000 0.465000 ;
-        RECT  6.705000  0.085000  7.715000 0.805000 ;
-        RECT 10.115000  0.085000 10.365000 0.545000 ;
-        RECT 11.515000  0.085000 11.825000 0.825000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
@@ -160,135 +133,169 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.420000 2.805000 ;
-        RECT  0.515000 2.195000  0.785000 2.635000 ;
-        RECT  2.690000 2.140000  2.985000 2.635000 ;
-        RECT  3.595000 2.275000  3.925000 2.635000 ;
-        RECT  5.945000 2.275000  6.330000 2.635000 ;
-        RECT  7.060000 2.125000  8.015000 2.635000 ;
-        RECT  9.160000 2.235000  9.490000 2.635000 ;
-        RECT 10.155000 2.235000 10.485000 2.635000 ;
-        RECT 11.515000 1.790000 11.825000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.125000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.870000 0.255000  1.625000 0.555000 ;
-      RECT  0.870000 0.555000  1.640000 0.575000 ;
-      RECT  0.870000 0.575000  1.650000 0.595000 ;
-      RECT  0.955000 2.025000  1.125000 2.255000 ;
-      RECT  0.955000 2.255000  2.045000 2.465000 ;
-      RECT  1.295000 1.845000  1.695000 2.085000 ;
-      RECT  1.380000 0.595000  1.660000 0.600000 ;
-      RECT  1.395000 0.600000  1.660000 0.605000 ;
-      RECT  1.405000 0.605000  1.660000 0.610000 ;
-      RECT  1.420000 0.610000  1.660000 0.615000 ;
-      RECT  1.430000 0.615000  1.660000 0.620000 ;
-      RECT  1.440000 0.620000  1.665000 0.630000 ;
-      RECT  1.445000 0.630000  1.665000 0.635000 ;
-      RECT  1.460000 0.635000  1.665000 0.645000 ;
-      RECT  1.475000 0.645000  1.670000 0.660000 ;
-      RECT  1.475000 0.660000  1.675000 0.665000 ;
-      RECT  1.495000 0.665000  1.675000 0.705000 ;
-      RECT  1.505000 0.705000  1.675000 0.710000 ;
-      RECT  1.505000 0.710000  1.695000 1.845000 ;
-      RECT  1.865000 0.715000  2.520000 0.905000 ;
-      RECT  1.865000 0.905000  2.200000 1.770000 ;
-      RECT  1.865000 1.770000  2.520000 2.085000 ;
-      RECT  2.260000 0.255000  2.520000 0.715000 ;
-      RECT  2.270000 2.085000  2.520000 2.465000 ;
-      RECT  3.255000 1.830000  3.995000 1.990000 ;
-      RECT  3.255000 1.990000  3.985000 2.000000 ;
-      RECT  3.255000 2.000000  3.425000 2.325000 ;
-      RECT  3.270000 0.255000  3.455000 0.715000 ;
-      RECT  3.270000 0.715000  3.995000 0.885000 ;
-      RECT  3.735000 0.885000  3.995000 1.830000 ;
-      RECT  4.095000 2.135000  4.440000 2.465000 ;
-      RECT  4.125000 0.255000  4.335000 0.585000 ;
-      RECT  4.165000 0.585000  4.335000 1.090000 ;
-      RECT  4.165000 1.090000  4.490000 1.420000 ;
-      RECT  4.165000 1.420000  4.440000 2.135000 ;
-      RECT  4.505000 0.255000  4.830000 0.920000 ;
-      RECT  4.615000 1.590000  4.915000 1.615000 ;
-      RECT  4.615000 1.615000  4.830000 2.465000 ;
-      RECT  4.660000 0.920000  4.830000 1.445000 ;
-      RECT  4.660000 1.445000  4.915000 1.590000 ;
-      RECT  5.000000 0.255000  5.440000 1.225000 ;
-      RECT  5.000000 1.225000  7.715000 1.275000 ;
-      RECT  5.035000 2.135000  5.755000 2.465000 ;
-      RECT  5.085000 1.275000  6.475000 1.395000 ;
-      RECT  5.205000 1.575000  5.415000 1.955000 ;
-      RECT  5.585000 1.395000  5.755000 2.135000 ;
-      RECT  5.645000 0.635000  6.535000 0.805000 ;
-      RECT  5.645000 0.805000  5.975000 1.015000 ;
-      RECT  5.925000 1.575000  6.095000 1.935000 ;
-      RECT  5.925000 1.935000  6.820000 2.105000 ;
-      RECT  6.285000 0.255000  6.535000 0.635000 ;
-      RECT  6.305000 0.975000  7.715000 1.225000 ;
-      RECT  6.605000 2.105000  6.820000 2.450000 ;
-      RECT  7.235000 1.670000  8.135000 1.955000 ;
-      RECT  7.355000 1.275000  7.715000 1.325000 ;
-      RECT  7.885000 0.720000  9.105000 0.905000 ;
-      RECT  7.885000 0.905000  8.135000 1.670000 ;
-      RECT  8.185000 2.125000  8.990000 2.460000 ;
-      RECT  8.425000 1.075000  8.650000 1.905000 ;
-      RECT  8.465000 0.275000  9.910000 0.545000 ;
-      RECT  8.820000 0.905000  9.105000 1.255000 ;
-      RECT  8.820000 1.895000 10.485000 2.065000 ;
-      RECT  8.820000 2.065000  8.990000 2.125000 ;
-      RECT  9.320000 0.855000  9.530000 1.195000 ;
-      RECT  9.320000 1.195000 10.915000 1.365000 ;
-      RECT  9.660000 2.065000  9.965000 2.450000 ;
-      RECT  9.710000 0.545000  9.910000 0.785000 ;
-      RECT  9.710000 0.785000 10.515000 1.015000 ;
-      RECT 10.155000 1.605000 10.485000 1.895000 ;
-      RECT 10.575000 0.255000 10.915000 0.585000 ;
-      RECT 10.655000 1.365000 10.915000 2.465000 ;
-      RECT 10.685000 0.585000 10.915000 1.195000 ;
-      RECT 11.085000 0.255000 11.345000 0.995000 ;
-      RECT 11.085000 0.995000 11.975000 1.325000 ;
-      RECT 11.085000 1.325000 11.345000 2.465000 ;
+      RECT  0.000000 -0.085000 12.420000 0.085000 ;
+      RECT  0.000000  2.635000 12.420000 2.805000 ;
+      RECT  0.085000  0.085000  0.700000 0.595000 ;
+      RECT  0.085000  1.845000  1.125000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.785000 2.635000 ;
+      RECT  0.870000  0.255000  1.625000 0.555000 ;
+      RECT  0.870000  0.555000  1.640000 0.575000 ;
+      RECT  0.870000  0.575000  1.650000 0.595000 ;
+      RECT  0.955000  2.025000  1.125000 2.255000 ;
+      RECT  0.955000  2.255000  2.045000 2.465000 ;
+      RECT  1.295000  1.845000  1.695000 2.085000 ;
+      RECT  1.380000  0.595000  1.660000 0.600000 ;
+      RECT  1.395000  0.600000  1.660000 0.605000 ;
+      RECT  1.405000  0.605000  1.660000 0.610000 ;
+      RECT  1.420000  0.610000  1.660000 0.615000 ;
+      RECT  1.430000  0.615000  1.660000 0.620000 ;
+      RECT  1.440000  0.620000  1.665000 0.630000 ;
+      RECT  1.445000  0.630000  1.665000 0.635000 ;
+      RECT  1.460000  0.635000  1.665000 0.645000 ;
+      RECT  1.475000  0.645000  1.670000 0.660000 ;
+      RECT  1.475000  0.660000  1.675000 0.665000 ;
+      RECT  1.495000  0.665000  1.675000 0.705000 ;
+      RECT  1.505000  0.705000  1.675000 0.710000 ;
+      RECT  1.505000  0.710000  1.695000 1.845000 ;
+      RECT  1.825000  0.085000  2.090000 0.545000 ;
+      RECT  1.865000  0.715000  2.520000 0.905000 ;
+      RECT  1.865000  0.905000  2.200000 1.770000 ;
+      RECT  1.865000  1.770000  2.520000 2.085000 ;
+      RECT  2.260000  0.255000  2.520000 0.715000 ;
+      RECT  2.270000  2.085000  2.520000 2.465000 ;
+      RECT  2.690000  0.085000  3.100000 0.555000 ;
+      RECT  2.690000  2.140000  2.985000 2.635000 ;
+      RECT  3.255000  1.830000  3.995000 1.990000 ;
+      RECT  3.255000  1.990000  3.985000 2.000000 ;
+      RECT  3.255000  2.000000  3.425000 2.325000 ;
+      RECT  3.270000  0.255000  3.455000 0.715000 ;
+      RECT  3.270000  0.715000  3.995000 0.885000 ;
+      RECT  3.595000  2.275000  3.925000 2.635000 ;
+      RECT  3.625000  0.085000  3.955000 0.545000 ;
+      RECT  3.735000  0.885000  3.995000 1.830000 ;
+      RECT  4.095000  2.135000  4.440000 2.465000 ;
+      RECT  4.125000  0.255000  4.335000 0.585000 ;
+      RECT  4.165000  0.585000  4.335000 1.090000 ;
+      RECT  4.165000  1.090000  4.490000 1.420000 ;
+      RECT  4.165000  1.420000  4.440000 2.135000 ;
+      RECT  4.505000  0.255000  4.830000 0.920000 ;
+      RECT  4.615000  1.590000  4.915000 1.615000 ;
+      RECT  4.615000  1.615000  4.830000 2.465000 ;
+      RECT  4.660000  0.920000  4.830000 1.445000 ;
+      RECT  4.660000  1.445000  4.915000 1.590000 ;
+      RECT  5.000000  0.255000  5.440000 1.225000 ;
+      RECT  5.000000  1.225000  7.715000 1.275000 ;
+      RECT  5.035000  2.135000  5.755000 2.465000 ;
+      RECT  5.085000  1.275000  6.475000 1.395000 ;
+      RECT  5.205000  1.575000  5.415000 1.955000 ;
+      RECT  5.585000  1.395000  5.755000 2.135000 ;
+      RECT  5.610000  0.085000  6.095000 0.465000 ;
+      RECT  5.645000  0.635000  6.535000 0.805000 ;
+      RECT  5.645000  0.805000  5.975000 1.015000 ;
+      RECT  5.925000  1.575000  6.095000 1.935000 ;
+      RECT  5.925000  1.935000  6.820000 2.105000 ;
+      RECT  5.945000  2.275000  6.330000 2.635000 ;
+      RECT  6.285000  0.255000  6.535000 0.635000 ;
+      RECT  6.305000  0.975000  7.715000 1.225000 ;
+      RECT  6.605000  2.105000  6.820000 2.450000 ;
+      RECT  6.705000  0.085000  7.715000 0.805000 ;
+      RECT  7.060000  2.125000  8.015000 2.635000 ;
+      RECT  7.235000  1.670000  8.135000 1.955000 ;
+      RECT  7.355000  1.275000  7.715000 1.325000 ;
+      RECT  7.885000  0.720000  9.105000 0.905000 ;
+      RECT  7.885000  0.905000  8.135000 1.670000 ;
+      RECT  8.185000  2.125000  8.990000 2.460000 ;
+      RECT  8.425000  1.075000  8.650000 1.905000 ;
+      RECT  8.465000  0.275000  9.910000 0.545000 ;
+      RECT  8.820000  0.905000  9.105000 1.255000 ;
+      RECT  8.820000  1.895000 10.485000 2.065000 ;
+      RECT  8.820000  2.065000  8.990000 2.125000 ;
+      RECT  9.160000  2.235000  9.490000 2.635000 ;
+      RECT  9.320000  0.855000  9.530000 1.195000 ;
+      RECT  9.320000  1.195000 10.915000 1.365000 ;
+      RECT  9.660000  2.065000  9.965000 2.450000 ;
+      RECT  9.710000  0.545000  9.910000 0.785000 ;
+      RECT  9.710000  0.785000 10.515000 1.015000 ;
+      RECT 10.115000  0.085000 10.365000 0.545000 ;
+      RECT 10.155000  1.605000 10.485000 1.895000 ;
+      RECT 10.155000  2.235000 10.485000 2.635000 ;
+      RECT 10.575000  0.255000 10.915000 0.585000 ;
+      RECT 10.655000  1.365000 10.915000 2.465000 ;
+      RECT 10.685000  0.585000 10.915000 1.195000 ;
+      RECT 11.085000  0.255000 11.345000 0.995000 ;
+      RECT 11.085000  0.995000 11.975000 1.325000 ;
+      RECT 11.085000  1.325000 11.345000 2.465000 ;
+      RECT 11.515000  0.085000 11.825000 0.825000 ;
+      RECT 11.515000  1.790000 11.825000 2.635000 ;
     LAYER mcon ;
-      RECT 1.525000 1.445000 1.695000 1.615000 ;
-      RECT 3.825000 1.785000 3.995000 1.955000 ;
-      RECT 4.285000 1.105000 4.455000 1.275000 ;
-      RECT 4.745000 1.445000 4.915000 1.615000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 7.560000 1.785000 7.730000 1.955000 ;
-      RECT 8.480000 1.105000 8.650000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  1.445000  1.695000 1.615000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  1.785000  3.995000 1.955000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  1.105000  4.455000 1.275000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  1.445000  4.915000 1.615000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.560000  1.785000  7.730000 1.955000 ;
+      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.480000  1.105000  8.650000 1.275000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.465000 1.415000 1.755000 1.460000 ;
       RECT 1.465000 1.460000 4.975000 1.600000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
index 1f1f00d..f7227b8 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.magic.lef
@@ -66,10 +66,16 @@
     PORT
       LAYER li1 ;
         RECT 0.540000 0.765000 0.820000 1.675000 ;
-        RECT 2.370000 1.075000 2.700000 1.600000 ;
       LAYER mcon ;
         RECT 0.605000 1.105000 0.775000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.370000 1.075000 2.700000 1.600000 ;
+      LAYER mcon ;
         RECT 2.445000 1.105000 2.615000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.545000 1.075000 0.835000 1.120000 ;
         RECT 0.545000 1.120000 2.675000 1.260000 ;
@@ -85,10 +91,15 @@
     PORT
       LAYER li1 ;
         RECT 6.640000 1.445000 7.065000 1.765000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 8.880000 1.425000 9.135000 1.545000 ;
         RECT 8.880000 1.545000 9.945000 1.725000 ;
       LAYER mcon ;
         RECT 8.940000 1.445000 9.110000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.580000 1.415000 6.870000 1.460000 ;
         RECT 6.580000 1.460000 9.170000 1.600000 ;
@@ -113,46 +124,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.880000 0.085000 ;
-        RECT  0.085000  0.085000  0.700000 0.595000 ;
-        RECT  1.825000  0.085000  2.090000 0.545000 ;
-        RECT  2.690000  0.085000  3.100000 0.555000 ;
-        RECT  3.625000  0.085000  3.955000 0.545000 ;
-        RECT  5.610000  0.085000  6.095000 0.465000 ;
-        RECT  6.705000  0.085000  7.715000 0.805000 ;
-        RECT 10.115000  0.085000 10.365000 0.545000 ;
-        RECT 11.570000  0.085000 11.865000 0.825000 ;
-        RECT 12.535000  0.085000 12.795000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
@@ -162,137 +133,173 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.880000 2.805000 ;
-        RECT  0.515000 2.195000  0.785000 2.635000 ;
-        RECT  2.690000 2.140000  2.985000 2.635000 ;
-        RECT  3.595000 2.275000  3.925000 2.635000 ;
-        RECT  5.945000 2.275000  6.330000 2.635000 ;
-        RECT  7.060000 2.125000  8.015000 2.635000 ;
-        RECT  9.160000 2.235000  9.490000 2.635000 ;
-        RECT 10.155000 2.235000 10.485000 2.635000 ;
-        RECT 11.570000 1.790000 11.820000 2.635000 ;
-        RECT 12.535000 1.495000 12.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 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.125000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.870000 0.255000  1.625000 0.555000 ;
-      RECT  0.870000 0.555000  1.640000 0.575000 ;
-      RECT  0.870000 0.575000  1.650000 0.595000 ;
-      RECT  0.955000 2.025000  1.125000 2.255000 ;
-      RECT  0.955000 2.255000  2.045000 2.465000 ;
-      RECT  1.295000 1.845000  1.695000 2.085000 ;
-      RECT  1.380000 0.595000  1.660000 0.600000 ;
-      RECT  1.395000 0.600000  1.660000 0.605000 ;
-      RECT  1.405000 0.605000  1.660000 0.610000 ;
-      RECT  1.420000 0.610000  1.660000 0.615000 ;
-      RECT  1.430000 0.615000  1.660000 0.620000 ;
-      RECT  1.440000 0.620000  1.665000 0.630000 ;
-      RECT  1.445000 0.630000  1.665000 0.635000 ;
-      RECT  1.460000 0.635000  1.665000 0.645000 ;
-      RECT  1.475000 0.645000  1.670000 0.660000 ;
-      RECT  1.475000 0.660000  1.675000 0.665000 ;
-      RECT  1.495000 0.665000  1.675000 0.705000 ;
-      RECT  1.505000 0.705000  1.675000 0.710000 ;
-      RECT  1.505000 0.710000  1.695000 1.845000 ;
-      RECT  1.865000 0.715000  2.520000 0.905000 ;
-      RECT  1.865000 0.905000  2.200000 1.770000 ;
-      RECT  1.865000 1.770000  2.520000 2.085000 ;
-      RECT  2.260000 0.255000  2.520000 0.715000 ;
-      RECT  2.270000 2.085000  2.520000 2.465000 ;
-      RECT  3.255000 1.830000  3.995000 1.990000 ;
-      RECT  3.255000 1.990000  3.985000 2.000000 ;
-      RECT  3.255000 2.000000  3.425000 2.325000 ;
-      RECT  3.270000 0.255000  3.455000 0.715000 ;
-      RECT  3.270000 0.715000  3.995000 0.885000 ;
-      RECT  3.735000 0.885000  3.995000 1.830000 ;
-      RECT  4.095000 2.135000  4.440000 2.465000 ;
-      RECT  4.125000 0.255000  4.335000 0.585000 ;
-      RECT  4.165000 0.585000  4.335000 1.090000 ;
-      RECT  4.165000 1.090000  4.490000 1.420000 ;
-      RECT  4.165000 1.420000  4.440000 2.135000 ;
-      RECT  4.505000 0.255000  4.830000 0.920000 ;
-      RECT  4.615000 1.590000  4.915000 1.615000 ;
-      RECT  4.615000 1.615000  4.830000 2.465000 ;
-      RECT  4.660000 0.920000  4.830000 1.445000 ;
-      RECT  4.660000 1.445000  4.915000 1.590000 ;
-      RECT  5.000000 0.255000  5.440000 1.225000 ;
-      RECT  5.000000 1.225000  7.715000 1.275000 ;
-      RECT  5.035000 2.135000  5.755000 2.465000 ;
-      RECT  5.085000 1.275000  6.475000 1.395000 ;
-      RECT  5.205000 1.575000  5.415000 1.955000 ;
-      RECT  5.585000 1.395000  5.755000 2.135000 ;
-      RECT  5.645000 0.635000  6.535000 0.805000 ;
-      RECT  5.645000 0.805000  5.975000 1.015000 ;
-      RECT  5.925000 1.575000  6.095000 1.935000 ;
-      RECT  5.925000 1.935000  6.820000 2.105000 ;
-      RECT  6.285000 0.255000  6.535000 0.635000 ;
-      RECT  6.305000 0.975000  7.715000 1.225000 ;
-      RECT  6.605000 2.105000  6.820000 2.450000 ;
-      RECT  7.235000 1.670000  8.135000 1.955000 ;
-      RECT  7.355000 1.275000  7.715000 1.325000 ;
-      RECT  7.885000 0.720000  9.105000 0.905000 ;
-      RECT  7.885000 0.905000  8.135000 1.670000 ;
-      RECT  8.185000 2.125000  8.990000 2.460000 ;
-      RECT  8.425000 1.075000  8.650000 1.905000 ;
-      RECT  8.465000 0.275000  9.910000 0.545000 ;
-      RECT  8.820000 0.905000  9.105000 1.255000 ;
-      RECT  8.820000 1.895000 10.485000 2.065000 ;
-      RECT  8.820000 2.065000  8.990000 2.125000 ;
-      RECT  9.320000 0.855000  9.530000 1.195000 ;
-      RECT  9.320000 1.195000 10.915000 1.365000 ;
-      RECT  9.660000 2.065000  9.965000 2.450000 ;
-      RECT  9.710000 0.545000  9.910000 0.785000 ;
-      RECT  9.710000 0.785000 10.515000 1.015000 ;
-      RECT 10.155000 1.605000 10.485000 1.895000 ;
-      RECT 10.575000 0.255000 10.915000 0.585000 ;
-      RECT 10.655000 1.365000 10.915000 2.465000 ;
-      RECT 10.685000 0.585000 10.915000 1.195000 ;
-      RECT 11.085000 0.255000 11.345000 0.995000 ;
-      RECT 11.085000 0.995000 11.975000 1.325000 ;
-      RECT 11.085000 1.325000 11.345000 2.465000 ;
+      RECT  0.000000 -0.085000 12.880000 0.085000 ;
+      RECT  0.000000  2.635000 12.880000 2.805000 ;
+      RECT  0.085000  0.085000  0.700000 0.595000 ;
+      RECT  0.085000  1.845000  1.125000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.785000 2.635000 ;
+      RECT  0.870000  0.255000  1.625000 0.555000 ;
+      RECT  0.870000  0.555000  1.640000 0.575000 ;
+      RECT  0.870000  0.575000  1.650000 0.595000 ;
+      RECT  0.955000  2.025000  1.125000 2.255000 ;
+      RECT  0.955000  2.255000  2.045000 2.465000 ;
+      RECT  1.295000  1.845000  1.695000 2.085000 ;
+      RECT  1.380000  0.595000  1.660000 0.600000 ;
+      RECT  1.395000  0.600000  1.660000 0.605000 ;
+      RECT  1.405000  0.605000  1.660000 0.610000 ;
+      RECT  1.420000  0.610000  1.660000 0.615000 ;
+      RECT  1.430000  0.615000  1.660000 0.620000 ;
+      RECT  1.440000  0.620000  1.665000 0.630000 ;
+      RECT  1.445000  0.630000  1.665000 0.635000 ;
+      RECT  1.460000  0.635000  1.665000 0.645000 ;
+      RECT  1.475000  0.645000  1.670000 0.660000 ;
+      RECT  1.475000  0.660000  1.675000 0.665000 ;
+      RECT  1.495000  0.665000  1.675000 0.705000 ;
+      RECT  1.505000  0.705000  1.675000 0.710000 ;
+      RECT  1.505000  0.710000  1.695000 1.845000 ;
+      RECT  1.825000  0.085000  2.090000 0.545000 ;
+      RECT  1.865000  0.715000  2.520000 0.905000 ;
+      RECT  1.865000  0.905000  2.200000 1.770000 ;
+      RECT  1.865000  1.770000  2.520000 2.085000 ;
+      RECT  2.260000  0.255000  2.520000 0.715000 ;
+      RECT  2.270000  2.085000  2.520000 2.465000 ;
+      RECT  2.690000  0.085000  3.100000 0.555000 ;
+      RECT  2.690000  2.140000  2.985000 2.635000 ;
+      RECT  3.255000  1.830000  3.995000 1.990000 ;
+      RECT  3.255000  1.990000  3.985000 2.000000 ;
+      RECT  3.255000  2.000000  3.425000 2.325000 ;
+      RECT  3.270000  0.255000  3.455000 0.715000 ;
+      RECT  3.270000  0.715000  3.995000 0.885000 ;
+      RECT  3.595000  2.275000  3.925000 2.635000 ;
+      RECT  3.625000  0.085000  3.955000 0.545000 ;
+      RECT  3.735000  0.885000  3.995000 1.830000 ;
+      RECT  4.095000  2.135000  4.440000 2.465000 ;
+      RECT  4.125000  0.255000  4.335000 0.585000 ;
+      RECT  4.165000  0.585000  4.335000 1.090000 ;
+      RECT  4.165000  1.090000  4.490000 1.420000 ;
+      RECT  4.165000  1.420000  4.440000 2.135000 ;
+      RECT  4.505000  0.255000  4.830000 0.920000 ;
+      RECT  4.615000  1.590000  4.915000 1.615000 ;
+      RECT  4.615000  1.615000  4.830000 2.465000 ;
+      RECT  4.660000  0.920000  4.830000 1.445000 ;
+      RECT  4.660000  1.445000  4.915000 1.590000 ;
+      RECT  5.000000  0.255000  5.440000 1.225000 ;
+      RECT  5.000000  1.225000  7.715000 1.275000 ;
+      RECT  5.035000  2.135000  5.755000 2.465000 ;
+      RECT  5.085000  1.275000  6.475000 1.395000 ;
+      RECT  5.205000  1.575000  5.415000 1.955000 ;
+      RECT  5.585000  1.395000  5.755000 2.135000 ;
+      RECT  5.610000  0.085000  6.095000 0.465000 ;
+      RECT  5.645000  0.635000  6.535000 0.805000 ;
+      RECT  5.645000  0.805000  5.975000 1.015000 ;
+      RECT  5.925000  1.575000  6.095000 1.935000 ;
+      RECT  5.925000  1.935000  6.820000 2.105000 ;
+      RECT  5.945000  2.275000  6.330000 2.635000 ;
+      RECT  6.285000  0.255000  6.535000 0.635000 ;
+      RECT  6.305000  0.975000  7.715000 1.225000 ;
+      RECT  6.605000  2.105000  6.820000 2.450000 ;
+      RECT  6.705000  0.085000  7.715000 0.805000 ;
+      RECT  7.060000  2.125000  8.015000 2.635000 ;
+      RECT  7.235000  1.670000  8.135000 1.955000 ;
+      RECT  7.355000  1.275000  7.715000 1.325000 ;
+      RECT  7.885000  0.720000  9.105000 0.905000 ;
+      RECT  7.885000  0.905000  8.135000 1.670000 ;
+      RECT  8.185000  2.125000  8.990000 2.460000 ;
+      RECT  8.425000  1.075000  8.650000 1.905000 ;
+      RECT  8.465000  0.275000  9.910000 0.545000 ;
+      RECT  8.820000  0.905000  9.105000 1.255000 ;
+      RECT  8.820000  1.895000 10.485000 2.065000 ;
+      RECT  8.820000  2.065000  8.990000 2.125000 ;
+      RECT  9.160000  2.235000  9.490000 2.635000 ;
+      RECT  9.320000  0.855000  9.530000 1.195000 ;
+      RECT  9.320000  1.195000 10.915000 1.365000 ;
+      RECT  9.660000  2.065000  9.965000 2.450000 ;
+      RECT  9.710000  0.545000  9.910000 0.785000 ;
+      RECT  9.710000  0.785000 10.515000 1.015000 ;
+      RECT 10.115000  0.085000 10.365000 0.545000 ;
+      RECT 10.155000  1.605000 10.485000 1.895000 ;
+      RECT 10.155000  2.235000 10.485000 2.635000 ;
+      RECT 10.575000  0.255000 10.915000 0.585000 ;
+      RECT 10.655000  1.365000 10.915000 2.465000 ;
+      RECT 10.685000  0.585000 10.915000 1.195000 ;
+      RECT 11.085000  0.255000 11.345000 0.995000 ;
+      RECT 11.085000  0.995000 11.975000 1.325000 ;
+      RECT 11.085000  1.325000 11.345000 2.465000 ;
+      RECT 11.570000  0.085000 11.865000 0.825000 ;
+      RECT 11.570000  1.790000 11.820000 2.635000 ;
+      RECT 12.535000  0.085000 12.795000 0.885000 ;
+      RECT 12.535000  1.495000 12.795000 2.635000 ;
     LAYER mcon ;
-      RECT 1.525000 1.445000 1.695000 1.615000 ;
-      RECT 3.825000 1.785000 3.995000 1.955000 ;
-      RECT 4.285000 1.105000 4.455000 1.275000 ;
-      RECT 4.745000 1.445000 4.915000 1.615000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 7.560000 1.785000 7.730000 1.955000 ;
-      RECT 8.480000 1.105000 8.650000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  1.445000  1.695000 1.615000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  1.785000  3.995000 1.955000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  1.105000  4.455000 1.275000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  1.445000  4.915000 1.615000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.560000  1.785000  7.730000 1.955000 ;
+      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.480000  1.105000  8.650000 1.275000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.465000 1.415000 1.755000 1.460000 ;
       RECT 1.465000 1.460000 4.975000 1.600000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
index 6a79cff..a6ba52b 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.magic.lef
@@ -70,10 +70,16 @@
     PORT
       LAYER li1 ;
         RECT 0.540000 0.765000 0.820000 1.675000 ;
-        RECT 2.370000 1.075000 2.700000 1.600000 ;
       LAYER mcon ;
         RECT 0.605000 1.105000 0.775000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 2.370000 1.075000 2.700000 1.600000 ;
+      LAYER mcon ;
         RECT 2.445000 1.105000 2.615000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.545000 1.075000 0.835000 1.120000 ;
         RECT 0.545000 1.120000 2.675000 1.260000 ;
@@ -89,10 +95,15 @@
     PORT
       LAYER li1 ;
         RECT 6.640000 1.445000 7.065000 1.765000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 8.880000 1.425000 9.135000 1.545000 ;
         RECT 8.880000 1.545000 9.945000 1.725000 ;
       LAYER mcon ;
         RECT 8.940000 1.445000 9.110000 1.615000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 6.580000 1.415000 6.870000 1.460000 ;
         RECT 6.580000 1.460000 9.170000 1.600000 ;
@@ -117,49 +128,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.800000 0.085000 ;
-        RECT  0.085000  0.085000  0.700000 0.595000 ;
-        RECT  1.825000  0.085000  2.090000 0.545000 ;
-        RECT  2.690000  0.085000  3.100000 0.555000 ;
-        RECT  3.625000  0.085000  3.955000 0.545000 ;
-        RECT  5.610000  0.085000  6.095000 0.465000 ;
-        RECT  6.705000  0.085000  7.715000 0.805000 ;
-        RECT 10.115000  0.085000 10.365000 0.545000 ;
-        RECT 11.515000  0.085000 11.870000 0.825000 ;
-        RECT 12.540000  0.085000 12.710000 0.885000 ;
-        RECT 13.380000  0.085000 13.715000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.800000 0.240000 ;
     END
@@ -169,140 +137,179 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.800000 2.805000 ;
-        RECT  0.515000 2.195000  0.785000 2.635000 ;
-        RECT  2.690000 2.140000  2.985000 2.635000 ;
-        RECT  3.595000 2.275000  3.925000 2.635000 ;
-        RECT  5.945000 2.275000  6.330000 2.635000 ;
-        RECT  7.060000 2.125000  8.015000 2.635000 ;
-        RECT  9.160000 2.235000  9.490000 2.635000 ;
-        RECT 10.155000 2.235000 10.485000 2.635000 ;
-        RECT 11.515000 1.495000 11.870000 2.635000 ;
-        RECT 12.540000 1.495000 12.710000 2.635000 ;
-        RECT 13.380000 1.495000 13.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 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.800000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.125000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.870000 0.255000  1.625000 0.555000 ;
-      RECT  0.870000 0.555000  1.640000 0.575000 ;
-      RECT  0.870000 0.575000  1.650000 0.595000 ;
-      RECT  0.955000 2.025000  1.125000 2.255000 ;
-      RECT  0.955000 2.255000  2.045000 2.465000 ;
-      RECT  1.295000 1.845000  1.695000 2.085000 ;
-      RECT  1.380000 0.595000  1.660000 0.600000 ;
-      RECT  1.395000 0.600000  1.660000 0.605000 ;
-      RECT  1.405000 0.605000  1.660000 0.610000 ;
-      RECT  1.420000 0.610000  1.660000 0.615000 ;
-      RECT  1.430000 0.615000  1.660000 0.620000 ;
-      RECT  1.440000 0.620000  1.665000 0.630000 ;
-      RECT  1.445000 0.630000  1.665000 0.635000 ;
-      RECT  1.460000 0.635000  1.665000 0.645000 ;
-      RECT  1.475000 0.645000  1.670000 0.660000 ;
-      RECT  1.475000 0.660000  1.675000 0.665000 ;
-      RECT  1.495000 0.665000  1.675000 0.705000 ;
-      RECT  1.505000 0.705000  1.675000 0.710000 ;
-      RECT  1.505000 0.710000  1.695000 1.845000 ;
-      RECT  1.865000 0.715000  2.520000 0.905000 ;
-      RECT  1.865000 0.905000  2.200000 1.770000 ;
-      RECT  1.865000 1.770000  2.520000 2.085000 ;
-      RECT  2.260000 0.255000  2.520000 0.715000 ;
-      RECT  2.270000 2.085000  2.520000 2.465000 ;
-      RECT  3.255000 1.830000  3.995000 1.990000 ;
-      RECT  3.255000 1.990000  3.985000 2.000000 ;
-      RECT  3.255000 2.000000  3.425000 2.325000 ;
-      RECT  3.270000 0.255000  3.455000 0.715000 ;
-      RECT  3.270000 0.715000  3.995000 0.885000 ;
-      RECT  3.735000 0.885000  3.995000 1.830000 ;
-      RECT  4.095000 2.135000  4.440000 2.465000 ;
-      RECT  4.125000 0.255000  4.335000 0.585000 ;
-      RECT  4.165000 0.585000  4.335000 1.090000 ;
-      RECT  4.165000 1.090000  4.490000 1.420000 ;
-      RECT  4.165000 1.420000  4.440000 2.135000 ;
-      RECT  4.505000 0.255000  4.830000 0.920000 ;
-      RECT  4.615000 1.590000  4.915000 1.615000 ;
-      RECT  4.615000 1.615000  4.830000 2.465000 ;
-      RECT  4.660000 0.920000  4.830000 1.445000 ;
-      RECT  4.660000 1.445000  4.915000 1.590000 ;
-      RECT  5.000000 0.255000  5.440000 1.225000 ;
-      RECT  5.000000 1.225000  7.715000 1.275000 ;
-      RECT  5.035000 2.135000  5.755000 2.465000 ;
-      RECT  5.085000 1.275000  6.475000 1.395000 ;
-      RECT  5.205000 1.575000  5.415000 1.955000 ;
-      RECT  5.585000 1.395000  5.755000 2.135000 ;
-      RECT  5.645000 0.635000  6.535000 0.805000 ;
-      RECT  5.645000 0.805000  5.975000 1.015000 ;
-      RECT  5.925000 1.575000  6.095000 1.935000 ;
-      RECT  5.925000 1.935000  6.820000 2.105000 ;
-      RECT  6.285000 0.255000  6.535000 0.635000 ;
-      RECT  6.305000 0.975000  7.715000 1.225000 ;
-      RECT  6.605000 2.105000  6.820000 2.450000 ;
-      RECT  7.235000 1.670000  8.135000 1.955000 ;
-      RECT  7.355000 1.275000  7.715000 1.325000 ;
-      RECT  7.885000 0.720000  9.105000 0.905000 ;
-      RECT  7.885000 0.905000  8.135000 1.670000 ;
-      RECT  8.185000 2.125000  8.990000 2.460000 ;
-      RECT  8.425000 1.075000  8.650000 1.905000 ;
-      RECT  8.465000 0.275000  9.910000 0.545000 ;
-      RECT  8.820000 0.905000  9.105000 1.255000 ;
-      RECT  8.820000 1.895000 10.485000 2.065000 ;
-      RECT  8.820000 2.065000  8.990000 2.125000 ;
-      RECT  9.320000 0.855000  9.530000 1.195000 ;
-      RECT  9.320000 1.195000 10.915000 1.365000 ;
-      RECT  9.660000 2.065000  9.965000 2.450000 ;
-      RECT  9.710000 0.545000  9.910000 0.785000 ;
-      RECT  9.710000 0.785000 10.515000 1.015000 ;
-      RECT 10.155000 1.605000 10.485000 1.895000 ;
-      RECT 10.575000 0.255000 10.915000 0.585000 ;
-      RECT 10.655000 1.365000 10.915000 2.465000 ;
-      RECT 10.685000 0.585000 10.915000 1.195000 ;
-      RECT 11.085000 0.255000 11.345000 0.995000 ;
-      RECT 11.085000 0.995000 11.975000 1.325000 ;
-      RECT 11.085000 1.325000 11.345000 2.465000 ;
+      RECT  0.000000 -0.085000 13.800000 0.085000 ;
+      RECT  0.000000  2.635000 13.800000 2.805000 ;
+      RECT  0.085000  0.085000  0.700000 0.595000 ;
+      RECT  0.085000  1.845000  1.125000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.785000 2.635000 ;
+      RECT  0.870000  0.255000  1.625000 0.555000 ;
+      RECT  0.870000  0.555000  1.640000 0.575000 ;
+      RECT  0.870000  0.575000  1.650000 0.595000 ;
+      RECT  0.955000  2.025000  1.125000 2.255000 ;
+      RECT  0.955000  2.255000  2.045000 2.465000 ;
+      RECT  1.295000  1.845000  1.695000 2.085000 ;
+      RECT  1.380000  0.595000  1.660000 0.600000 ;
+      RECT  1.395000  0.600000  1.660000 0.605000 ;
+      RECT  1.405000  0.605000  1.660000 0.610000 ;
+      RECT  1.420000  0.610000  1.660000 0.615000 ;
+      RECT  1.430000  0.615000  1.660000 0.620000 ;
+      RECT  1.440000  0.620000  1.665000 0.630000 ;
+      RECT  1.445000  0.630000  1.665000 0.635000 ;
+      RECT  1.460000  0.635000  1.665000 0.645000 ;
+      RECT  1.475000  0.645000  1.670000 0.660000 ;
+      RECT  1.475000  0.660000  1.675000 0.665000 ;
+      RECT  1.495000  0.665000  1.675000 0.705000 ;
+      RECT  1.505000  0.705000  1.675000 0.710000 ;
+      RECT  1.505000  0.710000  1.695000 1.845000 ;
+      RECT  1.825000  0.085000  2.090000 0.545000 ;
+      RECT  1.865000  0.715000  2.520000 0.905000 ;
+      RECT  1.865000  0.905000  2.200000 1.770000 ;
+      RECT  1.865000  1.770000  2.520000 2.085000 ;
+      RECT  2.260000  0.255000  2.520000 0.715000 ;
+      RECT  2.270000  2.085000  2.520000 2.465000 ;
+      RECT  2.690000  0.085000  3.100000 0.555000 ;
+      RECT  2.690000  2.140000  2.985000 2.635000 ;
+      RECT  3.255000  1.830000  3.995000 1.990000 ;
+      RECT  3.255000  1.990000  3.985000 2.000000 ;
+      RECT  3.255000  2.000000  3.425000 2.325000 ;
+      RECT  3.270000  0.255000  3.455000 0.715000 ;
+      RECT  3.270000  0.715000  3.995000 0.885000 ;
+      RECT  3.595000  2.275000  3.925000 2.635000 ;
+      RECT  3.625000  0.085000  3.955000 0.545000 ;
+      RECT  3.735000  0.885000  3.995000 1.830000 ;
+      RECT  4.095000  2.135000  4.440000 2.465000 ;
+      RECT  4.125000  0.255000  4.335000 0.585000 ;
+      RECT  4.165000  0.585000  4.335000 1.090000 ;
+      RECT  4.165000  1.090000  4.490000 1.420000 ;
+      RECT  4.165000  1.420000  4.440000 2.135000 ;
+      RECT  4.505000  0.255000  4.830000 0.920000 ;
+      RECT  4.615000  1.590000  4.915000 1.615000 ;
+      RECT  4.615000  1.615000  4.830000 2.465000 ;
+      RECT  4.660000  0.920000  4.830000 1.445000 ;
+      RECT  4.660000  1.445000  4.915000 1.590000 ;
+      RECT  5.000000  0.255000  5.440000 1.225000 ;
+      RECT  5.000000  1.225000  7.715000 1.275000 ;
+      RECT  5.035000  2.135000  5.755000 2.465000 ;
+      RECT  5.085000  1.275000  6.475000 1.395000 ;
+      RECT  5.205000  1.575000  5.415000 1.955000 ;
+      RECT  5.585000  1.395000  5.755000 2.135000 ;
+      RECT  5.610000  0.085000  6.095000 0.465000 ;
+      RECT  5.645000  0.635000  6.535000 0.805000 ;
+      RECT  5.645000  0.805000  5.975000 1.015000 ;
+      RECT  5.925000  1.575000  6.095000 1.935000 ;
+      RECT  5.925000  1.935000  6.820000 2.105000 ;
+      RECT  5.945000  2.275000  6.330000 2.635000 ;
+      RECT  6.285000  0.255000  6.535000 0.635000 ;
+      RECT  6.305000  0.975000  7.715000 1.225000 ;
+      RECT  6.605000  2.105000  6.820000 2.450000 ;
+      RECT  6.705000  0.085000  7.715000 0.805000 ;
+      RECT  7.060000  2.125000  8.015000 2.635000 ;
+      RECT  7.235000  1.670000  8.135000 1.955000 ;
+      RECT  7.355000  1.275000  7.715000 1.325000 ;
+      RECT  7.885000  0.720000  9.105000 0.905000 ;
+      RECT  7.885000  0.905000  8.135000 1.670000 ;
+      RECT  8.185000  2.125000  8.990000 2.460000 ;
+      RECT  8.425000  1.075000  8.650000 1.905000 ;
+      RECT  8.465000  0.275000  9.910000 0.545000 ;
+      RECT  8.820000  0.905000  9.105000 1.255000 ;
+      RECT  8.820000  1.895000 10.485000 2.065000 ;
+      RECT  8.820000  2.065000  8.990000 2.125000 ;
+      RECT  9.160000  2.235000  9.490000 2.635000 ;
+      RECT  9.320000  0.855000  9.530000 1.195000 ;
+      RECT  9.320000  1.195000 10.915000 1.365000 ;
+      RECT  9.660000  2.065000  9.965000 2.450000 ;
+      RECT  9.710000  0.545000  9.910000 0.785000 ;
+      RECT  9.710000  0.785000 10.515000 1.015000 ;
+      RECT 10.115000  0.085000 10.365000 0.545000 ;
+      RECT 10.155000  1.605000 10.485000 1.895000 ;
+      RECT 10.155000  2.235000 10.485000 2.635000 ;
+      RECT 10.575000  0.255000 10.915000 0.585000 ;
+      RECT 10.655000  1.365000 10.915000 2.465000 ;
+      RECT 10.685000  0.585000 10.915000 1.195000 ;
+      RECT 11.085000  0.255000 11.345000 0.995000 ;
+      RECT 11.085000  0.995000 11.975000 1.325000 ;
+      RECT 11.085000  1.325000 11.345000 2.465000 ;
+      RECT 11.515000  0.085000 11.870000 0.825000 ;
+      RECT 11.515000  1.495000 11.870000 2.635000 ;
+      RECT 12.540000  0.085000 12.710000 0.885000 ;
+      RECT 12.540000  1.495000 12.710000 2.635000 ;
+      RECT 13.380000  0.085000 13.715000 0.885000 ;
+      RECT 13.380000  1.495000 13.715000 2.635000 ;
     LAYER mcon ;
-      RECT 1.525000 1.445000 1.695000 1.615000 ;
-      RECT 3.825000 1.785000 3.995000 1.955000 ;
-      RECT 4.285000 1.105000 4.455000 1.275000 ;
-      RECT 4.745000 1.445000 4.915000 1.615000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 7.560000 1.785000 7.730000 1.955000 ;
-      RECT 8.480000 1.105000 8.650000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  1.445000  1.695000 1.615000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  1.785000  3.995000 1.955000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  1.105000  4.455000 1.275000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  1.445000  4.915000 1.615000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.560000  1.785000  7.730000 1.955000 ;
+      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.480000  1.105000  8.650000 1.275000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
     LAYER met1 ;
       RECT 1.465000 1.415000 1.755000 1.460000 ;
       RECT 1.465000 1.460000 4.975000 1.600000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
index ec0bc05..b30af8a 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.magic.lef
@@ -117,40 +117,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.955000  0.085000  2.285000 0.445000 ;
-        RECT  3.745000  0.085000  3.945000 0.545000 ;
-        RECT  5.675000  0.085000  6.045000 0.585000 ;
-        RECT  7.700000  0.085000  8.070000 0.615000 ;
-        RECT  8.840000  0.085000  9.010000 0.695000 ;
-        RECT 10.185000  0.085000 10.515000 0.805000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -160,116 +126,146 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  1.875000 2.245000  2.205000 2.635000 ;
-        RECT  3.740000 2.165000  3.910000 2.635000 ;
-        RECT  5.885000 1.835000  6.055000 2.635000 ;
-        RECT  7.765000 2.135000  8.070000 2.635000 ;
-        RECT  8.840000 1.625000  9.010000 2.635000 ;
-        RECT 10.210000 1.495000 10.515000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000  0.345000 0.635000 ;
-      RECT 0.175000 0.635000  0.810000 0.805000 ;
-      RECT 0.175000 1.795000  0.845000 1.965000 ;
-      RECT 0.175000 1.965000  0.345000 2.465000 ;
-      RECT 0.615000 0.805000  0.810000 0.970000 ;
-      RECT 0.615000 0.970000  0.845000 1.795000 ;
-      RECT 1.015000 0.345000  1.185000 2.465000 ;
-      RECT 1.420000 0.255000  1.705000 0.585000 ;
-      RECT 1.420000 0.585000  1.590000 1.860000 ;
-      RECT 1.420000 1.860000  3.230000 2.075000 ;
-      RECT 1.420000 2.075000  1.705000 2.445000 ;
-      RECT 2.100000 0.955000  2.445000 1.125000 ;
-      RECT 2.100000 1.125000  2.270000 1.860000 ;
-      RECT 2.675000 2.245000  3.570000 2.415000 ;
-      RECT 2.800000 0.275000  3.575000 0.445000 ;
-      RECT 3.060000 1.355000  3.255000 1.685000 ;
-      RECT 3.060000 1.685000  3.230000 1.860000 ;
-      RECT 3.400000 1.825000  4.335000 1.995000 ;
-      RECT 3.400000 1.995000  3.570000 2.245000 ;
-      RECT 3.405000 0.445000  3.575000 0.715000 ;
-      RECT 3.405000 0.715000  4.335000 0.885000 ;
-      RECT 4.165000 0.365000  4.515000 0.535000 ;
-      RECT 4.165000 0.535000  4.335000 0.715000 ;
-      RECT 4.165000 0.885000  4.335000 1.825000 ;
-      RECT 4.165000 1.995000  4.335000 2.070000 ;
-      RECT 4.165000 2.070000  4.450000 2.440000 ;
-      RECT 4.505000 0.705000  5.085000 1.035000 ;
-      RECT 4.505000 1.035000  4.745000 1.905000 ;
-      RECT 4.645000 2.190000  5.715000 2.360000 ;
-      RECT 4.685000 0.365000  5.425000 0.535000 ;
-      RECT 4.935000 1.655000  5.375000 2.010000 ;
-      RECT 5.255000 0.535000  5.425000 1.315000 ;
-      RECT 5.255000 1.315000  6.055000 1.485000 ;
-      RECT 5.545000 1.485000  6.055000 1.575000 ;
-      RECT 5.545000 1.575000  5.715000 2.190000 ;
-      RECT 5.595000 0.765000  6.395000 1.065000 ;
-      RECT 5.595000 1.065000  5.765000 1.095000 ;
-      RECT 5.885000 1.245000  6.055000 1.315000 ;
-      RECT 6.225000 0.365000  6.685000 0.535000 ;
-      RECT 6.225000 0.535000  6.395000 0.765000 ;
-      RECT 6.225000 1.065000  6.395000 2.135000 ;
-      RECT 6.225000 2.135000  6.475000 2.465000 ;
-      RECT 6.565000 0.705000  7.115000 1.035000 ;
-      RECT 6.565000 1.245000  6.755000 1.965000 ;
-      RECT 6.700000 2.165000  7.585000 2.335000 ;
-      RECT 6.915000 0.365000  7.455000 0.535000 ;
-      RECT 6.925000 1.035000  7.115000 1.575000 ;
-      RECT 6.925000 1.575000  7.245000 1.905000 ;
-      RECT 7.285000 0.535000  7.455000 0.995000 ;
-      RECT 7.285000 0.995000  8.315000 1.325000 ;
-      RECT 7.285000 1.325000  7.585000 1.405000 ;
-      RECT 7.415000 1.405000  7.585000 2.165000 ;
-      RECT 7.755000 1.575000  8.670000 1.905000 ;
-      RECT 8.340000 0.300000  8.670000 0.825000 ;
-      RECT 8.380000 1.905000  8.670000 2.455000 ;
-      RECT 8.485000 0.825000  8.670000 0.995000 ;
-      RECT 8.485000 0.995000  9.220000 1.325000 ;
-      RECT 8.485000 1.325000  8.670000 1.575000 ;
-      RECT 9.700000 0.345000  9.950000 0.620000 ;
-      RECT 9.700000 1.685000 10.030000 2.425000 ;
-      RECT 9.780000 0.620000  9.950000 0.995000 ;
-      RECT 9.780000 0.995000 10.560000 1.325000 ;
-      RECT 9.780000 1.325000 10.030000 1.685000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.810000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.810000 0.970000 ;
+      RECT  0.615000  0.970000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.420000  0.255000  1.705000 0.585000 ;
+      RECT  1.420000  0.585000  1.590000 1.860000 ;
+      RECT  1.420000  1.860000  3.230000 2.075000 ;
+      RECT  1.420000  2.075000  1.705000 2.445000 ;
+      RECT  1.875000  2.245000  2.205000 2.635000 ;
+      RECT  1.955000  0.085000  2.285000 0.445000 ;
+      RECT  2.100000  0.955000  2.445000 1.125000 ;
+      RECT  2.100000  1.125000  2.270000 1.860000 ;
+      RECT  2.675000  2.245000  3.570000 2.415000 ;
+      RECT  2.800000  0.275000  3.575000 0.445000 ;
+      RECT  3.060000  1.355000  3.255000 1.685000 ;
+      RECT  3.060000  1.685000  3.230000 1.860000 ;
+      RECT  3.400000  1.825000  4.335000 1.995000 ;
+      RECT  3.400000  1.995000  3.570000 2.245000 ;
+      RECT  3.405000  0.445000  3.575000 0.715000 ;
+      RECT  3.405000  0.715000  4.335000 0.885000 ;
+      RECT  3.740000  2.165000  3.910000 2.635000 ;
+      RECT  3.745000  0.085000  3.945000 0.545000 ;
+      RECT  4.165000  0.365000  4.515000 0.535000 ;
+      RECT  4.165000  0.535000  4.335000 0.715000 ;
+      RECT  4.165000  0.885000  4.335000 1.825000 ;
+      RECT  4.165000  1.995000  4.335000 2.070000 ;
+      RECT  4.165000  2.070000  4.450000 2.440000 ;
+      RECT  4.505000  0.705000  5.085000 1.035000 ;
+      RECT  4.505000  1.035000  4.745000 1.905000 ;
+      RECT  4.645000  2.190000  5.715000 2.360000 ;
+      RECT  4.685000  0.365000  5.425000 0.535000 ;
+      RECT  4.935000  1.655000  5.375000 2.010000 ;
+      RECT  5.255000  0.535000  5.425000 1.315000 ;
+      RECT  5.255000  1.315000  6.055000 1.485000 ;
+      RECT  5.545000  1.485000  6.055000 1.575000 ;
+      RECT  5.545000  1.575000  5.715000 2.190000 ;
+      RECT  5.595000  0.765000  6.395000 1.065000 ;
+      RECT  5.595000  1.065000  5.765000 1.095000 ;
+      RECT  5.675000  0.085000  6.045000 0.585000 ;
+      RECT  5.885000  1.245000  6.055000 1.315000 ;
+      RECT  5.885000  1.835000  6.055000 2.635000 ;
+      RECT  6.225000  0.365000  6.685000 0.535000 ;
+      RECT  6.225000  0.535000  6.395000 0.765000 ;
+      RECT  6.225000  1.065000  6.395000 2.135000 ;
+      RECT  6.225000  2.135000  6.475000 2.465000 ;
+      RECT  6.565000  0.705000  7.115000 1.035000 ;
+      RECT  6.565000  1.245000  6.755000 1.965000 ;
+      RECT  6.700000  2.165000  7.585000 2.335000 ;
+      RECT  6.915000  0.365000  7.455000 0.535000 ;
+      RECT  6.925000  1.035000  7.115000 1.575000 ;
+      RECT  6.925000  1.575000  7.245000 1.905000 ;
+      RECT  7.285000  0.535000  7.455000 0.995000 ;
+      RECT  7.285000  0.995000  8.315000 1.325000 ;
+      RECT  7.285000  1.325000  7.585000 1.405000 ;
+      RECT  7.415000  1.405000  7.585000 2.165000 ;
+      RECT  7.700000  0.085000  8.070000 0.615000 ;
+      RECT  7.755000  1.575000  8.670000 1.905000 ;
+      RECT  7.765000  2.135000  8.070000 2.635000 ;
+      RECT  8.340000  0.300000  8.670000 0.825000 ;
+      RECT  8.380000  1.905000  8.670000 2.455000 ;
+      RECT  8.485000  0.825000  8.670000 0.995000 ;
+      RECT  8.485000  0.995000  9.220000 1.325000 ;
+      RECT  8.485000  1.325000  8.670000 1.575000 ;
+      RECT  8.840000  0.085000  9.010000 0.695000 ;
+      RECT  8.840000  1.625000  9.010000 2.635000 ;
+      RECT  9.700000  0.345000  9.950000 0.620000 ;
+      RECT  9.700000  1.685000 10.030000 2.425000 ;
+      RECT  9.780000  0.620000  9.950000 0.995000 ;
+      RECT  9.780000  0.995000 10.560000 1.325000 ;
+      RECT  9.780000  1.325000 10.030000 1.685000 ;
+      RECT 10.185000  0.085000 10.515000 0.805000 ;
+      RECT 10.210000  1.495000 10.515000 2.635000 ;
     LAYER mcon ;
-      RECT 0.645000 1.785000 0.815000 1.955000 ;
-      RECT 1.015000 0.765000 1.185000 0.935000 ;
-      RECT 4.745000 0.765000 4.915000 0.935000 ;
-      RECT 5.165000 1.785000 5.335000 1.955000 ;
-      RECT 6.575000 1.785000 6.745000 1.955000 ;
-      RECT 6.585000 0.765000 6.755000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.645000  1.785000  0.815000 1.955000 ;
+      RECT  1.015000  0.765000  1.185000 0.935000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  0.765000  4.915000 0.935000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.165000  1.785000  5.335000 1.955000 ;
+      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.575000  1.785000  6.745000 1.955000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  0.765000  6.755000 0.935000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.585000 1.755000 0.875000 1.800000 ;
       RECT 0.585000 1.800000 6.805000 1.940000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
index 7839a0a..ae7f0b1 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.magic.lef
@@ -100,44 +100,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.975000  0.085000  2.305000 0.445000 ;
-        RECT  3.765000  0.085000  3.965000 0.525000 ;
-        RECT  5.715000  0.085000  6.085000 0.585000 ;
-        RECT  7.740000  0.085000  8.110000 0.615000 ;
-        RECT  8.895000  0.085000  9.085000 0.695000 ;
-        RECT  9.755000  0.085000  9.985000 0.690000 ;
-        RECT 10.690000  0.085000 11.020000 0.805000 ;
-        RECT 11.610000  0.085000 11.780000 0.955000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -147,119 +109,153 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.520000 2.135000  0.850000 2.635000 ;
-        RECT  1.880000 2.245000  2.210000 2.635000 ;
-        RECT  3.760000 2.165000  3.930000 2.635000 ;
-        RECT  5.925000 1.835000  6.095000 2.635000 ;
-        RECT  7.805000 2.135000  8.110000 2.635000 ;
-        RECT  8.895000 1.625000  9.075000 2.635000 ;
-        RECT  9.765000 1.615000  9.935000 2.635000 ;
-        RECT 10.715000 1.495000 11.020000 2.635000 ;
-        RECT 11.610000 1.395000 11.780000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.810000 0.805000 ;
-      RECT  0.180000 1.795000  0.845000 1.965000 ;
-      RECT  0.180000 1.965000  0.350000 2.465000 ;
-      RECT  0.615000 0.805000  0.810000 0.970000 ;
-      RECT  0.615000 0.970000  0.845000 1.795000 ;
-      RECT  1.015000 0.345000  1.245000 0.715000 ;
-      RECT  1.020000 0.715000  1.245000 2.465000 ;
-      RECT  1.435000 0.275000  1.805000 0.445000 ;
-      RECT  1.435000 0.445000  1.605000 1.860000 ;
-      RECT  1.435000 1.860000  3.250000 2.075000 ;
-      RECT  1.435000 2.075000  1.710000 2.445000 ;
-      RECT  2.120000 0.955000  2.465000 1.125000 ;
-      RECT  2.120000 1.125000  2.290000 1.860000 ;
-      RECT  2.695000 2.245000  3.590000 2.415000 ;
-      RECT  2.820000 0.275000  3.595000 0.445000 ;
-      RECT  3.080000 1.355000  3.275000 1.685000 ;
-      RECT  3.080000 1.685000  3.250000 1.860000 ;
-      RECT  3.420000 1.825000  4.375000 1.995000 ;
-      RECT  3.420000 1.995000  3.590000 2.245000 ;
-      RECT  3.425000 0.445000  3.595000 0.695000 ;
-      RECT  3.425000 0.695000  4.375000 0.865000 ;
-      RECT  4.205000 0.365000  4.555000 0.535000 ;
-      RECT  4.205000 0.535000  4.375000 0.695000 ;
-      RECT  4.205000 0.865000  4.375000 1.825000 ;
-      RECT  4.205000 1.995000  4.375000 2.065000 ;
-      RECT  4.205000 2.065000  4.485000 2.440000 ;
-      RECT  4.545000 0.705000  5.125000 1.035000 ;
-      RECT  4.545000 1.035000  4.785000 1.905000 ;
-      RECT  4.685000 2.190000  5.755000 2.360000 ;
-      RECT  4.725000 0.365000  5.465000 0.535000 ;
-      RECT  4.975000 1.655000  5.415000 2.010000 ;
-      RECT  5.295000 0.535000  5.465000 1.315000 ;
-      RECT  5.295000 1.315000  6.095000 1.485000 ;
-      RECT  5.585000 1.485000  6.095000 1.575000 ;
-      RECT  5.585000 1.575000  5.755000 2.190000 ;
-      RECT  5.635000 0.765000  6.435000 1.065000 ;
-      RECT  5.635000 1.065000  5.805000 1.095000 ;
-      RECT  5.925000 1.245000  6.095000 1.315000 ;
-      RECT  6.265000 0.365000  6.725000 0.535000 ;
-      RECT  6.265000 0.535000  6.435000 0.765000 ;
-      RECT  6.265000 1.065000  6.435000 2.135000 ;
-      RECT  6.265000 2.135000  6.515000 2.465000 ;
-      RECT  6.605000 0.705000  7.155000 1.035000 ;
-      RECT  6.605000 1.245000  6.795000 1.965000 ;
-      RECT  6.740000 2.165000  7.625000 2.335000 ;
-      RECT  6.955000 0.365000  7.495000 0.535000 ;
-      RECT  6.965000 1.035000  7.155000 1.575000 ;
-      RECT  6.965000 1.575000  7.285000 1.905000 ;
-      RECT  7.325000 0.535000  7.495000 0.995000 ;
-      RECT  7.325000 0.995000  8.370000 1.325000 ;
-      RECT  7.325000 1.325000  7.625000 1.405000 ;
-      RECT  7.455000 1.405000  7.625000 2.165000 ;
-      RECT  7.795000 1.575000  8.725000 1.905000 ;
-      RECT  8.360000 0.300000  8.725000 0.825000 ;
-      RECT  8.395000 1.905000  8.725000 2.455000 ;
-      RECT  8.540000 0.825000  8.725000 0.995000 ;
-      RECT  8.540000 0.995000  9.275000 1.325000 ;
-      RECT  8.540000 1.325000  8.725000 1.575000 ;
-      RECT 10.205000 0.345000 10.455000 0.995000 ;
-      RECT 10.205000 0.995000 11.065000 1.325000 ;
-      RECT 10.205000 1.325000 10.535000 2.425000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.810000 0.805000 ;
+      RECT  0.180000  1.795000  0.845000 1.965000 ;
+      RECT  0.180000  1.965000  0.350000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.520000  2.135000  0.850000 2.635000 ;
+      RECT  0.615000  0.805000  0.810000 0.970000 ;
+      RECT  0.615000  0.970000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.245000 0.715000 ;
+      RECT  1.020000  0.715000  1.245000 2.465000 ;
+      RECT  1.435000  0.275000  1.805000 0.445000 ;
+      RECT  1.435000  0.445000  1.605000 1.860000 ;
+      RECT  1.435000  1.860000  3.250000 2.075000 ;
+      RECT  1.435000  2.075000  1.710000 2.445000 ;
+      RECT  1.880000  2.245000  2.210000 2.635000 ;
+      RECT  1.975000  0.085000  2.305000 0.445000 ;
+      RECT  2.120000  0.955000  2.465000 1.125000 ;
+      RECT  2.120000  1.125000  2.290000 1.860000 ;
+      RECT  2.695000  2.245000  3.590000 2.415000 ;
+      RECT  2.820000  0.275000  3.595000 0.445000 ;
+      RECT  3.080000  1.355000  3.275000 1.685000 ;
+      RECT  3.080000  1.685000  3.250000 1.860000 ;
+      RECT  3.420000  1.825000  4.375000 1.995000 ;
+      RECT  3.420000  1.995000  3.590000 2.245000 ;
+      RECT  3.425000  0.445000  3.595000 0.695000 ;
+      RECT  3.425000  0.695000  4.375000 0.865000 ;
+      RECT  3.760000  2.165000  3.930000 2.635000 ;
+      RECT  3.765000  0.085000  3.965000 0.525000 ;
+      RECT  4.205000  0.365000  4.555000 0.535000 ;
+      RECT  4.205000  0.535000  4.375000 0.695000 ;
+      RECT  4.205000  0.865000  4.375000 1.825000 ;
+      RECT  4.205000  1.995000  4.375000 2.065000 ;
+      RECT  4.205000  2.065000  4.485000 2.440000 ;
+      RECT  4.545000  0.705000  5.125000 1.035000 ;
+      RECT  4.545000  1.035000  4.785000 1.905000 ;
+      RECT  4.685000  2.190000  5.755000 2.360000 ;
+      RECT  4.725000  0.365000  5.465000 0.535000 ;
+      RECT  4.975000  1.655000  5.415000 2.010000 ;
+      RECT  5.295000  0.535000  5.465000 1.315000 ;
+      RECT  5.295000  1.315000  6.095000 1.485000 ;
+      RECT  5.585000  1.485000  6.095000 1.575000 ;
+      RECT  5.585000  1.575000  5.755000 2.190000 ;
+      RECT  5.635000  0.765000  6.435000 1.065000 ;
+      RECT  5.635000  1.065000  5.805000 1.095000 ;
+      RECT  5.715000  0.085000  6.085000 0.585000 ;
+      RECT  5.925000  1.245000  6.095000 1.315000 ;
+      RECT  5.925000  1.835000  6.095000 2.635000 ;
+      RECT  6.265000  0.365000  6.725000 0.535000 ;
+      RECT  6.265000  0.535000  6.435000 0.765000 ;
+      RECT  6.265000  1.065000  6.435000 2.135000 ;
+      RECT  6.265000  2.135000  6.515000 2.465000 ;
+      RECT  6.605000  0.705000  7.155000 1.035000 ;
+      RECT  6.605000  1.245000  6.795000 1.965000 ;
+      RECT  6.740000  2.165000  7.625000 2.335000 ;
+      RECT  6.955000  0.365000  7.495000 0.535000 ;
+      RECT  6.965000  1.035000  7.155000 1.575000 ;
+      RECT  6.965000  1.575000  7.285000 1.905000 ;
+      RECT  7.325000  0.535000  7.495000 0.995000 ;
+      RECT  7.325000  0.995000  8.370000 1.325000 ;
+      RECT  7.325000  1.325000  7.625000 1.405000 ;
+      RECT  7.455000  1.405000  7.625000 2.165000 ;
+      RECT  7.740000  0.085000  8.110000 0.615000 ;
+      RECT  7.795000  1.575000  8.725000 1.905000 ;
+      RECT  7.805000  2.135000  8.110000 2.635000 ;
+      RECT  8.360000  0.300000  8.725000 0.825000 ;
+      RECT  8.395000  1.905000  8.725000 2.455000 ;
+      RECT  8.540000  0.825000  8.725000 0.995000 ;
+      RECT  8.540000  0.995000  9.275000 1.325000 ;
+      RECT  8.540000  1.325000  8.725000 1.575000 ;
+      RECT  8.895000  0.085000  9.085000 0.695000 ;
+      RECT  8.895000  1.625000  9.075000 2.635000 ;
+      RECT  9.755000  0.085000  9.985000 0.690000 ;
+      RECT  9.765000  1.615000  9.935000 2.635000 ;
+      RECT 10.205000  0.345000 10.455000 0.995000 ;
+      RECT 10.205000  0.995000 11.065000 1.325000 ;
+      RECT 10.205000  1.325000 10.535000 2.425000 ;
+      RECT 10.690000  0.085000 11.020000 0.805000 ;
+      RECT 10.715000  1.495000 11.020000 2.635000 ;
+      RECT 11.610000  0.085000 11.780000 0.955000 ;
+      RECT 11.610000  1.395000 11.780000 2.635000 ;
     LAYER mcon ;
-      RECT 0.645000 1.785000 0.815000 1.955000 ;
-      RECT 1.050000 0.765000 1.220000 0.935000 ;
-      RECT 4.745000 0.765000 4.915000 0.935000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 6.625000 1.785000 6.795000 1.955000 ;
-      RECT 6.640000 0.765000 6.810000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.645000  1.785000  0.815000 1.955000 ;
+      RECT  1.050000  0.765000  1.220000 0.935000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  0.765000  4.915000 0.935000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  1.785000  5.375000 1.955000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  6.625000  1.785000  6.795000 1.955000 ;
+      RECT  6.640000  0.765000  6.810000 0.935000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
     LAYER met1 ;
       RECT 0.585000 1.755000 0.875000 1.800000 ;
       RECT 0.585000 1.800000 6.855000 1.940000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
index a74fb5d..95fbd38 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.magic.lef
@@ -87,36 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.465000 ;
-        RECT 1.960000  0.085000 2.305000 0.445000 ;
-        RECT 3.760000  0.085000 3.960000 0.545000 ;
-        RECT 5.690000  0.085000 6.060000 0.585000 ;
-        RECT 7.715000  0.085000 8.085000 0.615000 ;
-        RECT 8.875000  0.085000 9.045000 0.695000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -126,109 +96,135 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.520000 2.135000 0.850000 2.635000 ;
-        RECT 1.880000 2.245000 2.210000 2.635000 ;
-        RECT 3.730000 2.165000 3.925000 2.635000 ;
-        RECT 5.900000 1.835000 6.070000 2.635000 ;
-        RECT 7.790000 2.135000 8.095000 2.635000 ;
-        RECT 8.875000 1.625000 9.045000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.810000 0.805000 ;
-      RECT 0.180000 1.795000 0.845000 1.965000 ;
-      RECT 0.180000 1.965000 0.350000 2.465000 ;
-      RECT 0.615000 0.805000 0.810000 0.970000 ;
-      RECT 0.615000 0.970000 0.845000 1.795000 ;
-      RECT 1.015000 0.345000 1.230000 0.715000 ;
-      RECT 1.020000 0.715000 1.230000 2.465000 ;
-      RECT 1.420000 0.260000 1.790000 0.465000 ;
-      RECT 1.420000 0.465000 1.590000 1.860000 ;
-      RECT 1.420000 1.860000 3.220000 2.075000 ;
-      RECT 1.420000 2.075000 1.710000 2.445000 ;
-      RECT 2.115000 0.960000 2.460000 1.130000 ;
-      RECT 2.115000 1.130000 2.290000 1.860000 ;
-      RECT 2.690000 2.245000 3.560000 2.415000 ;
-      RECT 2.820000 0.275000 3.590000 0.445000 ;
-      RECT 3.050000 1.305000 3.270000 1.635000 ;
-      RECT 3.050000 1.635000 3.220000 1.860000 ;
-      RECT 3.390000 1.825000 4.350000 1.995000 ;
-      RECT 3.390000 1.995000 3.560000 2.245000 ;
-      RECT 3.420000 0.445000 3.590000 0.715000 ;
-      RECT 3.420000 0.715000 4.350000 0.885000 ;
-      RECT 4.180000 0.285000 4.460000 0.615000 ;
-      RECT 4.180000 0.615000 4.350000 0.715000 ;
-      RECT 4.180000 0.885000 4.350000 1.825000 ;
-      RECT 4.180000 1.995000 4.350000 2.065000 ;
-      RECT 4.180000 2.065000 4.420000 2.440000 ;
-      RECT 4.520000 0.780000 5.100000 1.035000 ;
-      RECT 4.520000 1.035000 4.760000 1.905000 ;
-      RECT 4.630000 0.705000 5.100000 0.780000 ;
-      RECT 4.660000 2.190000 5.730000 2.360000 ;
-      RECT 4.700000 0.365000 5.440000 0.535000 ;
-      RECT 4.950000 1.655000 5.390000 2.010000 ;
-      RECT 5.270000 0.535000 5.440000 1.315000 ;
-      RECT 5.270000 1.315000 6.070000 1.485000 ;
-      RECT 5.560000 1.485000 6.070000 1.575000 ;
-      RECT 5.560000 1.575000 5.730000 2.190000 ;
-      RECT 5.610000 0.765000 6.410000 1.065000 ;
-      RECT 5.610000 1.065000 5.780000 1.095000 ;
-      RECT 5.900000 1.245000 6.070000 1.315000 ;
-      RECT 6.240000 0.365000 6.700000 0.535000 ;
-      RECT 6.240000 0.535000 6.410000 0.765000 ;
-      RECT 6.240000 1.065000 6.410000 2.135000 ;
-      RECT 6.240000 2.135000 6.490000 2.465000 ;
-      RECT 6.580000 0.705000 7.130000 1.035000 ;
-      RECT 6.580000 1.245000 6.770000 1.965000 ;
-      RECT 6.715000 2.165000 7.600000 2.335000 ;
-      RECT 6.930000 0.365000 7.470000 0.535000 ;
-      RECT 6.940000 1.035000 7.130000 1.575000 ;
-      RECT 6.940000 1.575000 7.260000 1.905000 ;
-      RECT 7.300000 0.535000 7.470000 0.995000 ;
-      RECT 7.300000 0.995000 8.365000 1.325000 ;
-      RECT 7.300000 1.325000 7.600000 1.405000 ;
-      RECT 7.430000 1.405000 7.600000 2.165000 ;
-      RECT 7.770000 1.575000 8.705000 1.905000 ;
-      RECT 8.355000 0.300000 8.705000 0.825000 ;
-      RECT 8.435000 1.905000 8.705000 2.455000 ;
-      RECT 8.535000 0.825000 8.705000 0.995000 ;
-      RECT 8.535000 0.995000 9.235000 1.325000 ;
-      RECT 8.535000 1.325000 8.705000 1.575000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.810000 0.805000 ;
+      RECT 0.180000  1.795000 0.845000 1.965000 ;
+      RECT 0.180000  1.965000 0.350000 2.465000 ;
+      RECT 0.515000  0.085000 0.845000 0.465000 ;
+      RECT 0.520000  2.135000 0.850000 2.635000 ;
+      RECT 0.615000  0.805000 0.810000 0.970000 ;
+      RECT 0.615000  0.970000 0.845000 1.795000 ;
+      RECT 1.015000  0.345000 1.230000 0.715000 ;
+      RECT 1.020000  0.715000 1.230000 2.465000 ;
+      RECT 1.420000  0.260000 1.790000 0.465000 ;
+      RECT 1.420000  0.465000 1.590000 1.860000 ;
+      RECT 1.420000  1.860000 3.220000 2.075000 ;
+      RECT 1.420000  2.075000 1.710000 2.445000 ;
+      RECT 1.880000  2.245000 2.210000 2.635000 ;
+      RECT 1.960000  0.085000 2.305000 0.445000 ;
+      RECT 2.115000  0.960000 2.460000 1.130000 ;
+      RECT 2.115000  1.130000 2.290000 1.860000 ;
+      RECT 2.690000  2.245000 3.560000 2.415000 ;
+      RECT 2.820000  0.275000 3.590000 0.445000 ;
+      RECT 3.050000  1.305000 3.270000 1.635000 ;
+      RECT 3.050000  1.635000 3.220000 1.860000 ;
+      RECT 3.390000  1.825000 4.350000 1.995000 ;
+      RECT 3.390000  1.995000 3.560000 2.245000 ;
+      RECT 3.420000  0.445000 3.590000 0.715000 ;
+      RECT 3.420000  0.715000 4.350000 0.885000 ;
+      RECT 3.730000  2.165000 3.925000 2.635000 ;
+      RECT 3.760000  0.085000 3.960000 0.545000 ;
+      RECT 4.180000  0.285000 4.460000 0.615000 ;
+      RECT 4.180000  0.615000 4.350000 0.715000 ;
+      RECT 4.180000  0.885000 4.350000 1.825000 ;
+      RECT 4.180000  1.995000 4.350000 2.065000 ;
+      RECT 4.180000  2.065000 4.420000 2.440000 ;
+      RECT 4.520000  0.780000 5.100000 1.035000 ;
+      RECT 4.520000  1.035000 4.760000 1.905000 ;
+      RECT 4.630000  0.705000 5.100000 0.780000 ;
+      RECT 4.660000  2.190000 5.730000 2.360000 ;
+      RECT 4.700000  0.365000 5.440000 0.535000 ;
+      RECT 4.950000  1.655000 5.390000 2.010000 ;
+      RECT 5.270000  0.535000 5.440000 1.315000 ;
+      RECT 5.270000  1.315000 6.070000 1.485000 ;
+      RECT 5.560000  1.485000 6.070000 1.575000 ;
+      RECT 5.560000  1.575000 5.730000 2.190000 ;
+      RECT 5.610000  0.765000 6.410000 1.065000 ;
+      RECT 5.610000  1.065000 5.780000 1.095000 ;
+      RECT 5.690000  0.085000 6.060000 0.585000 ;
+      RECT 5.900000  1.245000 6.070000 1.315000 ;
+      RECT 5.900000  1.835000 6.070000 2.635000 ;
+      RECT 6.240000  0.365000 6.700000 0.535000 ;
+      RECT 6.240000  0.535000 6.410000 0.765000 ;
+      RECT 6.240000  1.065000 6.410000 2.135000 ;
+      RECT 6.240000  2.135000 6.490000 2.465000 ;
+      RECT 6.580000  0.705000 7.130000 1.035000 ;
+      RECT 6.580000  1.245000 6.770000 1.965000 ;
+      RECT 6.715000  2.165000 7.600000 2.335000 ;
+      RECT 6.930000  0.365000 7.470000 0.535000 ;
+      RECT 6.940000  1.035000 7.130000 1.575000 ;
+      RECT 6.940000  1.575000 7.260000 1.905000 ;
+      RECT 7.300000  0.535000 7.470000 0.995000 ;
+      RECT 7.300000  0.995000 8.365000 1.325000 ;
+      RECT 7.300000  1.325000 7.600000 1.405000 ;
+      RECT 7.430000  1.405000 7.600000 2.165000 ;
+      RECT 7.715000  0.085000 8.085000 0.615000 ;
+      RECT 7.770000  1.575000 8.705000 1.905000 ;
+      RECT 7.790000  2.135000 8.095000 2.635000 ;
+      RECT 8.355000  0.300000 8.705000 0.825000 ;
+      RECT 8.435000  1.905000 8.705000 2.455000 ;
+      RECT 8.535000  0.825000 8.705000 0.995000 ;
+      RECT 8.535000  0.995000 9.235000 1.325000 ;
+      RECT 8.535000  1.325000 8.705000 1.575000 ;
+      RECT 8.875000  0.085000 9.045000 0.695000 ;
+      RECT 8.875000  1.625000 9.045000 2.635000 ;
     LAYER mcon ;
-      RECT 0.640000 1.785000 0.810000 1.955000 ;
-      RECT 1.040000 0.765000 1.210000 0.935000 ;
-      RECT 4.745000 0.765000 4.915000 0.935000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 6.590000 1.785000 6.760000 1.955000 ;
-      RECT 6.630000 0.765000 6.800000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.640000  1.785000 0.810000 1.955000 ;
+      RECT 1.040000  0.765000 1.210000 0.935000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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  0.765000 4.915000 0.935000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  1.785000 5.375000 1.955000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.590000  1.785000 6.760000 1.955000 ;
+      RECT 6.630000  0.765000 6.800000 0.935000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
     LAYER met1 ;
       RECT 0.580000 1.755000 0.870000 1.800000 ;
       RECT 0.580000 1.800000 6.820000 1.940000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
index 3f8c58c..340f875 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.magic.lef
@@ -85,38 +85,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.515000  0.085000  0.845000 0.465000 ;
-        RECT 1.975000  0.085000  2.305000 0.445000 ;
-        RECT 3.760000  0.085000  3.960000 0.525000 ;
-        RECT 5.720000  0.085000  6.090000 0.585000 ;
-        RECT 7.745000  0.085000  8.115000 0.615000 ;
-        RECT 8.905000  0.085000  9.075000 0.695000 ;
-        RECT 9.775000  0.085000  9.945000 0.930000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -126,110 +94,138 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.520000 2.135000  0.850000 2.635000 ;
-        RECT 1.880000 2.245000  2.210000 2.635000 ;
-        RECT 3.755000 2.165000  3.925000 2.635000 ;
-        RECT 5.930000 1.835000  6.100000 2.635000 ;
-        RECT 7.810000 2.135000  8.115000 2.635000 ;
-        RECT 8.905000 1.625000  9.080000 2.635000 ;
-        RECT 9.775000 1.405000  9.945000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.810000 0.805000 ;
-      RECT 0.180000 1.795000 0.845000 1.965000 ;
-      RECT 0.180000 1.965000 0.350000 2.465000 ;
-      RECT 0.615000 0.805000 0.810000 0.970000 ;
-      RECT 0.615000 0.970000 0.845000 1.795000 ;
-      RECT 1.015000 0.345000 1.245000 0.715000 ;
-      RECT 1.020000 0.715000 1.245000 2.465000 ;
-      RECT 1.435000 0.275000 1.805000 0.445000 ;
-      RECT 1.435000 0.445000 1.605000 1.860000 ;
-      RECT 1.435000 1.860000 3.245000 2.075000 ;
-      RECT 1.435000 2.075000 1.710000 2.445000 ;
-      RECT 2.120000 0.955000 2.460000 1.125000 ;
-      RECT 2.120000 1.125000 2.290000 1.860000 ;
-      RECT 2.690000 2.245000 3.585000 2.415000 ;
-      RECT 2.820000 0.275000 3.590000 0.445000 ;
-      RECT 3.075000 1.355000 3.270000 1.685000 ;
-      RECT 3.075000 1.685000 3.245000 1.860000 ;
-      RECT 3.415000 1.825000 4.380000 1.995000 ;
-      RECT 3.415000 1.995000 3.585000 2.245000 ;
-      RECT 3.420000 0.445000 3.590000 0.695000 ;
-      RECT 3.420000 0.695000 4.380000 0.865000 ;
-      RECT 4.210000 0.365000 4.560000 0.535000 ;
-      RECT 4.210000 0.535000 4.380000 0.695000 ;
-      RECT 4.210000 0.865000 4.380000 1.825000 ;
-      RECT 4.210000 1.995000 4.380000 2.065000 ;
-      RECT 4.210000 2.065000 4.445000 2.440000 ;
-      RECT 4.550000 0.705000 5.130000 1.035000 ;
-      RECT 4.550000 1.035000 4.790000 1.905000 ;
-      RECT 4.690000 2.190000 5.760000 2.360000 ;
-      RECT 4.730000 0.365000 5.470000 0.535000 ;
-      RECT 4.980000 1.655000 5.420000 2.010000 ;
-      RECT 5.300000 0.535000 5.470000 1.315000 ;
-      RECT 5.300000 1.315000 6.100000 1.485000 ;
-      RECT 5.590000 1.485000 6.100000 1.575000 ;
-      RECT 5.590000 1.575000 5.760000 2.190000 ;
-      RECT 5.640000 0.765000 6.440000 1.065000 ;
-      RECT 5.640000 1.065000 5.810000 1.095000 ;
-      RECT 5.930000 1.245000 6.100000 1.315000 ;
-      RECT 6.270000 0.365000 6.730000 0.535000 ;
-      RECT 6.270000 0.535000 6.440000 0.765000 ;
-      RECT 6.270000 1.065000 6.440000 2.135000 ;
-      RECT 6.270000 2.135000 6.520000 2.465000 ;
-      RECT 6.610000 0.705000 7.160000 1.035000 ;
-      RECT 6.610000 1.245000 6.800000 1.965000 ;
-      RECT 6.745000 2.165000 7.630000 2.335000 ;
-      RECT 6.960000 0.365000 7.500000 0.535000 ;
-      RECT 6.970000 1.035000 7.160000 1.575000 ;
-      RECT 6.970000 1.575000 7.290000 1.905000 ;
-      RECT 7.330000 0.535000 7.500000 0.995000 ;
-      RECT 7.330000 0.995000 8.395000 1.325000 ;
-      RECT 7.330000 1.325000 7.630000 1.405000 ;
-      RECT 7.460000 1.405000 7.630000 2.165000 ;
-      RECT 7.800000 1.575000 8.735000 1.905000 ;
-      RECT 8.385000 0.300000 8.735000 0.825000 ;
-      RECT 8.465000 1.905000 8.735000 2.455000 ;
-      RECT 8.565000 0.825000 8.735000 0.995000 ;
-      RECT 8.565000 0.995000 9.265000 1.325000 ;
-      RECT 8.565000 1.325000 8.735000 1.575000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.175000  0.345000  0.345000 0.635000 ;
+      RECT 0.175000  0.635000  0.810000 0.805000 ;
+      RECT 0.180000  1.795000  0.845000 1.965000 ;
+      RECT 0.180000  1.965000  0.350000 2.465000 ;
+      RECT 0.515000  0.085000  0.845000 0.465000 ;
+      RECT 0.520000  2.135000  0.850000 2.635000 ;
+      RECT 0.615000  0.805000  0.810000 0.970000 ;
+      RECT 0.615000  0.970000  0.845000 1.795000 ;
+      RECT 1.015000  0.345000  1.245000 0.715000 ;
+      RECT 1.020000  0.715000  1.245000 2.465000 ;
+      RECT 1.435000  0.275000  1.805000 0.445000 ;
+      RECT 1.435000  0.445000  1.605000 1.860000 ;
+      RECT 1.435000  1.860000  3.245000 2.075000 ;
+      RECT 1.435000  2.075000  1.710000 2.445000 ;
+      RECT 1.880000  2.245000  2.210000 2.635000 ;
+      RECT 1.975000  0.085000  2.305000 0.445000 ;
+      RECT 2.120000  0.955000  2.460000 1.125000 ;
+      RECT 2.120000  1.125000  2.290000 1.860000 ;
+      RECT 2.690000  2.245000  3.585000 2.415000 ;
+      RECT 2.820000  0.275000  3.590000 0.445000 ;
+      RECT 3.075000  1.355000  3.270000 1.685000 ;
+      RECT 3.075000  1.685000  3.245000 1.860000 ;
+      RECT 3.415000  1.825000  4.380000 1.995000 ;
+      RECT 3.415000  1.995000  3.585000 2.245000 ;
+      RECT 3.420000  0.445000  3.590000 0.695000 ;
+      RECT 3.420000  0.695000  4.380000 0.865000 ;
+      RECT 3.755000  2.165000  3.925000 2.635000 ;
+      RECT 3.760000  0.085000  3.960000 0.525000 ;
+      RECT 4.210000  0.365000  4.560000 0.535000 ;
+      RECT 4.210000  0.535000  4.380000 0.695000 ;
+      RECT 4.210000  0.865000  4.380000 1.825000 ;
+      RECT 4.210000  1.995000  4.380000 2.065000 ;
+      RECT 4.210000  2.065000  4.445000 2.440000 ;
+      RECT 4.550000  0.705000  5.130000 1.035000 ;
+      RECT 4.550000  1.035000  4.790000 1.905000 ;
+      RECT 4.690000  2.190000  5.760000 2.360000 ;
+      RECT 4.730000  0.365000  5.470000 0.535000 ;
+      RECT 4.980000  1.655000  5.420000 2.010000 ;
+      RECT 5.300000  0.535000  5.470000 1.315000 ;
+      RECT 5.300000  1.315000  6.100000 1.485000 ;
+      RECT 5.590000  1.485000  6.100000 1.575000 ;
+      RECT 5.590000  1.575000  5.760000 2.190000 ;
+      RECT 5.640000  0.765000  6.440000 1.065000 ;
+      RECT 5.640000  1.065000  5.810000 1.095000 ;
+      RECT 5.720000  0.085000  6.090000 0.585000 ;
+      RECT 5.930000  1.245000  6.100000 1.315000 ;
+      RECT 5.930000  1.835000  6.100000 2.635000 ;
+      RECT 6.270000  0.365000  6.730000 0.535000 ;
+      RECT 6.270000  0.535000  6.440000 0.765000 ;
+      RECT 6.270000  1.065000  6.440000 2.135000 ;
+      RECT 6.270000  2.135000  6.520000 2.465000 ;
+      RECT 6.610000  0.705000  7.160000 1.035000 ;
+      RECT 6.610000  1.245000  6.800000 1.965000 ;
+      RECT 6.745000  2.165000  7.630000 2.335000 ;
+      RECT 6.960000  0.365000  7.500000 0.535000 ;
+      RECT 6.970000  1.035000  7.160000 1.575000 ;
+      RECT 6.970000  1.575000  7.290000 1.905000 ;
+      RECT 7.330000  0.535000  7.500000 0.995000 ;
+      RECT 7.330000  0.995000  8.395000 1.325000 ;
+      RECT 7.330000  1.325000  7.630000 1.405000 ;
+      RECT 7.460000  1.405000  7.630000 2.165000 ;
+      RECT 7.745000  0.085000  8.115000 0.615000 ;
+      RECT 7.800000  1.575000  8.735000 1.905000 ;
+      RECT 7.810000  2.135000  8.115000 2.635000 ;
+      RECT 8.385000  0.300000  8.735000 0.825000 ;
+      RECT 8.465000  1.905000  8.735000 2.455000 ;
+      RECT 8.565000  0.825000  8.735000 0.995000 ;
+      RECT 8.565000  0.995000  9.265000 1.325000 ;
+      RECT 8.565000  1.325000  8.735000 1.575000 ;
+      RECT 8.905000  0.085000  9.075000 0.695000 ;
+      RECT 8.905000  1.625000  9.080000 2.635000 ;
+      RECT 9.775000  0.085000  9.945000 0.930000 ;
+      RECT 9.775000  1.405000  9.945000 2.635000 ;
     LAYER mcon ;
-      RECT 0.640000 1.785000 0.810000 1.955000 ;
-      RECT 1.050000 0.765000 1.220000 0.935000 ;
-      RECT 4.745000 0.765000 4.915000 0.935000 ;
-      RECT 5.205000 1.785000 5.375000 1.955000 ;
-      RECT 6.620000 1.785000 6.790000 1.955000 ;
-      RECT 6.630000 0.765000 6.800000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.640000  1.785000 0.810000 1.955000 ;
+      RECT 1.050000  0.765000 1.220000 0.935000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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  0.765000 4.915000 0.935000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  1.785000 5.375000 1.955000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.620000  1.785000 6.790000 1.955000 ;
+      RECT 6.630000  0.765000 6.800000 0.935000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      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.580000 1.755000 0.870000 1.800000 ;
       RECT 0.580000 1.800000 6.850000 1.940000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
index ae07ca6..6ff6cba 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.magic.lef
@@ -89,41 +89,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  1.975000  0.085000  2.305000 0.445000 ;
-        RECT  3.765000  0.085000  3.965000 0.525000 ;
-        RECT  5.725000  0.085000  6.095000 0.585000 ;
-        RECT  7.750000  0.085000  8.120000 0.615000 ;
-        RECT  8.925000  0.085000  9.095000 0.695000 ;
-        RECT  9.795000  0.085000  9.965000 0.565000 ;
-        RECT 10.635000  0.085000 10.805000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -133,113 +98,144 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.520000 2.135000  0.850000 2.635000 ;
-        RECT  1.880000 2.245000  2.210000 2.635000 ;
-        RECT  3.760000 2.165000  3.930000 2.635000 ;
-        RECT  5.935000 1.835000  6.105000 2.635000 ;
-        RECT  7.815000 2.135000  8.120000 2.635000 ;
-        RECT  8.925000 1.625000  9.105000 2.635000 ;
-        RECT  9.795000 1.845000  9.965000 2.635000 ;
-        RECT 10.635000 1.845000 10.805000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000  0.345000 0.635000 ;
-      RECT 0.175000 0.635000  0.810000 0.805000 ;
-      RECT 0.180000 1.795000  0.845000 1.965000 ;
-      RECT 0.180000 1.965000  0.350000 2.465000 ;
-      RECT 0.615000 0.805000  0.810000 0.970000 ;
-      RECT 0.615000 0.970000  0.845000 1.795000 ;
-      RECT 1.015000 0.345000  1.245000 0.715000 ;
-      RECT 1.020000 0.715000  1.245000 2.465000 ;
-      RECT 1.435000 0.275000  1.805000 0.445000 ;
-      RECT 1.435000 0.445000  1.605000 1.860000 ;
-      RECT 1.435000 1.860000  3.250000 2.075000 ;
-      RECT 1.435000 2.075000  1.710000 2.445000 ;
-      RECT 2.120000 0.955000  2.465000 1.125000 ;
-      RECT 2.120000 1.125000  2.290000 1.860000 ;
-      RECT 2.695000 2.245000  3.590000 2.415000 ;
-      RECT 2.820000 0.275000  3.595000 0.445000 ;
-      RECT 3.080000 1.355000  3.275000 1.685000 ;
-      RECT 3.080000 1.685000  3.250000 1.860000 ;
-      RECT 3.420000 1.825000  4.385000 1.995000 ;
-      RECT 3.420000 1.995000  3.590000 2.245000 ;
-      RECT 3.425000 0.445000  3.595000 0.695000 ;
-      RECT 3.425000 0.695000  4.385000 0.865000 ;
-      RECT 4.215000 0.365000  4.565000 0.535000 ;
-      RECT 4.215000 0.535000  4.385000 0.695000 ;
-      RECT 4.215000 0.865000  4.385000 1.825000 ;
-      RECT 4.215000 1.995000  4.385000 2.065000 ;
-      RECT 4.215000 2.065000  4.450000 2.440000 ;
-      RECT 4.555000 0.705000  5.135000 1.035000 ;
-      RECT 4.555000 1.035000  4.795000 1.905000 ;
-      RECT 4.695000 2.190000  5.765000 2.360000 ;
-      RECT 4.735000 0.365000  5.475000 0.535000 ;
-      RECT 4.985000 1.655000  5.425000 2.010000 ;
-      RECT 5.305000 0.535000  5.475000 1.315000 ;
-      RECT 5.305000 1.315000  6.105000 1.485000 ;
-      RECT 5.595000 1.485000  6.105000 1.575000 ;
-      RECT 5.595000 1.575000  5.765000 2.190000 ;
-      RECT 5.645000 0.765000  6.445000 1.065000 ;
-      RECT 5.645000 1.065000  5.815000 1.095000 ;
-      RECT 5.935000 1.245000  6.105000 1.315000 ;
-      RECT 6.275000 0.365000  6.735000 0.535000 ;
-      RECT 6.275000 0.535000  6.445000 0.765000 ;
-      RECT 6.275000 1.065000  6.445000 2.135000 ;
-      RECT 6.275000 2.135000  6.525000 2.465000 ;
-      RECT 6.615000 0.705000  7.165000 1.035000 ;
-      RECT 6.615000 1.245000  6.805000 1.965000 ;
-      RECT 6.750000 2.165000  7.635000 2.335000 ;
-      RECT 6.965000 0.365000  7.505000 0.535000 ;
-      RECT 6.975000 1.035000  7.165000 1.575000 ;
-      RECT 6.975000 1.575000  7.295000 1.905000 ;
-      RECT 7.335000 0.535000  7.505000 0.995000 ;
-      RECT 7.335000 0.995000  8.400000 1.325000 ;
-      RECT 7.335000 1.325000  7.635000 1.405000 ;
-      RECT 7.465000 1.405000  7.635000 2.165000 ;
-      RECT 7.805000 1.575000  8.755000 1.905000 ;
-      RECT 8.390000 0.300000  8.750000 0.825000 ;
-      RECT 8.470000 1.905000  8.755000 2.455000 ;
-      RECT 8.570000 0.825000  8.750000 1.075000 ;
-      RECT 8.570000 1.075000 10.485000 1.325000 ;
-      RECT 8.570000 1.325000  8.755000 1.575000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.810000 0.805000 ;
+      RECT  0.180000  1.795000  0.845000 1.965000 ;
+      RECT  0.180000  1.965000  0.350000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.520000  2.135000  0.850000 2.635000 ;
+      RECT  0.615000  0.805000  0.810000 0.970000 ;
+      RECT  0.615000  0.970000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.245000 0.715000 ;
+      RECT  1.020000  0.715000  1.245000 2.465000 ;
+      RECT  1.435000  0.275000  1.805000 0.445000 ;
+      RECT  1.435000  0.445000  1.605000 1.860000 ;
+      RECT  1.435000  1.860000  3.250000 2.075000 ;
+      RECT  1.435000  2.075000  1.710000 2.445000 ;
+      RECT  1.880000  2.245000  2.210000 2.635000 ;
+      RECT  1.975000  0.085000  2.305000 0.445000 ;
+      RECT  2.120000  0.955000  2.465000 1.125000 ;
+      RECT  2.120000  1.125000  2.290000 1.860000 ;
+      RECT  2.695000  2.245000  3.590000 2.415000 ;
+      RECT  2.820000  0.275000  3.595000 0.445000 ;
+      RECT  3.080000  1.355000  3.275000 1.685000 ;
+      RECT  3.080000  1.685000  3.250000 1.860000 ;
+      RECT  3.420000  1.825000  4.385000 1.995000 ;
+      RECT  3.420000  1.995000  3.590000 2.245000 ;
+      RECT  3.425000  0.445000  3.595000 0.695000 ;
+      RECT  3.425000  0.695000  4.385000 0.865000 ;
+      RECT  3.760000  2.165000  3.930000 2.635000 ;
+      RECT  3.765000  0.085000  3.965000 0.525000 ;
+      RECT  4.215000  0.365000  4.565000 0.535000 ;
+      RECT  4.215000  0.535000  4.385000 0.695000 ;
+      RECT  4.215000  0.865000  4.385000 1.825000 ;
+      RECT  4.215000  1.995000  4.385000 2.065000 ;
+      RECT  4.215000  2.065000  4.450000 2.440000 ;
+      RECT  4.555000  0.705000  5.135000 1.035000 ;
+      RECT  4.555000  1.035000  4.795000 1.905000 ;
+      RECT  4.695000  2.190000  5.765000 2.360000 ;
+      RECT  4.735000  0.365000  5.475000 0.535000 ;
+      RECT  4.985000  1.655000  5.425000 2.010000 ;
+      RECT  5.305000  0.535000  5.475000 1.315000 ;
+      RECT  5.305000  1.315000  6.105000 1.485000 ;
+      RECT  5.595000  1.485000  6.105000 1.575000 ;
+      RECT  5.595000  1.575000  5.765000 2.190000 ;
+      RECT  5.645000  0.765000  6.445000 1.065000 ;
+      RECT  5.645000  1.065000  5.815000 1.095000 ;
+      RECT  5.725000  0.085000  6.095000 0.585000 ;
+      RECT  5.935000  1.245000  6.105000 1.315000 ;
+      RECT  5.935000  1.835000  6.105000 2.635000 ;
+      RECT  6.275000  0.365000  6.735000 0.535000 ;
+      RECT  6.275000  0.535000  6.445000 0.765000 ;
+      RECT  6.275000  1.065000  6.445000 2.135000 ;
+      RECT  6.275000  2.135000  6.525000 2.465000 ;
+      RECT  6.615000  0.705000  7.165000 1.035000 ;
+      RECT  6.615000  1.245000  6.805000 1.965000 ;
+      RECT  6.750000  2.165000  7.635000 2.335000 ;
+      RECT  6.965000  0.365000  7.505000 0.535000 ;
+      RECT  6.975000  1.035000  7.165000 1.575000 ;
+      RECT  6.975000  1.575000  7.295000 1.905000 ;
+      RECT  7.335000  0.535000  7.505000 0.995000 ;
+      RECT  7.335000  0.995000  8.400000 1.325000 ;
+      RECT  7.335000  1.325000  7.635000 1.405000 ;
+      RECT  7.465000  1.405000  7.635000 2.165000 ;
+      RECT  7.750000  0.085000  8.120000 0.615000 ;
+      RECT  7.805000  1.575000  8.755000 1.905000 ;
+      RECT  7.815000  2.135000  8.120000 2.635000 ;
+      RECT  8.390000  0.300000  8.750000 0.825000 ;
+      RECT  8.470000  1.905000  8.755000 2.455000 ;
+      RECT  8.570000  0.825000  8.750000 1.075000 ;
+      RECT  8.570000  1.075000 10.485000 1.325000 ;
+      RECT  8.570000  1.325000  8.755000 1.575000 ;
+      RECT  8.925000  0.085000  9.095000 0.695000 ;
+      RECT  8.925000  1.625000  9.105000 2.635000 ;
+      RECT  9.795000  0.085000  9.965000 0.565000 ;
+      RECT  9.795000  1.845000  9.965000 2.635000 ;
+      RECT 10.635000  0.085000 10.805000 0.565000 ;
+      RECT 10.635000  1.845000 10.805000 2.635000 ;
     LAYER mcon ;
-      RECT 0.615000 1.785000 0.785000 1.955000 ;
-      RECT 1.055000 0.765000 1.225000 0.935000 ;
-      RECT 4.755000 0.765000 4.925000 0.935000 ;
-      RECT 5.215000 1.785000 5.385000 1.955000 ;
-      RECT 6.625000 0.765000 6.795000 0.935000 ;
-      RECT 6.625000 1.785000 6.795000 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.615000  1.785000  0.785000 1.955000 ;
+      RECT  1.055000  0.765000  1.225000 0.935000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  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  4.755000  0.765000  4.925000 0.935000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.215000  1.785000  5.385000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  6.625000  0.765000  6.795000 0.935000 ;
+      RECT  6.625000  1.785000  6.795000 1.955000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
     LAYER met1 ;
       RECT 0.555000 1.755000 0.845000 1.800000 ;
       RECT 0.555000 1.800000 6.855000 1.940000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
index 0f940d0..6ab5115 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.magic.lef
@@ -76,28 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.445000 ;
-        RECT 2.665000  0.085000 3.010000 0.825000 ;
-        RECT 4.080000  0.085000 4.410000 0.445000 ;
-        RECT 5.505000  0.085000 6.360000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -107,82 +85,100 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.085000 1.835000 0.345000 2.635000 ;
-        RECT 2.370000 2.075000 3.010000 2.635000 ;
-        RECT 3.580000 2.255000 5.490000 2.635000 ;
-        RECT 6.030000 2.255000 6.360000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.190000 0.785000 ;
-      RECT 0.510000 0.785000 0.680000 1.460000 ;
-      RECT 0.510000 1.460000 0.710000 1.755000 ;
-      RECT 0.540000 1.755000 0.710000 2.125000 ;
-      RECT 0.540000 2.125000 1.255000 2.465000 ;
-      RECT 1.015000 0.255000 1.190000 0.615000 ;
-      RECT 1.360000 0.255000 2.495000 0.535000 ;
-      RECT 1.360000 0.705000 1.700000 1.205000 ;
-      RECT 1.360000 1.205000 1.860000 1.325000 ;
-      RECT 1.405000 1.325000 1.860000 1.955000 ;
-      RECT 1.425000 2.125000 2.200000 2.465000 ;
-      RECT 1.870000 0.705000 2.155000 1.035000 ;
-      RECT 2.030000 1.205000 3.010000 1.375000 ;
-      RECT 2.030000 1.375000 2.200000 2.125000 ;
-      RECT 2.325000 0.535000 2.495000 0.995000 ;
-      RECT 2.325000 0.995000 3.010000 1.205000 ;
-      RECT 2.370000 1.575000 2.540000 1.635000 ;
-      RECT 2.370000 1.635000 3.400000 1.905000 ;
-      RECT 3.180000 0.255000 3.400000 1.635000 ;
-      RECT 3.180000 1.905000 3.400000 1.915000 ;
-      RECT 3.180000 1.915000 5.450000 2.085000 ;
-      RECT 3.180000 2.085000 3.400000 2.465000 ;
-      RECT 3.580000 0.255000 3.910000 0.765000 ;
-      RECT 3.580000 0.765000 4.005000 0.935000 ;
-      RECT 3.580000 0.935000 3.750000 1.575000 ;
-      RECT 3.580000 1.575000 3.990000 1.745000 ;
-      RECT 3.920000 1.105000 4.465000 1.275000 ;
-      RECT 4.160000 1.275000 4.465000 1.495000 ;
-      RECT 4.160000 1.495000 4.960000 1.745000 ;
-      RECT 4.175000 0.615000 4.830000 0.785000 ;
-      RECT 4.175000 0.785000 4.465000 1.105000 ;
-      RECT 4.580000 0.255000 4.830000 0.615000 ;
-      RECT 5.010000 0.255000 5.270000 0.615000 ;
-      RECT 5.010000 0.615000 6.360000 0.785000 ;
-      RECT 5.140000 1.435000 5.610000 1.605000 ;
-      RECT 5.140000 1.605000 5.450000 1.915000 ;
-      RECT 5.660000 1.775000 6.360000 2.085000 ;
-      RECT 5.660000 2.085000 5.830000 2.465000 ;
-      RECT 5.780000 1.435000 6.360000 1.775000 ;
-      RECT 6.190000 0.785000 6.360000 0.995000 ;
-      RECT 6.190000 0.995000 6.460000 1.325000 ;
-      RECT 6.190000 1.325000 6.360000 1.435000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 1.190000 0.785000 ;
+      RECT 0.085000  1.835000 0.345000 2.635000 ;
+      RECT 0.510000  0.785000 0.680000 1.460000 ;
+      RECT 0.510000  1.460000 0.710000 1.755000 ;
+      RECT 0.515000  0.085000 0.845000 0.445000 ;
+      RECT 0.540000  1.755000 0.710000 2.125000 ;
+      RECT 0.540000  2.125000 1.255000 2.465000 ;
+      RECT 1.015000  0.255000 1.190000 0.615000 ;
+      RECT 1.360000  0.255000 2.495000 0.535000 ;
+      RECT 1.360000  0.705000 1.700000 1.205000 ;
+      RECT 1.360000  1.205000 1.860000 1.325000 ;
+      RECT 1.405000  1.325000 1.860000 1.955000 ;
+      RECT 1.425000  2.125000 2.200000 2.465000 ;
+      RECT 1.870000  0.705000 2.155000 1.035000 ;
+      RECT 2.030000  1.205000 3.010000 1.375000 ;
+      RECT 2.030000  1.375000 2.200000 2.125000 ;
+      RECT 2.325000  0.535000 2.495000 0.995000 ;
+      RECT 2.325000  0.995000 3.010000 1.205000 ;
+      RECT 2.370000  1.575000 2.540000 1.635000 ;
+      RECT 2.370000  1.635000 3.400000 1.905000 ;
+      RECT 2.370000  2.075000 3.010000 2.635000 ;
+      RECT 2.665000  0.085000 3.010000 0.825000 ;
+      RECT 3.180000  0.255000 3.400000 1.635000 ;
+      RECT 3.180000  1.905000 3.400000 1.915000 ;
+      RECT 3.180000  1.915000 5.450000 2.085000 ;
+      RECT 3.180000  2.085000 3.400000 2.465000 ;
+      RECT 3.580000  0.255000 3.910000 0.765000 ;
+      RECT 3.580000  0.765000 4.005000 0.935000 ;
+      RECT 3.580000  0.935000 3.750000 1.575000 ;
+      RECT 3.580000  1.575000 3.990000 1.745000 ;
+      RECT 3.580000  2.255000 5.490000 2.635000 ;
+      RECT 3.920000  1.105000 4.465000 1.275000 ;
+      RECT 4.080000  0.085000 4.410000 0.445000 ;
+      RECT 4.160000  1.275000 4.465000 1.495000 ;
+      RECT 4.160000  1.495000 4.960000 1.745000 ;
+      RECT 4.175000  0.615000 4.830000 0.785000 ;
+      RECT 4.175000  0.785000 4.465000 1.105000 ;
+      RECT 4.580000  0.255000 4.830000 0.615000 ;
+      RECT 5.010000  0.255000 5.270000 0.615000 ;
+      RECT 5.010000  0.615000 6.360000 0.785000 ;
+      RECT 5.140000  1.435000 5.610000 1.605000 ;
+      RECT 5.140000  1.605000 5.450000 1.915000 ;
+      RECT 5.505000  0.085000 6.360000 0.445000 ;
+      RECT 5.660000  1.775000 6.360000 2.085000 ;
+      RECT 5.660000  2.085000 5.830000 2.465000 ;
+      RECT 5.780000  1.435000 6.360000 1.775000 ;
+      RECT 6.030000  2.255000 6.360000 2.635000 ;
+      RECT 6.190000  0.785000 6.360000 0.995000 ;
+      RECT 6.190000  0.995000 6.460000 1.325000 ;
+      RECT 6.190000  1.325000 6.360000 1.435000 ;
     LAYER mcon ;
-      RECT 1.525000 1.445000 1.695000 1.615000 ;
-      RECT 1.985000 0.765000 2.155000 0.935000 ;
-      RECT 3.835000 0.765000 4.005000 0.935000 ;
-      RECT 4.295000 1.445000 4.465000 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  1.445000 1.695000 1.615000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  0.765000 2.155000 0.935000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 3.835000  0.765000 4.005000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.295000  1.445000 4.465000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 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 1.465000 1.415000 1.755000 1.460000 ;
       RECT 1.465000 1.460000 4.525000 1.600000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
index 54c87ad..8e1f506 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.magic.lef
@@ -77,30 +77,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.445000 ;
-        RECT 2.670000  0.085000 3.015000 0.825000 ;
-        RECT 4.095000  0.085000 4.425000 0.445000 ;
-        RECT 5.490000  0.085000 6.400000 0.445000 ;
-        RECT 7.010000  0.085000 7.275000 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
@@ -110,82 +86,102 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.085000 1.835000 0.345000 2.635000 ;
-        RECT 2.375000 2.075000 3.015000 2.635000 ;
-        RECT 3.575000 2.255000 5.530000 2.635000 ;
-        RECT 6.070000 2.255000 6.400000 2.635000 ;
-        RECT 7.010000 1.485000 7.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 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.195000 0.785000 ;
-      RECT 0.515000 0.785000 0.685000 2.125000 ;
-      RECT 0.515000 2.125000 1.260000 2.465000 ;
-      RECT 1.015000 0.255000 1.195000 0.615000 ;
-      RECT 1.365000 0.255000 2.500000 0.535000 ;
-      RECT 1.365000 0.705000 1.705000 1.205000 ;
-      RECT 1.365000 1.205000 1.865000 1.325000 ;
-      RECT 1.410000 1.325000 1.865000 1.955000 ;
-      RECT 1.430000 2.125000 2.205000 2.465000 ;
-      RECT 1.875000 0.705000 2.160000 1.035000 ;
-      RECT 2.035000 1.205000 3.015000 1.375000 ;
-      RECT 2.035000 1.375000 2.205000 2.125000 ;
-      RECT 2.330000 0.535000 2.500000 0.995000 ;
-      RECT 2.330000 0.995000 3.015000 1.205000 ;
-      RECT 2.375000 1.575000 2.545000 1.635000 ;
-      RECT 2.375000 1.635000 3.405000 1.905000 ;
-      RECT 3.185000 0.255000 3.405000 1.635000 ;
-      RECT 3.185000 1.905000 3.405000 1.915000 ;
-      RECT 3.185000 1.915000 5.490000 2.085000 ;
-      RECT 3.185000 2.085000 3.405000 2.465000 ;
-      RECT 3.575000 0.255000 3.925000 0.765000 ;
-      RECT 3.575000 0.765000 4.000000 0.935000 ;
-      RECT 3.575000 0.935000 3.745000 1.575000 ;
-      RECT 3.575000 1.575000 4.040000 1.745000 ;
-      RECT 3.915000 1.105000 4.460000 1.275000 ;
-      RECT 4.170000 0.615000 4.825000 0.785000 ;
-      RECT 4.170000 0.785000 4.460000 1.105000 ;
-      RECT 4.210000 1.275000 4.460000 1.495000 ;
-      RECT 4.210000 1.495000 5.010000 1.745000 ;
-      RECT 4.595000 0.255000 4.825000 0.615000 ;
-      RECT 5.100000 0.255000 5.310000 0.615000 ;
-      RECT 5.100000 0.615000 6.400000 0.785000 ;
-      RECT 5.180000 1.435000 5.650000 1.605000 ;
-      RECT 5.180000 1.605000 5.490000 1.915000 ;
-      RECT 5.700000 1.775000 6.400000 2.085000 ;
-      RECT 5.700000 2.085000 5.870000 2.465000 ;
-      RECT 5.820000 1.435000 6.400000 1.775000 ;
-      RECT 6.230000 0.785000 6.400000 0.995000 ;
-      RECT 6.230000 0.995000 6.500000 1.325000 ;
-      RECT 6.230000 1.325000 6.400000 1.435000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 1.195000 0.785000 ;
+      RECT 0.085000  1.835000 0.345000 2.635000 ;
+      RECT 0.515000  0.085000 0.845000 0.445000 ;
+      RECT 0.515000  0.785000 0.685000 2.125000 ;
+      RECT 0.515000  2.125000 1.260000 2.465000 ;
+      RECT 1.015000  0.255000 1.195000 0.615000 ;
+      RECT 1.365000  0.255000 2.500000 0.535000 ;
+      RECT 1.365000  0.705000 1.705000 1.205000 ;
+      RECT 1.365000  1.205000 1.865000 1.325000 ;
+      RECT 1.410000  1.325000 1.865000 1.955000 ;
+      RECT 1.430000  2.125000 2.205000 2.465000 ;
+      RECT 1.875000  0.705000 2.160000 1.035000 ;
+      RECT 2.035000  1.205000 3.015000 1.375000 ;
+      RECT 2.035000  1.375000 2.205000 2.125000 ;
+      RECT 2.330000  0.535000 2.500000 0.995000 ;
+      RECT 2.330000  0.995000 3.015000 1.205000 ;
+      RECT 2.375000  1.575000 2.545000 1.635000 ;
+      RECT 2.375000  1.635000 3.405000 1.905000 ;
+      RECT 2.375000  2.075000 3.015000 2.635000 ;
+      RECT 2.670000  0.085000 3.015000 0.825000 ;
+      RECT 3.185000  0.255000 3.405000 1.635000 ;
+      RECT 3.185000  1.905000 3.405000 1.915000 ;
+      RECT 3.185000  1.915000 5.490000 2.085000 ;
+      RECT 3.185000  2.085000 3.405000 2.465000 ;
+      RECT 3.575000  0.255000 3.925000 0.765000 ;
+      RECT 3.575000  0.765000 4.000000 0.935000 ;
+      RECT 3.575000  0.935000 3.745000 1.575000 ;
+      RECT 3.575000  1.575000 4.040000 1.745000 ;
+      RECT 3.575000  2.255000 5.530000 2.635000 ;
+      RECT 3.915000  1.105000 4.460000 1.275000 ;
+      RECT 4.095000  0.085000 4.425000 0.445000 ;
+      RECT 4.170000  0.615000 4.825000 0.785000 ;
+      RECT 4.170000  0.785000 4.460000 1.105000 ;
+      RECT 4.210000  1.275000 4.460000 1.495000 ;
+      RECT 4.210000  1.495000 5.010000 1.745000 ;
+      RECT 4.595000  0.255000 4.825000 0.615000 ;
+      RECT 5.100000  0.255000 5.310000 0.615000 ;
+      RECT 5.100000  0.615000 6.400000 0.785000 ;
+      RECT 5.180000  1.435000 5.650000 1.605000 ;
+      RECT 5.180000  1.605000 5.490000 1.915000 ;
+      RECT 5.490000  0.085000 6.400000 0.445000 ;
+      RECT 5.700000  1.775000 6.400000 2.085000 ;
+      RECT 5.700000  2.085000 5.870000 2.465000 ;
+      RECT 5.820000  1.435000 6.400000 1.775000 ;
+      RECT 6.070000  2.255000 6.400000 2.635000 ;
+      RECT 6.230000  0.785000 6.400000 0.995000 ;
+      RECT 6.230000  0.995000 6.500000 1.325000 ;
+      RECT 6.230000  1.325000 6.400000 1.435000 ;
+      RECT 7.010000  0.085000 7.275000 0.885000 ;
+      RECT 7.010000  1.485000 7.275000 2.635000 ;
     LAYER mcon ;
-      RECT 1.530000 1.445000 1.700000 1.615000 ;
-      RECT 1.990000 0.765000 2.160000 0.935000 ;
-      RECT 3.830000 0.765000 4.000000 0.935000 ;
-      RECT 4.290000 1.445000 4.460000 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.530000  1.445000 1.700000 1.615000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 1.990000  0.765000 2.160000 0.935000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 3.830000  0.765000 4.000000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.290000  1.445000 4.460000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
     LAYER met1 ;
       RECT 1.470000 1.415000 1.760000 1.460000 ;
       RECT 1.470000 1.460000 4.520000 1.600000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
index 0eb85c6..a56a1dc 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.magic.lef
@@ -74,10 +74,16 @@
     PORT
       LAYER li1 ;
         RECT 4.725000 0.995000 4.945000 1.325000 ;
-        RECT 5.685000 0.995000 6.065000 1.325000 ;
       LAYER mcon ;
         RECT 4.770000 1.105000 4.940000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.685000 0.995000 6.065000 1.325000 ;
+      LAYER mcon ;
         RECT 5.710000 1.105000 5.880000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 4.710000 1.075000 5.000000 1.120000 ;
         RECT 4.710000 1.120000 5.940000 1.260000 ;
@@ -91,33 +97,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 0.845000 0.445000 ;
-        RECT 2.670000  0.085000 3.015000 0.825000 ;
-        RECT 4.095000  0.085000 4.425000 0.445000 ;
-        RECT 5.605000  0.085000 6.330000 0.445000 ;
-        RECT 7.000000  0.085000 7.250000 0.545000 ;
-        RECT 7.890000  0.085000 8.195000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -127,83 +106,106 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.085000 1.835000 0.345000 2.635000 ;
-        RECT 2.375000 2.075000 3.015000 2.635000 ;
-        RECT 3.595000 2.255000 5.515000 2.635000 ;
-        RECT 6.055000 2.255000 6.385000 2.635000 ;
-        RECT 7.000000 1.825000 7.250000 2.635000 ;
-        RECT 7.890000 1.485000 8.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 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.195000 0.785000 ;
-      RECT 0.515000 0.785000 0.685000 2.125000 ;
-      RECT 0.515000 2.125000 1.260000 2.465000 ;
-      RECT 1.015000 0.255000 1.195000 0.615000 ;
-      RECT 1.365000 0.255000 2.500000 0.535000 ;
-      RECT 1.365000 0.705000 1.705000 1.205000 ;
-      RECT 1.365000 1.205000 1.865000 1.325000 ;
-      RECT 1.410000 1.325000 1.865000 1.955000 ;
-      RECT 1.430000 2.125000 2.205000 2.465000 ;
-      RECT 1.875000 0.705000 2.160000 1.035000 ;
-      RECT 2.035000 1.205000 3.015000 1.375000 ;
-      RECT 2.035000 1.375000 2.205000 2.125000 ;
-      RECT 2.330000 0.535000 2.500000 0.995000 ;
-      RECT 2.330000 0.995000 3.015000 1.205000 ;
-      RECT 2.375000 1.575000 2.545000 1.635000 ;
-      RECT 2.375000 1.635000 3.405000 1.905000 ;
-      RECT 3.185000 0.255000 3.405000 1.635000 ;
-      RECT 3.185000 1.905000 3.405000 1.915000 ;
-      RECT 3.185000 1.915000 5.515000 2.085000 ;
-      RECT 3.185000 2.085000 3.405000 2.465000 ;
-      RECT 3.595000 0.255000 3.925000 0.765000 ;
-      RECT 3.595000 0.765000 4.020000 0.935000 ;
-      RECT 3.595000 0.935000 3.765000 1.575000 ;
-      RECT 3.595000 1.575000 4.005000 1.745000 ;
-      RECT 3.935000 1.105000 4.480000 1.275000 ;
-      RECT 4.175000 1.275000 4.480000 1.495000 ;
-      RECT 4.175000 1.495000 4.975000 1.745000 ;
-      RECT 4.190000 0.615000 4.845000 0.785000 ;
-      RECT 4.190000 0.785000 4.480000 1.105000 ;
-      RECT 4.595000 0.255000 4.845000 0.615000 ;
-      RECT 5.015000 0.255000 5.435000 0.615000 ;
-      RECT 5.015000 0.615000 6.410000 0.785000 ;
-      RECT 5.165000 0.995000 5.515000 1.915000 ;
-      RECT 5.685000 1.495000 6.410000 2.085000 ;
-      RECT 5.685000 2.085000 5.855000 2.465000 ;
-      RECT 6.240000 0.785000 6.410000 1.055000 ;
-      RECT 6.240000 1.055000 6.880000 1.315000 ;
-      RECT 6.240000 1.315000 6.410000 1.495000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 1.195000 0.785000 ;
+      RECT 0.085000  1.835000 0.345000 2.635000 ;
+      RECT 0.515000  0.085000 0.845000 0.445000 ;
+      RECT 0.515000  0.785000 0.685000 2.125000 ;
+      RECT 0.515000  2.125000 1.260000 2.465000 ;
+      RECT 1.015000  0.255000 1.195000 0.615000 ;
+      RECT 1.365000  0.255000 2.500000 0.535000 ;
+      RECT 1.365000  0.705000 1.705000 1.205000 ;
+      RECT 1.365000  1.205000 1.865000 1.325000 ;
+      RECT 1.410000  1.325000 1.865000 1.955000 ;
+      RECT 1.430000  2.125000 2.205000 2.465000 ;
+      RECT 1.875000  0.705000 2.160000 1.035000 ;
+      RECT 2.035000  1.205000 3.015000 1.375000 ;
+      RECT 2.035000  1.375000 2.205000 2.125000 ;
+      RECT 2.330000  0.535000 2.500000 0.995000 ;
+      RECT 2.330000  0.995000 3.015000 1.205000 ;
+      RECT 2.375000  1.575000 2.545000 1.635000 ;
+      RECT 2.375000  1.635000 3.405000 1.905000 ;
+      RECT 2.375000  2.075000 3.015000 2.635000 ;
+      RECT 2.670000  0.085000 3.015000 0.825000 ;
+      RECT 3.185000  0.255000 3.405000 1.635000 ;
+      RECT 3.185000  1.905000 3.405000 1.915000 ;
+      RECT 3.185000  1.915000 5.515000 2.085000 ;
+      RECT 3.185000  2.085000 3.405000 2.465000 ;
+      RECT 3.595000  0.255000 3.925000 0.765000 ;
+      RECT 3.595000  0.765000 4.020000 0.935000 ;
+      RECT 3.595000  0.935000 3.765000 1.575000 ;
+      RECT 3.595000  1.575000 4.005000 1.745000 ;
+      RECT 3.595000  2.255000 5.515000 2.635000 ;
+      RECT 3.935000  1.105000 4.480000 1.275000 ;
+      RECT 4.095000  0.085000 4.425000 0.445000 ;
+      RECT 4.175000  1.275000 4.480000 1.495000 ;
+      RECT 4.175000  1.495000 4.975000 1.745000 ;
+      RECT 4.190000  0.615000 4.845000 0.785000 ;
+      RECT 4.190000  0.785000 4.480000 1.105000 ;
+      RECT 4.595000  0.255000 4.845000 0.615000 ;
+      RECT 5.015000  0.255000 5.435000 0.615000 ;
+      RECT 5.015000  0.615000 6.410000 0.785000 ;
+      RECT 5.165000  0.995000 5.515000 1.915000 ;
+      RECT 5.605000  0.085000 6.330000 0.445000 ;
+      RECT 5.685000  1.495000 6.410000 2.085000 ;
+      RECT 5.685000  2.085000 5.855000 2.465000 ;
+      RECT 6.055000  2.255000 6.385000 2.635000 ;
+      RECT 6.240000  0.785000 6.410000 1.055000 ;
+      RECT 6.240000  1.055000 6.880000 1.315000 ;
+      RECT 6.240000  1.315000 6.410000 1.495000 ;
+      RECT 7.000000  0.085000 7.250000 0.545000 ;
+      RECT 7.000000  1.825000 7.250000 2.635000 ;
+      RECT 7.890000  0.085000 8.195000 0.885000 ;
+      RECT 7.890000  1.485000 8.195000 2.635000 ;
     LAYER mcon ;
-      RECT 1.530000 1.445000 1.700000 1.615000 ;
-      RECT 1.990000 0.765000 2.160000 0.935000 ;
-      RECT 3.850000 0.765000 4.020000 0.935000 ;
-      RECT 4.310000 1.445000 4.480000 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.530000  1.445000 1.700000 1.615000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 1.990000  0.765000 2.160000 0.935000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 3.850000  0.765000 4.020000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.310000  1.445000 4.480000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 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 ;
     LAYER met1 ;
       RECT 1.470000 1.415000 1.760000 1.460000 ;
       RECT 1.470000 1.460000 4.540000 1.600000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
index a4c6a89..f747bb9 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.magic.lef
@@ -101,48 +101,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  2.235000  0.085000  2.565000 0.515000 ;
-        RECT  3.185000  0.085000  3.515000 0.610000 ;
-        RECT  5.760000  0.085000  6.010000 0.905000 ;
-        RECT  8.245000  0.085000  8.640000 0.560000 ;
-        RECT  9.465000  0.085000  9.740000 0.615000 ;
-        RECT 11.395000  0.085000 11.645000 0.900000 ;
-        RECT 13.110000  0.085000 13.355000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -152,133 +110,171 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.260000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  2.235000 1.890000  2.565000 2.635000 ;
-        RECT  3.265000 1.825000  3.460000 2.635000 ;
-        RECT  5.665000 2.175000  6.010000 2.635000 ;
-        RECT  8.425000 1.835000  8.660000 2.635000 ;
-        RECT  9.370000 2.105000  9.660000 2.635000 ;
-        RECT 11.360000 1.495000 11.530000 2.635000 ;
-        RECT 13.110000 1.465000 13.355000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.845000 0.805000 ;
-      RECT  0.175000 1.795000  0.845000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.615000 0.805000  0.845000 1.795000 ;
-      RECT  1.015000 0.345000  1.185000 2.465000 ;
-      RECT  1.355000 0.255000  1.785000 0.515000 ;
-      RECT  1.355000 0.515000  1.525000 1.890000 ;
-      RECT  1.355000 1.890000  1.785000 2.465000 ;
-      RECT  2.495000 1.355000  3.085000 1.720000 ;
-      RECT  2.755000 1.720000  3.085000 2.425000 ;
-      RECT  2.780000 0.255000  3.005000 0.845000 ;
-      RECT  2.780000 0.845000  3.635000 1.175000 ;
-      RECT  2.780000 1.175000  3.085000 1.355000 ;
-      RECT  3.805000 0.685000  3.975000 1.320000 ;
-      RECT  3.805000 1.320000  4.175000 1.650000 ;
-      RECT  4.125000 1.820000  4.515000 2.020000 ;
-      RECT  4.125000 2.020000  4.455000 2.465000 ;
-      RECT  4.145000 0.255000  4.415000 0.980000 ;
-      RECT  4.145000 0.980000  4.515000 1.150000 ;
-      RECT  4.345000 1.150000  4.515000 1.820000 ;
-      RECT  4.595000 0.255000  4.795000 0.645000 ;
-      RECT  4.595000 0.645000  4.855000 0.825000 ;
-      RECT  4.635000 2.210000  4.965000 2.465000 ;
-      RECT  4.685000 0.825000  4.855000 1.785000 ;
-      RECT  4.685000 1.785000  4.965000 2.210000 ;
-      RECT  4.965000 0.255000  5.590000 0.515000 ;
-      RECT  5.155000 1.835000  6.585000 2.005000 ;
-      RECT  5.155000 2.005000  5.495000 2.465000 ;
-      RECT  5.260000 0.515000  5.590000 0.935000 ;
-      RECT  5.420000 0.935000  5.590000 1.835000 ;
-      RECT  6.385000 1.355000  6.585000 1.835000 ;
-      RECT  6.515000 0.255000  7.135000 0.565000 ;
-      RECT  6.515000 0.565000  6.925000 1.185000 ;
-      RECT  6.675000 2.150000  7.005000 2.465000 ;
-      RECT  6.755000 1.185000  6.925000 1.865000 ;
-      RECT  6.755000 1.865000  7.005000 2.150000 ;
-      RECT  7.095000 1.125000  7.280000 1.720000 ;
-      RECT  7.115000 0.735000  7.620000 0.955000 ;
-      RECT  7.215000 2.175000  8.255000 2.375000 ;
-      RECT  7.305000 0.255000  7.980000 0.565000 ;
-      RECT  7.450000 0.955000  7.620000 1.655000 ;
-      RECT  7.450000 1.655000  7.915000 2.005000 ;
-      RECT  7.810000 0.565000  7.980000 1.315000 ;
-      RECT  7.810000 1.315000  8.660000 1.485000 ;
-      RECT  8.085000 1.485000  8.660000 1.575000 ;
-      RECT  8.085000 1.575000  8.255000 2.175000 ;
-      RECT  8.170000 0.765000  9.235000 1.045000 ;
-      RECT  8.170000 1.045000  9.745000 1.065000 ;
-      RECT  8.170000 1.065000  8.370000 1.095000 ;
-      RECT  8.490000 1.245000  8.660000 1.315000 ;
-      RECT  8.830000 0.255000  9.235000 0.765000 ;
-      RECT  8.830000 1.065000  9.745000 1.375000 ;
-      RECT  8.830000 1.375000  9.160000 2.465000 ;
-      RECT 10.090000 1.245000 10.280000 1.965000 ;
-      RECT 10.225000 2.165000 11.190000 2.355000 ;
-      RECT 10.305000 0.705000 10.770000 1.035000 ;
-      RECT 10.325000 0.330000 11.190000 0.535000 ;
-      RECT 10.450000 1.035000 10.770000 1.995000 ;
-      RECT 10.940000 0.535000 11.190000 2.165000 ;
-      RECT 12.200000 1.575000 12.430000 2.010000 ;
-      RECT 12.315000 0.890000 12.940000 1.220000 ;
-      RECT 12.600000 0.255000 12.940000 0.890000 ;
-      RECT 12.600000 1.220000 12.940000 2.465000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.845000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.355000  0.255000  1.785000 0.515000 ;
+      RECT  1.355000  0.515000  1.525000 1.890000 ;
+      RECT  1.355000  1.890000  1.785000 2.465000 ;
+      RECT  2.235000  0.085000  2.565000 0.515000 ;
+      RECT  2.235000  1.890000  2.565000 2.635000 ;
+      RECT  2.495000  1.355000  3.085000 1.720000 ;
+      RECT  2.755000  1.720000  3.085000 2.425000 ;
+      RECT  2.780000  0.255000  3.005000 0.845000 ;
+      RECT  2.780000  0.845000  3.635000 1.175000 ;
+      RECT  2.780000  1.175000  3.085000 1.355000 ;
+      RECT  3.185000  0.085000  3.515000 0.610000 ;
+      RECT  3.265000  1.825000  3.460000 2.635000 ;
+      RECT  3.805000  0.685000  3.975000 1.320000 ;
+      RECT  3.805000  1.320000  4.175000 1.650000 ;
+      RECT  4.125000  1.820000  4.515000 2.020000 ;
+      RECT  4.125000  2.020000  4.455000 2.465000 ;
+      RECT  4.145000  0.255000  4.415000 0.980000 ;
+      RECT  4.145000  0.980000  4.515000 1.150000 ;
+      RECT  4.345000  1.150000  4.515000 1.820000 ;
+      RECT  4.595000  0.255000  4.795000 0.645000 ;
+      RECT  4.595000  0.645000  4.855000 0.825000 ;
+      RECT  4.635000  2.210000  4.965000 2.465000 ;
+      RECT  4.685000  0.825000  4.855000 1.785000 ;
+      RECT  4.685000  1.785000  4.965000 2.210000 ;
+      RECT  4.965000  0.255000  5.590000 0.515000 ;
+      RECT  5.155000  1.835000  6.585000 2.005000 ;
+      RECT  5.155000  2.005000  5.495000 2.465000 ;
+      RECT  5.260000  0.515000  5.590000 0.935000 ;
+      RECT  5.420000  0.935000  5.590000 1.835000 ;
+      RECT  5.665000  2.175000  6.010000 2.635000 ;
+      RECT  5.760000  0.085000  6.010000 0.905000 ;
+      RECT  6.385000  1.355000  6.585000 1.835000 ;
+      RECT  6.515000  0.255000  7.135000 0.565000 ;
+      RECT  6.515000  0.565000  6.925000 1.185000 ;
+      RECT  6.675000  2.150000  7.005000 2.465000 ;
+      RECT  6.755000  1.185000  6.925000 1.865000 ;
+      RECT  6.755000  1.865000  7.005000 2.150000 ;
+      RECT  7.095000  1.125000  7.280000 1.720000 ;
+      RECT  7.115000  0.735000  7.620000 0.955000 ;
+      RECT  7.215000  2.175000  8.255000 2.375000 ;
+      RECT  7.305000  0.255000  7.980000 0.565000 ;
+      RECT  7.450000  0.955000  7.620000 1.655000 ;
+      RECT  7.450000  1.655000  7.915000 2.005000 ;
+      RECT  7.810000  0.565000  7.980000 1.315000 ;
+      RECT  7.810000  1.315000  8.660000 1.485000 ;
+      RECT  8.085000  1.485000  8.660000 1.575000 ;
+      RECT  8.085000  1.575000  8.255000 2.175000 ;
+      RECT  8.170000  0.765000  9.235000 1.045000 ;
+      RECT  8.170000  1.045000  9.745000 1.065000 ;
+      RECT  8.170000  1.065000  8.370000 1.095000 ;
+      RECT  8.245000  0.085000  8.640000 0.560000 ;
+      RECT  8.425000  1.835000  8.660000 2.635000 ;
+      RECT  8.490000  1.245000  8.660000 1.315000 ;
+      RECT  8.830000  0.255000  9.235000 0.765000 ;
+      RECT  8.830000  1.065000  9.745000 1.375000 ;
+      RECT  8.830000  1.375000  9.160000 2.465000 ;
+      RECT  9.370000  2.105000  9.660000 2.635000 ;
+      RECT  9.465000  0.085000  9.740000 0.615000 ;
+      RECT 10.090000  1.245000 10.280000 1.965000 ;
+      RECT 10.225000  2.165000 11.190000 2.355000 ;
+      RECT 10.305000  0.705000 10.770000 1.035000 ;
+      RECT 10.325000  0.330000 11.190000 0.535000 ;
+      RECT 10.450000  1.035000 10.770000 1.995000 ;
+      RECT 10.940000  0.535000 11.190000 2.165000 ;
+      RECT 11.360000  1.495000 11.530000 2.635000 ;
+      RECT 11.395000  0.085000 11.645000 0.900000 ;
+      RECT 12.200000  1.575000 12.430000 2.010000 ;
+      RECT 12.315000  0.890000 12.940000 1.220000 ;
+      RECT 12.600000  0.255000 12.940000 0.890000 ;
+      RECT 12.600000  1.220000 12.940000 2.465000 ;
+      RECT 13.110000  0.085000 13.355000 0.900000 ;
+      RECT 13.110000  1.465000 13.355000 2.635000 ;
     LAYER mcon ;
-      RECT  0.635000 1.785000  0.805000 1.955000 ;
-      RECT  1.015000 1.445000  1.185000 1.615000 ;
-      RECT  1.355000 0.425000  1.525000 0.595000 ;
-      RECT  3.805000 0.765000  3.975000 0.935000 ;
-      RECT  4.185000 0.425000  4.355000 0.595000 ;
-      RECT  4.615000 0.425000  4.785000 0.595000 ;
-      RECT  6.530000 0.425000  6.700000 0.595000 ;
-      RECT  7.100000 1.445000  7.270000 1.615000 ;
-      RECT  7.510000 1.785000  7.680000 1.955000 ;
-      RECT 10.100000 1.785000 10.270000 1.955000 ;
-      RECT 10.520000 1.445000 10.690000 1.615000 ;
-      RECT 10.980000 1.785000 11.150000 1.955000 ;
-      RECT 12.230000 1.785000 12.400000 1.955000 ;
-      RECT 12.690000 0.765000 12.860000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.635000  1.785000  0.805000 1.955000 ;
+      RECT  1.015000  1.445000  1.185000 1.615000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.355000  0.425000  1.525000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.805000  0.765000  3.975000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.185000  0.425000  4.355000 0.595000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.615000  0.425000  4.785000 0.595000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.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.530000  0.425000  6.700000 0.595000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.100000  1.445000  7.270000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.510000  1.785000  7.680000 1.955000 ;
+      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.100000  1.785000 10.270000 1.955000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.520000  1.445000 10.690000 1.615000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 10.980000  1.785000 11.150000 1.955000 ;
+      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.230000  1.785000 12.400000 1.955000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 12.690000  0.765000 12.860000 0.935000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT  0.575000 1.755000  0.865000 1.800000 ;
       RECT  0.575000 1.800000 10.330000 1.940000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
index 5fb56ca..60b3be2 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.magic.lef
@@ -101,52 +101,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.180000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  2.235000  0.085000  2.565000 0.515000 ;
-        RECT  3.185000  0.085000  3.515000 0.610000 ;
-        RECT  5.760000  0.085000  6.010000 0.905000 ;
-        RECT  8.245000  0.085000  8.640000 0.560000 ;
-        RECT  9.465000  0.085000  9.740000 0.615000 ;
-        RECT 11.395000  0.085000 11.645000 0.900000 ;
-        RECT 12.315000  0.085000 12.565000 0.900000 ;
-        RECT 13.530000  0.085000 13.765000 0.900000 ;
-        RECT 14.435000  0.085000 14.695000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
@@ -156,137 +110,179 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 15.180000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  2.235000 1.890000  2.565000 2.635000 ;
-        RECT  3.265000 1.825000  3.460000 2.635000 ;
-        RECT  5.665000 2.175000  6.010000 2.635000 ;
-        RECT  8.425000 1.835000  8.660000 2.635000 ;
-        RECT  9.370000 2.105000  9.660000 2.635000 ;
-        RECT 11.360000 1.495000 11.530000 2.635000 ;
-        RECT 12.200000 1.465000 12.450000 2.635000 ;
-        RECT 13.530000 1.465000 13.765000 2.635000 ;
-        RECT 14.435000 1.465000 14.695000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.845000 0.805000 ;
-      RECT  0.175000 1.795000  0.845000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.615000 0.805000  0.845000 1.795000 ;
-      RECT  1.015000 0.345000  1.185000 2.465000 ;
-      RECT  1.355000 0.255000  1.785000 0.515000 ;
-      RECT  1.355000 0.515000  1.525000 1.890000 ;
-      RECT  1.355000 1.890000  1.785000 2.465000 ;
-      RECT  2.495000 1.355000  3.085000 1.720000 ;
-      RECT  2.755000 1.720000  3.085000 2.425000 ;
-      RECT  2.780000 0.255000  3.005000 0.845000 ;
-      RECT  2.780000 0.845000  3.635000 1.175000 ;
-      RECT  2.780000 1.175000  3.085000 1.355000 ;
-      RECT  3.805000 0.685000  3.975000 1.320000 ;
-      RECT  3.805000 1.320000  4.175000 1.650000 ;
-      RECT  4.125000 1.820000  4.515000 2.020000 ;
-      RECT  4.125000 2.020000  4.455000 2.465000 ;
-      RECT  4.145000 0.255000  4.415000 0.980000 ;
-      RECT  4.145000 0.980000  4.515000 1.150000 ;
-      RECT  4.345000 1.150000  4.515000 1.820000 ;
-      RECT  4.595000 0.255000  4.795000 0.645000 ;
-      RECT  4.595000 0.645000  4.855000 0.825000 ;
-      RECT  4.635000 2.210000  4.965000 2.465000 ;
-      RECT  4.685000 0.825000  4.855000 1.785000 ;
-      RECT  4.685000 1.785000  4.965000 2.210000 ;
-      RECT  4.965000 0.255000  5.590000 0.515000 ;
-      RECT  5.155000 1.835000  6.585000 2.005000 ;
-      RECT  5.155000 2.005000  5.495000 2.465000 ;
-      RECT  5.260000 0.515000  5.590000 0.935000 ;
-      RECT  5.420000 0.935000  5.590000 1.835000 ;
-      RECT  6.385000 1.355000  6.585000 1.835000 ;
-      RECT  6.515000 0.255000  7.135000 0.565000 ;
-      RECT  6.515000 0.565000  6.925000 1.185000 ;
-      RECT  6.675000 2.150000  7.005000 2.465000 ;
-      RECT  6.755000 1.185000  6.925000 1.865000 ;
-      RECT  6.755000 1.865000  7.005000 2.150000 ;
-      RECT  7.095000 1.125000  7.280000 1.720000 ;
-      RECT  7.115000 0.735000  7.620000 0.955000 ;
-      RECT  7.215000 2.175000  8.255000 2.375000 ;
-      RECT  7.305000 0.255000  7.980000 0.565000 ;
-      RECT  7.450000 0.955000  7.620000 1.655000 ;
-      RECT  7.450000 1.655000  7.915000 2.005000 ;
-      RECT  7.810000 0.565000  7.980000 1.315000 ;
-      RECT  7.810000 1.315000  8.660000 1.485000 ;
-      RECT  8.085000 1.485000  8.660000 1.575000 ;
-      RECT  8.085000 1.575000  8.255000 2.175000 ;
-      RECT  8.170000 0.765000  9.235000 1.045000 ;
-      RECT  8.170000 1.045000  9.745000 1.065000 ;
-      RECT  8.170000 1.065000  8.370000 1.095000 ;
-      RECT  8.490000 1.245000  8.660000 1.315000 ;
-      RECT  8.830000 0.255000  9.235000 0.765000 ;
-      RECT  8.830000 1.065000  9.745000 1.375000 ;
-      RECT  8.830000 1.375000  9.160000 2.465000 ;
-      RECT 10.090000 1.245000 10.280000 1.965000 ;
-      RECT 10.225000 2.165000 11.190000 2.355000 ;
-      RECT 10.305000 0.705000 10.770000 1.035000 ;
-      RECT 10.325000 0.330000 11.190000 0.535000 ;
-      RECT 10.450000 1.035000 10.770000 1.995000 ;
-      RECT 10.940000 0.535000 11.190000 2.165000 ;
-      RECT 12.620000 1.575000 12.850000 2.010000 ;
-      RECT 12.735000 0.890000 13.360000 1.220000 ;
-      RECT 13.020000 0.255000 13.360000 0.890000 ;
-      RECT 13.020000 1.220000 13.360000 2.465000 ;
+      RECT  0.000000 -0.085000 15.180000 0.085000 ;
+      RECT  0.000000  2.635000 15.180000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.845000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.355000  0.255000  1.785000 0.515000 ;
+      RECT  1.355000  0.515000  1.525000 1.890000 ;
+      RECT  1.355000  1.890000  1.785000 2.465000 ;
+      RECT  2.235000  0.085000  2.565000 0.515000 ;
+      RECT  2.235000  1.890000  2.565000 2.635000 ;
+      RECT  2.495000  1.355000  3.085000 1.720000 ;
+      RECT  2.755000  1.720000  3.085000 2.425000 ;
+      RECT  2.780000  0.255000  3.005000 0.845000 ;
+      RECT  2.780000  0.845000  3.635000 1.175000 ;
+      RECT  2.780000  1.175000  3.085000 1.355000 ;
+      RECT  3.185000  0.085000  3.515000 0.610000 ;
+      RECT  3.265000  1.825000  3.460000 2.635000 ;
+      RECT  3.805000  0.685000  3.975000 1.320000 ;
+      RECT  3.805000  1.320000  4.175000 1.650000 ;
+      RECT  4.125000  1.820000  4.515000 2.020000 ;
+      RECT  4.125000  2.020000  4.455000 2.465000 ;
+      RECT  4.145000  0.255000  4.415000 0.980000 ;
+      RECT  4.145000  0.980000  4.515000 1.150000 ;
+      RECT  4.345000  1.150000  4.515000 1.820000 ;
+      RECT  4.595000  0.255000  4.795000 0.645000 ;
+      RECT  4.595000  0.645000  4.855000 0.825000 ;
+      RECT  4.635000  2.210000  4.965000 2.465000 ;
+      RECT  4.685000  0.825000  4.855000 1.785000 ;
+      RECT  4.685000  1.785000  4.965000 2.210000 ;
+      RECT  4.965000  0.255000  5.590000 0.515000 ;
+      RECT  5.155000  1.835000  6.585000 2.005000 ;
+      RECT  5.155000  2.005000  5.495000 2.465000 ;
+      RECT  5.260000  0.515000  5.590000 0.935000 ;
+      RECT  5.420000  0.935000  5.590000 1.835000 ;
+      RECT  5.665000  2.175000  6.010000 2.635000 ;
+      RECT  5.760000  0.085000  6.010000 0.905000 ;
+      RECT  6.385000  1.355000  6.585000 1.835000 ;
+      RECT  6.515000  0.255000  7.135000 0.565000 ;
+      RECT  6.515000  0.565000  6.925000 1.185000 ;
+      RECT  6.675000  2.150000  7.005000 2.465000 ;
+      RECT  6.755000  1.185000  6.925000 1.865000 ;
+      RECT  6.755000  1.865000  7.005000 2.150000 ;
+      RECT  7.095000  1.125000  7.280000 1.720000 ;
+      RECT  7.115000  0.735000  7.620000 0.955000 ;
+      RECT  7.215000  2.175000  8.255000 2.375000 ;
+      RECT  7.305000  0.255000  7.980000 0.565000 ;
+      RECT  7.450000  0.955000  7.620000 1.655000 ;
+      RECT  7.450000  1.655000  7.915000 2.005000 ;
+      RECT  7.810000  0.565000  7.980000 1.315000 ;
+      RECT  7.810000  1.315000  8.660000 1.485000 ;
+      RECT  8.085000  1.485000  8.660000 1.575000 ;
+      RECT  8.085000  1.575000  8.255000 2.175000 ;
+      RECT  8.170000  0.765000  9.235000 1.045000 ;
+      RECT  8.170000  1.045000  9.745000 1.065000 ;
+      RECT  8.170000  1.065000  8.370000 1.095000 ;
+      RECT  8.245000  0.085000  8.640000 0.560000 ;
+      RECT  8.425000  1.835000  8.660000 2.635000 ;
+      RECT  8.490000  1.245000  8.660000 1.315000 ;
+      RECT  8.830000  0.255000  9.235000 0.765000 ;
+      RECT  8.830000  1.065000  9.745000 1.375000 ;
+      RECT  8.830000  1.375000  9.160000 2.465000 ;
+      RECT  9.370000  2.105000  9.660000 2.635000 ;
+      RECT  9.465000  0.085000  9.740000 0.615000 ;
+      RECT 10.090000  1.245000 10.280000 1.965000 ;
+      RECT 10.225000  2.165000 11.190000 2.355000 ;
+      RECT 10.305000  0.705000 10.770000 1.035000 ;
+      RECT 10.325000  0.330000 11.190000 0.535000 ;
+      RECT 10.450000  1.035000 10.770000 1.995000 ;
+      RECT 10.940000  0.535000 11.190000 2.165000 ;
+      RECT 11.360000  1.495000 11.530000 2.635000 ;
+      RECT 11.395000  0.085000 11.645000 0.900000 ;
+      RECT 12.200000  1.465000 12.450000 2.635000 ;
+      RECT 12.315000  0.085000 12.565000 0.900000 ;
+      RECT 12.620000  1.575000 12.850000 2.010000 ;
+      RECT 12.735000  0.890000 13.360000 1.220000 ;
+      RECT 13.020000  0.255000 13.360000 0.890000 ;
+      RECT 13.020000  1.220000 13.360000 2.465000 ;
+      RECT 13.530000  0.085000 13.765000 0.900000 ;
+      RECT 13.530000  1.465000 13.765000 2.635000 ;
+      RECT 14.435000  0.085000 14.695000 0.900000 ;
+      RECT 14.435000  1.465000 14.695000 2.635000 ;
     LAYER mcon ;
-      RECT  0.635000 1.785000  0.805000 1.955000 ;
-      RECT  1.015000 1.445000  1.185000 1.615000 ;
-      RECT  1.355000 0.425000  1.525000 0.595000 ;
-      RECT  3.805000 0.765000  3.975000 0.935000 ;
-      RECT  4.185000 0.425000  4.355000 0.595000 ;
-      RECT  4.615000 0.425000  4.785000 0.595000 ;
-      RECT  6.530000 0.425000  6.700000 0.595000 ;
-      RECT  7.100000 1.445000  7.270000 1.615000 ;
-      RECT  7.510000 1.785000  7.680000 1.955000 ;
-      RECT 10.100000 1.785000 10.270000 1.955000 ;
-      RECT 10.520000 1.445000 10.690000 1.615000 ;
-      RECT 10.980000 1.785000 11.150000 1.955000 ;
-      RECT 12.650000 1.785000 12.820000 1.955000 ;
-      RECT 13.110000 0.765000 13.280000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.635000  1.785000  0.805000 1.955000 ;
+      RECT  1.015000  1.445000  1.185000 1.615000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.355000  0.425000  1.525000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.805000  0.765000  3.975000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.185000  0.425000  4.355000 0.595000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.615000  0.425000  4.785000 0.595000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.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.530000  0.425000  6.700000 0.595000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.100000  1.445000  7.270000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.510000  1.785000  7.680000 1.955000 ;
+      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.100000  1.785000 10.270000 1.955000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.520000  1.445000 10.690000 1.615000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 10.980000  1.785000 11.150000 1.955000 ;
+      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 12.650000  1.785000 12.820000 1.955000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.110000  0.765000 13.280000 0.935000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
     LAYER met1 ;
       RECT  0.575000 1.755000  0.865000 1.800000 ;
       RECT  0.575000 1.800000 10.330000 1.940000 ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
index 25e2354..508af4e 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.magic.lef
@@ -90,46 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.340000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  2.235000  0.085000  2.565000 0.515000 ;
-        RECT  3.185000  0.085000  3.515000 0.610000 ;
-        RECT  5.760000  0.085000  6.010000 0.905000 ;
-        RECT  8.245000  0.085000  8.640000 0.560000 ;
-        RECT  9.465000  0.085000  9.740000 0.615000 ;
-        RECT 11.350000  0.085000 11.665000 0.615000 ;
-        RECT 12.350000  0.085000 12.595000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -139,131 +99,167 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.340000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  2.235000 1.890000  2.565000 2.635000 ;
-        RECT  3.265000 1.825000  3.460000 2.635000 ;
-        RECT  5.665000 2.175000  6.010000 2.635000 ;
-        RECT  8.425000 1.835000  8.660000 2.635000 ;
-        RECT  9.370000 2.105000  9.660000 2.635000 ;
-        RECT 11.280000 2.135000 11.540000 2.635000 ;
-        RECT 12.350000 1.465000 12.595000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.845000 0.805000 ;
-      RECT  0.175000 1.795000  0.845000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.615000 0.805000  0.845000 1.795000 ;
-      RECT  1.015000 0.345000  1.185000 2.465000 ;
-      RECT  1.355000 0.255000  1.785000 0.515000 ;
-      RECT  1.355000 0.515000  1.525000 1.890000 ;
-      RECT  1.355000 1.890000  1.785000 2.465000 ;
-      RECT  2.495000 1.355000  3.085000 1.720000 ;
-      RECT  2.755000 1.720000  3.085000 2.425000 ;
-      RECT  2.780000 0.255000  3.005000 0.845000 ;
-      RECT  2.780000 0.845000  3.635000 1.175000 ;
-      RECT  2.780000 1.175000  3.085000 1.355000 ;
-      RECT  3.805000 0.685000  3.975000 1.320000 ;
-      RECT  3.805000 1.320000  4.175000 1.650000 ;
-      RECT  4.125000 1.820000  4.515000 2.020000 ;
-      RECT  4.125000 2.020000  4.455000 2.465000 ;
-      RECT  4.145000 0.255000  4.415000 0.980000 ;
-      RECT  4.145000 0.980000  4.515000 1.150000 ;
-      RECT  4.345000 1.150000  4.515000 1.820000 ;
-      RECT  4.595000 0.255000  4.795000 0.645000 ;
-      RECT  4.595000 0.645000  4.855000 0.825000 ;
-      RECT  4.635000 2.210000  4.965000 2.465000 ;
-      RECT  4.685000 0.825000  4.855000 1.785000 ;
-      RECT  4.685000 1.785000  4.965000 2.210000 ;
-      RECT  4.965000 0.255000  5.590000 0.515000 ;
-      RECT  5.155000 1.835000  6.585000 2.005000 ;
-      RECT  5.155000 2.005000  5.495000 2.465000 ;
-      RECT  5.260000 0.515000  5.590000 0.935000 ;
-      RECT  5.420000 0.935000  5.590000 1.835000 ;
-      RECT  6.385000 1.355000  6.585000 1.835000 ;
-      RECT  6.515000 0.255000  7.135000 0.565000 ;
-      RECT  6.515000 0.565000  6.925000 1.185000 ;
-      RECT  6.675000 2.150000  7.005000 2.465000 ;
-      RECT  6.755000 1.185000  6.925000 1.865000 ;
-      RECT  6.755000 1.865000  7.005000 2.150000 ;
-      RECT  7.095000 1.125000  7.280000 1.720000 ;
-      RECT  7.115000 0.735000  7.620000 0.955000 ;
-      RECT  7.215000 2.175000  8.255000 2.375000 ;
-      RECT  7.305000 0.255000  7.980000 0.565000 ;
-      RECT  7.450000 0.955000  7.620000 1.655000 ;
-      RECT  7.450000 1.655000  7.915000 2.005000 ;
-      RECT  7.810000 0.565000  7.980000 1.315000 ;
-      RECT  7.810000 1.315000  8.660000 1.485000 ;
-      RECT  8.085000 1.485000  8.660000 1.575000 ;
-      RECT  8.085000 1.575000  8.255000 2.175000 ;
-      RECT  8.170000 0.765000  9.235000 1.045000 ;
-      RECT  8.170000 1.045000  9.745000 1.065000 ;
-      RECT  8.170000 1.065000  8.370000 1.095000 ;
-      RECT  8.490000 1.245000  8.660000 1.315000 ;
-      RECT  8.830000 0.255000  9.235000 0.765000 ;
-      RECT  8.830000 1.065000  9.745000 1.375000 ;
-      RECT  8.830000 1.375000  9.160000 2.465000 ;
-      RECT 10.090000 1.245000 10.280000 1.965000 ;
-      RECT 10.225000 2.165000 11.110000 2.355000 ;
-      RECT 10.305000 0.705000 10.770000 1.035000 ;
-      RECT 10.325000 0.330000 11.110000 0.535000 ;
-      RECT 10.450000 1.035000 10.770000 1.995000 ;
-      RECT 10.940000 0.535000 11.110000 0.995000 ;
-      RECT 10.940000 0.995000 11.810000 1.325000 ;
-      RECT 10.940000 1.325000 11.110000 2.165000 ;
-      RECT 11.280000 1.530000 12.180000 1.905000 ;
-      RECT 11.840000 1.905000 12.180000 2.465000 ;
-      RECT 11.850000 0.300000 12.180000 0.825000 ;
-      RECT 11.990000 0.825000 12.180000 1.530000 ;
+      RECT  0.000000 -0.085000 13.340000 0.085000 ;
+      RECT  0.000000  2.635000 13.340000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.845000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.355000  0.255000  1.785000 0.515000 ;
+      RECT  1.355000  0.515000  1.525000 1.890000 ;
+      RECT  1.355000  1.890000  1.785000 2.465000 ;
+      RECT  2.235000  0.085000  2.565000 0.515000 ;
+      RECT  2.235000  1.890000  2.565000 2.635000 ;
+      RECT  2.495000  1.355000  3.085000 1.720000 ;
+      RECT  2.755000  1.720000  3.085000 2.425000 ;
+      RECT  2.780000  0.255000  3.005000 0.845000 ;
+      RECT  2.780000  0.845000  3.635000 1.175000 ;
+      RECT  2.780000  1.175000  3.085000 1.355000 ;
+      RECT  3.185000  0.085000  3.515000 0.610000 ;
+      RECT  3.265000  1.825000  3.460000 2.635000 ;
+      RECT  3.805000  0.685000  3.975000 1.320000 ;
+      RECT  3.805000  1.320000  4.175000 1.650000 ;
+      RECT  4.125000  1.820000  4.515000 2.020000 ;
+      RECT  4.125000  2.020000  4.455000 2.465000 ;
+      RECT  4.145000  0.255000  4.415000 0.980000 ;
+      RECT  4.145000  0.980000  4.515000 1.150000 ;
+      RECT  4.345000  1.150000  4.515000 1.820000 ;
+      RECT  4.595000  0.255000  4.795000 0.645000 ;
+      RECT  4.595000  0.645000  4.855000 0.825000 ;
+      RECT  4.635000  2.210000  4.965000 2.465000 ;
+      RECT  4.685000  0.825000  4.855000 1.785000 ;
+      RECT  4.685000  1.785000  4.965000 2.210000 ;
+      RECT  4.965000  0.255000  5.590000 0.515000 ;
+      RECT  5.155000  1.835000  6.585000 2.005000 ;
+      RECT  5.155000  2.005000  5.495000 2.465000 ;
+      RECT  5.260000  0.515000  5.590000 0.935000 ;
+      RECT  5.420000  0.935000  5.590000 1.835000 ;
+      RECT  5.665000  2.175000  6.010000 2.635000 ;
+      RECT  5.760000  0.085000  6.010000 0.905000 ;
+      RECT  6.385000  1.355000  6.585000 1.835000 ;
+      RECT  6.515000  0.255000  7.135000 0.565000 ;
+      RECT  6.515000  0.565000  6.925000 1.185000 ;
+      RECT  6.675000  2.150000  7.005000 2.465000 ;
+      RECT  6.755000  1.185000  6.925000 1.865000 ;
+      RECT  6.755000  1.865000  7.005000 2.150000 ;
+      RECT  7.095000  1.125000  7.280000 1.720000 ;
+      RECT  7.115000  0.735000  7.620000 0.955000 ;
+      RECT  7.215000  2.175000  8.255000 2.375000 ;
+      RECT  7.305000  0.255000  7.980000 0.565000 ;
+      RECT  7.450000  0.955000  7.620000 1.655000 ;
+      RECT  7.450000  1.655000  7.915000 2.005000 ;
+      RECT  7.810000  0.565000  7.980000 1.315000 ;
+      RECT  7.810000  1.315000  8.660000 1.485000 ;
+      RECT  8.085000  1.485000  8.660000 1.575000 ;
+      RECT  8.085000  1.575000  8.255000 2.175000 ;
+      RECT  8.170000  0.765000  9.235000 1.045000 ;
+      RECT  8.170000  1.045000  9.745000 1.065000 ;
+      RECT  8.170000  1.065000  8.370000 1.095000 ;
+      RECT  8.245000  0.085000  8.640000 0.560000 ;
+      RECT  8.425000  1.835000  8.660000 2.635000 ;
+      RECT  8.490000  1.245000  8.660000 1.315000 ;
+      RECT  8.830000  0.255000  9.235000 0.765000 ;
+      RECT  8.830000  1.065000  9.745000 1.375000 ;
+      RECT  8.830000  1.375000  9.160000 2.465000 ;
+      RECT  9.370000  2.105000  9.660000 2.635000 ;
+      RECT  9.465000  0.085000  9.740000 0.615000 ;
+      RECT 10.090000  1.245000 10.280000 1.965000 ;
+      RECT 10.225000  2.165000 11.110000 2.355000 ;
+      RECT 10.305000  0.705000 10.770000 1.035000 ;
+      RECT 10.325000  0.330000 11.110000 0.535000 ;
+      RECT 10.450000  1.035000 10.770000 1.995000 ;
+      RECT 10.940000  0.535000 11.110000 0.995000 ;
+      RECT 10.940000  0.995000 11.810000 1.325000 ;
+      RECT 10.940000  1.325000 11.110000 2.165000 ;
+      RECT 11.280000  1.530000 12.180000 1.905000 ;
+      RECT 11.280000  2.135000 11.540000 2.635000 ;
+      RECT 11.350000  0.085000 11.665000 0.615000 ;
+      RECT 11.840000  1.905000 12.180000 2.465000 ;
+      RECT 11.850000  0.300000 12.180000 0.825000 ;
+      RECT 11.990000  0.825000 12.180000 1.530000 ;
+      RECT 12.350000  0.085000 12.595000 0.900000 ;
+      RECT 12.350000  1.465000 12.595000 2.635000 ;
     LAYER mcon ;
-      RECT  0.635000 1.785000  0.805000 1.955000 ;
-      RECT  1.015000 1.445000  1.185000 1.615000 ;
-      RECT  1.355000 0.425000  1.525000 0.595000 ;
-      RECT  3.805000 0.765000  3.975000 0.935000 ;
-      RECT  4.185000 0.425000  4.355000 0.595000 ;
-      RECT  4.615000 0.425000  4.785000 0.595000 ;
-      RECT  6.530000 0.425000  6.700000 0.595000 ;
-      RECT  7.100000 1.445000  7.270000 1.615000 ;
-      RECT  7.510000 1.785000  7.680000 1.955000 ;
-      RECT 10.100000 1.785000 10.270000 1.955000 ;
-      RECT 10.520000 1.445000 10.690000 1.615000 ;
-      RECT 12.000000 0.765000 12.170000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.635000  1.785000  0.805000 1.955000 ;
+      RECT  1.015000  1.445000  1.185000 1.615000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.355000  0.425000  1.525000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.805000  0.765000  3.975000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.185000  0.425000  4.355000 0.595000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.615000  0.425000  4.785000 0.595000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.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.530000  0.425000  6.700000 0.595000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.100000  1.445000  7.270000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.510000  1.785000  7.680000 1.955000 ;
+      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.100000  1.785000 10.270000 1.955000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.520000  1.445000 10.690000 1.615000 ;
+      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.000000  0.765000 12.170000 0.935000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
     LAYER met1 ;
       RECT  0.575000 1.755000  0.865000 1.800000 ;
       RECT  0.575000 1.800000 10.330000 1.940000 ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
index 30b0925..9f9815e 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.magic.lef
@@ -90,48 +90,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.800000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  2.235000  0.085000  2.565000 0.515000 ;
-        RECT  3.185000  0.085000  3.515000 0.610000 ;
-        RECT  5.760000  0.085000  6.010000 0.905000 ;
-        RECT  8.245000  0.085000  8.640000 0.560000 ;
-        RECT  9.465000  0.085000  9.740000 0.615000 ;
-        RECT 11.350000  0.085000 11.665000 0.615000 ;
-        RECT 12.350000  0.085000 12.585000 0.900000 ;
-        RECT 13.255000  0.085000 13.515000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.800000 0.240000 ;
     END
@@ -141,133 +99,171 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.800000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  2.235000 1.890000  2.565000 2.635000 ;
-        RECT  3.265000 1.825000  3.460000 2.635000 ;
-        RECT  5.665000 2.175000  6.010000 2.635000 ;
-        RECT  8.425000 1.835000  8.660000 2.635000 ;
-        RECT  9.370000 2.105000  9.660000 2.635000 ;
-        RECT 11.280000 2.135000 11.540000 2.635000 ;
-        RECT 12.350000 1.465000 12.585000 2.635000 ;
-        RECT 13.255000 1.465000 13.515000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.800000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.845000 0.805000 ;
-      RECT  0.175000 1.795000  0.845000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.615000 0.805000  0.845000 1.795000 ;
-      RECT  1.015000 0.345000  1.185000 2.465000 ;
-      RECT  1.355000 0.255000  1.785000 0.515000 ;
-      RECT  1.355000 0.515000  1.525000 1.890000 ;
-      RECT  1.355000 1.890000  1.785000 2.465000 ;
-      RECT  2.495000 1.355000  3.085000 1.720000 ;
-      RECT  2.755000 1.720000  3.085000 2.425000 ;
-      RECT  2.780000 0.255000  3.005000 0.845000 ;
-      RECT  2.780000 0.845000  3.635000 1.175000 ;
-      RECT  2.780000 1.175000  3.085000 1.355000 ;
-      RECT  3.805000 0.685000  3.975000 1.320000 ;
-      RECT  3.805000 1.320000  4.175000 1.650000 ;
-      RECT  4.125000 1.820000  4.515000 2.020000 ;
-      RECT  4.125000 2.020000  4.455000 2.465000 ;
-      RECT  4.145000 0.255000  4.415000 0.980000 ;
-      RECT  4.145000 0.980000  4.515000 1.150000 ;
-      RECT  4.345000 1.150000  4.515000 1.820000 ;
-      RECT  4.595000 0.255000  4.795000 0.645000 ;
-      RECT  4.595000 0.645000  4.855000 0.825000 ;
-      RECT  4.635000 2.210000  4.965000 2.465000 ;
-      RECT  4.685000 0.825000  4.855000 1.785000 ;
-      RECT  4.685000 1.785000  4.965000 2.210000 ;
-      RECT  4.965000 0.255000  5.590000 0.515000 ;
-      RECT  5.155000 1.835000  6.585000 2.005000 ;
-      RECT  5.155000 2.005000  5.495000 2.465000 ;
-      RECT  5.260000 0.515000  5.590000 0.935000 ;
-      RECT  5.420000 0.935000  5.590000 1.835000 ;
-      RECT  6.385000 1.355000  6.585000 1.835000 ;
-      RECT  6.515000 0.255000  7.135000 0.565000 ;
-      RECT  6.515000 0.565000  6.925000 1.185000 ;
-      RECT  6.675000 2.150000  7.005000 2.465000 ;
-      RECT  6.755000 1.185000  6.925000 1.865000 ;
-      RECT  6.755000 1.865000  7.005000 2.150000 ;
-      RECT  7.095000 1.125000  7.280000 1.720000 ;
-      RECT  7.115000 0.735000  7.620000 0.955000 ;
-      RECT  7.215000 2.175000  8.255000 2.375000 ;
-      RECT  7.305000 0.255000  7.980000 0.565000 ;
-      RECT  7.450000 0.955000  7.620000 1.655000 ;
-      RECT  7.450000 1.655000  7.915000 2.005000 ;
-      RECT  7.810000 0.565000  7.980000 1.315000 ;
-      RECT  7.810000 1.315000  8.660000 1.485000 ;
-      RECT  8.085000 1.485000  8.660000 1.575000 ;
-      RECT  8.085000 1.575000  8.255000 2.175000 ;
-      RECT  8.170000 0.765000  9.235000 1.045000 ;
-      RECT  8.170000 1.045000  9.745000 1.065000 ;
-      RECT  8.170000 1.065000  8.370000 1.095000 ;
-      RECT  8.490000 1.245000  8.660000 1.315000 ;
-      RECT  8.830000 0.255000  9.235000 0.765000 ;
-      RECT  8.830000 1.065000  9.745000 1.375000 ;
-      RECT  8.830000 1.375000  9.160000 2.465000 ;
-      RECT 10.090000 1.245000 10.280000 1.965000 ;
-      RECT 10.225000 2.165000 11.110000 2.355000 ;
-      RECT 10.305000 0.705000 10.770000 1.035000 ;
-      RECT 10.325000 0.330000 11.110000 0.535000 ;
-      RECT 10.450000 1.035000 10.770000 1.995000 ;
-      RECT 10.940000 0.535000 11.110000 0.995000 ;
-      RECT 10.940000 0.995000 11.810000 1.325000 ;
-      RECT 10.940000 1.325000 11.110000 2.165000 ;
-      RECT 11.280000 1.530000 12.180000 1.905000 ;
-      RECT 11.840000 1.905000 12.180000 2.465000 ;
-      RECT 11.850000 0.300000 12.180000 0.825000 ;
-      RECT 11.990000 0.825000 12.180000 1.530000 ;
+      RECT  0.000000 -0.085000 13.800000 0.085000 ;
+      RECT  0.000000  2.635000 13.800000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.845000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.355000  0.255000  1.785000 0.515000 ;
+      RECT  1.355000  0.515000  1.525000 1.890000 ;
+      RECT  1.355000  1.890000  1.785000 2.465000 ;
+      RECT  2.235000  0.085000  2.565000 0.515000 ;
+      RECT  2.235000  1.890000  2.565000 2.635000 ;
+      RECT  2.495000  1.355000  3.085000 1.720000 ;
+      RECT  2.755000  1.720000  3.085000 2.425000 ;
+      RECT  2.780000  0.255000  3.005000 0.845000 ;
+      RECT  2.780000  0.845000  3.635000 1.175000 ;
+      RECT  2.780000  1.175000  3.085000 1.355000 ;
+      RECT  3.185000  0.085000  3.515000 0.610000 ;
+      RECT  3.265000  1.825000  3.460000 2.635000 ;
+      RECT  3.805000  0.685000  3.975000 1.320000 ;
+      RECT  3.805000  1.320000  4.175000 1.650000 ;
+      RECT  4.125000  1.820000  4.515000 2.020000 ;
+      RECT  4.125000  2.020000  4.455000 2.465000 ;
+      RECT  4.145000  0.255000  4.415000 0.980000 ;
+      RECT  4.145000  0.980000  4.515000 1.150000 ;
+      RECT  4.345000  1.150000  4.515000 1.820000 ;
+      RECT  4.595000  0.255000  4.795000 0.645000 ;
+      RECT  4.595000  0.645000  4.855000 0.825000 ;
+      RECT  4.635000  2.210000  4.965000 2.465000 ;
+      RECT  4.685000  0.825000  4.855000 1.785000 ;
+      RECT  4.685000  1.785000  4.965000 2.210000 ;
+      RECT  4.965000  0.255000  5.590000 0.515000 ;
+      RECT  5.155000  1.835000  6.585000 2.005000 ;
+      RECT  5.155000  2.005000  5.495000 2.465000 ;
+      RECT  5.260000  0.515000  5.590000 0.935000 ;
+      RECT  5.420000  0.935000  5.590000 1.835000 ;
+      RECT  5.665000  2.175000  6.010000 2.635000 ;
+      RECT  5.760000  0.085000  6.010000 0.905000 ;
+      RECT  6.385000  1.355000  6.585000 1.835000 ;
+      RECT  6.515000  0.255000  7.135000 0.565000 ;
+      RECT  6.515000  0.565000  6.925000 1.185000 ;
+      RECT  6.675000  2.150000  7.005000 2.465000 ;
+      RECT  6.755000  1.185000  6.925000 1.865000 ;
+      RECT  6.755000  1.865000  7.005000 2.150000 ;
+      RECT  7.095000  1.125000  7.280000 1.720000 ;
+      RECT  7.115000  0.735000  7.620000 0.955000 ;
+      RECT  7.215000  2.175000  8.255000 2.375000 ;
+      RECT  7.305000  0.255000  7.980000 0.565000 ;
+      RECT  7.450000  0.955000  7.620000 1.655000 ;
+      RECT  7.450000  1.655000  7.915000 2.005000 ;
+      RECT  7.810000  0.565000  7.980000 1.315000 ;
+      RECT  7.810000  1.315000  8.660000 1.485000 ;
+      RECT  8.085000  1.485000  8.660000 1.575000 ;
+      RECT  8.085000  1.575000  8.255000 2.175000 ;
+      RECT  8.170000  0.765000  9.235000 1.045000 ;
+      RECT  8.170000  1.045000  9.745000 1.065000 ;
+      RECT  8.170000  1.065000  8.370000 1.095000 ;
+      RECT  8.245000  0.085000  8.640000 0.560000 ;
+      RECT  8.425000  1.835000  8.660000 2.635000 ;
+      RECT  8.490000  1.245000  8.660000 1.315000 ;
+      RECT  8.830000  0.255000  9.235000 0.765000 ;
+      RECT  8.830000  1.065000  9.745000 1.375000 ;
+      RECT  8.830000  1.375000  9.160000 2.465000 ;
+      RECT  9.370000  2.105000  9.660000 2.635000 ;
+      RECT  9.465000  0.085000  9.740000 0.615000 ;
+      RECT 10.090000  1.245000 10.280000 1.965000 ;
+      RECT 10.225000  2.165000 11.110000 2.355000 ;
+      RECT 10.305000  0.705000 10.770000 1.035000 ;
+      RECT 10.325000  0.330000 11.110000 0.535000 ;
+      RECT 10.450000  1.035000 10.770000 1.995000 ;
+      RECT 10.940000  0.535000 11.110000 0.995000 ;
+      RECT 10.940000  0.995000 11.810000 1.325000 ;
+      RECT 10.940000  1.325000 11.110000 2.165000 ;
+      RECT 11.280000  1.530000 12.180000 1.905000 ;
+      RECT 11.280000  2.135000 11.540000 2.635000 ;
+      RECT 11.350000  0.085000 11.665000 0.615000 ;
+      RECT 11.840000  1.905000 12.180000 2.465000 ;
+      RECT 11.850000  0.300000 12.180000 0.825000 ;
+      RECT 11.990000  0.825000 12.180000 1.530000 ;
+      RECT 12.350000  0.085000 12.585000 0.900000 ;
+      RECT 12.350000  1.465000 12.585000 2.635000 ;
+      RECT 13.255000  0.085000 13.515000 0.900000 ;
+      RECT 13.255000  1.465000 13.515000 2.635000 ;
     LAYER mcon ;
-      RECT  0.635000 1.785000  0.805000 1.955000 ;
-      RECT  1.015000 1.445000  1.185000 1.615000 ;
-      RECT  1.355000 0.425000  1.525000 0.595000 ;
-      RECT  3.805000 0.765000  3.975000 0.935000 ;
-      RECT  4.185000 0.425000  4.355000 0.595000 ;
-      RECT  4.615000 0.425000  4.785000 0.595000 ;
-      RECT  6.530000 0.425000  6.700000 0.595000 ;
-      RECT  7.100000 1.445000  7.270000 1.615000 ;
-      RECT  7.510000 1.785000  7.680000 1.955000 ;
-      RECT 10.100000 1.785000 10.270000 1.955000 ;
-      RECT 10.520000 1.445000 10.690000 1.615000 ;
-      RECT 12.000000 0.765000 12.170000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.635000  1.785000  0.805000 1.955000 ;
+      RECT  1.015000  1.445000  1.185000 1.615000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.355000  0.425000  1.525000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.805000  0.765000  3.975000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.185000  0.425000  4.355000 0.595000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.615000  0.425000  4.785000 0.595000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.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.530000  0.425000  6.700000 0.595000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.100000  1.445000  7.270000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.510000  1.785000  7.680000 1.955000 ;
+      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.100000  1.785000 10.270000 1.955000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.520000  1.445000 10.690000 1.615000 ;
+      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.000000  0.765000 12.170000 0.935000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
     LAYER met1 ;
       RECT  0.575000 1.755000  0.865000 1.800000 ;
       RECT  0.575000 1.800000 10.330000 1.940000 ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
index f2c5ce4..d370377 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.magic.lef
@@ -94,51 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.720000 0.085000 ;
-        RECT  0.515000  0.085000  0.845000 0.465000 ;
-        RECT  2.235000  0.085000  2.565000 0.515000 ;
-        RECT  3.185000  0.085000  3.515000 0.610000 ;
-        RECT  5.760000  0.085000  6.010000 0.905000 ;
-        RECT  8.245000  0.085000  8.640000 0.560000 ;
-        RECT  9.465000  0.085000  9.740000 0.615000 ;
-        RECT 11.350000  0.085000 11.665000 0.615000 ;
-        RECT 12.350000  0.085000 12.585000 0.900000 ;
-        RECT 13.255000  0.085000 13.425000 0.900000 ;
-        RECT 14.095000  0.085000 14.355000 1.280000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
@@ -148,136 +103,177 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.720000 2.805000 ;
-        RECT  0.515000 2.135000  0.845000 2.635000 ;
-        RECT  2.235000 1.890000  2.565000 2.635000 ;
-        RECT  3.265000 1.825000  3.460000 2.635000 ;
-        RECT  5.665000 2.175000  6.010000 2.635000 ;
-        RECT  8.425000 1.835000  8.660000 2.635000 ;
-        RECT  9.370000 2.105000  9.660000 2.635000 ;
-        RECT 11.280000 2.135000 11.540000 2.635000 ;
-        RECT 12.350000 1.465000 12.585000 2.635000 ;
-        RECT 13.255000 1.465000 13.425000 2.635000 ;
-        RECT 14.095000 1.465000 14.355000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.845000 0.805000 ;
-      RECT  0.175000 1.795000  0.845000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.615000 0.805000  0.845000 1.795000 ;
-      RECT  1.015000 0.345000  1.185000 2.465000 ;
-      RECT  1.355000 0.255000  1.785000 0.515000 ;
-      RECT  1.355000 0.515000  1.525000 1.890000 ;
-      RECT  1.355000 1.890000  1.785000 2.465000 ;
-      RECT  2.495000 1.355000  3.085000 1.720000 ;
-      RECT  2.755000 1.720000  3.085000 2.425000 ;
-      RECT  2.780000 0.255000  3.005000 0.845000 ;
-      RECT  2.780000 0.845000  3.635000 1.175000 ;
-      RECT  2.780000 1.175000  3.085000 1.355000 ;
-      RECT  3.805000 0.685000  3.975000 1.320000 ;
-      RECT  3.805000 1.320000  4.175000 1.650000 ;
-      RECT  4.125000 1.820000  4.515000 2.020000 ;
-      RECT  4.125000 2.020000  4.455000 2.465000 ;
-      RECT  4.145000 0.255000  4.415000 0.980000 ;
-      RECT  4.145000 0.980000  4.515000 1.150000 ;
-      RECT  4.345000 1.150000  4.515000 1.820000 ;
-      RECT  4.595000 0.255000  4.795000 0.645000 ;
-      RECT  4.595000 0.645000  4.855000 0.825000 ;
-      RECT  4.635000 2.210000  4.965000 2.465000 ;
-      RECT  4.685000 0.825000  4.855000 1.785000 ;
-      RECT  4.685000 1.785000  4.965000 2.210000 ;
-      RECT  4.965000 0.255000  5.590000 0.515000 ;
-      RECT  5.155000 1.835000  6.585000 2.005000 ;
-      RECT  5.155000 2.005000  5.495000 2.465000 ;
-      RECT  5.260000 0.515000  5.590000 0.935000 ;
-      RECT  5.420000 0.935000  5.590000 1.835000 ;
-      RECT  6.385000 1.355000  6.585000 1.835000 ;
-      RECT  6.515000 0.255000  7.135000 0.565000 ;
-      RECT  6.515000 0.565000  6.925000 1.185000 ;
-      RECT  6.675000 2.150000  7.005000 2.465000 ;
-      RECT  6.755000 1.185000  6.925000 1.865000 ;
-      RECT  6.755000 1.865000  7.005000 2.150000 ;
-      RECT  7.095000 1.125000  7.280000 1.720000 ;
-      RECT  7.115000 0.735000  7.620000 0.955000 ;
-      RECT  7.215000 2.175000  8.255000 2.375000 ;
-      RECT  7.305000 0.255000  7.980000 0.565000 ;
-      RECT  7.450000 0.955000  7.620000 1.655000 ;
-      RECT  7.450000 1.655000  7.915000 2.005000 ;
-      RECT  7.810000 0.565000  7.980000 1.315000 ;
-      RECT  7.810000 1.315000  8.660000 1.485000 ;
-      RECT  8.085000 1.485000  8.660000 1.575000 ;
-      RECT  8.085000 1.575000  8.255000 2.175000 ;
-      RECT  8.170000 0.765000  9.235000 1.045000 ;
-      RECT  8.170000 1.045000  9.745000 1.065000 ;
-      RECT  8.170000 1.065000  8.370000 1.095000 ;
-      RECT  8.490000 1.245000  8.660000 1.315000 ;
-      RECT  8.830000 0.255000  9.235000 0.765000 ;
-      RECT  8.830000 1.065000  9.745000 1.375000 ;
-      RECT  8.830000 1.375000  9.160000 2.465000 ;
-      RECT 10.090000 1.245000 10.280000 1.965000 ;
-      RECT 10.225000 2.165000 11.110000 2.355000 ;
-      RECT 10.305000 0.705000 10.770000 1.035000 ;
-      RECT 10.325000 0.330000 11.110000 0.535000 ;
-      RECT 10.450000 1.035000 10.770000 1.995000 ;
-      RECT 10.940000 0.535000 11.110000 0.995000 ;
-      RECT 10.940000 0.995000 11.810000 1.325000 ;
-      RECT 10.940000 1.325000 11.110000 2.165000 ;
-      RECT 11.280000 1.530000 12.180000 1.905000 ;
-      RECT 11.840000 1.905000 12.180000 2.465000 ;
-      RECT 11.850000 0.300000 12.180000 0.825000 ;
-      RECT 11.990000 0.825000 12.180000 1.530000 ;
+      RECT  0.000000 -0.085000 14.720000 0.085000 ;
+      RECT  0.000000  2.635000 14.720000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.845000 0.805000 ;
+      RECT  0.175000  1.795000  0.845000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.845000 0.465000 ;
+      RECT  0.515000  2.135000  0.845000 2.635000 ;
+      RECT  0.615000  0.805000  0.845000 1.795000 ;
+      RECT  1.015000  0.345000  1.185000 2.465000 ;
+      RECT  1.355000  0.255000  1.785000 0.515000 ;
+      RECT  1.355000  0.515000  1.525000 1.890000 ;
+      RECT  1.355000  1.890000  1.785000 2.465000 ;
+      RECT  2.235000  0.085000  2.565000 0.515000 ;
+      RECT  2.235000  1.890000  2.565000 2.635000 ;
+      RECT  2.495000  1.355000  3.085000 1.720000 ;
+      RECT  2.755000  1.720000  3.085000 2.425000 ;
+      RECT  2.780000  0.255000  3.005000 0.845000 ;
+      RECT  2.780000  0.845000  3.635000 1.175000 ;
+      RECT  2.780000  1.175000  3.085000 1.355000 ;
+      RECT  3.185000  0.085000  3.515000 0.610000 ;
+      RECT  3.265000  1.825000  3.460000 2.635000 ;
+      RECT  3.805000  0.685000  3.975000 1.320000 ;
+      RECT  3.805000  1.320000  4.175000 1.650000 ;
+      RECT  4.125000  1.820000  4.515000 2.020000 ;
+      RECT  4.125000  2.020000  4.455000 2.465000 ;
+      RECT  4.145000  0.255000  4.415000 0.980000 ;
+      RECT  4.145000  0.980000  4.515000 1.150000 ;
+      RECT  4.345000  1.150000  4.515000 1.820000 ;
+      RECT  4.595000  0.255000  4.795000 0.645000 ;
+      RECT  4.595000  0.645000  4.855000 0.825000 ;
+      RECT  4.635000  2.210000  4.965000 2.465000 ;
+      RECT  4.685000  0.825000  4.855000 1.785000 ;
+      RECT  4.685000  1.785000  4.965000 2.210000 ;
+      RECT  4.965000  0.255000  5.590000 0.515000 ;
+      RECT  5.155000  1.835000  6.585000 2.005000 ;
+      RECT  5.155000  2.005000  5.495000 2.465000 ;
+      RECT  5.260000  0.515000  5.590000 0.935000 ;
+      RECT  5.420000  0.935000  5.590000 1.835000 ;
+      RECT  5.665000  2.175000  6.010000 2.635000 ;
+      RECT  5.760000  0.085000  6.010000 0.905000 ;
+      RECT  6.385000  1.355000  6.585000 1.835000 ;
+      RECT  6.515000  0.255000  7.135000 0.565000 ;
+      RECT  6.515000  0.565000  6.925000 1.185000 ;
+      RECT  6.675000  2.150000  7.005000 2.465000 ;
+      RECT  6.755000  1.185000  6.925000 1.865000 ;
+      RECT  6.755000  1.865000  7.005000 2.150000 ;
+      RECT  7.095000  1.125000  7.280000 1.720000 ;
+      RECT  7.115000  0.735000  7.620000 0.955000 ;
+      RECT  7.215000  2.175000  8.255000 2.375000 ;
+      RECT  7.305000  0.255000  7.980000 0.565000 ;
+      RECT  7.450000  0.955000  7.620000 1.655000 ;
+      RECT  7.450000  1.655000  7.915000 2.005000 ;
+      RECT  7.810000  0.565000  7.980000 1.315000 ;
+      RECT  7.810000  1.315000  8.660000 1.485000 ;
+      RECT  8.085000  1.485000  8.660000 1.575000 ;
+      RECT  8.085000  1.575000  8.255000 2.175000 ;
+      RECT  8.170000  0.765000  9.235000 1.045000 ;
+      RECT  8.170000  1.045000  9.745000 1.065000 ;
+      RECT  8.170000  1.065000  8.370000 1.095000 ;
+      RECT  8.245000  0.085000  8.640000 0.560000 ;
+      RECT  8.425000  1.835000  8.660000 2.635000 ;
+      RECT  8.490000  1.245000  8.660000 1.315000 ;
+      RECT  8.830000  0.255000  9.235000 0.765000 ;
+      RECT  8.830000  1.065000  9.745000 1.375000 ;
+      RECT  8.830000  1.375000  9.160000 2.465000 ;
+      RECT  9.370000  2.105000  9.660000 2.635000 ;
+      RECT  9.465000  0.085000  9.740000 0.615000 ;
+      RECT 10.090000  1.245000 10.280000 1.965000 ;
+      RECT 10.225000  2.165000 11.110000 2.355000 ;
+      RECT 10.305000  0.705000 10.770000 1.035000 ;
+      RECT 10.325000  0.330000 11.110000 0.535000 ;
+      RECT 10.450000  1.035000 10.770000 1.995000 ;
+      RECT 10.940000  0.535000 11.110000 0.995000 ;
+      RECT 10.940000  0.995000 11.810000 1.325000 ;
+      RECT 10.940000  1.325000 11.110000 2.165000 ;
+      RECT 11.280000  1.530000 12.180000 1.905000 ;
+      RECT 11.280000  2.135000 11.540000 2.635000 ;
+      RECT 11.350000  0.085000 11.665000 0.615000 ;
+      RECT 11.840000  1.905000 12.180000 2.465000 ;
+      RECT 11.850000  0.300000 12.180000 0.825000 ;
+      RECT 11.990000  0.825000 12.180000 1.530000 ;
+      RECT 12.350000  0.085000 12.585000 0.900000 ;
+      RECT 12.350000  1.465000 12.585000 2.635000 ;
+      RECT 13.255000  0.085000 13.425000 0.900000 ;
+      RECT 13.255000  1.465000 13.425000 2.635000 ;
+      RECT 14.095000  0.085000 14.355000 1.280000 ;
+      RECT 14.095000  1.465000 14.355000 2.635000 ;
     LAYER mcon ;
-      RECT  0.635000 1.785000  0.805000 1.955000 ;
-      RECT  1.015000 1.445000  1.185000 1.615000 ;
-      RECT  1.355000 0.425000  1.525000 0.595000 ;
-      RECT  3.805000 0.765000  3.975000 0.935000 ;
-      RECT  4.185000 0.425000  4.355000 0.595000 ;
-      RECT  4.615000 0.425000  4.785000 0.595000 ;
-      RECT  6.530000 0.425000  6.700000 0.595000 ;
-      RECT  7.100000 1.445000  7.270000 1.615000 ;
-      RECT  7.510000 1.785000  7.680000 1.955000 ;
-      RECT 10.100000 1.785000 10.270000 1.955000 ;
-      RECT 10.520000 1.445000 10.690000 1.615000 ;
-      RECT 12.000000 0.765000 12.170000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.635000  1.785000  0.805000 1.955000 ;
+      RECT  1.015000  1.445000  1.185000 1.615000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.355000  0.425000  1.525000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.805000  0.765000  3.975000 0.935000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.185000  0.425000  4.355000 0.595000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.615000  0.425000  4.785000 0.595000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.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.530000  0.425000  6.700000 0.595000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.100000  1.445000  7.270000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.510000  1.785000  7.680000 1.955000 ;
+      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.100000  1.785000 10.270000 1.955000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.520000  1.445000 10.690000 1.615000 ;
+      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.000000  0.765000 12.170000 0.935000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
     LAYER met1 ;
       RECT  0.575000 1.755000  0.865000 1.800000 ;
       RECT  0.575000 1.800000 10.330000 1.940000 ;
diff --git a/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
index 412ef97..63d7d2e 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hd__tap_1.magic.lef
@@ -49,10 +49,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -62,12 +58,16 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
 END sky130_fd_sc_hd__tap_1
diff --git a/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef b/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
index 600f723..9e8ae9f 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_hd__tap_2.magic.lef
@@ -49,11 +49,6 @@
     SHAPE ABUTMENT ;
     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
@@ -63,13 +58,18 @@
     SHAPE ABUTMENT ;
     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
 END sky130_fd_sc_hd__tap_2
diff --git a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
index fb217a0..5c09a4d 100644
--- a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.magic.lef
@@ -33,10 +33,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.148750 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 1.470000 0.375000 2.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.125000 0.315000 2.295000 ;
       LAYER met1 ;
         RECT 0.085000 2.095000 0.375000 2.325000 ;
     END
@@ -46,11 +42,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -60,12 +51,19 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  1.470000 0.375000 2.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.125000 0.315000 2.295000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
 END sky130_fd_sc_hd__tapvgnd_1
diff --git a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
index f3ad055..8c3c4e6 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.magic.lef
@@ -33,10 +33,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.148750 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 1.470000 0.375000 2.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 1.785000 0.315000 1.955000 ;
       LAYER met1 ;
         RECT 0.085000 1.755000 0.375000 1.985000 ;
     END
@@ -46,11 +42,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -60,12 +51,19 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  1.470000 0.375000 2.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  1.785000 0.315000 1.955000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
 END sky130_fd_sc_hd__tapvgnd2_1
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
index 2b29211..fb98305 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.magic.lef
@@ -35,11 +35,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -49,13 +44,18 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-        RECT 0.085000 1.470000 0.375000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  1.470000 0.375000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
 END sky130_fd_sc_hd__tapvpwrvgnd_1
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
index abdd231..49e9559 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.magic.lef
@@ -69,18 +69,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 1.055000  0.085000 1.225000 0.905000 ;
-        RECT 1.895000  0.085000 2.245000 0.475000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -90,36 +78,45 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.085000 2.125000 0.385000 2.635000 ;
-        RECT 1.055000 2.125000 1.685000 2.635000 ;
-        RECT 2.815000 2.125000 3.115000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.550000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.785000 ;
-      RECT 0.085000 1.785000 2.305000 1.955000 ;
-      RECT 0.555000 1.955000 0.885000 2.465000 ;
-      RECT 1.395000 0.255000 1.725000 0.735000 ;
-      RECT 1.395000 0.735000 2.645000 0.825000 ;
-      RECT 1.395000 0.825000 2.305000 0.905000 ;
-      RECT 2.135000 0.655000 2.645000 0.735000 ;
-      RECT 2.135000 1.415000 2.795000 1.585000 ;
-      RECT 2.135000 1.585000 2.305000 1.785000 ;
-      RECT 2.415000 0.255000 2.645000 0.655000 ;
-      RECT 2.625000 0.995000 2.795000 1.415000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.280000 0.550000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.785000 ;
+      RECT 0.085000  1.785000 2.305000 1.955000 ;
+      RECT 0.085000  2.125000 0.385000 2.635000 ;
+      RECT 0.555000  1.955000 0.885000 2.465000 ;
+      RECT 1.055000  0.085000 1.225000 0.905000 ;
+      RECT 1.055000  2.125000 1.685000 2.635000 ;
+      RECT 1.395000  0.255000 1.725000 0.735000 ;
+      RECT 1.395000  0.735000 2.645000 0.825000 ;
+      RECT 1.395000  0.825000 2.305000 0.905000 ;
+      RECT 1.895000  0.085000 2.245000 0.475000 ;
+      RECT 2.135000  0.655000 2.645000 0.735000 ;
+      RECT 2.135000  1.415000 2.795000 1.585000 ;
+      RECT 2.135000  1.585000 2.305000 1.785000 ;
+      RECT 2.415000  0.255000 2.645000 0.655000 ;
+      RECT 2.625000  0.995000 2.795000 1.415000 ;
+      RECT 2.815000  2.125000 3.115000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
index 20df481..f3197a3 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.magic.lef
@@ -72,26 +72,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 1.450000  0.085000 1.620000 0.555000 ;
-        RECT 2.430000  0.085000 2.600000 0.905000 ;
-        RECT 3.270000  0.085000 3.440000 0.555000 ;
-        RECT 4.145000  0.085000 4.315000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -101,59 +81,75 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.570000 2.135000 0.820000 2.635000 ;
-        RECT 1.410000 2.135000 1.660000 2.635000 ;
-        RECT 2.810000 2.135000 3.060000 2.635000 ;
-        RECT 4.625000 2.135000 4.875000 2.635000 ;
-        RECT 5.465000 1.795000 5.895000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.645000 0.860000 0.895000 ;
-      RECT 0.085000 0.895000 0.315000 1.785000 ;
-      RECT 0.085000 1.785000 3.480000 1.955000 ;
-      RECT 0.085000 1.955000 2.080000 1.965000 ;
-      RECT 0.085000 1.965000 0.400000 2.465000 ;
-      RECT 0.105000 0.255000 1.280000 0.475000 ;
-      RECT 0.990000 1.965000 1.240000 2.465000 ;
-      RECT 1.030000 0.475000 1.280000 0.725000 ;
-      RECT 1.030000 0.725000 2.120000 0.905000 ;
-      RECT 1.790000 0.255000 2.120000 0.725000 ;
-      RECT 1.830000 1.965000 2.080000 2.465000 ;
-      RECT 2.390000 2.125000 2.640000 2.465000 ;
-      RECT 2.770000 0.255000 3.100000 0.725000 ;
-      RECT 2.770000 0.725000 5.335000 0.905000 ;
-      RECT 3.230000 2.125000 3.555000 2.295000 ;
-      RECT 3.230000 2.295000 4.355000 2.465000 ;
-      RECT 3.310000 1.455000 4.805000 1.625000 ;
-      RECT 3.310000 1.625000 3.480000 1.785000 ;
-      RECT 3.610000 0.255000 3.975000 0.725000 ;
-      RECT 4.105000 2.135000 4.355000 2.295000 ;
-      RECT 4.635000 1.075000 5.295000 1.245000 ;
-      RECT 4.635000 1.245000 4.805000 1.455000 ;
-      RECT 5.005000 0.645000 5.335000 0.725000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.645000 0.860000 0.895000 ;
+      RECT 0.085000  0.895000 0.315000 1.785000 ;
+      RECT 0.085000  1.785000 3.480000 1.955000 ;
+      RECT 0.085000  1.955000 2.080000 1.965000 ;
+      RECT 0.085000  1.965000 0.400000 2.465000 ;
+      RECT 0.105000  0.255000 1.280000 0.475000 ;
+      RECT 0.570000  2.135000 0.820000 2.635000 ;
+      RECT 0.990000  1.965000 1.240000 2.465000 ;
+      RECT 1.030000  0.475000 1.280000 0.725000 ;
+      RECT 1.030000  0.725000 2.120000 0.905000 ;
+      RECT 1.410000  2.135000 1.660000 2.635000 ;
+      RECT 1.450000  0.085000 1.620000 0.555000 ;
+      RECT 1.790000  0.255000 2.120000 0.725000 ;
+      RECT 1.830000  1.965000 2.080000 2.465000 ;
+      RECT 2.390000  2.125000 2.640000 2.465000 ;
+      RECT 2.430000  0.085000 2.600000 0.905000 ;
+      RECT 2.770000  0.255000 3.100000 0.725000 ;
+      RECT 2.770000  0.725000 5.335000 0.905000 ;
+      RECT 2.810000  2.135000 3.060000 2.635000 ;
+      RECT 3.230000  2.125000 3.555000 2.295000 ;
+      RECT 3.230000  2.295000 4.355000 2.465000 ;
+      RECT 3.270000  0.085000 3.440000 0.555000 ;
+      RECT 3.310000  1.455000 4.805000 1.625000 ;
+      RECT 3.310000  1.625000 3.480000 1.785000 ;
+      RECT 3.610000  0.255000 3.975000 0.725000 ;
+      RECT 4.105000  2.135000 4.355000 2.295000 ;
+      RECT 4.145000  0.085000 4.315000 0.555000 ;
+      RECT 4.625000  2.135000 4.875000 2.635000 ;
+      RECT 4.635000  1.075000 5.295000 1.245000 ;
+      RECT 4.635000  1.245000 4.805000 1.455000 ;
+      RECT 5.005000  0.645000 5.335000 0.725000 ;
+      RECT 5.465000  1.795000 5.895000 2.635000 ;
     LAYER mcon ;
-      RECT 2.465000 2.125000 2.635000 2.295000 ;
-      RECT 3.385000 2.125000 3.555000 2.295000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.465000  2.125000 2.635000 2.295000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.385000  2.125000 3.555000 2.295000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
     LAYER met1 ;
       RECT 2.405000 2.095000 2.695000 2.140000 ;
       RECT 2.405000 2.140000 3.615000 2.280000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
index 9c21083..a632538 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.magic.lef
@@ -73,38 +73,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 2.350000  0.085000  2.520000 0.555000 ;
-        RECT 3.190000  0.085000  3.360000 0.555000 ;
-        RECT 4.035000  0.085000  4.310000 0.905000 ;
-        RECT 4.980000  0.085000  5.150000 0.555000 ;
-        RECT 5.820000  0.085000  5.990000 0.555000 ;
-        RECT 6.660000  0.085000  6.830000 0.555000 ;
-        RECT 7.500000  0.085000  7.770000 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
@@ -114,79 +82,107 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.630000 1.835000  0.880000 2.635000 ;
-        RECT 1.470000 2.175000  1.720000 2.635000 ;
-        RECT 2.310000 2.175000  2.560000 2.635000 ;
-        RECT 3.150000 2.175000  3.400000 2.635000 ;
-        RECT 4.520000 2.175000  4.770000 2.635000 ;
-        RECT 5.360000 2.175000  5.610000 2.635000 ;
-        RECT 8.420000 1.835000  8.670000 2.635000 ;
-        RECT 9.260000 1.835000  9.510000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.645000 1.760000 0.905000 ;
-      RECT 0.085000 0.905000 0.320000 1.445000 ;
-      RECT 0.085000 1.445000 1.300000 1.615000 ;
-      RECT 0.085000 1.615000 0.460000 2.465000 ;
-      RECT 0.170000 0.255000 2.180000 0.475000 ;
-      RECT 1.050000 1.615000 1.300000 1.785000 ;
-      RECT 1.050000 1.785000 3.820000 2.005000 ;
-      RECT 1.050000 2.005000 1.300000 2.465000 ;
-      RECT 1.890000 2.005000 2.140000 2.465000 ;
-      RECT 1.930000 0.475000 2.180000 0.725000 ;
-      RECT 1.930000 0.725000 3.860000 0.905000 ;
-      RECT 2.690000 0.255000 3.020000 0.725000 ;
-      RECT 2.730000 2.005000 2.980000 2.465000 ;
-      RECT 3.530000 0.255000 3.860000 0.725000 ;
-      RECT 3.570000 2.005000 3.820000 2.465000 ;
-      RECT 4.035000 1.785000 5.990000 2.005000 ;
-      RECT 4.035000 2.005000 4.350000 2.465000 ;
-      RECT 4.480000 0.255000 4.810000 0.725000 ;
-      RECT 4.480000 0.725000 7.430000 0.735000 ;
-      RECT 4.480000 0.735000 8.210000 0.905000 ;
-      RECT 4.940000 2.005000 5.190000 2.465000 ;
-      RECT 5.320000 0.255000 5.650000 0.725000 ;
-      RECT 5.780000 2.005000 5.990000 2.215000 ;
-      RECT 5.780000 2.215000 7.750000 2.465000 ;
-      RECT 5.900000 1.445000 7.770000 1.615000 ;
-      RECT 6.160000 0.255000 6.490000 0.725000 ;
-      RECT 7.000000 0.255000 7.330000 0.725000 ;
-      RECT 7.600000 1.075000 9.645000 1.275000 ;
-      RECT 7.600000 1.275000 7.770000 1.445000 ;
-      RECT 7.960000 0.305000 9.970000 0.475000 ;
-      RECT 7.960000 0.475000 8.210000 0.735000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.085000  0.645000  1.760000 0.905000 ;
+      RECT 0.085000  0.905000  0.320000 1.445000 ;
+      RECT 0.085000  1.445000  1.300000 1.615000 ;
+      RECT 0.085000  1.615000  0.460000 2.465000 ;
+      RECT 0.170000  0.255000  2.180000 0.475000 ;
+      RECT 0.630000  1.835000  0.880000 2.635000 ;
+      RECT 1.050000  1.615000  1.300000 1.785000 ;
+      RECT 1.050000  1.785000  3.820000 2.005000 ;
+      RECT 1.050000  2.005000  1.300000 2.465000 ;
+      RECT 1.470000  2.175000  1.720000 2.635000 ;
+      RECT 1.890000  2.005000  2.140000 2.465000 ;
+      RECT 1.930000  0.475000  2.180000 0.725000 ;
+      RECT 1.930000  0.725000  3.860000 0.905000 ;
+      RECT 2.310000  2.175000  2.560000 2.635000 ;
+      RECT 2.350000  0.085000  2.520000 0.555000 ;
+      RECT 2.690000  0.255000  3.020000 0.725000 ;
+      RECT 2.730000  2.005000  2.980000 2.465000 ;
+      RECT 3.150000  2.175000  3.400000 2.635000 ;
+      RECT 3.190000  0.085000  3.360000 0.555000 ;
+      RECT 3.530000  0.255000  3.860000 0.725000 ;
+      RECT 3.570000  2.005000  3.820000 2.465000 ;
+      RECT 4.035000  0.085000  4.310000 0.905000 ;
+      RECT 4.035000  1.785000  5.990000 2.005000 ;
+      RECT 4.035000  2.005000  4.350000 2.465000 ;
+      RECT 4.480000  0.255000  4.810000 0.725000 ;
+      RECT 4.480000  0.725000  7.430000 0.735000 ;
+      RECT 4.480000  0.735000  8.210000 0.905000 ;
+      RECT 4.520000  2.175000  4.770000 2.635000 ;
+      RECT 4.940000  2.005000  5.190000 2.465000 ;
+      RECT 4.980000  0.085000  5.150000 0.555000 ;
+      RECT 5.320000  0.255000  5.650000 0.725000 ;
+      RECT 5.360000  2.175000  5.610000 2.635000 ;
+      RECT 5.780000  2.005000  5.990000 2.215000 ;
+      RECT 5.780000  2.215000  7.750000 2.465000 ;
+      RECT 5.820000  0.085000  5.990000 0.555000 ;
+      RECT 5.900000  1.445000  7.770000 1.615000 ;
+      RECT 6.160000  0.255000  6.490000 0.725000 ;
+      RECT 6.660000  0.085000  6.830000 0.555000 ;
+      RECT 7.000000  0.255000  7.330000 0.725000 ;
+      RECT 7.500000  0.085000  7.770000 0.555000 ;
+      RECT 7.600000  1.075000  9.645000 1.275000 ;
+      RECT 7.600000  1.275000  7.770000 1.445000 ;
+      RECT 7.960000  0.305000  9.970000 0.475000 ;
+      RECT 7.960000  0.475000  8.210000 0.735000 ;
+      RECT 8.420000  1.835000  8.670000 2.635000 ;
+      RECT 9.260000  1.835000  9.510000 2.635000 ;
     LAYER mcon ;
-      RECT 1.065000 1.445000 1.235000 1.615000 ;
-      RECT 6.125000 1.445000 6.295000 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  1.445000 1.235000 1.615000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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  1.445000 6.295000 1.615000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.005000 1.415000 1.295000 1.460000 ;
       RECT 1.005000 1.460000 6.355000 1.600000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
index 16b311e..142d583 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.magic.lef
@@ -74,30 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.515000  0.085000 0.765000 0.525000 ;
-        RECT 3.475000  0.085000 3.645000 0.865000 ;
-        RECT 7.475000  0.085000 7.645000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -107,102 +83,122 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.535000 2.215000 0.870000 2.635000 ;
-        RECT 3.225000 2.235000 3.555000 2.635000 ;
-        RECT 7.395000 2.275000 7.730000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.500000 0.995000 0.705000 1.325000 ;
-      RECT 0.530000 0.695000 1.105000 0.865000 ;
-      RECT 0.530000 0.865000 0.705000 0.995000 ;
-      RECT 0.535000 1.325000 0.705000 1.875000 ;
-      RECT 0.535000 1.875000 1.220000 2.045000 ;
-      RECT 0.935000 0.255000 2.505000 0.425000 ;
-      RECT 0.935000 0.425000 1.105000 0.695000 ;
-      RECT 0.935000 1.535000 2.520000 1.705000 ;
-      RECT 1.050000 2.045000 1.220000 2.235000 ;
-      RECT 1.050000 2.235000 2.520000 2.405000 ;
-      RECT 1.275000 0.595000 1.445000 1.535000 ;
-      RECT 1.560000 1.895000 4.060000 2.065000 ;
-      RECT 1.745000 0.625000 2.965000 0.795000 ;
-      RECT 1.745000 0.795000 2.125000 0.905000 ;
-      RECT 2.070000 0.425000 2.505000 0.455000 ;
-      RECT 2.350000 0.995000 2.625000 1.325000 ;
-      RECT 2.350000 1.325000 2.520000 1.535000 ;
-      RECT 2.675000 0.285000 3.305000 0.455000 ;
-      RECT 2.690000 1.525000 3.075000 1.695000 ;
-      RECT 2.795000 0.795000 2.965000 1.375000 ;
-      RECT 2.795000 1.375000 3.075000 1.525000 ;
-      RECT 3.135000 0.455000 3.305000 1.035000 ;
-      RECT 3.135000 1.035000 3.415000 1.205000 ;
-      RECT 3.245000 1.205000 3.415000 1.895000 ;
-      RECT 3.645000 1.445000 4.065000 1.715000 ;
-      RECT 3.825000 0.415000 4.065000 1.445000 ;
-      RECT 3.890000 2.065000 4.060000 2.275000 ;
-      RECT 3.890000 2.275000 6.985000 2.445000 ;
-      RECT 4.245000 0.265000 4.655000 0.485000 ;
-      RECT 4.245000 0.485000 4.455000 0.595000 ;
-      RECT 4.245000 0.595000 4.415000 2.105000 ;
-      RECT 4.585000 0.720000 4.995000 0.825000 ;
-      RECT 4.585000 0.825000 4.795000 0.890000 ;
-      RECT 4.585000 0.890000 4.755000 2.275000 ;
-      RECT 4.625000 0.655000 4.995000 0.720000 ;
-      RECT 4.825000 0.320000 4.995000 0.655000 ;
-      RECT 4.935000 1.445000 5.715000 1.615000 ;
-      RECT 4.935000 1.615000 5.350000 2.045000 ;
-      RECT 4.950000 0.995000 5.375000 1.270000 ;
-      RECT 5.165000 0.630000 5.375000 0.995000 ;
-      RECT 5.545000 0.255000 6.690000 0.425000 ;
-      RECT 5.545000 0.425000 5.715000 1.445000 ;
-      RECT 5.885000 0.595000 6.055000 1.935000 ;
-      RECT 5.885000 1.935000 8.195000 2.105000 ;
-      RECT 6.225000 0.425000 6.690000 0.465000 ;
-      RECT 6.565000 0.730000 6.770000 0.945000 ;
-      RECT 6.565000 0.945000 6.875000 1.275000 ;
-      RECT 6.975000 1.495000 7.795000 1.705000 ;
-      RECT 7.015000 0.295000 7.305000 0.735000 ;
-      RECT 7.015000 0.735000 7.795000 0.750000 ;
-      RECT 7.055000 0.750000 7.795000 0.905000 ;
-      RECT 7.625000 0.905000 7.795000 0.995000 ;
-      RECT 7.625000 0.995000 7.855000 1.325000 ;
-      RECT 7.625000 1.325000 7.795000 1.495000 ;
-      RECT 7.710000 1.875000 8.195000 1.935000 ;
-      RECT 7.895000 0.255000 8.195000 0.585000 ;
-      RECT 7.900000 2.105000 8.195000 2.465000 ;
-      RECT 8.025000 0.585000 8.195000 1.875000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.500000  0.995000 0.705000 1.325000 ;
+      RECT 0.515000  0.085000 0.765000 0.525000 ;
+      RECT 0.530000  0.695000 1.105000 0.865000 ;
+      RECT 0.530000  0.865000 0.705000 0.995000 ;
+      RECT 0.535000  1.325000 0.705000 1.875000 ;
+      RECT 0.535000  1.875000 1.220000 2.045000 ;
+      RECT 0.535000  2.215000 0.870000 2.635000 ;
+      RECT 0.935000  0.255000 2.505000 0.425000 ;
+      RECT 0.935000  0.425000 1.105000 0.695000 ;
+      RECT 0.935000  1.535000 2.520000 1.705000 ;
+      RECT 1.050000  2.045000 1.220000 2.235000 ;
+      RECT 1.050000  2.235000 2.520000 2.405000 ;
+      RECT 1.275000  0.595000 1.445000 1.535000 ;
+      RECT 1.560000  1.895000 4.060000 2.065000 ;
+      RECT 1.745000  0.625000 2.965000 0.795000 ;
+      RECT 1.745000  0.795000 2.125000 0.905000 ;
+      RECT 2.070000  0.425000 2.505000 0.455000 ;
+      RECT 2.350000  0.995000 2.625000 1.325000 ;
+      RECT 2.350000  1.325000 2.520000 1.535000 ;
+      RECT 2.675000  0.285000 3.305000 0.455000 ;
+      RECT 2.690000  1.525000 3.075000 1.695000 ;
+      RECT 2.795000  0.795000 2.965000 1.375000 ;
+      RECT 2.795000  1.375000 3.075000 1.525000 ;
+      RECT 3.135000  0.455000 3.305000 1.035000 ;
+      RECT 3.135000  1.035000 3.415000 1.205000 ;
+      RECT 3.225000  2.235000 3.555000 2.635000 ;
+      RECT 3.245000  1.205000 3.415000 1.895000 ;
+      RECT 3.475000  0.085000 3.645000 0.865000 ;
+      RECT 3.645000  1.445000 4.065000 1.715000 ;
+      RECT 3.825000  0.415000 4.065000 1.445000 ;
+      RECT 3.890000  2.065000 4.060000 2.275000 ;
+      RECT 3.890000  2.275000 6.985000 2.445000 ;
+      RECT 4.245000  0.265000 4.655000 0.485000 ;
+      RECT 4.245000  0.485000 4.455000 0.595000 ;
+      RECT 4.245000  0.595000 4.415000 2.105000 ;
+      RECT 4.585000  0.720000 4.995000 0.825000 ;
+      RECT 4.585000  0.825000 4.795000 0.890000 ;
+      RECT 4.585000  0.890000 4.755000 2.275000 ;
+      RECT 4.625000  0.655000 4.995000 0.720000 ;
+      RECT 4.825000  0.320000 4.995000 0.655000 ;
+      RECT 4.935000  1.445000 5.715000 1.615000 ;
+      RECT 4.935000  1.615000 5.350000 2.045000 ;
+      RECT 4.950000  0.995000 5.375000 1.270000 ;
+      RECT 5.165000  0.630000 5.375000 0.995000 ;
+      RECT 5.545000  0.255000 6.690000 0.425000 ;
+      RECT 5.545000  0.425000 5.715000 1.445000 ;
+      RECT 5.885000  0.595000 6.055000 1.935000 ;
+      RECT 5.885000  1.935000 8.195000 2.105000 ;
+      RECT 6.225000  0.425000 6.690000 0.465000 ;
+      RECT 6.565000  0.730000 6.770000 0.945000 ;
+      RECT 6.565000  0.945000 6.875000 1.275000 ;
+      RECT 6.975000  1.495000 7.795000 1.705000 ;
+      RECT 7.015000  0.295000 7.305000 0.735000 ;
+      RECT 7.015000  0.735000 7.795000 0.750000 ;
+      RECT 7.055000  0.750000 7.795000 0.905000 ;
+      RECT 7.395000  2.275000 7.730000 2.635000 ;
+      RECT 7.475000  0.085000 7.645000 0.565000 ;
+      RECT 7.625000  0.905000 7.795000 0.995000 ;
+      RECT 7.625000  0.995000 7.855000 1.325000 ;
+      RECT 7.625000  1.325000 7.795000 1.495000 ;
+      RECT 7.710000  1.875000 8.195000 1.935000 ;
+      RECT 7.895000  0.255000 8.195000 0.585000 ;
+      RECT 7.900000  2.105000 8.195000 2.465000 ;
+      RECT 8.025000  0.585000 8.195000 1.875000 ;
     LAYER mcon ;
-      RECT 2.905000 1.445000 3.075000 1.615000 ;
-      RECT 3.825000 0.765000 3.995000 0.935000 ;
-      RECT 4.285000 0.425000 4.455000 0.595000 ;
-      RECT 5.205000 0.765000 5.375000 0.935000 ;
-      RECT 5.205000 1.445000 5.375000 1.615000 ;
-      RECT 6.585000 0.765000 6.755000 0.935000 ;
-      RECT 7.045000 0.425000 7.215000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  1.445000 3.075000 1.615000 ;
+      RECT 2.905000  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  0.765000 3.995000 0.935000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  0.425000 4.455000 0.595000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  0.765000 5.375000 0.935000 ;
+      RECT 5.205000  1.445000 5.375000 1.615000 ;
+      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  0.765000 6.755000 0.935000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  0.425000 7.215000 0.595000 ;
+      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 ;
     LAYER met1 ;
       RECT 2.845000 1.415000 3.135000 1.460000 ;
       RECT 2.845000 1.460000 5.435000 1.600000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
index e35a558..09b3350 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.magic.lef
@@ -74,32 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.735000 ;
-        RECT 0.975000  0.085000 1.225000 0.525000 ;
-        RECT 3.935000  0.085000 4.105000 0.865000 ;
-        RECT 7.935000  0.085000 8.105000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -109,104 +83,126 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.085000 1.490000 0.375000 2.635000 ;
-        RECT 0.995000 2.215000 1.330000 2.635000 ;
-        RECT 3.685000 2.235000 4.015000 2.635000 ;
-        RECT 7.855000 2.275000 8.190000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.960000 0.995000 1.165000 1.325000 ;
-      RECT 0.990000 0.695000 1.565000 0.865000 ;
-      RECT 0.990000 0.865000 1.165000 0.995000 ;
-      RECT 0.995000 1.325000 1.165000 1.875000 ;
-      RECT 0.995000 1.875000 1.680000 2.045000 ;
-      RECT 1.395000 0.255000 2.965000 0.425000 ;
-      RECT 1.395000 0.425000 1.565000 0.695000 ;
-      RECT 1.395000 1.535000 2.980000 1.705000 ;
-      RECT 1.510000 2.045000 1.680000 2.235000 ;
-      RECT 1.510000 2.235000 2.980000 2.405000 ;
-      RECT 1.735000 0.595000 1.905000 1.535000 ;
-      RECT 2.020000 1.895000 4.520000 2.065000 ;
-      RECT 2.205000 0.625000 3.425000 0.795000 ;
-      RECT 2.205000 0.795000 2.585000 0.905000 ;
-      RECT 2.530000 0.425000 2.965000 0.455000 ;
-      RECT 2.810000 0.995000 3.085000 1.325000 ;
-      RECT 2.810000 1.325000 2.980000 1.535000 ;
-      RECT 3.135000 0.285000 3.765000 0.455000 ;
-      RECT 3.150000 1.525000 3.535000 1.695000 ;
-      RECT 3.255000 0.795000 3.425000 1.375000 ;
-      RECT 3.255000 1.375000 3.535000 1.525000 ;
-      RECT 3.595000 0.455000 3.765000 1.035000 ;
-      RECT 3.595000 1.035000 3.875000 1.205000 ;
-      RECT 3.705000 1.205000 3.875000 1.895000 ;
-      RECT 4.105000 1.445000 4.525000 1.715000 ;
-      RECT 4.285000 0.415000 4.525000 1.445000 ;
-      RECT 4.350000 2.065000 4.520000 2.275000 ;
-      RECT 4.350000 2.275000 7.445000 2.445000 ;
-      RECT 4.705000 0.265000 5.115000 0.485000 ;
-      RECT 4.705000 0.485000 4.915000 0.595000 ;
-      RECT 4.705000 0.595000 4.875000 2.105000 ;
-      RECT 5.045000 0.720000 5.455000 0.825000 ;
-      RECT 5.045000 0.825000 5.255000 0.890000 ;
-      RECT 5.045000 0.890000 5.215000 2.275000 ;
-      RECT 5.085000 0.655000 5.455000 0.720000 ;
-      RECT 5.285000 0.320000 5.455000 0.655000 ;
-      RECT 5.395000 1.445000 6.175000 1.615000 ;
-      RECT 5.395000 1.615000 5.810000 2.045000 ;
-      RECT 5.410000 0.995000 5.835000 1.270000 ;
-      RECT 5.625000 0.630000 5.835000 0.995000 ;
-      RECT 6.005000 0.255000 7.150000 0.425000 ;
-      RECT 6.005000 0.425000 6.175000 1.445000 ;
-      RECT 6.345000 0.595000 6.515000 1.935000 ;
-      RECT 6.345000 1.935000 8.655000 2.105000 ;
-      RECT 6.685000 0.425000 7.150000 0.465000 ;
-      RECT 7.025000 0.730000 7.230000 0.945000 ;
-      RECT 7.025000 0.945000 7.335000 1.275000 ;
-      RECT 7.435000 1.495000 8.255000 1.705000 ;
-      RECT 7.475000 0.295000 7.765000 0.735000 ;
-      RECT 7.475000 0.735000 8.255000 0.750000 ;
-      RECT 7.515000 0.750000 8.255000 0.905000 ;
-      RECT 8.085000 0.905000 8.255000 0.995000 ;
-      RECT 8.085000 0.995000 8.315000 1.325000 ;
-      RECT 8.085000 1.325000 8.255000 1.495000 ;
-      RECT 8.170000 1.875000 8.655000 1.935000 ;
-      RECT 8.355000 0.255000 8.655000 0.585000 ;
-      RECT 8.360000 2.105000 8.655000 2.465000 ;
-      RECT 8.485000 0.585000 8.655000 1.875000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.735000 ;
+      RECT 0.085000  1.490000 0.375000 2.635000 ;
+      RECT 0.960000  0.995000 1.165000 1.325000 ;
+      RECT 0.975000  0.085000 1.225000 0.525000 ;
+      RECT 0.990000  0.695000 1.565000 0.865000 ;
+      RECT 0.990000  0.865000 1.165000 0.995000 ;
+      RECT 0.995000  1.325000 1.165000 1.875000 ;
+      RECT 0.995000  1.875000 1.680000 2.045000 ;
+      RECT 0.995000  2.215000 1.330000 2.635000 ;
+      RECT 1.395000  0.255000 2.965000 0.425000 ;
+      RECT 1.395000  0.425000 1.565000 0.695000 ;
+      RECT 1.395000  1.535000 2.980000 1.705000 ;
+      RECT 1.510000  2.045000 1.680000 2.235000 ;
+      RECT 1.510000  2.235000 2.980000 2.405000 ;
+      RECT 1.735000  0.595000 1.905000 1.535000 ;
+      RECT 2.020000  1.895000 4.520000 2.065000 ;
+      RECT 2.205000  0.625000 3.425000 0.795000 ;
+      RECT 2.205000  0.795000 2.585000 0.905000 ;
+      RECT 2.530000  0.425000 2.965000 0.455000 ;
+      RECT 2.810000  0.995000 3.085000 1.325000 ;
+      RECT 2.810000  1.325000 2.980000 1.535000 ;
+      RECT 3.135000  0.285000 3.765000 0.455000 ;
+      RECT 3.150000  1.525000 3.535000 1.695000 ;
+      RECT 3.255000  0.795000 3.425000 1.375000 ;
+      RECT 3.255000  1.375000 3.535000 1.525000 ;
+      RECT 3.595000  0.455000 3.765000 1.035000 ;
+      RECT 3.595000  1.035000 3.875000 1.205000 ;
+      RECT 3.685000  2.235000 4.015000 2.635000 ;
+      RECT 3.705000  1.205000 3.875000 1.895000 ;
+      RECT 3.935000  0.085000 4.105000 0.865000 ;
+      RECT 4.105000  1.445000 4.525000 1.715000 ;
+      RECT 4.285000  0.415000 4.525000 1.445000 ;
+      RECT 4.350000  2.065000 4.520000 2.275000 ;
+      RECT 4.350000  2.275000 7.445000 2.445000 ;
+      RECT 4.705000  0.265000 5.115000 0.485000 ;
+      RECT 4.705000  0.485000 4.915000 0.595000 ;
+      RECT 4.705000  0.595000 4.875000 2.105000 ;
+      RECT 5.045000  0.720000 5.455000 0.825000 ;
+      RECT 5.045000  0.825000 5.255000 0.890000 ;
+      RECT 5.045000  0.890000 5.215000 2.275000 ;
+      RECT 5.085000  0.655000 5.455000 0.720000 ;
+      RECT 5.285000  0.320000 5.455000 0.655000 ;
+      RECT 5.395000  1.445000 6.175000 1.615000 ;
+      RECT 5.395000  1.615000 5.810000 2.045000 ;
+      RECT 5.410000  0.995000 5.835000 1.270000 ;
+      RECT 5.625000  0.630000 5.835000 0.995000 ;
+      RECT 6.005000  0.255000 7.150000 0.425000 ;
+      RECT 6.005000  0.425000 6.175000 1.445000 ;
+      RECT 6.345000  0.595000 6.515000 1.935000 ;
+      RECT 6.345000  1.935000 8.655000 2.105000 ;
+      RECT 6.685000  0.425000 7.150000 0.465000 ;
+      RECT 7.025000  0.730000 7.230000 0.945000 ;
+      RECT 7.025000  0.945000 7.335000 1.275000 ;
+      RECT 7.435000  1.495000 8.255000 1.705000 ;
+      RECT 7.475000  0.295000 7.765000 0.735000 ;
+      RECT 7.475000  0.735000 8.255000 0.750000 ;
+      RECT 7.515000  0.750000 8.255000 0.905000 ;
+      RECT 7.855000  2.275000 8.190000 2.635000 ;
+      RECT 7.935000  0.085000 8.105000 0.565000 ;
+      RECT 8.085000  0.905000 8.255000 0.995000 ;
+      RECT 8.085000  0.995000 8.315000 1.325000 ;
+      RECT 8.085000  1.325000 8.255000 1.495000 ;
+      RECT 8.170000  1.875000 8.655000 1.935000 ;
+      RECT 8.355000  0.255000 8.655000 0.585000 ;
+      RECT 8.360000  2.105000 8.655000 2.465000 ;
+      RECT 8.485000  0.585000 8.655000 1.875000 ;
     LAYER mcon ;
-      RECT 3.365000 1.445000 3.535000 1.615000 ;
-      RECT 4.285000 0.765000 4.455000 0.935000 ;
-      RECT 4.745000 0.425000 4.915000 0.595000 ;
-      RECT 5.665000 0.765000 5.835000 0.935000 ;
-      RECT 5.665000 1.445000 5.835000 1.615000 ;
-      RECT 7.045000 0.765000 7.215000 0.935000 ;
-      RECT 7.505000 0.425000 7.675000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  1.445000 3.535000 1.615000 ;
+      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.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  0.425000 4.915000 0.595000 ;
+      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  0.765000 5.835000 0.935000 ;
+      RECT 5.665000  1.445000 5.835000 1.615000 ;
+      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  0.765000 7.215000 0.935000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  0.425000 7.675000 0.595000 ;
+      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 ;
     LAYER met1 ;
       RECT 3.305000 1.415000 3.595000 1.460000 ;
       RECT 3.305000 1.460000 5.895000 1.600000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
index 156296b..6bd9eab 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.magic.lef
@@ -78,35 +78,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.285000  0.085000 0.455000 0.735000 ;
-        RECT 1.125000  0.085000 1.295000 0.735000 ;
-        RECT 1.895000  0.085000 2.145000 0.525000 ;
-        RECT 4.855000  0.085000 5.025000 0.865000 ;
-        RECT 8.855000  0.085000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -116,107 +87,132 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.285000 1.490000 0.455000 2.635000 ;
-        RECT 1.125000 1.495000 1.295000 2.635000 ;
-        RECT 1.915000 2.215000 2.250000 2.635000 ;
-        RECT 4.605000 2.235000 4.935000 2.635000 ;
-        RECT 8.775000 2.275000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.880000 0.995000 2.085000 1.325000 ;
-      RECT 1.910000 0.695000 2.485000 0.865000 ;
-      RECT 1.910000 0.865000 2.085000 0.995000 ;
-      RECT 1.915000 1.325000 2.085000 1.875000 ;
-      RECT 1.915000 1.875000 2.600000 2.045000 ;
-      RECT 2.315000 0.255000 3.885000 0.425000 ;
-      RECT 2.315000 0.425000 2.485000 0.695000 ;
-      RECT 2.315000 1.535000 3.900000 1.705000 ;
-      RECT 2.430000 2.045000 2.600000 2.235000 ;
-      RECT 2.430000 2.235000 3.900000 2.405000 ;
-      RECT 2.655000 0.595000 2.825000 1.535000 ;
-      RECT 2.940000 1.895000 5.440000 2.065000 ;
-      RECT 3.125000 0.625000 4.345000 0.795000 ;
-      RECT 3.125000 0.795000 3.505000 0.905000 ;
-      RECT 3.450000 0.425000 3.885000 0.455000 ;
-      RECT 3.730000 0.995000 4.005000 1.325000 ;
-      RECT 3.730000 1.325000 3.900000 1.535000 ;
-      RECT 4.055000 0.285000 4.685000 0.455000 ;
-      RECT 4.070000 1.525000 4.455000 1.695000 ;
-      RECT 4.175000 0.795000 4.345000 1.375000 ;
-      RECT 4.175000 1.375000 4.455000 1.525000 ;
-      RECT 4.515000 0.455000 4.685000 1.035000 ;
-      RECT 4.515000 1.035000 4.795000 1.205000 ;
-      RECT 4.625000 1.205000 4.795000 1.895000 ;
-      RECT 5.025000 1.445000 5.445000 1.715000 ;
-      RECT 5.205000 0.415000 5.445000 1.445000 ;
-      RECT 5.270000 2.065000 5.440000 2.275000 ;
-      RECT 5.270000 2.275000 8.365000 2.445000 ;
-      RECT 5.625000 0.265000 6.035000 0.485000 ;
-      RECT 5.625000 0.485000 5.835000 0.595000 ;
-      RECT 5.625000 0.595000 5.795000 2.105000 ;
-      RECT 5.965000 0.720000 6.375000 0.825000 ;
-      RECT 5.965000 0.825000 6.175000 0.890000 ;
-      RECT 5.965000 0.890000 6.135000 2.275000 ;
-      RECT 6.005000 0.655000 6.375000 0.720000 ;
-      RECT 6.205000 0.320000 6.375000 0.655000 ;
-      RECT 6.315000 1.445000 7.095000 1.615000 ;
-      RECT 6.315000 1.615000 6.730000 2.045000 ;
-      RECT 6.330000 0.995000 6.755000 1.270000 ;
-      RECT 6.545000 0.630000 6.755000 0.995000 ;
-      RECT 6.925000 0.255000 8.070000 0.425000 ;
-      RECT 6.925000 0.425000 7.095000 1.445000 ;
-      RECT 7.265000 0.595000 7.435000 1.935000 ;
-      RECT 7.265000 1.935000 9.575000 2.105000 ;
-      RECT 7.605000 0.425000 8.070000 0.465000 ;
-      RECT 7.945000 0.730000 8.150000 0.945000 ;
-      RECT 7.945000 0.945000 8.255000 1.275000 ;
-      RECT 8.355000 1.495000 9.175000 1.705000 ;
-      RECT 8.395000 0.295000 8.685000 0.735000 ;
-      RECT 8.395000 0.735000 9.175000 0.750000 ;
-      RECT 8.435000 0.750000 9.175000 0.905000 ;
-      RECT 9.005000 0.905000 9.175000 0.995000 ;
-      RECT 9.005000 0.995000 9.235000 1.325000 ;
-      RECT 9.005000 1.325000 9.175000 1.495000 ;
-      RECT 9.090000 1.875000 9.575000 1.935000 ;
-      RECT 9.275000 0.255000 9.575000 0.585000 ;
-      RECT 9.280000 2.105000 9.575000 2.465000 ;
-      RECT 9.405000 0.585000 9.575000 1.875000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.285000  0.085000 0.455000 0.735000 ;
+      RECT 0.285000  1.490000 0.455000 2.635000 ;
+      RECT 1.125000  0.085000 1.295000 0.735000 ;
+      RECT 1.125000  1.495000 1.295000 2.635000 ;
+      RECT 1.880000  0.995000 2.085000 1.325000 ;
+      RECT 1.895000  0.085000 2.145000 0.525000 ;
+      RECT 1.910000  0.695000 2.485000 0.865000 ;
+      RECT 1.910000  0.865000 2.085000 0.995000 ;
+      RECT 1.915000  1.325000 2.085000 1.875000 ;
+      RECT 1.915000  1.875000 2.600000 2.045000 ;
+      RECT 1.915000  2.215000 2.250000 2.635000 ;
+      RECT 2.315000  0.255000 3.885000 0.425000 ;
+      RECT 2.315000  0.425000 2.485000 0.695000 ;
+      RECT 2.315000  1.535000 3.900000 1.705000 ;
+      RECT 2.430000  2.045000 2.600000 2.235000 ;
+      RECT 2.430000  2.235000 3.900000 2.405000 ;
+      RECT 2.655000  0.595000 2.825000 1.535000 ;
+      RECT 2.940000  1.895000 5.440000 2.065000 ;
+      RECT 3.125000  0.625000 4.345000 0.795000 ;
+      RECT 3.125000  0.795000 3.505000 0.905000 ;
+      RECT 3.450000  0.425000 3.885000 0.455000 ;
+      RECT 3.730000  0.995000 4.005000 1.325000 ;
+      RECT 3.730000  1.325000 3.900000 1.535000 ;
+      RECT 4.055000  0.285000 4.685000 0.455000 ;
+      RECT 4.070000  1.525000 4.455000 1.695000 ;
+      RECT 4.175000  0.795000 4.345000 1.375000 ;
+      RECT 4.175000  1.375000 4.455000 1.525000 ;
+      RECT 4.515000  0.455000 4.685000 1.035000 ;
+      RECT 4.515000  1.035000 4.795000 1.205000 ;
+      RECT 4.605000  2.235000 4.935000 2.635000 ;
+      RECT 4.625000  1.205000 4.795000 1.895000 ;
+      RECT 4.855000  0.085000 5.025000 0.865000 ;
+      RECT 5.025000  1.445000 5.445000 1.715000 ;
+      RECT 5.205000  0.415000 5.445000 1.445000 ;
+      RECT 5.270000  2.065000 5.440000 2.275000 ;
+      RECT 5.270000  2.275000 8.365000 2.445000 ;
+      RECT 5.625000  0.265000 6.035000 0.485000 ;
+      RECT 5.625000  0.485000 5.835000 0.595000 ;
+      RECT 5.625000  0.595000 5.795000 2.105000 ;
+      RECT 5.965000  0.720000 6.375000 0.825000 ;
+      RECT 5.965000  0.825000 6.175000 0.890000 ;
+      RECT 5.965000  0.890000 6.135000 2.275000 ;
+      RECT 6.005000  0.655000 6.375000 0.720000 ;
+      RECT 6.205000  0.320000 6.375000 0.655000 ;
+      RECT 6.315000  1.445000 7.095000 1.615000 ;
+      RECT 6.315000  1.615000 6.730000 2.045000 ;
+      RECT 6.330000  0.995000 6.755000 1.270000 ;
+      RECT 6.545000  0.630000 6.755000 0.995000 ;
+      RECT 6.925000  0.255000 8.070000 0.425000 ;
+      RECT 6.925000  0.425000 7.095000 1.445000 ;
+      RECT 7.265000  0.595000 7.435000 1.935000 ;
+      RECT 7.265000  1.935000 9.575000 2.105000 ;
+      RECT 7.605000  0.425000 8.070000 0.465000 ;
+      RECT 7.945000  0.730000 8.150000 0.945000 ;
+      RECT 7.945000  0.945000 8.255000 1.275000 ;
+      RECT 8.355000  1.495000 9.175000 1.705000 ;
+      RECT 8.395000  0.295000 8.685000 0.735000 ;
+      RECT 8.395000  0.735000 9.175000 0.750000 ;
+      RECT 8.435000  0.750000 9.175000 0.905000 ;
+      RECT 8.775000  2.275000 9.110000 2.635000 ;
+      RECT 8.855000  0.085000 9.025000 0.565000 ;
+      RECT 9.005000  0.905000 9.175000 0.995000 ;
+      RECT 9.005000  0.995000 9.235000 1.325000 ;
+      RECT 9.005000  1.325000 9.175000 1.495000 ;
+      RECT 9.090000  1.875000 9.575000 1.935000 ;
+      RECT 9.275000  0.255000 9.575000 0.585000 ;
+      RECT 9.280000  2.105000 9.575000 2.465000 ;
+      RECT 9.405000  0.585000 9.575000 1.875000 ;
     LAYER mcon ;
-      RECT 4.285000 1.445000 4.455000 1.615000 ;
-      RECT 5.205000 0.765000 5.375000 0.935000 ;
-      RECT 5.665000 0.425000 5.835000 0.595000 ;
-      RECT 6.585000 0.765000 6.755000 0.935000 ;
-      RECT 6.585000 1.445000 6.755000 1.615000 ;
-      RECT 7.965000 0.765000 8.135000 0.935000 ;
-      RECT 8.425000 0.425000 8.595000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  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  0.765000 5.375000 0.935000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  0.425000 5.835000 0.595000 ;
+      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  0.765000 6.755000 0.935000 ;
+      RECT 6.585000  1.445000 6.755000 1.615000 ;
+      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  0.765000 8.135000 0.935000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  0.425000 8.595000 0.595000 ;
+      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 4.225000 1.415000 4.515000 1.460000 ;
       RECT 4.225000 1.460000 6.815000 1.600000 ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
index b892784..18f6d24 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_1.magic.lef
@@ -68,19 +68,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.135000  0.085000 0.465000 0.475000 ;
-        RECT 0.975000  0.085000 1.305000 0.475000 ;
-        RECT 2.845000  0.085000 3.135000 0.920000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -90,31 +77,41 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.055000 1.785000 1.225000 2.635000 ;
-        RECT 1.895000 2.125000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.655000 2.335000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.785000 ;
-      RECT 0.085000 1.785000 0.465000 2.465000 ;
-      RECT 0.635000 0.335000 0.805000 0.655000 ;
-      RECT 1.395000 1.785000 2.635000 1.955000 ;
-      RECT 1.395000 1.955000 1.725000 2.465000 ;
-      RECT 2.105000 0.825000 2.335000 1.325000 ;
-      RECT 2.235000 1.955000 2.635000 2.465000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.655000 2.335000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.785000 ;
+      RECT 0.085000  1.785000 0.465000 2.465000 ;
+      RECT 0.135000  0.085000 0.465000 0.475000 ;
+      RECT 0.635000  0.335000 0.805000 0.655000 ;
+      RECT 0.975000  0.085000 1.305000 0.475000 ;
+      RECT 1.055000  1.785000 1.225000 2.635000 ;
+      RECT 1.395000  1.785000 2.635000 1.955000 ;
+      RECT 1.395000  1.955000 1.725000 2.465000 ;
+      RECT 1.895000  2.125000 2.065000 2.635000 ;
+      RECT 2.105000  0.825000 2.335000 1.325000 ;
+      RECT 2.235000  1.955000 2.635000 2.465000 ;
+      RECT 2.845000  0.085000 3.135000 0.920000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
 END sky130_fd_sc_hd__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
index 789b609..c6e8027 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_2.magic.lef
@@ -50,10 +50,16 @@
     PORT
       LAYER li1 ;
         RECT 1.045000 1.075000 1.540000 1.275000 ;
-        RECT 3.420000 1.075000 4.090000 1.275000 ;
       LAYER mcon ;
         RECT 1.065000 1.105000 1.235000 1.275000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.420000 1.075000 4.090000 1.275000 ;
+      LAYER mcon ;
         RECT 3.825000 1.105000 3.995000 1.275000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 1.005000 1.075000 1.295000 1.120000 ;
         RECT 1.005000 1.120000 4.055000 1.260000 ;
@@ -81,28 +87,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.190000  0.085000 0.360000 0.555000 ;
-        RECT 1.030000  0.085000 1.200000 0.555000 ;
-        RECT 1.870000  0.085000 2.040000 0.555000 ;
-        RECT 2.810000  0.085000 2.980000 0.555000 ;
-        RECT 4.645000  0.085000 4.815000 0.555000 ;
-        RECT 5.485000  0.085000 5.655000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -112,58 +96,77 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.570000 2.135000 0.820000 2.635000 ;
-        RECT 2.770000 2.135000 3.020000 2.635000 ;
-        RECT 3.610000 2.135000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 0.725000 1.700000 0.905000 ;
-      RECT 0.120000 0.905000 0.290000 1.785000 ;
-      RECT 0.120000 1.785000 2.220000 1.955000 ;
-      RECT 0.120000 2.135000 0.400000 2.465000 ;
-      RECT 0.145000 2.125000 0.315000 2.135000 ;
-      RECT 0.530000 0.255000 0.860000 0.725000 ;
-      RECT 0.990000 2.135000 1.240000 2.295000 ;
-      RECT 0.990000 2.295000 2.080000 2.465000 ;
-      RECT 1.065000 2.125000 1.235000 2.135000 ;
-      RECT 1.370000 0.255000 1.700000 0.725000 ;
-      RECT 1.410000 1.955000 1.660000 2.125000 ;
-      RECT 1.830000 2.135000 2.080000 2.295000 ;
-      RECT 2.050000 1.445000 4.785000 1.615000 ;
-      RECT 2.050000 1.615000 2.220000 1.785000 ;
-      RECT 2.285000 2.125000 2.600000 2.465000 ;
-      RECT 2.310000 0.255000 2.640000 0.725000 ;
-      RECT 2.310000 0.725000 3.400000 0.905000 ;
-      RECT 2.390000 1.785000 4.855000 1.955000 ;
-      RECT 2.390000 1.955000 2.600000 2.125000 ;
-      RECT 3.150000 0.255000 4.380000 0.475000 ;
-      RECT 3.150000 0.475000 3.400000 0.725000 ;
-      RECT 3.190000 1.955000 3.440000 2.465000 ;
-      RECT 4.085000 1.955000 4.855000 2.295000 ;
-      RECT 4.085000 2.295000 5.695000 2.465000 ;
-      RECT 4.615000 1.075000 5.275000 1.245000 ;
-      RECT 4.615000 1.245000 4.785000 1.445000 ;
-      RECT 5.445000 1.795000 5.695000 2.295000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.120000  0.725000 1.700000 0.905000 ;
+      RECT 0.120000  0.905000 0.290000 1.785000 ;
+      RECT 0.120000  1.785000 2.220000 1.955000 ;
+      RECT 0.120000  2.135000 0.400000 2.465000 ;
+      RECT 0.145000  2.125000 0.315000 2.135000 ;
+      RECT 0.190000  0.085000 0.360000 0.555000 ;
+      RECT 0.530000  0.255000 0.860000 0.725000 ;
+      RECT 0.570000  2.135000 0.820000 2.635000 ;
+      RECT 0.990000  2.135000 1.240000 2.295000 ;
+      RECT 0.990000  2.295000 2.080000 2.465000 ;
+      RECT 1.030000  0.085000 1.200000 0.555000 ;
+      RECT 1.065000  2.125000 1.235000 2.135000 ;
+      RECT 1.370000  0.255000 1.700000 0.725000 ;
+      RECT 1.410000  1.955000 1.660000 2.125000 ;
+      RECT 1.830000  2.135000 2.080000 2.295000 ;
+      RECT 1.870000  0.085000 2.040000 0.555000 ;
+      RECT 2.050000  1.445000 4.785000 1.615000 ;
+      RECT 2.050000  1.615000 2.220000 1.785000 ;
+      RECT 2.285000  2.125000 2.600000 2.465000 ;
+      RECT 2.310000  0.255000 2.640000 0.725000 ;
+      RECT 2.310000  0.725000 3.400000 0.905000 ;
+      RECT 2.390000  1.785000 4.855000 1.955000 ;
+      RECT 2.390000  1.955000 2.600000 2.125000 ;
+      RECT 2.770000  2.135000 3.020000 2.635000 ;
+      RECT 2.810000  0.085000 2.980000 0.555000 ;
+      RECT 3.150000  0.255000 4.380000 0.475000 ;
+      RECT 3.150000  0.475000 3.400000 0.725000 ;
+      RECT 3.190000  1.955000 3.440000 2.465000 ;
+      RECT 3.610000  2.135000 3.915000 2.635000 ;
+      RECT 4.085000  1.955000 4.855000 2.295000 ;
+      RECT 4.085000  2.295000 5.695000 2.465000 ;
+      RECT 4.615000  1.075000 5.275000 1.245000 ;
+      RECT 4.615000  1.245000 4.785000 1.445000 ;
+      RECT 4.645000  0.085000 4.815000 0.555000 ;
+      RECT 5.445000  1.795000 5.695000 2.295000 ;
+      RECT 5.485000  0.085000 5.655000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
     LAYER met1 ;
       RECT 0.085000 2.095000 0.375000 2.140000 ;
       RECT 0.085000 2.140000 1.295000 2.280000 ;
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
index b0b33a5..9b15a2f 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_4.magic.lef
@@ -59,8 +59,13 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 4.165000 0.645000  5.580000 0.905000 ;
-        RECT 5.150000 0.905000  5.580000 0.935000 ;
+        RECT 4.165000 0.645000 5.580000 0.905000 ;
+        RECT 5.150000 0.905000 5.580000 0.935000 ;
+      LAYER mcon ;
+        RECT 5.205000 0.765000 5.375000 0.935000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 7.850000 0.725000  8.630000 0.735000 ;
         RECT 7.850000 0.735000 10.035000 0.905000 ;
         RECT 7.850000 0.905000  8.305000 0.935000 ;
@@ -73,8 +78,9 @@
         RECT 9.600000 1.625000 10.035000 2.465000 ;
         RECT 9.735000 0.905000 10.035000 1.445000 ;
       LAYER mcon ;
-        RECT 5.205000 0.765000 5.375000 0.935000 ;
         RECT 7.965000 0.765000 8.135000 0.935000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 5.145000 0.735000 5.435000 0.780000 ;
         RECT 5.145000 0.780000 8.195000 0.920000 ;
@@ -88,41 +94,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.085000  0.085000  0.360000 0.565000 ;
-        RECT 1.030000  0.085000  1.200000 0.555000 ;
-        RECT 1.870000  0.085000  2.040000 0.555000 ;
-        RECT 2.710000  0.085000  2.880000 0.555000 ;
-        RECT 3.550000  0.085000  3.820000 0.895000 ;
-        RECT 6.170000  0.085000  6.340000 0.555000 ;
-        RECT 7.010000  0.085000  7.180000 0.555000 ;
-        RECT 7.960000  0.085000  8.130000 0.555000 ;
-        RECT 8.800000  0.085000  8.970000 0.555000 ;
-        RECT 9.640000  0.085000  9.810000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -132,84 +103,115 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.570000 2.175000  0.820000 2.635000 ;
-        RECT 1.410000 2.175000  1.660000 2.635000 ;
-        RECT 4.450000 2.175000  4.700000 2.635000 ;
-        RECT 5.290000 2.175000  5.540000 2.635000 ;
-        RECT 6.130000 2.175000  6.380000 2.635000 ;
-        RECT 6.970000 2.175000  7.220000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.735000 3.380000 0.905000 ;
-      RECT 0.085000 0.905000 0.255000 1.445000 ;
-      RECT 0.085000 1.445000 2.420000 1.615000 ;
-      RECT 0.085000 1.785000 2.080000 2.005000 ;
-      RECT 0.085000 2.005000 0.400000 2.465000 ;
-      RECT 0.530000 0.255000 0.860000 0.725000 ;
-      RECT 0.530000 0.725000 3.380000 0.735000 ;
-      RECT 0.990000 2.005000 1.240000 2.465000 ;
-      RECT 1.370000 0.255000 1.700000 0.725000 ;
-      RECT 1.830000 2.005000 2.080000 2.295000 ;
-      RECT 1.830000 2.295000 3.760000 2.465000 ;
-      RECT 2.210000 0.255000 2.540000 0.725000 ;
-      RECT 2.250000 1.615000 2.420000 1.785000 ;
-      RECT 2.250000 1.785000 3.340000 1.955000 ;
-      RECT 2.250000 1.955000 2.500000 2.125000 ;
-      RECT 2.670000 2.125000 2.920000 2.295000 ;
-      RECT 3.050000 0.255000 3.380000 0.725000 ;
-      RECT 3.090000 1.955000 3.340000 2.125000 ;
-      RECT 3.510000 1.795000 3.760000 2.295000 ;
-      RECT 3.990000 0.255000 6.000000 0.475000 ;
-      RECT 4.030000 1.785000 7.640000 2.005000 ;
-      RECT 4.030000 2.005000 4.280000 2.465000 ;
-      RECT 4.870000 2.005000 5.120000 2.465000 ;
-      RECT 5.710000 2.005000 5.960000 2.465000 ;
-      RECT 5.750000 0.475000 6.000000 0.725000 ;
-      RECT 5.750000 0.725000 7.680000 0.905000 ;
-      RECT 6.510000 0.255000 6.840000 0.725000 ;
-      RECT 6.550000 1.455000 6.800000 1.785000 ;
-      RECT 6.550000 2.005000 6.800000 2.465000 ;
-      RECT 7.260000 1.445000 7.710000 1.615000 ;
-      RECT 7.350000 0.255000 7.680000 0.725000 ;
-      RECT 7.390000 2.005000 7.640000 2.295000 ;
-      RECT 7.390000 2.295000 9.430000 2.465000 ;
-      RECT 7.540000 1.105000 9.565000 1.275000 ;
-      RECT 7.540000 1.275000 7.710000 1.445000 ;
-      RECT 8.340000 1.835000 8.590000 2.295000 ;
-      RECT 8.540000 1.075000 9.565000 1.105000 ;
-      RECT 9.180000 1.795000 9.430000 2.295000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.085000  0.085000  0.360000 0.565000 ;
+      RECT 0.085000  0.735000  3.380000 0.905000 ;
+      RECT 0.085000  0.905000  0.255000 1.445000 ;
+      RECT 0.085000  1.445000  2.420000 1.615000 ;
+      RECT 0.085000  1.785000  2.080000 2.005000 ;
+      RECT 0.085000  2.005000  0.400000 2.465000 ;
+      RECT 0.530000  0.255000  0.860000 0.725000 ;
+      RECT 0.530000  0.725000  3.380000 0.735000 ;
+      RECT 0.570000  2.175000  0.820000 2.635000 ;
+      RECT 0.990000  2.005000  1.240000 2.465000 ;
+      RECT 1.030000  0.085000  1.200000 0.555000 ;
+      RECT 1.370000  0.255000  1.700000 0.725000 ;
+      RECT 1.410000  2.175000  1.660000 2.635000 ;
+      RECT 1.830000  2.005000  2.080000 2.295000 ;
+      RECT 1.830000  2.295000  3.760000 2.465000 ;
+      RECT 1.870000  0.085000  2.040000 0.555000 ;
+      RECT 2.210000  0.255000  2.540000 0.725000 ;
+      RECT 2.250000  1.615000  2.420000 1.785000 ;
+      RECT 2.250000  1.785000  3.340000 1.955000 ;
+      RECT 2.250000  1.955000  2.500000 2.125000 ;
+      RECT 2.670000  2.125000  2.920000 2.295000 ;
+      RECT 2.710000  0.085000  2.880000 0.555000 ;
+      RECT 3.050000  0.255000  3.380000 0.725000 ;
+      RECT 3.090000  1.955000  3.340000 2.125000 ;
+      RECT 3.510000  1.795000  3.760000 2.295000 ;
+      RECT 3.550000  0.085000  3.820000 0.895000 ;
+      RECT 3.990000  0.255000  6.000000 0.475000 ;
+      RECT 4.030000  1.785000  7.640000 2.005000 ;
+      RECT 4.030000  2.005000  4.280000 2.465000 ;
+      RECT 4.450000  2.175000  4.700000 2.635000 ;
+      RECT 4.870000  2.005000  5.120000 2.465000 ;
+      RECT 5.290000  2.175000  5.540000 2.635000 ;
+      RECT 5.710000  2.005000  5.960000 2.465000 ;
+      RECT 5.750000  0.475000  6.000000 0.725000 ;
+      RECT 5.750000  0.725000  7.680000 0.905000 ;
+      RECT 6.130000  2.175000  6.380000 2.635000 ;
+      RECT 6.170000  0.085000  6.340000 0.555000 ;
+      RECT 6.510000  0.255000  6.840000 0.725000 ;
+      RECT 6.550000  1.455000  6.800000 1.785000 ;
+      RECT 6.550000  2.005000  6.800000 2.465000 ;
+      RECT 6.970000  2.175000  7.220000 2.635000 ;
+      RECT 7.010000  0.085000  7.180000 0.555000 ;
+      RECT 7.260000  1.445000  7.710000 1.615000 ;
+      RECT 7.350000  0.255000  7.680000 0.725000 ;
+      RECT 7.390000  2.005000  7.640000 2.295000 ;
+      RECT 7.390000  2.295000  9.430000 2.465000 ;
+      RECT 7.540000  1.105000  9.565000 1.275000 ;
+      RECT 7.540000  1.275000  7.710000 1.445000 ;
+      RECT 7.960000  0.085000  8.130000 0.555000 ;
+      RECT 8.340000  1.835000  8.590000 2.295000 ;
+      RECT 8.540000  1.075000  9.565000 1.105000 ;
+      RECT 8.800000  0.085000  8.970000 0.555000 ;
+      RECT 9.180000  1.795000  9.430000 2.295000 ;
+      RECT 9.640000  0.085000  9.810000 0.555000 ;
     LAYER mcon ;
-      RECT 1.985000 1.445000 2.155000 1.615000 ;
-      RECT 7.505000 1.445000 7.675000 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  1.445000 2.155000 1.615000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  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  1.445000 7.675000 1.615000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.925000 1.415000 2.215000 1.460000 ;
       RECT 1.925000 1.460000 7.735000 1.600000 ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
index 83328d4..2e3b3e7 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_1.magic.lef
@@ -74,31 +74,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.760000  0.085000 1.010000 0.525000 ;
-        RECT 3.930000  0.085000 4.100000 0.865000 ;
-        RECT 7.935000  0.085000 8.105000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -108,107 +83,128 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.780000 2.215000 1.115000 2.635000 ;
-        RECT 3.685000 2.235000 4.015000 2.635000 ;
-        RECT 7.855000 2.275000 8.190000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.750000 0.995000 0.950000 1.325000 ;
-      RECT 0.780000 0.695000 1.350000 0.865000 ;
-      RECT 0.780000 0.865000 0.950000 0.995000 ;
-      RECT 0.780000 1.325000 0.950000 1.875000 ;
-      RECT 0.780000 1.875000 1.470000 2.045000 ;
-      RECT 1.180000 0.255000 2.740000 0.425000 ;
-      RECT 1.180000 0.425000 1.350000 0.695000 ;
-      RECT 1.185000 1.535000 2.835000 1.705000 ;
-      RECT 1.300000 2.045000 1.470000 2.235000 ;
-      RECT 1.300000 2.235000 2.895000 2.405000 ;
-      RECT 1.520000 0.595000 1.690000 1.535000 ;
-      RECT 1.870000 1.895000 3.175000 2.065000 ;
-      RECT 1.970000 0.655000 3.080000 0.825000 ;
-      RECT 2.390000 0.425000 2.740000 0.455000 ;
-      RECT 2.665000 0.995000 2.940000 1.325000 ;
-      RECT 2.665000 1.325000 2.835000 1.535000 ;
-      RECT 2.910000 0.255000 3.760000 0.425000 ;
-      RECT 2.910000 0.425000 3.080000 0.655000 ;
-      RECT 3.005000 1.525000 3.535000 1.695000 ;
-      RECT 3.005000 1.695000 3.175000 1.895000 ;
-      RECT 3.110000 2.235000 3.515000 2.405000 ;
-      RECT 3.250000 0.595000 3.420000 1.375000 ;
-      RECT 3.250000 1.375000 3.535000 1.525000 ;
-      RECT 3.345000 1.895000 4.520000 2.065000 ;
-      RECT 3.345000 2.065000 3.515000 2.235000 ;
-      RECT 3.590000 0.425000 3.760000 1.035000 ;
-      RECT 3.590000 1.035000 3.875000 1.205000 ;
-      RECT 3.705000 1.205000 3.875000 1.895000 ;
-      RECT 4.105000 1.445000 4.520000 1.715000 ;
-      RECT 4.280000 0.415000 4.520000 1.445000 ;
-      RECT 4.350000 2.065000 4.520000 2.275000 ;
-      RECT 4.350000 2.275000 7.445000 2.445000 ;
-      RECT 4.695000 0.265000 5.110000 0.485000 ;
-      RECT 4.695000 0.485000 4.915000 0.595000 ;
-      RECT 4.695000 0.595000 4.865000 2.105000 ;
-      RECT 5.035000 0.720000 5.450000 0.825000 ;
-      RECT 5.035000 0.825000 5.255000 0.890000 ;
-      RECT 5.035000 0.890000 5.205000 2.275000 ;
-      RECT 5.085000 0.655000 5.450000 0.720000 ;
-      RECT 5.280000 0.320000 5.450000 0.655000 ;
-      RECT 5.395000 1.445000 6.175000 1.615000 ;
-      RECT 5.395000 1.615000 5.810000 2.045000 ;
-      RECT 5.410000 0.995000 5.835000 1.270000 ;
-      RECT 5.620000 0.630000 5.835000 0.995000 ;
-      RECT 6.005000 0.255000 7.150000 0.425000 ;
-      RECT 6.005000 0.425000 6.175000 1.445000 ;
-      RECT 6.345000 0.595000 6.515000 1.935000 ;
-      RECT 6.345000 1.935000 8.655000 2.105000 ;
-      RECT 6.685000 0.425000 7.150000 0.465000 ;
-      RECT 7.025000 0.730000 7.230000 0.945000 ;
-      RECT 7.025000 0.945000 7.335000 1.275000 ;
-      RECT 7.435000 1.495000 8.255000 1.705000 ;
-      RECT 7.475000 0.295000 7.765000 0.735000 ;
-      RECT 7.475000 0.735000 8.255000 0.750000 ;
-      RECT 7.515000 0.750000 8.255000 0.905000 ;
-      RECT 8.085000 0.905000 8.255000 0.995000 ;
-      RECT 8.085000 0.995000 8.315000 1.325000 ;
-      RECT 8.085000 1.325000 8.255000 1.495000 ;
-      RECT 8.170000 1.875000 8.655000 1.935000 ;
-      RECT 8.355000 0.255000 8.655000 0.585000 ;
-      RECT 8.360000 2.105000 8.655000 2.465000 ;
-      RECT 8.485000 0.585000 8.655000 1.875000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.750000  0.995000 0.950000 1.325000 ;
+      RECT 0.760000  0.085000 1.010000 0.525000 ;
+      RECT 0.780000  0.695000 1.350000 0.865000 ;
+      RECT 0.780000  0.865000 0.950000 0.995000 ;
+      RECT 0.780000  1.325000 0.950000 1.875000 ;
+      RECT 0.780000  1.875000 1.470000 2.045000 ;
+      RECT 0.780000  2.215000 1.115000 2.635000 ;
+      RECT 1.180000  0.255000 2.740000 0.425000 ;
+      RECT 1.180000  0.425000 1.350000 0.695000 ;
+      RECT 1.185000  1.535000 2.835000 1.705000 ;
+      RECT 1.300000  2.045000 1.470000 2.235000 ;
+      RECT 1.300000  2.235000 2.895000 2.405000 ;
+      RECT 1.520000  0.595000 1.690000 1.535000 ;
+      RECT 1.870000  1.895000 3.175000 2.065000 ;
+      RECT 1.970000  0.655000 3.080000 0.825000 ;
+      RECT 2.390000  0.425000 2.740000 0.455000 ;
+      RECT 2.665000  0.995000 2.940000 1.325000 ;
+      RECT 2.665000  1.325000 2.835000 1.535000 ;
+      RECT 2.910000  0.255000 3.760000 0.425000 ;
+      RECT 2.910000  0.425000 3.080000 0.655000 ;
+      RECT 3.005000  1.525000 3.535000 1.695000 ;
+      RECT 3.005000  1.695000 3.175000 1.895000 ;
+      RECT 3.110000  2.235000 3.515000 2.405000 ;
+      RECT 3.250000  0.595000 3.420000 1.375000 ;
+      RECT 3.250000  1.375000 3.535000 1.525000 ;
+      RECT 3.345000  1.895000 4.520000 2.065000 ;
+      RECT 3.345000  2.065000 3.515000 2.235000 ;
+      RECT 3.590000  0.425000 3.760000 1.035000 ;
+      RECT 3.590000  1.035000 3.875000 1.205000 ;
+      RECT 3.685000  2.235000 4.015000 2.635000 ;
+      RECT 3.705000  1.205000 3.875000 1.895000 ;
+      RECT 3.930000  0.085000 4.100000 0.865000 ;
+      RECT 4.105000  1.445000 4.520000 1.715000 ;
+      RECT 4.280000  0.415000 4.520000 1.445000 ;
+      RECT 4.350000  2.065000 4.520000 2.275000 ;
+      RECT 4.350000  2.275000 7.445000 2.445000 ;
+      RECT 4.695000  0.265000 5.110000 0.485000 ;
+      RECT 4.695000  0.485000 4.915000 0.595000 ;
+      RECT 4.695000  0.595000 4.865000 2.105000 ;
+      RECT 5.035000  0.720000 5.450000 0.825000 ;
+      RECT 5.035000  0.825000 5.255000 0.890000 ;
+      RECT 5.035000  0.890000 5.205000 2.275000 ;
+      RECT 5.085000  0.655000 5.450000 0.720000 ;
+      RECT 5.280000  0.320000 5.450000 0.655000 ;
+      RECT 5.395000  1.445000 6.175000 1.615000 ;
+      RECT 5.395000  1.615000 5.810000 2.045000 ;
+      RECT 5.410000  0.995000 5.835000 1.270000 ;
+      RECT 5.620000  0.630000 5.835000 0.995000 ;
+      RECT 6.005000  0.255000 7.150000 0.425000 ;
+      RECT 6.005000  0.425000 6.175000 1.445000 ;
+      RECT 6.345000  0.595000 6.515000 1.935000 ;
+      RECT 6.345000  1.935000 8.655000 2.105000 ;
+      RECT 6.685000  0.425000 7.150000 0.465000 ;
+      RECT 7.025000  0.730000 7.230000 0.945000 ;
+      RECT 7.025000  0.945000 7.335000 1.275000 ;
+      RECT 7.435000  1.495000 8.255000 1.705000 ;
+      RECT 7.475000  0.295000 7.765000 0.735000 ;
+      RECT 7.475000  0.735000 8.255000 0.750000 ;
+      RECT 7.515000  0.750000 8.255000 0.905000 ;
+      RECT 7.855000  2.275000 8.190000 2.635000 ;
+      RECT 7.935000  0.085000 8.105000 0.565000 ;
+      RECT 8.085000  0.905000 8.255000 0.995000 ;
+      RECT 8.085000  0.995000 8.315000 1.325000 ;
+      RECT 8.085000  1.325000 8.255000 1.495000 ;
+      RECT 8.170000  1.875000 8.655000 1.935000 ;
+      RECT 8.355000  0.255000 8.655000 0.585000 ;
+      RECT 8.360000  2.105000 8.655000 2.465000 ;
+      RECT 8.485000  0.585000 8.655000 1.875000 ;
     LAYER mcon ;
-      RECT 3.365000 1.445000 3.535000 1.615000 ;
-      RECT 4.285000 0.765000 4.455000 0.935000 ;
-      RECT 4.745000 0.425000 4.915000 0.595000 ;
-      RECT 5.665000 0.765000 5.835000 0.935000 ;
-      RECT 5.665000 1.445000 5.835000 1.615000 ;
-      RECT 7.045000 0.765000 7.215000 0.935000 ;
-      RECT 7.505000 0.425000 7.675000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  1.445000 3.535000 1.615000 ;
+      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.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  0.425000 4.915000 0.595000 ;
+      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  0.765000 5.835000 0.935000 ;
+      RECT 5.665000  1.445000 5.835000 1.615000 ;
+      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  0.765000 7.215000 0.935000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  0.425000 7.675000 0.595000 ;
+      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 ;
     LAYER met1 ;
       RECT 3.305000 1.415000 3.595000 1.460000 ;
       RECT 3.305000 1.460000 5.895000 1.600000 ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
index 590ec1f..eeb389f 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_2.magic.lef
@@ -76,33 +76,6 @@
     SHAPE ABUTMENT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.300000  0.085000 0.630000 0.465000 ;
-        RECT 1.220000  0.085000 1.470000 0.525000 ;
-        RECT 4.390000  0.085000 4.560000 0.865000 ;
-        RECT 8.395000  0.085000 8.565000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -112,109 +85,132 @@
     SHAPE ABUTMENT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.300000 2.215000 0.650000 2.635000 ;
-        RECT 1.240000 2.215000 1.575000 2.635000 ;
-        RECT 4.145000 2.235000 4.475000 2.635000 ;
-        RECT 8.315000 2.275000 8.650000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.210000 0.995000 1.410000 1.325000 ;
-      RECT 1.240000 0.695000 1.810000 0.865000 ;
-      RECT 1.240000 0.865000 1.410000 0.995000 ;
-      RECT 1.240000 1.325000 1.410000 1.875000 ;
-      RECT 1.240000 1.875000 1.930000 2.045000 ;
-      RECT 1.640000 0.255000 3.200000 0.425000 ;
-      RECT 1.640000 0.425000 1.810000 0.695000 ;
-      RECT 1.645000 1.535000 3.295000 1.705000 ;
-      RECT 1.760000 2.045000 1.930000 2.235000 ;
-      RECT 1.760000 2.235000 3.355000 2.405000 ;
-      RECT 1.980000 0.595000 2.150000 1.535000 ;
-      RECT 2.330000 1.895000 3.635000 2.065000 ;
-      RECT 2.430000 0.655000 3.540000 0.825000 ;
-      RECT 2.850000 0.425000 3.200000 0.455000 ;
-      RECT 3.125000 0.995000 3.400000 1.325000 ;
-      RECT 3.125000 1.325000 3.295000 1.535000 ;
-      RECT 3.370000 0.255000 4.220000 0.425000 ;
-      RECT 3.370000 0.425000 3.540000 0.655000 ;
-      RECT 3.465000 1.525000 3.995000 1.695000 ;
-      RECT 3.465000 1.695000 3.635000 1.895000 ;
-      RECT 3.570000 2.235000 3.975000 2.405000 ;
-      RECT 3.710000 0.595000 3.880000 1.375000 ;
-      RECT 3.710000 1.375000 3.995000 1.525000 ;
-      RECT 3.805000 1.895000 4.980000 2.065000 ;
-      RECT 3.805000 2.065000 3.975000 2.235000 ;
-      RECT 4.050000 0.425000 4.220000 1.035000 ;
-      RECT 4.050000 1.035000 4.335000 1.205000 ;
-      RECT 4.165000 1.205000 4.335000 1.895000 ;
-      RECT 4.565000 1.445000 4.980000 1.715000 ;
-      RECT 4.740000 0.415000 4.980000 1.445000 ;
-      RECT 4.810000 2.065000 4.980000 2.275000 ;
-      RECT 4.810000 2.275000 7.905000 2.445000 ;
-      RECT 5.155000 0.265000 5.570000 0.485000 ;
-      RECT 5.155000 0.485000 5.375000 0.595000 ;
-      RECT 5.155000 0.595000 5.325000 2.105000 ;
-      RECT 5.495000 0.720000 5.910000 0.825000 ;
-      RECT 5.495000 0.825000 5.715000 0.890000 ;
-      RECT 5.495000 0.890000 5.665000 2.275000 ;
-      RECT 5.545000 0.655000 5.910000 0.720000 ;
-      RECT 5.740000 0.320000 5.910000 0.655000 ;
-      RECT 5.855000 1.445000 6.635000 1.615000 ;
-      RECT 5.855000 1.615000 6.270000 2.045000 ;
-      RECT 5.870000 0.995000 6.295000 1.270000 ;
-      RECT 6.080000 0.630000 6.295000 0.995000 ;
-      RECT 6.465000 0.255000 7.610000 0.425000 ;
-      RECT 6.465000 0.425000 6.635000 1.445000 ;
-      RECT 6.805000 0.595000 6.975000 1.935000 ;
-      RECT 6.805000 1.935000 9.115000 2.105000 ;
-      RECT 7.145000 0.425000 7.610000 0.465000 ;
-      RECT 7.485000 0.730000 7.690000 0.945000 ;
-      RECT 7.485000 0.945000 7.795000 1.275000 ;
-      RECT 7.895000 1.495000 8.715000 1.705000 ;
-      RECT 7.935000 0.295000 8.225000 0.735000 ;
-      RECT 7.935000 0.735000 8.715000 0.750000 ;
-      RECT 7.975000 0.750000 8.715000 0.905000 ;
-      RECT 8.545000 0.905000 8.715000 0.995000 ;
-      RECT 8.545000 0.995000 8.775000 1.325000 ;
-      RECT 8.545000 1.325000 8.715000 1.495000 ;
-      RECT 8.630000 1.875000 9.115000 1.935000 ;
-      RECT 8.815000 0.255000 9.115000 0.585000 ;
-      RECT 8.820000 2.105000 9.115000 2.465000 ;
-      RECT 8.945000 0.585000 9.115000 1.875000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.300000  0.085000 0.630000 0.465000 ;
+      RECT 0.300000  2.215000 0.650000 2.635000 ;
+      RECT 1.210000  0.995000 1.410000 1.325000 ;
+      RECT 1.220000  0.085000 1.470000 0.525000 ;
+      RECT 1.240000  0.695000 1.810000 0.865000 ;
+      RECT 1.240000  0.865000 1.410000 0.995000 ;
+      RECT 1.240000  1.325000 1.410000 1.875000 ;
+      RECT 1.240000  1.875000 1.930000 2.045000 ;
+      RECT 1.240000  2.215000 1.575000 2.635000 ;
+      RECT 1.640000  0.255000 3.200000 0.425000 ;
+      RECT 1.640000  0.425000 1.810000 0.695000 ;
+      RECT 1.645000  1.535000 3.295000 1.705000 ;
+      RECT 1.760000  2.045000 1.930000 2.235000 ;
+      RECT 1.760000  2.235000 3.355000 2.405000 ;
+      RECT 1.980000  0.595000 2.150000 1.535000 ;
+      RECT 2.330000  1.895000 3.635000 2.065000 ;
+      RECT 2.430000  0.655000 3.540000 0.825000 ;
+      RECT 2.850000  0.425000 3.200000 0.455000 ;
+      RECT 3.125000  0.995000 3.400000 1.325000 ;
+      RECT 3.125000  1.325000 3.295000 1.535000 ;
+      RECT 3.370000  0.255000 4.220000 0.425000 ;
+      RECT 3.370000  0.425000 3.540000 0.655000 ;
+      RECT 3.465000  1.525000 3.995000 1.695000 ;
+      RECT 3.465000  1.695000 3.635000 1.895000 ;
+      RECT 3.570000  2.235000 3.975000 2.405000 ;
+      RECT 3.710000  0.595000 3.880000 1.375000 ;
+      RECT 3.710000  1.375000 3.995000 1.525000 ;
+      RECT 3.805000  1.895000 4.980000 2.065000 ;
+      RECT 3.805000  2.065000 3.975000 2.235000 ;
+      RECT 4.050000  0.425000 4.220000 1.035000 ;
+      RECT 4.050000  1.035000 4.335000 1.205000 ;
+      RECT 4.145000  2.235000 4.475000 2.635000 ;
+      RECT 4.165000  1.205000 4.335000 1.895000 ;
+      RECT 4.390000  0.085000 4.560000 0.865000 ;
+      RECT 4.565000  1.445000 4.980000 1.715000 ;
+      RECT 4.740000  0.415000 4.980000 1.445000 ;
+      RECT 4.810000  2.065000 4.980000 2.275000 ;
+      RECT 4.810000  2.275000 7.905000 2.445000 ;
+      RECT 5.155000  0.265000 5.570000 0.485000 ;
+      RECT 5.155000  0.485000 5.375000 0.595000 ;
+      RECT 5.155000  0.595000 5.325000 2.105000 ;
+      RECT 5.495000  0.720000 5.910000 0.825000 ;
+      RECT 5.495000  0.825000 5.715000 0.890000 ;
+      RECT 5.495000  0.890000 5.665000 2.275000 ;
+      RECT 5.545000  0.655000 5.910000 0.720000 ;
+      RECT 5.740000  0.320000 5.910000 0.655000 ;
+      RECT 5.855000  1.445000 6.635000 1.615000 ;
+      RECT 5.855000  1.615000 6.270000 2.045000 ;
+      RECT 5.870000  0.995000 6.295000 1.270000 ;
+      RECT 6.080000  0.630000 6.295000 0.995000 ;
+      RECT 6.465000  0.255000 7.610000 0.425000 ;
+      RECT 6.465000  0.425000 6.635000 1.445000 ;
+      RECT 6.805000  0.595000 6.975000 1.935000 ;
+      RECT 6.805000  1.935000 9.115000 2.105000 ;
+      RECT 7.145000  0.425000 7.610000 0.465000 ;
+      RECT 7.485000  0.730000 7.690000 0.945000 ;
+      RECT 7.485000  0.945000 7.795000 1.275000 ;
+      RECT 7.895000  1.495000 8.715000 1.705000 ;
+      RECT 7.935000  0.295000 8.225000 0.735000 ;
+      RECT 7.935000  0.735000 8.715000 0.750000 ;
+      RECT 7.975000  0.750000 8.715000 0.905000 ;
+      RECT 8.315000  2.275000 8.650000 2.635000 ;
+      RECT 8.395000  0.085000 8.565000 0.565000 ;
+      RECT 8.545000  0.905000 8.715000 0.995000 ;
+      RECT 8.545000  0.995000 8.775000 1.325000 ;
+      RECT 8.545000  1.325000 8.715000 1.495000 ;
+      RECT 8.630000  1.875000 9.115000 1.935000 ;
+      RECT 8.815000  0.255000 9.115000 0.585000 ;
+      RECT 8.820000  2.105000 9.115000 2.465000 ;
+      RECT 8.945000  0.585000 9.115000 1.875000 ;
     LAYER mcon ;
-      RECT 3.825000 1.445000 3.995000 1.615000 ;
-      RECT 4.745000 0.765000 4.915000 0.935000 ;
-      RECT 5.205000 0.425000 5.375000 0.595000 ;
-      RECT 6.125000 0.765000 6.295000 0.935000 ;
-      RECT 6.125000 1.445000 6.295000 1.615000 ;
-      RECT 7.505000 0.765000 7.675000 0.935000 ;
-      RECT 7.965000 0.425000 8.135000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  1.445000 3.995000 1.615000 ;
+      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  0.765000 4.915000 0.935000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  0.425000 5.375000 0.595000 ;
+      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  0.765000 6.295000 0.935000 ;
+      RECT 6.125000  1.445000 6.295000 1.615000 ;
+      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  0.765000 7.675000 0.935000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  0.425000 8.135000 0.595000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
     LAYER met1 ;
       RECT 3.765000 1.415000 4.055000 1.460000 ;
       RECT 3.765000 1.460000 6.355000 1.600000 ;
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
index e535f0d..ecb46d2 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_4.magic.lef
@@ -110,6 +110,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
@@ -149,6 +151,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