diff --git a/README.rst b/README.rst
index fc3757e..b9e528f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
 :lib:`sky130_fd_sc_hdll` - SKY130 High Density Low Leakage Digital Standard Cells (SkyWater Provided)
 =====================================================================================================
 
-Initial release of version (0, 1, 0).
+Initial release of version (0, 1, 1).
 
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_1.lef
index ea59fd3..cc49587 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.lef
@@ -64,22 +64,6 @@
         RECT 3.305000 0.995000 3.585000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.447300 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 0.090000 1.685000 0.355000 2.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
index 046014a..8fcb25f 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
@@ -70,12 +70,21 @@
         RECT 3.305000 0.995000 3.585000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.832000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.447250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 0.265000 0.425000 1.685000 ;
+        RECT 0.090000 1.685000 0.355000 2.455000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.655000  0.085000 1.400000 0.455000 ;
         RECT 2.700000  0.085000 3.080000 0.455000 ;
@@ -93,9 +102,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.755000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -114,16 +122,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.447250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.265000 0.425000 1.685000 ;
-        RECT 0.090000 1.685000 0.355000 2.455000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.605000 0.625000 3.535000 0.815000 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_2.lef
index 03f4087..106d99c 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.lef
@@ -64,22 +64,6 @@
         RECT 3.365000 1.045000 3.735000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.504500 ;
     DIRECTION OUTPUT ;
@@ -89,6 +73,22 @@
         RECT 0.605000 0.255000 0.835000 2.335000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
index bcaa46b..0fdbba3 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
@@ -70,12 +70,20 @@
         RECT 3.365000 1.045000 3.735000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.027000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.504500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.605000 0.255000 0.835000 2.335000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.090000  0.085000 0.385000 0.905000 ;
         RECT 1.005000  0.085000 1.770000 0.445000 ;
@@ -95,9 +103,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.940000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -118,15 +125,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.504500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.605000 0.255000 0.835000 2.335000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 1.100000 0.695000 3.935000 0.875000 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_4.lef
index 2999c41..24b3f57 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.lef
@@ -70,22 +70,6 @@
         RECT 3.275000 0.985000 4.045000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.071300 ;
     DIRECTION OUTPUT ;
@@ -102,6 +86,22 @@
         RECT 2.045000 0.255000 2.225000 0.615000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
index eb19589..43f6d38 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
@@ -76,12 +76,27 @@
         RECT 3.275000 0.985000 4.045000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.433250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.071250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.635000 2.225000 0.875000 ;
+        RECT 0.085000 0.875000 0.340000 1.495000 ;
+        RECT 0.085000 1.495000 1.790000 1.705000 ;
+        RECT 0.645000 1.705000 0.830000 2.465000 ;
+        RECT 1.085000 0.255000 1.275000 0.615000 ;
+        RECT 1.085000 0.615000 2.225000 0.635000 ;
+        RECT 1.600000 1.705000 1.790000 2.465000 ;
+        RECT 2.045000 0.255000 2.225000 0.615000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.360000 0.085000 ;
         RECT 0.485000  0.085000 0.865000 0.465000 ;
         RECT 1.445000  0.085000 1.825000 0.445000 ;
@@ -111,9 +126,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.550000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.360000 2.805000 ;
@@ -143,22 +157,6 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.071250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.635000 2.225000 0.875000 ;
-        RECT 0.085000 0.875000 0.340000 1.495000 ;
-        RECT 0.085000 1.495000 1.790000 1.705000 ;
-        RECT 0.645000 1.705000 0.830000 2.465000 ;
-        RECT 1.085000 0.255000 1.275000 0.615000 ;
-        RECT 1.085000 0.615000 2.225000 0.635000 ;
-        RECT 1.600000 1.705000 1.790000 2.465000 ;
-        RECT 2.045000 0.255000 2.225000 0.615000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.525000 1.045000 2.620000 1.325000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.lef
index 22cda83..6f35196 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.lef
@@ -65,22 +65,6 @@
         RECT 1.980000 0.995000 2.265000 1.615000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.870200 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 2.435000 0.815000 2.650000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
index 0fe6ce5..283b2f8 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
@@ -71,12 +71,24 @@
         RECT 1.980000 0.995000 2.265000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.438750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.870250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.155000 0.265000 1.340000 0.625000 ;
+        RECT 1.155000 0.625000 2.650000 0.815000 ;
+        RECT 1.965000 1.785000 2.650000 2.455000 ;
+        RECT 2.255000 0.265000 2.480000 0.625000 ;
+        RECT 2.435000 0.815000 2.650000 1.785000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.085000  0.085000 0.425000 0.595000 ;
         RECT 1.550000  0.085000 1.930000 0.455000 ;
@@ -92,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.305000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -110,19 +121,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.870250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.155000 0.265000 1.340000 0.625000 ;
-        RECT 1.155000 0.625000 2.650000 0.815000 ;
-        RECT 1.965000 1.785000 2.650000 2.455000 ;
-        RECT 2.255000 0.265000 2.480000 0.625000 ;
-        RECT 2.435000 0.815000 2.650000 1.785000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.125000 1.525000 1.330000 1.725000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.lef
index e417b2a..d701d04 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.lef
@@ -66,22 +66,6 @@
         RECT 0.100000 0.995000 0.405000 1.615000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.008500 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 0.575000 0.855000 0.895000 2.115000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
index 920324c..7b5eddf 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
@@ -72,12 +72,22 @@
         RECT 0.100000 0.995000 0.405000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.806000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.008500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.575000 0.255000 0.885000 0.655000 ;
+        RECT 0.575000 0.655000 3.395000 0.855000 ;
+        RECT 0.575000 0.855000 0.895000 2.115000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.145000  0.085000 0.395000 0.815000 ;
         RECT 1.055000  0.085000 1.435000 0.475000 ;
@@ -100,9 +110,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -125,17 +134,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.008500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.575000 0.255000 0.885000 0.655000 ;
-        RECT 0.575000 0.655000 3.395000 0.855000 ;
-        RECT 0.575000 0.855000 0.895000 2.115000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.145000 1.785000 0.405000 2.285000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.lef
index 4a9eea9..e705ddd 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.lef
@@ -71,22 +71,6 @@
         RECT 6.830000 1.275000 7.050000 1.695000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.985000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +91,22 @@
         RECT 7.905000 0.825000 8.160000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
index 444241e..2864013 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
@@ -85,12 +85,31 @@
         RECT 6.830000 1.275000 7.050000 1.695000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.404000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.985000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.925000 0.675000 3.680000 0.695000 ;
+        RECT 1.925000 0.695000 8.160000 0.825000 ;
+        RECT 1.925000 0.825000 7.055000 0.865000 ;
+        RECT 4.275000 0.255000 4.645000 0.615000 ;
+        RECT 4.275000 0.615000 5.595000 0.625000 ;
+        RECT 4.275000 0.625000 8.160000 0.695000 ;
+        RECT 5.425000 0.255000 5.595000 0.615000 ;
+        RECT 5.720000 1.865000 8.160000 2.085000 ;
+        RECT 6.365000 0.255000 6.535000 0.615000 ;
+        RECT 6.365000 0.615000 8.160000 0.625000 ;
+        RECT 7.680000 1.495000 8.160000 1.865000 ;
+        RECT 7.905000 0.825000 8.160000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.095000  0.085000 0.395000 0.585000 ;
         RECT 1.000000  0.085000 1.285000 0.525000 ;
@@ -123,9 +142,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -156,26 +174,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.985000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.925000 0.675000 3.680000 0.695000 ;
-        RECT 1.925000 0.695000 8.160000 0.825000 ;
-        RECT 1.925000 0.825000 7.055000 0.865000 ;
-        RECT 4.275000 0.255000 4.645000 0.615000 ;
-        RECT 4.275000 0.615000 5.595000 0.625000 ;
-        RECT 4.275000 0.625000 8.160000 0.695000 ;
-        RECT 5.425000 0.255000 5.595000 0.615000 ;
-        RECT 5.720000 1.865000 8.160000 2.085000 ;
-        RECT 6.365000 0.255000 6.535000 0.615000 ;
-        RECT 6.365000 0.615000 8.160000 0.625000 ;
-        RECT 7.680000 1.495000 8.160000 1.865000 ;
-        RECT 7.905000 0.825000 8.160000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 1.795000 4.105000 2.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.lef
index f2ec280..c425d22 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.lef
@@ -55,22 +55,6 @@
         RECT 0.105000 0.325000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.628800 ;
     DIRECTION OUTPUT ;
@@ -80,6 +64,22 @@
         RECT 3.715000 0.265000 3.995000 2.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
index ce1ff97..11b8109 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
@@ -61,12 +61,20 @@
         RECT 0.105000 0.325000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.907050 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.628750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.715000 0.265000 3.995000 2.455000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 1.045000  0.085000 1.290000 0.865000 ;
         RECT 2.620000  0.085000 3.350000 0.455000 ;
@@ -85,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.683400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -108,15 +115,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.628750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.715000 0.265000 3.995000 2.455000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.105000 1.845000 0.965000 2.045000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.lef
index 73a1ff3..e0f7d19 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.lef
@@ -55,22 +55,6 @@
         RECT 1.225000 0.995000 1.695000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.547000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 0.645000 2.005000 0.900000 2.425000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
index 2a6e0b2..00d647c 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
@@ -61,12 +61,24 @@
         RECT 1.225000 0.995000 1.695000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.788750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.547000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.110000 0.715000 0.900000 0.885000 ;
+        RECT 0.110000 0.885000 0.380000 1.835000 ;
+        RECT 0.110000 1.835000 0.900000 2.005000 ;
+        RECT 0.520000 0.315000 0.900000 0.715000 ;
+        RECT 0.645000 2.005000 0.900000 2.425000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.090000  0.085000 0.345000 0.545000 ;
         RECT 1.070000  0.085000 1.400000 0.785000 ;
@@ -87,9 +99,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.937200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -110,19 +121,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.547000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.110000 0.715000 0.900000 0.885000 ;
-        RECT 0.110000 0.885000 0.380000 1.835000 ;
-        RECT 0.110000 1.835000 0.900000 2.005000 ;
-        RECT 0.520000 0.315000 0.900000 0.715000 ;
-        RECT 0.645000 2.005000 0.900000 2.425000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.620000 1.075000 0.950000 1.495000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.lef
index f08d1fe..97228ea 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.lef
@@ -59,22 +59,6 @@
         RECT 0.470000 1.010000 0.850000 1.625000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.029000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +70,22 @@
         RECT 1.050000 1.595000 2.580000 1.765000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
index 07d7f93..1b6313a 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
@@ -65,12 +65,22 @@
         RECT 0.470000 1.010000 0.850000 1.625000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.423500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.029000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.050000 0.615000 2.510000 0.785000 ;
+        RECT 1.050000 0.785000 1.540000 1.595000 ;
+        RECT 1.050000 1.595000 2.580000 1.765000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.680000  0.085000 1.070000 0.445000 ;
         RECT 1.650000  0.085000 2.030000 0.445000 ;
@@ -97,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -127,17 +136,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.029000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.050000 0.615000 2.510000 0.785000 ;
-        RECT 1.050000 0.785000 1.540000 1.595000 ;
-        RECT 1.050000 1.595000 2.580000 1.765000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.105000 0.255000 0.510000 0.840000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.lef
index 7fec85f..4c82ae5 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.lef
@@ -55,22 +55,6 @@
         RECT 0.105000 0.975000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.676000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 1.440000 0.265000 1.780000 1.045000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
index 69758da..cffc1df 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
@@ -61,12 +61,22 @@
         RECT 0.105000 0.975000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.434500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.676000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.065000 1.045000 1.780000 1.345000 ;
+        RECT 1.065000 1.345000 1.525000 2.455000 ;
+        RECT 1.440000 0.265000 1.780000 1.045000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 1.025000  0.085000 1.255000 0.865000 ;
         RECT 2.715000  0.085000 3.075000 0.815000 ;
@@ -83,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.535500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -103,17 +112,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.676000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.065000 1.045000 1.780000 1.345000 ;
-        RECT 1.065000 1.345000 1.525000 2.455000 ;
-        RECT 1.440000 0.265000 1.780000 1.045000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 1.835000 0.855000 2.005000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.lef
index 75de0e5..f33a924 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.lef
@@ -58,22 +58,6 @@
         RECT 0.120000 0.765000 0.425000 1.805000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.712500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +70,22 @@
         RECT 2.980000 0.255000 3.360000 0.615000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
index eeedc2a..83142e9 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
@@ -64,12 +64,23 @@
         RECT 0.120000 0.765000 0.425000 1.805000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.884500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.712500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.525000 0.255000 1.870000 0.615000 ;
+        RECT 1.525000 0.615000 3.360000 0.785000 ;
+        RECT 1.525000 0.785000 1.865000 2.115000 ;
+        RECT 2.980000 0.255000 3.360000 0.615000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 1.085000  0.085000 1.325000 0.885000 ;
         RECT 2.140000  0.085000 2.470000 0.445000 ;
@@ -90,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.705500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -114,18 +124,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.712500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.525000 0.255000 1.870000 0.615000 ;
-        RECT 1.525000 0.615000 3.360000 0.785000 ;
-        RECT 1.525000 0.785000 1.865000 2.115000 ;
-        RECT 2.980000 0.255000 3.360000 0.615000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.265000 0.360000 0.825000 0.530000 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.lef
index e2f54ff..d6d900d 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.lef
@@ -58,22 +58,6 @@
         RECT 0.450000 0.995000 0.670000 1.075000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.490500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 3.555000 0.675000 5.385000 0.695000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
index 32c9961..a5ee51d 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
@@ -64,12 +64,28 @@
         RECT 0.450000 0.995000 0.670000 1.075000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.365000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.490500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.375000 0.370000 1.565000 0.615000 ;
+        RECT 1.375000 0.615000 2.525000 0.695000 ;
+        RECT 1.375000 0.695000 5.385000 0.865000 ;
+        RECT 1.680000 1.585000 3.130000 1.705000 ;
+        RECT 1.680000 1.705000 2.945000 2.035000 ;
+        RECT 2.335000 0.255000 2.525000 0.615000 ;
+        RECT 2.820000 0.865000 5.385000 0.895000 ;
+        RECT 2.820000 0.895000 3.130000 1.585000 ;
+        RECT 3.555000 0.675000 5.385000 0.695000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.360000 0.085000 ;
         RECT 0.770000  0.085000 1.155000 0.445000 ;
         RECT 1.785000  0.085000 2.165000 0.445000 ;
@@ -98,9 +114,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.465000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.360000 2.805000 ;
@@ -130,23 +145,6 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.490500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.375000 0.370000 1.565000 0.615000 ;
-        RECT 1.375000 0.615000 2.525000 0.695000 ;
-        RECT 1.375000 0.695000 5.385000 0.865000 ;
-        RECT 1.680000 1.585000 3.130000 1.705000 ;
-        RECT 1.680000 1.705000 2.945000 2.035000 ;
-        RECT 2.335000 0.255000 2.525000 0.615000 ;
-        RECT 2.820000 0.865000 5.385000 0.895000 ;
-        RECT 2.820000 0.895000 3.130000 1.585000 ;
-        RECT 3.555000 0.675000 5.385000 0.695000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.445000 0.615000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_1.lef
index 8af3e2d..b375ec0 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.lef
@@ -56,22 +56,6 @@
         RECT 1.065000 1.015000 1.610000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 0.095000 0.265000 0.355000 2.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
index 069d0d1..4dcf84f 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
@@ -62,12 +62,20 @@
         RECT 1.065000 1.015000 1.610000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.783250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 0.265000 0.355000 2.455000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.665000  0.085000 1.335000 0.455000 ;
         RECT 2.575000  0.085000 2.865000 0.815000 ;
@@ -84,9 +92,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -104,15 +111,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 0.265000 0.355000 2.455000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.545000 0.635000 1.815000 0.835000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_2.lef
index 63d286f..24c388e 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.lef
@@ -55,22 +55,6 @@
         RECT 1.865000 0.995000 2.240000 1.410000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.629500 ;
     DIRECTION OUTPUT ;
@@ -80,6 +64,22 @@
         RECT 0.545000 0.255000 0.825000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
index a1da1f9..6ad9ad8 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
@@ -61,12 +61,20 @@
         RECT 1.865000 0.995000 2.240000 1.410000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.854750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.629500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.545000 0.255000 0.825000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.175000  0.085000 0.345000 0.555000 ;
         RECT 1.275000  0.085000 1.655000 0.445000 ;
@@ -85,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.935000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -107,15 +114,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.629500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.545000 0.255000 0.825000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.995000 0.655000 2.240000 0.825000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_4.lef
index 27c50ce..bfb819c 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.lef
@@ -59,22 +59,6 @@
         RECT 2.500000 0.995000 2.905000 1.525000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.029000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 1.635000 1.755000 1.885000 2.185000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
index 61e5c21..548503e 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
@@ -65,12 +65,24 @@
         RECT 2.500000 0.995000 2.905000 1.525000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.365000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.029000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.145000 0.615000 1.885000 0.785000 ;
+        RECT 0.145000 0.785000 0.680000 1.585000 ;
+        RECT 0.145000 1.585000 1.885000 1.755000 ;
+        RECT 0.675000 1.755000 0.845000 2.185000 ;
+        RECT 1.635000 1.755000 1.885000 2.185000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.105000  0.085000 0.445000 0.445000 ;
         RECT 1.025000  0.085000 1.405000 0.445000 ;
@@ -96,9 +108,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -125,19 +136,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.029000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.145000 0.615000 1.885000 0.785000 ;
-        RECT 0.145000 0.785000 0.680000 1.585000 ;
-        RECT 0.145000 1.585000 1.885000 1.755000 ;
-        RECT 0.675000 1.755000 0.845000 2.185000 ;
-        RECT 1.635000 1.755000 1.885000 2.185000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.850000 0.995000 2.300000 1.325000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_6.lef
index be93ebb..782bcc9 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.lef
@@ -59,22 +59,6 @@
         RECT 2.865000 1.055000 3.195000 1.615000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.396500 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 5.815000 1.615000 6.085000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
index 0e1ac1e..000dae2 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
@@ -65,12 +65,28 @@
         RECT 2.865000 1.055000 3.195000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.690000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.396500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.905000 0.255000 4.235000 0.695000 ;
+        RECT 3.905000 0.695000 6.115000 0.865000 ;
+        RECT 3.935000 1.445000 6.085000 1.615000 ;
+        RECT 3.935000 1.615000 4.205000 2.465000 ;
+        RECT 4.845000 0.255000 5.175000 0.695000 ;
+        RECT 4.875000 1.615000 5.145000 2.465000 ;
+        RECT 5.625000 0.865000 5.875000 1.445000 ;
+        RECT 5.785000 0.255000 6.115000 0.695000 ;
+        RECT 5.815000 1.615000 6.085000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.205000  0.085000 0.535000 0.885000 ;
         RECT 1.945000  0.085000 2.275000 0.505000 ;
@@ -99,9 +115,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -131,23 +146,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.396500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.905000 0.255000 4.235000 0.695000 ;
-        RECT 3.905000 0.695000 6.115000 0.865000 ;
-        RECT 3.935000 1.445000 6.085000 1.615000 ;
-        RECT 3.935000 1.615000 4.205000 2.465000 ;
-        RECT 4.845000 0.255000 5.175000 0.695000 ;
-        RECT 4.875000 1.615000 5.145000 2.465000 ;
-        RECT 5.625000 0.865000 5.875000 1.445000 ;
-        RECT 5.785000 0.255000 6.115000 0.695000 ;
-        RECT 5.815000 1.615000 6.085000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.460000 0.355000 1.800000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_8.lef
index ae9f486..0a7bfa2 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.lef
@@ -59,22 +59,6 @@
         RECT 2.865000 1.055000 3.195000 1.615000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.862000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 6.755000 1.615000 7.025000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
index 2a9bcdb..65c6334 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
@@ -65,12 +65,30 @@
         RECT 2.865000 1.055000 3.195000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.930500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.862000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.905000 0.255000 4.235000 0.695000 ;
+        RECT 3.905000 0.695000 7.055000 0.865000 ;
+        RECT 3.935000 1.445000 7.025000 1.615000 ;
+        RECT 3.935000 1.615000 4.205000 2.465000 ;
+        RECT 4.845000 0.255000 5.175000 0.695000 ;
+        RECT 4.875000 1.615000 5.145000 2.465000 ;
+        RECT 5.785000 0.255000 6.115000 0.695000 ;
+        RECT 5.815000 1.615000 6.085000 2.465000 ;
+        RECT 6.545000 0.865000 6.795000 1.445000 ;
+        RECT 6.725000 0.255000 7.055000 0.695000 ;
+        RECT 6.755000 1.615000 7.025000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
         RECT 0.205000  0.085000 0.535000 0.885000 ;
         RECT 1.945000  0.085000 2.275000 0.505000 ;
@@ -102,9 +120,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
@@ -137,25 +154,6 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.862000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.905000 0.255000 4.235000 0.695000 ;
-        RECT 3.905000 0.695000 7.055000 0.865000 ;
-        RECT 3.935000 1.445000 7.025000 1.615000 ;
-        RECT 3.935000 1.615000 4.205000 2.465000 ;
-        RECT 4.845000 0.255000 5.175000 0.695000 ;
-        RECT 4.875000 1.615000 5.145000 2.465000 ;
-        RECT 5.785000 0.255000 6.115000 0.695000 ;
-        RECT 5.815000 1.615000 6.085000 2.465000 ;
-        RECT 6.545000 0.865000 6.795000 1.445000 ;
-        RECT 6.725000 0.255000 7.055000 0.695000 ;
-        RECT 6.755000 1.615000 7.025000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.460000 0.355000 1.800000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.lef
index 4ac0b48..3921041 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.lef
@@ -56,22 +56,6 @@
         RECT 0.095000 0.675000 0.335000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.489500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 0.660000 0.265000 0.885000 0.645000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
index cf2c855..e5e5496 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
@@ -62,12 +62,24 @@
         RECT 0.095000 0.675000 0.335000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.409500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.489500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 1.495000 0.730000 1.685000 ;
+        RECT 0.095000 1.685000 0.370000 2.455000 ;
+        RECT 0.505000 0.645000 0.885000 0.825000 ;
+        RECT 0.505000 0.825000 0.730000 1.495000 ;
+        RECT 0.660000 0.265000 0.885000 0.645000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.110000  0.085000 0.440000 0.475000 ;
         RECT 1.595000  0.085000 1.895000 0.815000 ;
@@ -82,9 +94,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.315000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -99,19 +110,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.489500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 1.495000 0.730000 1.685000 ;
-        RECT 0.095000 1.685000 0.370000 2.455000 ;
-        RECT 0.505000 0.645000 0.885000 0.825000 ;
-        RECT 0.505000 0.825000 0.730000 1.495000 ;
-        RECT 0.660000 0.265000 0.885000 0.645000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.540000 1.855000 1.895000 2.025000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.lef
index 971cd69..915903f 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.lef
@@ -57,22 +57,6 @@
         RECT 3.035000 0.995000 3.535000 1.625000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.745000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +70,22 @@
         RECT 2.545000 0.255000 2.865000 0.615000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
index cdd6215..b3b33e2 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
@@ -63,12 +63,24 @@
         RECT 3.035000 0.995000 3.535000 1.625000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.754000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.745000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.005000 0.255000 1.400000 0.615000 ;
+        RECT 1.005000 0.615000 2.865000 0.785000 ;
+        RECT 2.410000 0.785000 2.865000 1.330000 ;
+        RECT 2.515000 1.330000 2.865000 2.115000 ;
+        RECT 2.545000 0.255000 2.865000 0.615000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.100000  0.085000 0.395000 0.865000 ;
         RECT 1.910000  0.085000 2.290000 0.445000 ;
@@ -87,9 +99,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.590000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -108,19 +119,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.745000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.005000 0.255000 1.400000 0.615000 ;
-        RECT 1.005000 0.615000 2.865000 0.785000 ;
-        RECT 2.410000 0.785000 2.865000 1.330000 ;
-        RECT 2.515000 1.330000 2.865000 2.115000 ;
-        RECT 2.545000 0.255000 2.865000 0.615000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.110000 1.855000 2.345000 2.025000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.lef
index 10471f1..5ea73d0 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.lef
@@ -58,22 +58,6 @@
         RECT 0.090000 1.035000 1.580000 1.415000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.523000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 2.475000 0.675000 4.305000 0.695000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
index 8e5dd90..bd3800d 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
@@ -64,12 +64,28 @@
         RECT 0.090000 1.035000 1.580000 1.415000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.014000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.523000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.630000 1.585000 2.080000 1.705000 ;
+        RECT 0.630000 1.705000 1.895000 2.035000 ;
+        RECT 0.645000 0.370000 0.835000 0.615000 ;
+        RECT 0.645000 0.615000 1.795000 0.695000 ;
+        RECT 0.645000 0.695000 4.305000 0.865000 ;
+        RECT 1.605000 0.255000 1.795000 0.615000 ;
+        RECT 1.750000 0.865000 4.305000 0.895000 ;
+        RECT 1.750000 0.895000 2.080000 1.585000 ;
+        RECT 2.475000 0.675000 4.305000 0.695000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.805000 ;
         RECT 1.005000  0.085000 1.385000 0.445000 ;
@@ -96,9 +112,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.210000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -125,23 +140,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.523000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.630000 1.585000 2.080000 1.705000 ;
-        RECT 0.630000 1.705000 1.895000 2.035000 ;
-        RECT 0.645000 0.370000 0.835000 0.615000 ;
-        RECT 0.645000 0.615000 1.795000 0.695000 ;
-        RECT 0.645000 0.695000 4.305000 0.865000 ;
-        RECT 1.605000 0.255000 1.795000 0.615000 ;
-        RECT 1.750000 0.865000 4.305000 0.895000 ;
-        RECT 1.750000 0.895000 2.080000 1.585000 ;
-        RECT 2.475000 0.675000 4.305000 0.695000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.180000 1.795000 0.375000 2.215000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.lef
index 1e4cf62..a45d4b8 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.lef
@@ -75,22 +75,6 @@
         RECT 0.085000 1.075000 0.435000 1.285000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.874500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +94,22 @@
         RECT 3.255000 0.825000 3.535000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
index f6776d4..ac21e68 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
@@ -81,50 +81,6 @@
         RECT 0.085000 1.075000 0.435000 1.285000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.432250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.565000 ;
-        RECT 3.030000  0.085000 3.360000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    ANTENNADIFFAREA  0.560000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 2.025000 2.215000 2.355000 2.635000 ;
-        RECT 3.045000 1.875000 3.375000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.874500 ;
     DIRECTION OUTPUT ;
@@ -144,6 +100,48 @@
         RECT 3.255000 0.825000 3.535000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 3.680000 0.085000 ;
+        RECT 0.515000  0.085000 0.895000 0.565000 ;
+        RECT 3.030000  0.085000 3.360000 0.485000 ;
+      LAYER mcon ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+        RECT 0.605000 -0.085000 0.775000 0.085000 ;
+        RECT 1.065000 -0.085000 1.235000 0.085000 ;
+        RECT 1.525000 -0.085000 1.695000 0.085000 ;
+        RECT 1.985000 -0.085000 2.155000 0.085000 ;
+        RECT 2.445000 -0.085000 2.615000 0.085000 ;
+        RECT 2.905000 -0.085000 3.075000 0.085000 ;
+        RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 3.680000 2.805000 ;
+        RECT 2.025000 2.215000 2.355000 2.635000 ;
+        RECT 3.045000 1.875000 3.375000 2.635000 ;
+      LAYER mcon ;
+        RECT 0.145000 2.635000 0.315000 2.805000 ;
+        RECT 0.605000 2.635000 0.775000 2.805000 ;
+        RECT 1.065000 2.635000 1.235000 2.805000 ;
+        RECT 1.525000 2.635000 1.695000 2.805000 ;
+        RECT 1.985000 2.635000 2.155000 2.805000 ;
+        RECT 2.445000 2.635000 2.615000 2.805000 ;
+        RECT 2.905000 2.635000 3.075000 2.805000 ;
+        RECT 3.365000 2.635000 3.535000 2.805000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.515000 1.795000 0.815000 2.295000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.lef
index 9b14410..9538fe3 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.lef
@@ -78,22 +78,6 @@
         RECT 0.090000 1.075000 0.420000 1.615000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.979000 ;
     DIRECTION OUTPUT ;
@@ -108,6 +92,22 @@
         RECT 4.415000 0.645000 4.795000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
index 2bad8ab..34329e4 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
@@ -84,12 +84,25 @@
         RECT 0.090000 1.075000 0.420000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.183000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.979000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.525000 0.305000 0.905000 0.725000 ;
+        RECT 0.525000 0.725000 4.795000 0.865000 ;
+        RECT 0.605000 0.865000 4.795000 0.905000 ;
+        RECT 0.605000 0.905000 0.905000 2.125000 ;
+        RECT 2.435000 0.645000 2.835000 0.725000 ;
+        RECT 4.415000 0.645000 4.795000 0.725000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.105000  0.085000 0.355000 0.895000 ;
         RECT 1.125000  0.085000 1.815000 0.555000 ;
@@ -114,9 +127,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -140,20 +152,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.979000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.525000 0.305000 0.905000 0.725000 ;
-        RECT 0.525000 0.725000 4.795000 0.865000 ;
-        RECT 0.605000 0.865000 4.795000 0.905000 ;
-        RECT 0.605000 0.905000 0.905000 2.125000 ;
-        RECT 2.435000 0.645000 2.835000 0.725000 ;
-        RECT 4.415000 0.645000 4.795000 0.725000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 1.795000 0.435000 2.295000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.lef
index 0fe0079..d21b225 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.lef
@@ -79,22 +79,6 @@
         RECT 0.090000 1.075000 1.435000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.893000 ;
     DIRECTION OUTPUT ;
@@ -117,6 +101,22 @@
         RECT 6.960000 0.645000 8.585000 0.735000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
index f668b68..49ce6c2 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
@@ -85,12 +85,33 @@
         RECT 0.090000 1.075000 1.435000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.485250 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.893000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 1.855000 0.905000 ;
+        RECT 0.625000 1.445000 1.855000 1.615000 ;
+        RECT 0.625000 1.615000 0.875000 2.125000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 1.565000 1.615000 1.815000 2.125000 ;
+        RECT 1.655000 0.905000 1.855000 1.095000 ;
+        RECT 1.655000 1.095000 3.595000 1.275000 ;
+        RECT 1.655000 1.275000 1.855000 1.445000 ;
+        RECT 3.375000 0.645000 6.280000 0.735000 ;
+        RECT 3.375000 0.735000 8.585000 0.820000 ;
+        RECT 3.375000 0.820000 3.595000 1.095000 ;
+        RECT 6.110000 0.820000 7.130000 0.905000 ;
+        RECT 6.960000 0.645000 8.585000 0.735000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 10.580000 0.085000 ;
         RECT  0.115000  0.085000  0.365000 0.895000 ;
         RECT  1.135000  0.085000  1.305000 0.555000 ;
@@ -129,9 +150,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.580000 2.805000 ;
@@ -165,28 +185,6 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.893000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 1.855000 0.905000 ;
-        RECT 0.625000 1.445000 1.855000 1.615000 ;
-        RECT 0.625000 1.615000 0.875000 2.125000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 1.565000 1.615000 1.815000 2.125000 ;
-        RECT 1.655000 0.905000 1.855000 1.095000 ;
-        RECT 1.655000 1.095000 3.595000 1.275000 ;
-        RECT 1.655000 1.275000 1.855000 1.445000 ;
-        RECT 3.375000 0.645000 6.280000 0.735000 ;
-        RECT 3.375000 0.735000 8.585000 0.820000 ;
-        RECT 3.375000 0.820000 3.595000 1.095000 ;
-        RECT 6.110000 0.820000 7.130000 0.905000 ;
-        RECT 6.960000 0.645000 8.585000 0.735000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.090000 1.445000  0.405000 2.295000 ;
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.lef b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.lef
index 1fb2972..a593683 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.lef
@@ -82,22 +82,6 @@
         RECT 0.765000 1.000000 1.235000 1.315000 ;
     END
   END C2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.981600 ;
     DIRECTION OUTPUT ;
@@ -112,6 +96,22 @@
         RECT 2.410000 0.295000 2.975000 0.645000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
index b8473ff..7ab945b 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
@@ -88,12 +88,25 @@
         RECT 0.765000 1.000000 1.235000 1.315000 ;
     END
   END C2
-  PIN VGND
-    ANTENNADIFFAREA  0.928000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.981600 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 0.255000 0.425000 0.645000 ;
+        RECT 0.095000 0.645000 2.975000 0.815000 ;
+        RECT 0.095000 1.485000 1.655000 1.795000 ;
+        RECT 0.095000 1.795000 0.345000 2.295000 ;
+        RECT 1.405000 0.815000 1.655000 1.485000 ;
+        RECT 2.410000 0.295000 2.975000 0.645000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.925000  0.085000 1.705000 0.465000 ;
         RECT 3.555000  0.085000 3.965000 0.815000 ;
@@ -112,9 +125,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.350000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -133,20 +145,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.981600 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 0.255000 0.425000 0.645000 ;
-        RECT 0.095000 0.645000 2.975000 0.815000 ;
-        RECT 0.095000 1.485000 1.655000 1.795000 ;
-        RECT 0.095000 1.795000 0.345000 2.295000 ;
-        RECT 1.405000 0.815000 1.655000 1.485000 ;
-        RECT 2.410000 0.295000 2.975000 0.645000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.565000 2.055000 0.895000 2.295000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_1.lef
index 50a8a0d..3a3003d 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.lef
@@ -66,22 +66,6 @@
         RECT 0.085000 1.075000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.670000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.365000 0.585000 3.535000 1.785000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
index 260a573..3271c85 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
@@ -72,12 +72,22 @@
         RECT 0.085000 1.075000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.435500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.670000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.275000 0.255000 3.535000 0.585000 ;
+        RECT 3.275000 1.785000 3.535000 2.465000 ;
+        RECT 3.365000 0.585000 3.535000 1.785000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.090000  0.085000 0.595000 0.850000 ;
         RECT 2.585000  0.085000 2.915000 0.445000 ;
@@ -95,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.600000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -116,17 +125,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.670000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.275000 0.255000 3.535000 0.585000 ;
-        RECT 3.275000 1.785000 3.535000 2.465000 ;
-        RECT 3.365000 0.585000 3.535000 1.785000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.090000 1.495000 3.035000 1.715000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_2.lef
index 565f5d5..e3c1d5b 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.lef
@@ -66,22 +66,6 @@
         RECT 0.090000 1.075000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.240000 0.585000 3.560000 1.785000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
index 7cf2fad..3650012 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
@@ -72,12 +72,22 @@
         RECT 0.090000 1.075000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.695500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.150000 0.255000 3.560000 0.585000 ;
+        RECT 3.150000 1.785000 3.560000 2.465000 ;
+        RECT 3.240000 0.585000 3.560000 1.785000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.095000  0.085000 0.595000 0.850000 ;
         RECT 2.505000  0.085000 2.885000 0.565000 ;
@@ -97,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -120,17 +129,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.150000 0.255000 3.560000 0.585000 ;
-        RECT 3.150000 1.785000 3.560000 2.465000 ;
-        RECT 3.240000 0.585000 3.560000 1.785000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.455000 3.015000 1.625000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_4.lef
index dc2838c..1282c71 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.lef
@@ -69,22 +69,6 @@
         RECT 4.200000 1.075000 4.580000 1.445000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -100,6 +84,22 @@
         RECT 1.630000 1.615000 1.880000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
index 2c6f98e..f6db0e4 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
@@ -75,12 +75,26 @@
         RECT 4.200000 1.075000 4.580000 1.445000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.397500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.725000 1.920000 0.905000 ;
+        RECT 0.085000 0.905000 0.370000 1.445000 ;
+        RECT 0.085000 1.445000 1.880000 1.615000 ;
+        RECT 0.600000 0.265000 0.980000 0.725000 ;
+        RECT 0.690000 1.615000 0.940000 2.465000 ;
+        RECT 1.540000 0.255000 1.920000 0.725000 ;
+        RECT 1.630000 1.615000 1.880000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.260000  0.085000 0.430000 0.555000 ;
         RECT 1.200000  0.085000 1.370000 0.555000 ;
@@ -108,9 +122,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -139,21 +152,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.725000 1.920000 0.905000 ;
-        RECT 0.085000 0.905000 0.370000 1.445000 ;
-        RECT 0.085000 1.445000 1.880000 1.615000 ;
-        RECT 0.600000 0.265000 0.980000 0.725000 ;
-        RECT 0.690000 1.615000 0.940000 2.465000 ;
-        RECT 1.540000 0.255000 1.920000 0.725000 ;
-        RECT 1.630000 1.615000 1.880000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.540000 1.075000 2.430000 1.275000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.lef
index f32be09..49cad44 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.lef
@@ -66,22 +66,6 @@
         RECT 0.125000 0.765000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.917000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +82,22 @@
         RECT 2.795000 0.825000 3.135000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
index 8ddb0e4..fe0448b 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
@@ -72,12 +72,27 @@
         RECT 0.125000 0.765000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.429000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.917000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 1.445000 3.135000 1.615000 ;
+        RECT 0.095000 1.615000 0.425000 2.295000 ;
+        RECT 0.095000 2.295000 1.375000 2.465000 ;
+        RECT 0.870000 0.255000 2.275000 0.505000 ;
+        RECT 1.035000 2.195000 1.375000 2.295000 ;
+        RECT 2.095000 0.505000 2.275000 0.655000 ;
+        RECT 2.095000 0.655000 3.135000 0.825000 ;
+        RECT 2.795000 0.825000 3.135000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.095000  0.085000 0.595000 0.595000 ;
         RECT 2.505000  0.085000 2.835000 0.485000 ;
@@ -94,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -114,22 +128,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.917000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 1.445000 3.135000 1.615000 ;
-        RECT 0.095000 1.615000 0.425000 2.295000 ;
-        RECT 0.095000 2.295000 1.375000 2.465000 ;
-        RECT 0.870000 0.255000 2.275000 0.505000 ;
-        RECT 1.035000 2.195000 1.375000 2.295000 ;
-        RECT 2.095000 0.505000 2.275000 0.655000 ;
-        RECT 2.095000 0.655000 3.135000 0.825000 ;
-        RECT 2.795000 0.825000 3.135000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.645000 1.785000 2.275000 1.980000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.lef
index d8d9ef3..2841982 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.lef
@@ -64,30 +64,6 @@
         RECT 0.150000 1.075000 0.830000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.510000 ;
-        RECT 3.980000  0.085000 4.360000 0.510000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 3.045000 1.825000 3.215000 2.635000 ;
-        RECT 4.085000 1.825000 4.255000 2.635000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.278500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +78,30 @@
         RECT 1.930000 0.845000 2.360000 1.485000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 5.060000 0.085000 ;
+        RECT 0.515000  0.085000 0.895000 0.510000 ;
+        RECT 3.980000  0.085000 4.360000 0.510000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 5.060000 2.805000 ;
+        RECT 3.045000 1.825000 3.215000 2.635000 ;
+        RECT 4.085000 1.825000 4.255000 2.635000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 0.345000 0.680000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
index b1f4383..b049d77 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
@@ -70,12 +70,25 @@
         RECT 0.150000 1.075000 0.830000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.448500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.278500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 1.485000 2.360000 1.655000 ;
+        RECT 0.095000 1.655000 0.345000 2.465000 ;
+        RECT 0.985000 1.655000 1.365000 2.125000 ;
+        RECT 1.455000 0.675000 3.295000 0.845000 ;
+        RECT 1.925000 1.655000 2.360000 2.125000 ;
+        RECT 1.930000 0.845000 2.360000 1.485000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.510000 ;
         RECT 3.980000  0.085000 4.360000 0.510000 ;
@@ -96,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -120,20 +132,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.278500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 1.485000 2.360000 1.655000 ;
-        RECT 0.095000 1.655000 0.345000 2.465000 ;
-        RECT 0.985000 1.655000 1.365000 2.125000 ;
-        RECT 1.455000 0.675000 3.295000 0.845000 ;
-        RECT 1.925000 1.655000 2.360000 2.125000 ;
-        RECT 1.930000 0.845000 2.360000 1.485000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 0.345000 0.680000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.lef
index 2fbe3b6..dfce331 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.lef
@@ -64,22 +64,6 @@
         RECT 0.090000 1.075000 2.095000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 3.425000 1.625000 3.675000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
index 475b963..9e24aca 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
@@ -70,12 +70,26 @@
         RECT 0.090000 1.075000 2.095000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.897000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.645000 1.445000 3.675000 1.625000 ;
+        RECT 0.645000 1.625000 0.855000 2.125000 ;
+        RECT 1.545000 1.625000 1.795000 2.125000 ;
+        RECT 2.395000 0.645000 6.115000 0.885000 ;
+        RECT 2.395000 0.885000 2.695000 1.445000 ;
+        RECT 2.485000 1.625000 2.735000 2.125000 ;
+        RECT 3.425000 1.625000 3.675000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.740000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.555000 ;
         RECT 1.585000  0.085000 1.755000 0.555000 ;
@@ -106,9 +120,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.740000 2.805000 ;
@@ -140,21 +153,6 @@
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.645000 1.445000 3.675000 1.625000 ;
-        RECT 0.645000 1.625000 0.855000 2.125000 ;
-        RECT 1.545000 1.625000 1.795000 2.125000 ;
-        RECT 2.395000 0.645000 6.115000 0.885000 ;
-        RECT 2.395000 0.885000 2.695000 1.445000 ;
-        RECT 2.485000 1.625000 2.735000 2.125000 ;
-        RECT 3.425000 1.625000 3.675000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 0.425000 2.295000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.lef
index ecae9cf..8d8edb4 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.lef
@@ -64,9 +64,18 @@
         RECT 2.895000 1.040000 3.155000 1.655000 ;
     END
   END B2
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER li1 ;
+        RECT 0.085000 0.255000 0.345000 2.465000 ;
+    END
+  END X
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
@@ -79,7 +88,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -89,15 +98,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.345000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.995000 0.685000 1.805000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
index fed67b7..50d88fe 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
@@ -70,12 +70,20 @@
         RECT 2.895000 1.040000 3.155000 1.655000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.774600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.255000 0.345000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.515000  0.085000 0.995000 0.530000 ;
         RECT 1.670000  0.085000 2.390000 0.485000 ;
@@ -95,9 +103,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.467400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -117,15 +124,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.345000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.995000 0.685000 1.805000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.lef
index 5225d07..c00642b 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.lef
@@ -64,9 +64,20 @@
         RECT 3.300000 1.050000 3.760000 1.655000 ;
     END
   END B2
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER li1 ;
+        RECT 0.525000 0.255000 0.830000 0.810000 ;
+        RECT 0.525000 0.810000 0.745000 1.525000 ;
+        RECT 0.525000 1.525000 0.830000 2.465000 ;
+    END
+  END X
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
@@ -80,7 +91,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -91,17 +102,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.525000 0.255000 0.830000 0.810000 ;
-        RECT 0.525000 0.810000 0.745000 1.525000 ;
-        RECT 0.525000 1.525000 0.830000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.915000 0.995000 1.220000 1.325000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
index dddb377..e3fdb9c 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
@@ -70,12 +70,22 @@
         RECT 3.300000 1.050000 3.760000 1.655000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.900650 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.525000 0.255000 0.830000 0.810000 ;
+        RECT 0.525000 0.810000 0.745000 1.525000 ;
+        RECT 0.525000 1.525000 0.830000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.185000  0.085000 0.355000 0.930000 ;
         RECT 1.000000  0.085000 1.480000 0.530000 ;
@@ -97,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.849000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -121,17 +130,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.525000 0.255000 0.830000 0.810000 ;
-        RECT 0.525000 0.810000 0.745000 1.525000 ;
-        RECT 0.525000 1.525000 0.830000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.915000 0.995000 1.220000 1.325000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.lef
index d7de72e..f71c4ee 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.lef
@@ -70,22 +70,6 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -103,6 +87,22 @@
         RECT 7.310000 0.905000 7.675000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
index dd1d384..fc11c65 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
@@ -76,12 +76,28 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.716000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 5.735000 0.275000 6.115000 0.725000 ;
+        RECT 5.735000 0.725000 7.675000 0.905000 ;
+        RECT 5.825000 1.785000 7.015000 1.955000 ;
+        RECT 5.825000 1.955000 6.075000 2.465000 ;
+        RECT 6.675000 0.275000 7.055000 0.725000 ;
+        RECT 6.765000 1.415000 7.675000 1.655000 ;
+        RECT 6.765000 1.655000 7.015000 1.785000 ;
+        RECT 6.765000 1.955000 7.015000 2.465000 ;
+        RECT 7.310000 0.905000 7.675000 1.415000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
         RECT 0.175000  0.085000 0.345000 0.895000 ;
         RECT 2.055000  0.085000 2.225000 0.555000 ;
@@ -113,9 +129,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
@@ -147,23 +162,6 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 5.735000 0.275000 6.115000 0.725000 ;
-        RECT 5.735000 0.725000 7.675000 0.905000 ;
-        RECT 5.825000 1.785000 7.015000 1.955000 ;
-        RECT 5.825000 1.955000 6.075000 2.465000 ;
-        RECT 6.675000 0.275000 7.055000 0.725000 ;
-        RECT 6.765000 1.415000 7.675000 1.655000 ;
-        RECT 6.765000 1.655000 7.015000 1.785000 ;
-        RECT 6.765000 1.955000 7.015000 2.465000 ;
-        RECT 7.310000 0.905000 7.675000 1.415000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.135000 1.785000 2.265000 1.955000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.lef
index d618f5f..05524cc 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.lef
@@ -65,31 +65,6 @@
         RECT 2.445000 0.425000 2.615000 0.995000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.825000 ;
-        RECT 1.045000  0.085000 1.715000 0.490000 ;
-        RECT 3.005000  0.085000 3.385000 0.825000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.095000 1.805000 0.425000 2.635000 ;
-        RECT 2.665000 2.135000 2.915000 2.635000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.530000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +77,31 @@
         RECT 1.985000 0.825000 2.155000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 3.680000 0.085000 ;
+        RECT 0.095000  0.085000 0.425000 0.825000 ;
+        RECT 1.045000  0.085000 1.715000 0.490000 ;
+        RECT 3.005000  0.085000 3.385000 0.825000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 3.680000 2.805000 ;
+        RECT 0.095000 1.805000 0.425000 2.635000 ;
+        RECT 2.665000 2.135000 2.915000 2.635000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.645000 0.255000 0.815000 0.660000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
index 2db661c..2cbab16 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
@@ -71,12 +71,23 @@
         RECT 2.445000 0.425000 2.615000 0.995000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.942500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.530000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.520000 1.785000 2.155000 1.955000 ;
+        RECT 1.520000 1.955000 1.885000 2.465000 ;
+        RECT 1.985000 0.255000 2.275000 0.825000 ;
+        RECT 1.985000 0.825000 2.155000 1.785000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.825000 ;
         RECT 1.045000  0.085000 1.715000 0.490000 ;
@@ -95,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -116,18 +126,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.530000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.520000 1.785000 2.155000 1.955000 ;
-        RECT 1.520000 1.955000 1.885000 2.465000 ;
-        RECT 1.985000 0.255000 2.275000 0.825000 ;
-        RECT 1.985000 0.825000 2.155000 1.785000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.645000 0.255000 0.815000 0.660000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.lef
index 70bb51b..2830ac9 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.lef
@@ -66,22 +66,6 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.738500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 2.445000 0.905000 2.775000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
index 12fb7b3..248cd2b 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
@@ -72,12 +72,23 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.280500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.738500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.985000 0.645000 1.365000 0.725000 ;
+        RECT 0.985000 0.725000 2.775000 0.905000 ;
+        RECT 2.395000 0.255000 2.775000 0.725000 ;
+        RECT 2.445000 0.905000 2.775000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.175000  0.085000 0.345000 0.895000 ;
         RECT 2.055000  0.085000 2.225000 0.555000 ;
@@ -103,9 +114,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -130,18 +140,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.738500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.985000 0.645000 1.365000 0.725000 ;
-        RECT 0.985000 0.725000 2.775000 0.905000 ;
-        RECT 2.395000 0.255000 2.775000 0.725000 ;
-        RECT 2.445000 0.905000 2.775000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.135000 1.785000 2.265000 1.955000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.lef
index c282075..7096285 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.lef
@@ -67,22 +67,6 @@
         RECT 1.875000 1.075000 3.425000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.477000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 5.245000 1.615000 5.515000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
index 7119ddb..79533a0 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
@@ -73,12 +73,27 @@
         RECT 1.875000 1.075000 3.425000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  2.067000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.477000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.925000 0.645000 3.295000 0.725000 ;
+        RECT 1.925000 0.725000 5.595000 0.905000 ;
+        RECT 4.145000 0.905000 4.365000 1.415000 ;
+        RECT 4.145000 1.415000 5.515000 1.615000 ;
+        RECT 4.275000 0.275000 4.655000 0.725000 ;
+        RECT 4.365000 1.615000 4.615000 2.125000 ;
+        RECT 5.215000 0.275000 5.595000 0.725000 ;
+        RECT 5.245000 1.615000 5.515000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 10.580000 0.085000 ;
         RECT  0.175000  0.085000  0.345000 0.895000 ;
         RECT  1.115000  0.085000  1.285000 0.555000 ;
@@ -118,9 +133,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.580000 2.805000 ;
@@ -158,22 +172,6 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.477000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.925000 0.645000 3.295000 0.725000 ;
-        RECT 1.925000 0.725000 5.595000 0.905000 ;
-        RECT 4.145000 0.905000 4.365000 1.415000 ;
-        RECT 4.145000 1.415000 5.515000 1.615000 ;
-        RECT 4.275000 0.275000 4.655000 0.725000 ;
-        RECT 4.365000 1.615000 4.615000 2.125000 ;
-        RECT 5.215000 0.275000 5.595000 0.725000 ;
-        RECT 5.245000 1.615000 5.515000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.085000 1.455000  1.315000 1.625000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_1.lef
index c9c2daf..bf9ef9e 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.lef
@@ -65,22 +65,6 @@
         RECT 2.445000 0.995000 2.745000 1.655000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.447300 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 0.095000 1.575000 0.425000 2.425000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
index 35bf8d4..4f503dd 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
@@ -71,12 +71,22 @@
         RECT 2.445000 0.995000 2.745000 1.655000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.490750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.447250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 0.300000 0.425000 0.810000 ;
+        RECT 0.095000 0.810000 0.285000 1.575000 ;
+        RECT 0.095000 1.575000 0.425000 2.425000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.605000  0.085000 0.935000 0.485000 ;
         RECT 2.725000  0.085000 3.055000 0.485000 ;
@@ -93,9 +103,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.705000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -113,17 +122,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.447250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 0.300000 0.425000 0.810000 ;
-        RECT 0.095000 0.810000 0.285000 1.575000 ;
-        RECT 0.095000 1.575000 0.425000 2.425000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.455000 0.995000 0.815000 1.325000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_2.lef
index eef1fe1..0f1c869 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.lef
@@ -65,22 +65,6 @@
         RECT 3.195000 0.755000 3.535000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 0.645000 2.005000 0.815000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
index a712f97..f955834 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
@@ -71,12 +71,24 @@
         RECT 3.195000 0.755000 3.535000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.546000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.530500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 0.715000 0.815000 0.885000 ;
+        RECT 0.090000 0.885000 0.345000 1.835000 ;
+        RECT 0.090000 1.835000 0.815000 2.005000 ;
+        RECT 0.645000 0.255000 0.815000 0.715000 ;
+        RECT 0.645000 2.005000 0.815000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.465000 ;
         RECT 1.005000  0.085000 1.385000 0.465000 ;
@@ -95,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.910000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -117,19 +128,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.530500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.715000 0.815000 0.885000 ;
-        RECT 0.090000 0.885000 0.345000 1.835000 ;
-        RECT 0.090000 1.835000 0.815000 2.005000 ;
-        RECT 0.645000 0.255000 0.815000 0.715000 ;
-        RECT 0.645000 2.005000 0.815000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 1.075000 0.845000 1.245000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_4.lef
index 8d469c4..594f92d 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.lef
@@ -70,22 +70,6 @@
         RECT 4.215000 0.745000 4.455000 1.075000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 6.585000 0.825000 6.780000 1.785000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
index 742f758..7dab22e 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
@@ -76,12 +76,24 @@
         RECT 4.215000 0.745000 4.455000 1.075000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.404000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.905000 0.655000 6.780000 0.825000 ;
+        RECT 4.935000 1.785000 6.780000 1.955000 ;
+        RECT 5.045000 1.955000 5.215000 2.465000 ;
+        RECT 5.985000 1.955000 6.155000 2.465000 ;
+        RECT 6.585000 0.825000 6.780000 1.785000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.175000  0.085000 0.345000 0.905000 ;
         RECT 2.950000  0.085000 3.285000 0.530000 ;
@@ -109,9 +121,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -141,19 +152,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.905000 0.655000 6.780000 0.825000 ;
-        RECT 4.935000 1.785000 6.780000 1.955000 ;
-        RECT 5.045000 1.955000 5.215000 2.465000 ;
-        RECT 5.985000 1.955000 6.155000 2.465000 ;
-        RECT 6.585000 0.825000 6.780000 1.785000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 1.785000 3.285000 1.955000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.lef
index 7589e78..1ace5ea 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.lef
@@ -65,22 +65,6 @@
         RECT 2.325000 0.995000 2.650000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.523800 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 1.985000 1.495000 2.410000 2.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
index a4b055d..041b940 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
@@ -71,12 +71,22 @@
         RECT 2.325000 0.995000 2.650000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.520000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.523750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.480000 0.295000 2.155000 0.825000 ;
+        RECT 1.985000 0.825000 2.155000 1.495000 ;
+        RECT 1.985000 1.495000 2.410000 2.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.090000  0.085000 0.430000 0.815000 ;
         RECT 2.325000  0.085000 2.585000 0.565000 ;
@@ -92,9 +102,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.595000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -111,17 +120,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.523750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.480000 0.295000 2.155000 0.825000 ;
-        RECT 1.985000 0.825000 2.155000 1.495000 ;
-        RECT 1.985000 1.495000 2.410000 2.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.640000 1.835000 1.815000 2.005000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.lef
index 8eec61e..9d26f11 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.lef
@@ -65,22 +65,6 @@
         RECT 4.715000 1.275000 4.940000 1.625000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.007000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 4.575000 0.295000 4.955000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
index d372a9c..b2723ee 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
@@ -71,12 +71,26 @@
         RECT 4.715000 1.275000 4.940000 1.625000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.468000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.007000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.545000 0.655000 4.955000 0.825000 ;
+        RECT 3.330000 0.825000 4.955000 0.845000 ;
+        RECT 3.330000 0.845000 3.645000 1.445000 ;
+        RECT 3.330000 1.445000 4.485000 1.615000 ;
+        RECT 3.605000 0.255000 3.775000 0.655000 ;
+        RECT 4.155000 1.615000 4.485000 2.115000 ;
+        RECT 4.575000 0.295000 4.955000 0.655000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.465000 ;
         RECT 4.025000  0.085000 4.405000 0.465000 ;
@@ -97,9 +111,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -122,21 +135,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.007000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.545000 0.655000 4.955000 0.825000 ;
-        RECT 3.330000 0.825000 4.955000 0.845000 ;
-        RECT 3.330000 0.845000 3.645000 1.445000 ;
-        RECT 3.330000 1.445000 4.485000 1.615000 ;
-        RECT 3.605000 0.255000 3.775000 0.655000 ;
-        RECT 4.155000 1.615000 4.485000 2.115000 ;
-        RECT 4.575000 0.295000 4.955000 0.655000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 0.655000 2.305000 0.825000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.lef
index e9c9203..2385343 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.lef
@@ -64,22 +64,6 @@
         RECT 6.270000 0.995000 7.605000 1.630000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.613500 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 8.265000 0.255000 8.435000 0.635000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
index 4450d8b..d3245ae 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
@@ -70,12 +70,24 @@
         RECT 6.270000 0.995000 7.605000 1.630000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.832000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.613500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.425000 0.635000 8.435000 0.805000 ;
+        RECT 6.725000 1.915000 8.085000 2.085000 ;
+        RECT 7.325000 0.255000 7.495000 0.635000 ;
+        RECT 7.845000 0.805000 8.085000 1.915000 ;
+        RECT 8.265000 0.255000 8.435000 0.635000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.740000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.465000 ;
         RECT 1.455000  0.085000 1.835000 0.465000 ;
@@ -106,9 +118,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.740000 2.805000 ;
@@ -142,19 +153,6 @@
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.613500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.425000 0.635000 8.435000 0.805000 ;
-        RECT 6.725000 1.915000 8.085000 2.085000 ;
-        RECT 7.325000 0.255000 7.495000 0.635000 ;
-        RECT 7.845000 0.805000 8.085000 1.915000 ;
-        RECT 8.265000 0.255000 8.435000 0.635000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.345000 0.635000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_1.lef
index 6ac5176..15b2488 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.lef
@@ -75,22 +75,6 @@
         RECT 3.790000 1.325000 4.030000 1.615000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.554500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +86,22 @@
         RECT 0.090000 1.915000 0.425000 2.425000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
index e36ffa7..d195dd2 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
@@ -81,12 +81,22 @@
         RECT 3.790000 1.325000 4.030000 1.615000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.604500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.554500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 0.300000 0.425000 0.560000 ;
+        RECT 0.090000 0.560000 0.345000 1.915000 ;
+        RECT 0.090000 1.915000 0.425000 2.425000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.595000  0.085000 0.975000 0.485000 ;
         RECT 3.505000  0.085000 3.885000 0.805000 ;
@@ -105,9 +115,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.975000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -127,17 +136,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.554500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.300000 0.425000 0.560000 ;
-        RECT 0.090000 0.560000 0.345000 1.915000 ;
-        RECT 0.090000 1.915000 0.425000 2.425000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.570000 0.995000 0.845000 1.325000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_2.lef
index c85d0c2..56d0638 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.lef
@@ -74,22 +74,6 @@
         RECT 1.065000 0.745000 1.630000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.748000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +87,22 @@
         RECT 1.115000 1.955000 1.285000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
index a227f93..8ce6558 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
@@ -80,12 +80,24 @@
         RECT 1.065000 0.745000 1.630000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.854750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.748000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.135000 0.655000 0.895000 0.825000 ;
+        RECT 0.135000 0.825000 0.345000 1.785000 ;
+        RECT 0.135000 1.785000 1.285000 1.955000 ;
+        RECT 0.135000 1.955000 0.345000 2.465000 ;
+        RECT 1.115000 1.955000 1.285000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.465000 ;
         RECT 0.985000  0.085000 1.740000 0.445000 ;
@@ -106,9 +118,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -130,19 +141,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.748000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.135000 0.655000 0.895000 0.825000 ;
-        RECT 0.135000 0.825000 0.345000 1.785000 ;
-        RECT 0.135000 1.785000 1.285000 1.955000 ;
-        RECT 0.135000 1.955000 0.345000 2.465000 ;
-        RECT 1.115000 1.955000 1.285000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.535000 0.995000 0.755000 1.445000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_4.lef
index 1428413..cd1e172 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.lef
@@ -74,22 +74,6 @@
         RECT 7.440000 1.295000 7.635000 1.635000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -105,6 +89,22 @@
         RECT 1.585000 1.665000 1.755000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
index 3f892ff..5766650 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
@@ -80,12 +80,26 @@
         RECT 7.440000 1.295000 7.635000 1.635000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.962000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.120000 0.635000 1.755000 0.805000 ;
+        RECT 0.120000 0.805000 0.340000 1.495000 ;
+        RECT 0.120000 1.495000 1.755000 1.665000 ;
+        RECT 0.645000 0.255000 0.815000 0.635000 ;
+        RECT 0.645000 1.665000 0.815000 2.465000 ;
+        RECT 1.585000 0.255000 1.755000 0.635000 ;
+        RECT 1.585000 1.665000 1.755000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.465000 ;
         RECT 0.985000  0.085000 1.365000 0.465000 ;
@@ -116,9 +130,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -151,21 +164,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.120000 0.635000 1.755000 0.805000 ;
-        RECT 0.120000 0.805000 0.340000 1.495000 ;
-        RECT 0.120000 1.495000 1.755000 1.665000 ;
-        RECT 0.645000 0.255000 0.815000 0.635000 ;
-        RECT 0.645000 1.665000 0.815000 2.465000 ;
-        RECT 1.585000 0.255000 1.755000 0.635000 ;
-        RECT 1.585000 1.665000 1.755000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.620000 0.995000 2.170000 1.325000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.lef
index d5abfd5..65c2b75 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.lef
@@ -73,22 +73,6 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.634500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 0.965000 0.295000 1.265000 0.635000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.235000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
index d0cc50a..80760e1 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
@@ -79,12 +79,23 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.403000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.634500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.635000 1.265000 0.805000 ;
+        RECT 0.515000 0.805000 0.775000 1.785000 ;
+        RECT 0.515000 1.785000 0.915000 2.085000 ;
+        RECT 0.965000 0.295000 1.265000 0.635000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.235000 0.085000 ;
         RECT 0.110000  0.085000 0.440000 0.465000 ;
         RECT 2.570000  0.085000 2.960000 0.805000 ;
@@ -101,9 +112,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -121,18 +131,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.634500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.635000 1.265000 0.805000 ;
-        RECT 0.515000 0.805000 0.775000 1.785000 ;
-        RECT 0.515000 1.785000 0.915000 2.085000 ;
-        RECT 0.965000 0.295000 1.265000 0.635000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 1.835000 0.345000 2.255000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.lef
index 20a3a57..897608c 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.lef
@@ -74,22 +74,6 @@
         RECT 0.145000 1.285000 0.325000 1.625000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +87,22 @@
         RECT 1.965000 0.825000 2.195000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
index a3206d0..5b29a7b 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
@@ -80,12 +80,24 @@
         RECT 0.145000 1.285000 0.325000 1.625000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.646750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.565000 1.455000 2.195000 1.625000 ;
+        RECT 0.565000 1.625000 0.895000 2.125000 ;
+        RECT 1.455000 0.655000 3.245000 0.825000 ;
+        RECT 1.585000 1.625000 1.755000 2.125000 ;
+        RECT 1.965000 0.825000 2.195000 1.455000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.545000 ;
         RECT 4.865000  0.085000 5.250000 0.465000 ;
@@ -110,9 +122,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.080000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -138,19 +149,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.565000 1.455000 2.195000 1.625000 ;
-        RECT 0.565000 1.625000 0.895000 2.125000 ;
-        RECT 1.455000 0.655000 3.245000 0.825000 ;
-        RECT 1.585000 1.625000 1.755000 2.125000 ;
-        RECT 1.965000 0.825000 2.195000 1.455000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 0.295000 0.425000 0.715000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.lef
index dcee61d..971f935 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.lef
@@ -75,22 +75,6 @@
         RECT 0.110000 1.305000 0.330000 1.965000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.500000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.500000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -107,6 +91,22 @@
         RECT 3.335000 1.745000 3.715000 2.085000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.500000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.500000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.500000 0.085000 ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
index cdfab36..12659ef 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
@@ -81,12 +81,27 @@
         RECT 0.110000 1.305000 0.330000 1.965000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.975000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.575000 3.715000 1.745000 ;
+        RECT 0.515000 1.745000 0.895000 2.085000 ;
+        RECT 1.455000 1.745000 1.835000 2.085000 ;
+        RECT 2.175000 0.990000 2.615000 1.575000 ;
+        RECT 2.175000 1.745000 2.775000 2.085000 ;
+        RECT 2.395000 0.635000 6.165000 0.805000 ;
+        RECT 2.395000 0.805000 2.615000 0.990000 ;
+        RECT 3.335000 1.745000 3.715000 2.085000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 11.500000 0.085000 ;
         RECT  0.515000  0.085000  0.895000 0.465000 ;
         RECT  1.455000  0.085000  1.835000 0.465000 ;
@@ -123,9 +138,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.195000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.500000 2.805000 ;
@@ -164,22 +178,6 @@
         RECT 0.000000 2.480000 11.500000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.575000 3.715000 1.745000 ;
-        RECT 0.515000 1.745000 0.895000 2.085000 ;
-        RECT 1.455000 1.745000 1.835000 2.085000 ;
-        RECT 2.175000 0.990000 2.615000 1.575000 ;
-        RECT 2.175000 1.745000 2.775000 2.085000 ;
-        RECT 2.395000 0.635000 6.165000 0.805000 ;
-        RECT 2.395000 0.805000 2.615000 0.990000 ;
-        RECT 3.335000 1.745000 3.715000 2.085000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.095000 2.255000  4.105000 2.425000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.lef b/cells/and2/sky130_fd_sc_hdll__and2_1.lef
index 17fc2e1..9cef5bf 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.lef
@@ -47,22 +47,6 @@
         RECT 0.885000 1.075000 1.235000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.757200 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 1.860000 0.545000 2.155000 1.915000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
index 9c0c42d..1f55007 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
@@ -53,12 +53,22 @@
         RECT 0.885000 1.075000 1.235000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.240600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.757250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.525000 0.255000 2.155000 0.545000 ;
+        RECT 1.730000 1.915000 2.155000 2.465000 ;
+        RECT 1.860000 0.545000 2.155000 1.915000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 1.105000  0.085000 1.355000 0.545000 ;
       LAYER mcon ;
@@ -72,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.445650 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -90,17 +99,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.757250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.525000 0.255000 2.155000 0.545000 ;
-        RECT 1.730000 1.915000 2.155000 2.465000 ;
-        RECT 1.860000 0.545000 2.155000 1.915000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.125000 0.355000 0.455000 0.715000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.lef b/cells/and2/sky130_fd_sc_hdll__and2_2.lef
index 6fad781..c017613 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.lef
@@ -47,22 +47,6 @@
         RECT 0.885000 1.075000 1.265000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.728500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 1.935000 0.545000 2.205000 1.915000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
index a08d4df..53dbad9 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
@@ -53,12 +53,22 @@
         RECT 0.885000 1.075000 1.265000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.465600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.728500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.595000 0.255000 2.205000 0.545000 ;
+        RECT 1.745000 1.915000 2.205000 2.465000 ;
+        RECT 1.935000 0.545000 2.205000 1.915000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 1.175000  0.085000 1.425000 0.545000 ;
         RECT 2.375000  0.085000 2.665000 0.885000 ;
@@ -74,9 +84,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.819100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -94,17 +103,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.728500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.595000 0.255000 2.205000 0.545000 ;
-        RECT 1.745000 1.915000 2.205000 2.465000 ;
-        RECT 1.935000 0.545000 2.205000 1.915000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.115000 0.355000 0.445000 0.715000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.lef b/cells/and2/sky130_fd_sc_hdll__and2_4.lef
index 538639c..9588b11 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.lef
@@ -46,22 +46,6 @@
         RECT 0.605000 0.995000 1.080000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.061500 ;
     DIRECTION OUTPUT ;
@@ -78,6 +62,22 @@
         RECT 3.290000 0.845000 3.570000 1.535000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
index 114e869..e2b5581 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
@@ -52,12 +52,27 @@
         RECT 0.605000 0.995000 1.080000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.708500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.061500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.680000 0.515000 1.870000 0.615000 ;
+        RECT 1.680000 0.615000 3.570000 0.845000 ;
+        RECT 1.680000 1.535000 3.570000 1.760000 ;
+        RECT 1.680000 1.760000 1.870000 2.465000 ;
+        RECT 2.640000 0.255000 2.830000 0.615000 ;
+        RECT 2.640000 1.760000 3.570000 1.765000 ;
+        RECT 2.640000 1.765000 2.830000 2.465000 ;
+        RECT 3.290000 0.845000 3.570000 1.535000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 1.055000  0.085000 1.385000 0.445000 ;
         RECT 2.040000  0.085000 2.420000 0.445000 ;
@@ -76,9 +91,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.245000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -99,22 +113,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.061500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.680000 0.515000 1.870000 0.615000 ;
-        RECT 1.680000 0.615000 3.570000 0.845000 ;
-        RECT 1.680000 1.535000 3.570000 1.760000 ;
-        RECT 1.680000 1.760000 1.870000 2.465000 ;
-        RECT 2.640000 0.255000 2.830000 0.615000 ;
-        RECT 2.640000 1.760000 3.570000 1.765000 ;
-        RECT 2.640000 1.765000 2.830000 2.465000 ;
-        RECT 3.290000 0.845000 3.570000 1.535000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 0.425000 0.615000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.lef b/cells/and2/sky130_fd_sc_hdll__and2_6.lef
index 1245a3b..333a934 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.lef
@@ -50,22 +50,6 @@
         RECT 1.705000 1.325000 1.885000 1.465000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.396500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 4.475000 0.885000 4.975000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
index 1024842..503c9c2 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
@@ -56,12 +56,28 @@
         RECT 1.705000 1.325000 1.885000 1.465000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.215500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.396500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.475000 0.255000 2.745000 0.715000 ;
+        RECT 2.475000 0.715000 4.975000 0.885000 ;
+        RECT 2.475000 1.445000 4.975000 1.615000 ;
+        RECT 2.475000 1.615000 2.745000 2.465000 ;
+        RECT 3.415000 0.255000 3.685000 0.715000 ;
+        RECT 3.415000 1.615000 3.685000 2.465000 ;
+        RECT 4.355000 0.255000 4.625000 0.715000 ;
+        RECT 4.355000 1.615000 4.625000 2.465000 ;
+        RECT 4.475000 0.885000 4.975000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.825000 ;
         RECT 1.940000  0.085000 2.270000 0.485000 ;
@@ -86,9 +102,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -115,23 +130,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.396500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.475000 0.255000 2.745000 0.715000 ;
-        RECT 2.475000 0.715000 4.975000 0.885000 ;
-        RECT 2.475000 1.445000 4.975000 1.615000 ;
-        RECT 2.475000 1.615000 2.745000 2.465000 ;
-        RECT 3.415000 0.255000 3.685000 0.715000 ;
-        RECT 3.415000 1.615000 3.685000 2.465000 ;
-        RECT 4.355000 0.255000 4.625000 0.715000 ;
-        RECT 4.355000 1.615000 4.625000 2.465000 ;
-        RECT 4.475000 0.885000 4.975000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.565000 1.805000 2.305000 1.975000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.lef b/cells/and2/sky130_fd_sc_hdll__and2_8.lef
index a197009..6f6687d 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.lef
@@ -50,22 +50,6 @@
         RECT 1.705000 1.325000 1.885000 1.465000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.862000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 5.495000 0.885000 5.915000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
index 1a8b4c2..f407bd2 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
@@ -56,12 +56,30 @@
         RECT 1.705000 1.325000 1.885000 1.465000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.456000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.862000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.475000 0.255000 2.745000 0.715000 ;
+        RECT 2.475000 0.715000 5.915000 0.885000 ;
+        RECT 2.475000 1.445000 5.915000 1.615000 ;
+        RECT 2.475000 1.615000 2.745000 2.465000 ;
+        RECT 3.415000 0.255000 3.685000 0.715000 ;
+        RECT 3.415000 1.615000 3.685000 2.465000 ;
+        RECT 4.355000 0.255000 4.625000 0.715000 ;
+        RECT 4.355000 1.615000 4.625000 2.465000 ;
+        RECT 5.295000 0.255000 5.565000 0.715000 ;
+        RECT 5.295000 1.615000 5.565000 2.465000 ;
+        RECT 5.495000 0.885000 5.915000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.825000 ;
         RECT 1.940000  0.085000 2.270000 0.485000 ;
@@ -89,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.010000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -121,25 +138,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.862000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.475000 0.255000 2.745000 0.715000 ;
-        RECT 2.475000 0.715000 5.915000 0.885000 ;
-        RECT 2.475000 1.445000 5.915000 1.615000 ;
-        RECT 2.475000 1.615000 2.745000 2.465000 ;
-        RECT 3.415000 0.255000 3.685000 0.715000 ;
-        RECT 3.415000 1.615000 3.685000 2.465000 ;
-        RECT 4.355000 0.255000 4.625000 0.715000 ;
-        RECT 4.355000 1.615000 4.625000 2.465000 ;
-        RECT 5.295000 0.255000 5.565000 0.715000 ;
-        RECT 5.295000 1.615000 5.565000 2.465000 ;
-        RECT 5.495000 0.885000 5.915000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.565000 1.805000 2.305000 1.975000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_1.lef
index f203f79..61e181f 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.lef
@@ -46,22 +46,6 @@
         RECT 1.630000 1.645000 2.275000 1.955000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.505000 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 2.770000 0.775000 3.080000 1.580000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
index 9067756..4ed0b35 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 1.630000 1.645000 2.275000 1.955000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.365300 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.505000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.445000 1.580000 3.080000 2.365000 ;
+        RECT 2.705000 0.255000 3.080000 0.775000 ;
+        RECT 2.770000 0.775000 3.080000 1.580000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.590000 ;
         RECT 2.000000  0.085000 2.445000 0.580000 ;
@@ -74,9 +84,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.642200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -94,17 +103,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.505000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.445000 1.580000 3.080000 2.365000 ;
-        RECT 2.705000 0.255000 3.080000 0.775000 ;
-        RECT 2.770000 0.775000 3.080000 1.580000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 1.785000 0.900000 2.015000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_2.lef
index 1ef6287..e63d73b 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.lef
@@ -46,22 +46,6 @@
         RECT 1.655000 1.645000 2.400000 1.955000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.762000 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 2.755000 0.775000 3.090000 1.580000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
index 1b4577d..524a8c6 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
@@ -52,12 +52,22 @@
         RECT 1.655000 1.645000 2.400000 1.955000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.541950 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.762000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.575000 1.580000 3.090000 2.365000 ;
+        RECT 2.695000 0.255000 3.090000 0.775000 ;
+        RECT 2.755000 0.775000 3.090000 1.580000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.590000 ;
         RECT 2.105000  0.085000 2.475000 0.580000 ;
@@ -76,9 +86,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.924800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -98,17 +107,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.762000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.575000 1.580000 3.090000 2.365000 ;
-        RECT 2.695000 0.255000 3.090000 0.775000 ;
-        RECT 2.755000 0.775000 3.090000 1.580000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 1.785000 0.905000 2.015000 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_4.lef
index 60c6e8d..a0576b6 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.lef
@@ -46,22 +46,6 @@
         RECT 0.605000 0.995000 1.075000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.071500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 2.445000 0.825000 2.980000 1.535000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
index 5963f26..4bbe61e 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
@@ -52,12 +52,23 @@
         RECT 0.605000 0.995000 1.075000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.761000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.071500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.635000 1.535000 2.980000 1.745000 ;
+        RECT 1.675000 0.495000 1.865000 0.615000 ;
+        RECT 1.675000 0.615000 2.980000 0.825000 ;
+        RECT 2.445000 0.825000 2.980000 1.535000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 1.055000  0.085000 1.385000 0.445000 ;
         RECT 2.035000  0.085000 2.415000 0.445000 ;
@@ -77,9 +88,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.275700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -101,18 +111,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.071500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.635000 1.535000 2.980000 1.745000 ;
-        RECT 1.675000 0.495000 1.865000 0.615000 ;
-        RECT 1.675000 0.615000 2.980000 0.825000 ;
-        RECT 2.445000 0.825000 2.980000 1.535000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.615000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.lef b/cells/and3/sky130_fd_sc_hdll__and3_1.lef
index 7fa535c..b1efbd8 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.lef
@@ -55,22 +55,6 @@
         RECT 1.390000 0.305000 1.760000 1.200000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 2.490000 0.735000 2.660000 1.765000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
index d108615..6a9e257 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
@@ -61,12 +61,22 @@
         RECT 1.390000 0.305000 1.760000 1.200000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.258000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.385000 1.765000 2.660000 2.465000 ;
+        RECT 2.400000 0.255000 2.660000 0.735000 ;
+        RECT 2.490000 0.735000 2.660000 1.765000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 1.930000  0.085000 2.100000 0.625000 ;
       LAYER mcon ;
@@ -81,9 +91,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.454800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -103,17 +112,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.385000 1.765000 2.660000 2.465000 ;
-        RECT 2.400000 0.255000 2.660000 0.735000 ;
-        RECT 2.490000 0.735000 2.660000 1.765000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.295000 1.075000 0.465000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.lef b/cells/and3/sky130_fd_sc_hdll__and3_2.lef
index 25ec1c8..72227a7 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.lef
@@ -56,22 +56,6 @@
         RECT 1.065000 0.750000 1.625000 1.245000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.511000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 2.260000 1.445000 2.620000 1.795000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
index 7c6aa97..6270192 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
@@ -62,12 +62,24 @@
         RECT 1.065000 0.750000 1.625000 1.245000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.509300 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.511000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.985000 0.255000 2.430000 0.715000 ;
+        RECT 2.170000 1.795000 2.620000 2.465000 ;
+        RECT 2.260000 0.715000 2.430000 0.925000 ;
+        RECT 2.260000 0.925000 2.925000 1.445000 ;
+        RECT 2.260000 1.445000 2.620000 1.795000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 1.485000  0.085000 1.815000 0.580000 ;
         RECT 2.695000  0.085000 2.970000 0.745000 ;
@@ -84,9 +96,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.832500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -107,19 +118,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.511000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.985000 0.255000 2.430000 0.715000 ;
-        RECT 2.170000 1.795000 2.620000 2.465000 ;
-        RECT 2.260000 0.715000 2.430000 0.925000 ;
-        RECT 2.260000 0.925000 2.925000 1.445000 ;
-        RECT 2.260000 1.445000 2.620000 1.795000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.100000 1.425000 2.040000 1.595000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.lef b/cells/and3/sky130_fd_sc_hdll__and3_4.lef
index c413735..36105e5 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.lef
@@ -56,22 +56,6 @@
         RECT 1.525000 0.995000 2.050000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.061500 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 4.210000 0.845000 4.490000 1.535000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
index 655d1b5..5d8e59a 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
@@ -62,12 +62,27 @@
         RECT 1.525000 0.995000 2.050000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.708500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.061500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.650000 0.515000 2.840000 0.615000 ;
+        RECT 2.650000 0.615000 4.490000 0.845000 ;
+        RECT 2.650000 1.535000 4.490000 1.760000 ;
+        RECT 2.650000 1.760000 2.840000 2.465000 ;
+        RECT 3.610000 0.255000 3.800000 0.615000 ;
+        RECT 3.610000 1.760000 4.490000 1.765000 ;
+        RECT 3.610000 1.765000 3.800000 2.465000 ;
+        RECT 4.210000 0.845000 4.490000 1.535000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 2.055000  0.085000 2.385000 0.445000 ;
         RECT 3.010000  0.085000 3.390000 0.445000 ;
@@ -88,9 +103,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.435000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -113,22 +127,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.061500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.650000 0.515000 2.840000 0.615000 ;
-        RECT 2.650000 0.615000 4.490000 0.845000 ;
-        RECT 2.650000 1.535000 4.490000 1.760000 ;
-        RECT 2.650000 1.760000 2.840000 2.465000 ;
-        RECT 3.610000 0.255000 3.800000 0.615000 ;
-        RECT 3.610000 1.760000 4.490000 1.765000 ;
-        RECT 3.610000 1.765000 3.800000 2.465000 ;
-        RECT 4.210000 0.845000 4.490000 1.535000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.465000 0.255000 1.825000 0.445000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_1.lef
index 95d3bb0..aea346e 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.lef
@@ -55,22 +55,6 @@
         RECT 2.280000 0.305000 2.645000 1.255000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 3.365000 0.735000 3.535000 1.765000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
index 184e0e6..0df4fdf 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
@@ -61,12 +61,22 @@
         RECT 2.280000 0.305000 2.645000 1.255000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.470450 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.270000 1.765000 3.535000 2.465000 ;
+        RECT 3.275000 0.255000 3.535000 0.735000 ;
+        RECT 3.365000 0.735000 3.535000 1.765000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.085000  0.085000 0.345000 0.905000 ;
         RECT 2.815000  0.085000 3.105000 0.625000 ;
@@ -84,9 +94,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.591300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -108,17 +117,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.270000 1.765000 3.535000 2.465000 ;
-        RECT 3.275000 0.255000 3.535000 0.735000 ;
-        RECT 3.365000 0.735000 3.535000 1.765000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.485000 0.895000 0.905000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_2.lef
index 6be955f..48570c8 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.lef
@@ -56,22 +56,6 @@
         RECT 1.985000 0.765000 2.620000 1.245000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 3.240000 1.445000 3.590000 1.795000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
index 81ad882..634d1f2 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
@@ -62,12 +62,24 @@
         RECT 1.985000 0.765000 2.620000 1.245000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.693600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.125000 1.795000 3.590000 2.465000 ;
+        RECT 3.165000 0.255000 3.570000 0.715000 ;
+        RECT 3.240000 0.715000 3.570000 0.925000 ;
+        RECT 3.240000 0.925000 4.040000 1.445000 ;
+        RECT 3.240000 1.445000 3.590000 1.795000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.085000  0.085000 0.355000 0.575000 ;
         RECT 2.610000  0.085000 2.940000 0.580000 ;
@@ -87,9 +99,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.940900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -113,19 +124,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.125000 1.795000 3.590000 2.465000 ;
-        RECT 3.165000 0.255000 3.570000 0.715000 ;
-        RECT 3.240000 0.715000 3.570000 0.925000 ;
-        RECT 3.240000 0.925000 4.040000 1.445000 ;
-        RECT 3.240000 1.445000 3.590000 1.795000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.630000 0.305000 0.905000 1.015000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_4.lef
index 59040cb..20a5c63 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.lef
@@ -55,22 +55,6 @@
         RECT 1.490000 0.995000 1.865000 1.340000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.071500 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 3.570000 0.845000 3.995000 1.535000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
index 0efbd4b..4db04dd 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
@@ -61,12 +61,24 @@
         RECT 1.490000 0.995000 1.865000 1.340000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.728500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.071500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.375000 1.535000 3.995000 1.705000 ;
+        RECT 2.485000 0.515000 2.675000 0.615000 ;
+        RECT 2.485000 0.615000 3.995000 0.845000 ;
+        RECT 3.365000 0.255000 3.635000 0.615000 ;
+        RECT 3.570000 0.845000 3.995000 1.535000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 1.930000  0.085000 2.260000 0.445000 ;
         RECT 2.845000  0.085000 3.195000 0.445000 ;
@@ -88,9 +100,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.390700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -114,19 +125,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.071500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.375000 1.535000 3.995000 1.705000 ;
-        RECT 2.485000 0.515000 2.675000 0.615000 ;
-        RECT 2.485000 0.615000 3.995000 0.845000 ;
-        RECT 3.365000 0.255000 3.635000 0.615000 ;
-        RECT 3.570000 0.845000 3.995000 1.535000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.150000 0.255000 0.635000 0.355000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.lef b/cells/and4/sky130_fd_sc_hdll__and4_1.lef
index 3b760dc..14b83ca 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.lef
@@ -64,22 +64,6 @@
         RECT 1.885000 0.715000 2.165000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.752500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 2.825000 0.805000 3.085000 2.205000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
index 4cbbdaa..bab4f7f 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
@@ -70,12 +70,22 @@
         RECT 1.885000 0.715000 2.165000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.275250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.752500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.695000 0.295000 3.085000 0.805000 ;
+        RECT 2.695000 2.205000 3.085000 2.465000 ;
+        RECT 2.825000 0.805000 3.085000 2.205000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 2.065000  0.085000 2.335000 0.545000 ;
       LAYER mcon ;
@@ -91,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.560100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -112,17 +121,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.752500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.695000 0.295000 3.085000 0.805000 ;
-        RECT 2.695000 2.205000 3.085000 2.465000 ;
-        RECT 2.825000 0.805000 3.085000 2.205000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.170000 0.255000 0.685000 0.585000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.lef b/cells/and4/sky130_fd_sc_hdll__and4_2.lef
index 8373872..9af7b5b 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.lef
@@ -64,22 +64,6 @@
         RECT 1.885000 0.740000 2.155000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.629500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 2.835000 0.805000 3.075000 1.835000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
index 518a7d7..34f8ec0 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
@@ -70,12 +70,22 @@
         RECT 1.885000 0.740000 2.155000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.515750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.629500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.625000 0.295000 3.075000 0.805000 ;
+        RECT 2.625000 1.835000 3.075000 2.465000 ;
+        RECT 2.835000 0.805000 3.075000 1.835000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 2.285000  0.085000 2.455000 0.550000 ;
         RECT 3.245000  0.085000 3.575000 0.810000 ;
@@ -93,9 +103,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.994300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -116,17 +125,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.629500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.625000 0.295000 3.075000 0.805000 ;
-        RECT 2.625000 1.835000 3.075000 2.465000 ;
-        RECT 2.835000 0.805000 3.075000 1.835000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.670000 0.585000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.lef b/cells/and4/sky130_fd_sc_hdll__and4_4.lef
index 6606efc..f3274ec 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.lef
@@ -64,22 +64,6 @@
         RECT 1.985000 0.730000 2.275000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 4.200000 0.810000 4.455000 1.485000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
index 6b68786..a7e3aa5 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
@@ -70,12 +70,27 @@
         RECT 1.985000 0.730000 2.275000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.624000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.785000 0.255000 2.955000 0.640000 ;
+        RECT 2.785000 0.640000 4.455000 0.810000 ;
+        RECT 2.785000 1.485000 4.455000 1.655000 ;
+        RECT 2.785000 1.655000 3.035000 2.465000 ;
+        RECT 3.725000 0.255000 3.895000 0.640000 ;
+        RECT 3.725000 1.655000 4.455000 1.745000 ;
+        RECT 3.725000 1.745000 3.895000 2.465000 ;
+        RECT 4.200000 0.810000 4.455000 1.485000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 2.225000  0.085000 2.535000 0.550000 ;
         RECT 3.125000  0.085000 3.505000 0.470000 ;
@@ -96,9 +111,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.510000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -122,22 +136,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.785000 0.255000 2.955000 0.640000 ;
-        RECT 2.785000 0.640000 4.455000 0.810000 ;
-        RECT 2.785000 1.485000 4.455000 1.655000 ;
-        RECT 2.785000 1.655000 3.035000 2.465000 ;
-        RECT 3.725000 0.255000 3.895000 0.640000 ;
-        RECT 3.725000 1.655000 4.455000 1.745000 ;
-        RECT 3.725000 1.745000 3.895000 2.465000 ;
-        RECT 4.200000 0.810000 4.455000 1.485000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.720000 0.585000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_1.lef
index 9442436..141f0c0 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.lef
@@ -64,22 +64,6 @@
         RECT 2.785000 0.665000 3.075000 1.695000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 3.725000 0.805000 3.995000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
index 2096ebd..5a75617 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
@@ -70,12 +70,22 @@
         RECT 2.785000 0.665000 3.075000 1.695000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.342200 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.520000 0.295000 3.995000 0.805000 ;
+        RECT 3.635000 1.495000 3.995000 2.465000 ;
+        RECT 3.725000 0.805000 3.995000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.465000 ;
         RECT 2.955000  0.085000 3.350000 0.465000 ;
@@ -94,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.711500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -117,17 +126,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.520000 0.295000 3.995000 0.805000 ;
-        RECT 3.635000 1.495000 3.995000 2.465000 ;
-        RECT 3.725000 0.805000 3.995000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.170000 0.255000 0.345000 0.655000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_2.lef
index 05675d1..28fbb64 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.lef
@@ -64,22 +64,6 @@
         RECT 2.785000 0.645000 3.115000 1.615000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.555700 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.775000 0.825000 4.455000 1.535000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
index 6480800..6559132 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
@@ -70,12 +70,24 @@
         RECT 2.785000 0.645000 3.115000 1.615000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.539650 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.555750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.560000 0.255000 3.895000 0.640000 ;
+        RECT 3.560000 0.640000 4.455000 0.825000 ;
+        RECT 3.690000 1.535000 4.455000 1.665000 ;
+        RECT 3.690000 1.665000 3.995000 2.465000 ;
+        RECT 3.775000 0.825000 4.455000 1.535000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.465000 ;
         RECT 3.010000  0.085000 3.390000 0.465000 ;
@@ -96,9 +108,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.856300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -121,19 +132,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.555750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.560000 0.255000 3.895000 0.640000 ;
-        RECT 3.560000 0.640000 4.455000 0.825000 ;
-        RECT 3.690000 1.535000 4.455000 1.665000 ;
-        RECT 3.690000 1.665000 3.995000 2.465000 ;
-        RECT 3.775000 0.825000 4.455000 1.535000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 1.830000 0.855000 2.000000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_4.lef
index 399b60c..f55c0c6 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.lef
@@ -64,22 +64,6 @@
         RECT 2.870000 0.995000 3.120000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 2.110000 0.255000 2.280000 0.650000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
index 897b93e..d1e89ff 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
@@ -70,12 +70,24 @@
         RECT 2.870000 0.995000 3.120000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.720500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.030000 0.255000 1.340000 0.650000 ;
+        RECT 1.030000 0.650000 2.280000 0.820000 ;
+        RECT 1.030000 0.820000 1.360000 1.545000 ;
+        RECT 1.030000 1.545000 2.360000 1.715000 ;
+        RECT 2.110000 0.255000 2.280000 0.650000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.565000  0.085000 0.815000 0.545000 ;
         RECT 1.510000  0.085000 1.890000 0.470000 ;
@@ -97,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.615700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -124,19 +135,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.030000 0.255000 1.340000 0.650000 ;
-        RECT 1.030000 0.650000 2.280000 0.820000 ;
-        RECT 1.030000 0.820000 1.360000 1.545000 ;
-        RECT 1.030000 1.545000 2.360000 1.715000 ;
-        RECT 2.110000 0.255000 2.280000 0.650000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.585000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.lef
index f607945..14a38f0 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.lef
@@ -65,22 +65,6 @@
         RECT 3.345000 0.420000 3.640000 1.635000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 4.285000 0.825000 4.510000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
index f28bee2..7b996af 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
@@ -71,12 +71,22 @@
         RECT 3.345000 0.420000 3.640000 1.635000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.386100 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.250000 0.255000 4.510000 0.825000 ;
+        RECT 4.250000 1.445000 4.510000 2.465000 ;
+        RECT 4.285000 0.825000 4.510000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.575000  0.085000 0.955000 0.465000 ;
         RECT 3.810000  0.085000 3.980000 0.545000 ;
@@ -96,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.677900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -121,17 +130,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.250000 0.255000 4.510000 0.825000 ;
-        RECT 4.250000 1.445000 4.510000 2.465000 ;
-        RECT 4.285000 0.825000 4.510000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.585000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.lef
index da493a4..8dc8a69 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.lef
@@ -64,22 +64,6 @@
         RECT 3.705000 0.425000 4.005000 1.405000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 1.065000 1.545000 1.420000 1.715000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
index 22a199b..d508d8e 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
@@ -70,12 +70,21 @@
         RECT 3.705000 0.425000 4.005000 1.405000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.612550 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.065000 0.255000 1.340000 1.545000 ;
+        RECT 1.065000 1.545000 1.420000 1.715000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.465000 ;
         RECT 1.510000  0.085000 1.890000 0.465000 ;
@@ -97,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.299000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -123,16 +131,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.065000 0.255000 1.340000 1.545000 ;
-        RECT 1.065000 1.545000 1.420000 1.715000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.345000 0.635000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.lef
index ac76c2d..7ddb398 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.lef
@@ -64,22 +64,6 @@
         RECT 2.905000 0.995000 3.195000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 2.110000 0.255000 2.280000 0.650000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
index a372d67..2a6c796 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
@@ -70,12 +70,24 @@
         RECT 2.905000 0.995000 3.195000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.855200 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.010000 0.650000 2.280000 0.820000 ;
+        RECT 1.010000 0.820000 1.340000 1.545000 ;
+        RECT 1.010000 1.545000 2.360000 1.715000 ;
+        RECT 1.170000 0.255000 1.340000 0.650000 ;
+        RECT 2.110000 0.255000 2.280000 0.650000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.620000  0.085000 0.950000 0.470000 ;
         RECT 1.510000  0.085000 1.890000 0.470000 ;
@@ -101,9 +113,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.981400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -131,19 +142,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.010000 0.650000 2.280000 0.820000 ;
-        RECT 1.010000 0.820000 1.340000 1.545000 ;
-        RECT 1.010000 1.545000 2.360000 1.715000 ;
-        RECT 1.170000 0.255000 1.340000 0.650000 ;
-        RECT 2.110000 0.255000 2.280000 0.650000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.585000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.lef b/cells/buf/sky130_fd_sc_hdll__buf_1.lef
index 41b0144..fc7d049 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.lef
@@ -37,28 +37,6 @@
         RECT 0.105000 0.985000 0.545000 1.355000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.525000  0.085000 0.895000 0.465000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.525000 1.875000 0.895000 2.635000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.348500 ;
     DIRECTION OUTPUT ;
@@ -70,6 +48,28 @@
         RECT 1.215000 0.760000 1.395000 1.560000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 1.840000 0.085000 ;
+        RECT 0.525000  0.085000 0.895000 0.465000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 1.840000 2.805000 ;
+        RECT 0.525000 1.875000 0.895000 2.635000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 1.840000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.165000 1.535000 0.890000 1.705000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
index 620407e..87a9538 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
@@ -43,12 +43,22 @@
         RECT 0.105000 0.985000 0.545000 1.355000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.176800 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.348500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.065000 0.255000 1.395000 0.760000 ;
+        RECT 1.065000 1.560000 1.395000 2.465000 ;
+        RECT 1.215000 0.760000 1.395000 1.560000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
         RECT 0.525000  0.085000 0.895000 0.465000 ;
       LAYER mcon ;
@@ -61,9 +71,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.244900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -77,17 +86,6 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.348500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.065000 0.255000 1.395000 0.760000 ;
-        RECT 1.065000 1.560000 1.395000 2.465000 ;
-        RECT 1.215000 0.760000 1.395000 1.560000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.165000 1.535000 0.890000 1.705000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.lef b/cells/buf/sky130_fd_sc_hdll__buf_12.lef
index 37a285b..fb9de8e 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.lef
@@ -37,44 +37,6 @@
         RECT 0.135000 1.075000 1.810000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.565000 ;
-        RECT 0.985000  0.085000 1.365000 0.565000 ;
-        RECT 1.925000  0.085000 2.305000 0.565000 ;
-        RECT 2.865000  0.085000 3.245000 0.565000 ;
-        RECT 3.805000  0.085000 4.185000 0.565000 ;
-        RECT 4.745000  0.085000 5.125000 0.565000 ;
-        RECT 5.685000  0.085000 6.065000 0.565000 ;
-        RECT 6.625000  0.085000 7.005000 0.565000 ;
-        RECT 7.565000  0.085000 7.945000 0.885000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.175000 1.835000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.225000 2.635000 ;
-        RECT 2.865000 1.835000 3.245000 2.635000 ;
-        RECT 3.805000 1.835000 4.185000 2.635000 ;
-        RECT 4.745000 1.835000 5.125000 2.635000 ;
-        RECT 5.685000 1.835000 6.065000 2.635000 ;
-        RECT 6.625000 1.835000 7.005000 2.635000 ;
-        RECT 7.565000 1.485000 7.945000 2.635000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  3.020500 ;
     DIRECTION OUTPUT ;
@@ -98,6 +60,44 @@
         RECT 7.225000 1.615000 7.395000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 8.280000 0.085000 ;
+        RECT 0.095000  0.085000 0.425000 0.565000 ;
+        RECT 0.985000  0.085000 1.365000 0.565000 ;
+        RECT 1.925000  0.085000 2.305000 0.565000 ;
+        RECT 2.865000  0.085000 3.245000 0.565000 ;
+        RECT 3.805000  0.085000 4.185000 0.565000 ;
+        RECT 4.745000  0.085000 5.125000 0.565000 ;
+        RECT 5.685000  0.085000 6.065000 0.565000 ;
+        RECT 6.625000  0.085000 7.005000 0.565000 ;
+        RECT 7.565000  0.085000 7.945000 0.885000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 8.280000 2.805000 ;
+        RECT 0.175000 1.835000 0.345000 2.635000 ;
+        RECT 1.115000 1.835000 1.285000 2.635000 ;
+        RECT 2.055000 1.835000 2.225000 2.635000 ;
+        RECT 2.865000 1.835000 3.245000 2.635000 ;
+        RECT 3.805000 1.835000 4.185000 2.635000 ;
+        RECT 4.745000 1.835000 5.125000 2.635000 ;
+        RECT 5.685000 1.835000 6.065000 2.635000 ;
+        RECT 6.625000 1.835000 7.005000 2.635000 ;
+        RECT 7.565000 1.485000 7.945000 2.635000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.515000 1.445000 2.215000 1.615000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
index 1f1a5ef..d478a5d 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
@@ -43,12 +43,34 @@
         RECT 0.135000 1.075000 1.810000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.820000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  3.020500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.525000 0.255000 2.695000 0.735000 ;
+        RECT 2.525000 0.735000 7.395000 0.905000 ;
+        RECT 2.525000 1.445000 7.395000 1.615000 ;
+        RECT 2.525000 1.615000 2.695000 2.465000 ;
+        RECT 3.465000 0.255000 3.635000 0.735000 ;
+        RECT 3.465000 1.615000 3.635000 2.465000 ;
+        RECT 4.405000 0.255000 4.575000 0.735000 ;
+        RECT 4.405000 1.615000 4.575000 2.465000 ;
+        RECT 5.210000 0.905000 7.395000 1.445000 ;
+        RECT 5.345000 0.255000 5.515000 0.735000 ;
+        RECT 5.345000 1.615000 5.515000 2.465000 ;
+        RECT 6.285000 0.255000 6.455000 0.735000 ;
+        RECT 6.285000 1.615000 6.455000 2.465000 ;
+        RECT 7.225000 0.255000 7.395000 0.735000 ;
+        RECT 7.225000 1.615000 7.395000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.565000 ;
         RECT 0.985000  0.085000 1.365000 0.565000 ;
@@ -83,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -121,29 +142,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  3.020500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.525000 0.255000 2.695000 0.735000 ;
-        RECT 2.525000 0.735000 7.395000 0.905000 ;
-        RECT 2.525000 1.445000 7.395000 1.615000 ;
-        RECT 2.525000 1.615000 2.695000 2.465000 ;
-        RECT 3.465000 0.255000 3.635000 0.735000 ;
-        RECT 3.465000 1.615000 3.635000 2.465000 ;
-        RECT 4.405000 0.255000 4.575000 0.735000 ;
-        RECT 4.405000 1.615000 4.575000 2.465000 ;
-        RECT 5.210000 0.905000 7.395000 1.445000 ;
-        RECT 5.345000 0.255000 5.515000 0.735000 ;
-        RECT 5.345000 1.615000 5.515000 2.465000 ;
-        RECT 6.285000 0.255000 6.455000 0.735000 ;
-        RECT 6.285000 1.615000 6.455000 2.465000 ;
-        RECT 7.225000 0.255000 7.395000 0.735000 ;
-        RECT 7.225000 1.615000 7.395000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 1.445000 2.215000 1.615000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.lef b/cells/buf/sky130_fd_sc_hdll__buf_16.lef
index 535cef0..87aa6bb 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 1.075000 2.735000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.500000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.500000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  4.016500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 10.860000 1.615000 11.135000 2.360000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.500000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.500000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.500000 0.085000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
index 1e8b9fc..adad659 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
@@ -43,12 +43,43 @@
         RECT 0.085000 1.075000 2.735000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  2.385500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  4.016500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  3.335000 0.255000  3.635000 0.260000 ;
+        RECT  3.335000 0.260000  3.715000 0.735000 ;
+        RECT  3.335000 0.735000 11.135000 0.905000 ;
+        RECT  3.335000 1.445000 11.135000 1.615000 ;
+        RECT  3.335000 1.615000  3.715000 2.465000 ;
+        RECT  4.275000 0.260000  4.655000 0.735000 ;
+        RECT  4.275000 1.615000  4.655000 2.465000 ;
+        RECT  4.405000 0.255000  4.575000 0.260000 ;
+        RECT  5.215000 0.260000  5.595000 0.735000 ;
+        RECT  5.215000 1.615000  5.595000 2.465000 ;
+        RECT  5.345000 0.255000  5.515000 0.260000 ;
+        RECT  6.155000 0.260000  6.535000 0.735000 ;
+        RECT  6.155000 1.615000  6.535000 2.465000 ;
+        RECT  7.095000 0.260000  7.475000 0.735000 ;
+        RECT  7.095000 1.615000  7.475000 2.465000 ;
+        RECT  8.035000 0.260000  8.415000 0.735000 ;
+        RECT  8.035000 1.615000  8.415000 2.465000 ;
+        RECT  8.975000 0.260000  9.355000 0.735000 ;
+        RECT  8.975000 1.615000  9.355000 2.465000 ;
+        RECT  9.915000 0.260000 10.295000 0.735000 ;
+        RECT  9.915000 1.615000 10.295000 2.465000 ;
+        RECT 10.635000 0.905000 11.135000 1.445000 ;
+        RECT 10.860000 0.365000 11.135000 0.735000 ;
+        RECT 10.860000 1.615000 11.135000 2.360000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 11.500000 0.085000 ;
         RECT  0.175000  0.085000  0.345000 0.905000 ;
         RECT  1.115000  0.085000  1.285000 0.565000 ;
@@ -93,9 +124,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.440000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.500000 2.805000 ;
@@ -141,38 +171,6 @@
         RECT 0.000000 2.480000 11.500000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  4.016500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  3.335000 0.255000  3.635000 0.260000 ;
-        RECT  3.335000 0.260000  3.715000 0.735000 ;
-        RECT  3.335000 0.735000 11.135000 0.905000 ;
-        RECT  3.335000 1.445000 11.135000 1.615000 ;
-        RECT  3.335000 1.615000  3.715000 2.465000 ;
-        RECT  4.275000 0.260000  4.655000 0.735000 ;
-        RECT  4.275000 1.615000  4.655000 2.465000 ;
-        RECT  4.405000 0.255000  4.575000 0.260000 ;
-        RECT  5.215000 0.260000  5.595000 0.735000 ;
-        RECT  5.215000 1.615000  5.595000 2.465000 ;
-        RECT  5.345000 0.255000  5.515000 0.260000 ;
-        RECT  6.155000 0.260000  6.535000 0.735000 ;
-        RECT  6.155000 1.615000  6.535000 2.465000 ;
-        RECT  7.095000 0.260000  7.475000 0.735000 ;
-        RECT  7.095000 1.615000  7.475000 2.465000 ;
-        RECT  8.035000 0.260000  8.415000 0.735000 ;
-        RECT  8.035000 1.615000  8.415000 2.465000 ;
-        RECT  8.975000 0.260000  9.355000 0.735000 ;
-        RECT  8.975000 1.615000  9.355000 2.465000 ;
-        RECT  9.915000 0.260000 10.295000 0.735000 ;
-        RECT  9.915000 1.615000 10.295000 2.465000 ;
-        RECT 10.635000 0.905000 11.135000 1.445000 ;
-        RECT 10.860000 0.365000 11.135000 0.735000 ;
-        RECT 10.860000 1.615000 11.135000 2.360000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.260000  0.895000 0.735000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.lef b/cells/buf/sky130_fd_sc_hdll__buf_2.lef
index 252d5ff..8c7f0c3 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.lef
@@ -37,9 +37,18 @@
         RECT 0.085000 0.985000 0.440000 1.355000 ;
     END
   END A
+  PIN X
+    ANTENNADIFFAREA  0.703800 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER li1 ;
+        RECT 1.270000 0.255000 1.695000 2.465000 ;
+    END
+  END X
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
@@ -51,7 +60,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -61,15 +70,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.703800 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.270000 0.255000 1.695000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.345000 0.635000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
index 59435e8..d30cac6 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
@@ -43,12 +43,20 @@
         RECT 0.085000 0.985000 0.440000 1.355000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.444250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.703750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.270000 0.255000 1.695000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.610000  0.085000 0.940000 0.465000 ;
         RECT 1.865000  0.085000 2.125000 0.925000 ;
@@ -63,9 +71,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.709400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -81,15 +88,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.703750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.270000 0.255000 1.695000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 0.255000 0.345000 0.635000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.lef b/cells/buf/sky130_fd_sc_hdll__buf_4.lef
index c41407c..dcfce5a 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.lef
@@ -37,32 +37,6 @@
         RECT 0.090000 1.075000 0.470000 1.315000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.525000  0.085000 0.815000 0.565000 ;
-        RECT 1.455000  0.085000 1.835000 0.565000 ;
-        RECT 2.395000  0.085000 2.775000 0.885000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.645000 1.835000 0.885000 2.635000 ;
-        RECT 1.455000 1.835000 1.835000 2.635000 ;
-        RECT 2.395000 1.485000 2.775000 2.635000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -78,6 +52,32 @@
         RECT 2.055000 1.615000 2.225000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 3.220000 0.085000 ;
+        RECT 0.525000  0.085000 0.815000 0.565000 ;
+        RECT 1.455000  0.085000 1.835000 0.565000 ;
+        RECT 2.395000  0.085000 2.775000 0.885000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 3.220000 2.805000 ;
+        RECT 0.645000 1.835000 0.885000 2.635000 ;
+        RECT 1.455000 1.835000 1.835000 2.635000 ;
+        RECT 2.395000 1.485000 2.775000 2.635000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.095000 1.485000 0.860000 1.655000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
index 00fa3af..d2e2665 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
@@ -43,12 +43,26 @@
         RECT 0.090000 1.075000 0.470000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.585000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.115000 0.255000 1.285000 0.735000 ;
+        RECT 1.115000 0.735000 2.225000 0.905000 ;
+        RECT 1.115000 1.445000 2.225000 1.615000 ;
+        RECT 1.115000 1.615000 1.285000 2.465000 ;
+        RECT 1.920000 0.905000 2.225000 1.445000 ;
+        RECT 2.055000 0.255000 2.225000 0.735000 ;
+        RECT 2.055000 1.615000 2.225000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.525000  0.085000 0.815000 0.565000 ;
         RECT 1.455000  0.085000 1.835000 0.565000 ;
@@ -66,9 +80,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -87,21 +100,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.115000 0.255000 1.285000 0.735000 ;
-        RECT 1.115000 0.735000 2.225000 0.905000 ;
-        RECT 1.115000 1.445000 2.225000 1.615000 ;
-        RECT 1.115000 1.615000 1.285000 2.465000 ;
-        RECT 1.920000 0.905000 2.225000 1.445000 ;
-        RECT 2.055000 0.255000 2.225000 0.735000 ;
-        RECT 2.055000 1.615000 2.225000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.485000 0.860000 1.655000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.lef b/cells/buf/sky130_fd_sc_hdll__buf_6.lef
index 1d82d3b..fc14ddd 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.lef
@@ -37,36 +37,6 @@
         RECT 0.280000 1.075000 1.265000 1.315000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.435000  0.085000 0.605000 0.565000 ;
-        RECT 1.375000  0.085000 1.545000 0.565000 ;
-        RECT 2.185000  0.085000 2.565000 0.565000 ;
-        RECT 3.125000  0.085000 3.505000 0.565000 ;
-        RECT 4.065000  0.085000 4.445000 0.885000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.435000 1.485000 0.605000 2.635000 ;
-        RECT 1.375000 1.835000 1.615000 2.635000 ;
-        RECT 2.185000 1.835000 2.565000 2.635000 ;
-        RECT 3.125000 1.835000 3.505000 2.635000 ;
-        RECT 4.065000 1.485000 4.445000 2.635000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.526500 ;
     DIRECTION OUTPUT ;
@@ -84,6 +54,36 @@
         RECT 3.725000 1.615000 3.895000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 4.600000 0.085000 ;
+        RECT 0.435000  0.085000 0.605000 0.565000 ;
+        RECT 1.375000  0.085000 1.545000 0.565000 ;
+        RECT 2.185000  0.085000 2.565000 0.565000 ;
+        RECT 3.125000  0.085000 3.505000 0.565000 ;
+        RECT 4.065000  0.085000 4.445000 0.885000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 4.600000 2.805000 ;
+        RECT 0.435000 1.485000 0.605000 2.635000 ;
+        RECT 1.375000 1.835000 1.615000 2.635000 ;
+        RECT 2.185000 1.835000 2.565000 2.635000 ;
+        RECT 3.125000 1.835000 3.505000 2.635000 ;
+        RECT 4.065000 1.485000 4.445000 2.635000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.775000 0.255000 1.155000 0.735000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
index 058528a..baf384f 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
@@ -43,12 +43,28 @@
         RECT 0.280000 1.075000 1.265000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.962000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.526500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.845000 0.255000 2.015000 0.735000 ;
+        RECT 1.845000 0.735000 3.895000 0.905000 ;
+        RECT 1.845000 1.445000 3.895000 1.615000 ;
+        RECT 1.845000 1.615000 2.015000 2.465000 ;
+        RECT 2.410000 0.905000 3.895000 1.445000 ;
+        RECT 2.785000 0.255000 2.955000 0.735000 ;
+        RECT 2.785000 1.615000 2.955000 2.465000 ;
+        RECT 3.725000 0.255000 3.895000 0.735000 ;
+        RECT 3.725000 1.615000 3.895000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.435000  0.085000 0.605000 0.565000 ;
         RECT 1.375000  0.085000 1.545000 0.565000 ;
@@ -71,9 +87,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -97,23 +112,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.526500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.845000 0.255000 2.015000 0.735000 ;
-        RECT 1.845000 0.735000 3.895000 0.905000 ;
-        RECT 1.845000 1.445000 3.895000 1.615000 ;
-        RECT 1.845000 1.615000 2.015000 2.465000 ;
-        RECT 2.410000 0.905000 3.895000 1.445000 ;
-        RECT 2.785000 0.255000 2.955000 0.735000 ;
-        RECT 2.785000 1.615000 2.955000 2.465000 ;
-        RECT 3.725000 0.255000 3.895000 0.735000 ;
-        RECT 3.725000 1.615000 3.895000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.775000 0.255000 1.155000 0.735000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.lef b/cells/buf/sky130_fd_sc_hdll__buf_8.lef
index 1da4a36..df8a209 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.lef
@@ -37,38 +37,6 @@
         RECT 0.140000 1.075000 1.340000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.565000 ;
-        RECT 1.455000  0.085000 1.835000 0.565000 ;
-        RECT 2.395000  0.085000 2.775000 0.565000 ;
-        RECT 3.335000  0.085000 3.715000 0.565000 ;
-        RECT 4.275000  0.085000 4.655000 0.565000 ;
-        RECT 5.215000  0.085000 5.595000 0.885000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.645000 1.835000 0.815000 2.635000 ;
-        RECT 1.585000 1.835000 1.755000 2.635000 ;
-        RECT 2.395000 1.835000 2.775000 2.635000 ;
-        RECT 3.335000 1.835000 3.715000 2.635000 ;
-        RECT 4.275000 1.835000 4.655000 2.635000 ;
-        RECT 5.215000 1.485000 5.595000 2.635000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -88,6 +56,38 @@
         RECT 4.875000 1.615000 5.045000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 5.980000 0.085000 ;
+        RECT 0.515000  0.085000 0.895000 0.565000 ;
+        RECT 1.455000  0.085000 1.835000 0.565000 ;
+        RECT 2.395000  0.085000 2.775000 0.565000 ;
+        RECT 3.335000  0.085000 3.715000 0.565000 ;
+        RECT 4.275000  0.085000 4.655000 0.565000 ;
+        RECT 5.215000  0.085000 5.595000 0.885000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 5.980000 2.805000 ;
+        RECT 0.645000 1.835000 0.815000 2.635000 ;
+        RECT 1.585000 1.835000 1.755000 2.635000 ;
+        RECT 2.395000 1.835000 2.775000 2.635000 ;
+        RECT 3.335000 1.835000 3.715000 2.635000 ;
+        RECT 4.275000 1.835000 4.655000 2.635000 ;
+        RECT 5.215000 1.485000 5.595000 2.635000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.745000 1.615000 ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
index 3dc3321..08d7b6f 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
@@ -43,12 +43,30 @@
         RECT 0.140000 1.075000 1.340000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.176500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.055000 0.255000 2.225000 0.735000 ;
+        RECT 2.055000 0.735000 5.045000 0.905000 ;
+        RECT 2.055000 1.445000 5.045000 1.615000 ;
+        RECT 2.055000 1.615000 2.225000 2.465000 ;
+        RECT 2.995000 0.255000 3.165000 0.735000 ;
+        RECT 2.995000 1.615000 3.165000 2.465000 ;
+        RECT 3.935000 0.255000 4.105000 0.735000 ;
+        RECT 3.935000 1.615000 4.105000 2.465000 ;
+        RECT 4.690000 0.905000 5.045000 1.445000 ;
+        RECT 4.875000 0.255000 5.045000 0.735000 ;
+        RECT 4.875000 1.615000 5.045000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.565000 ;
         RECT 1.455000  0.085000 1.835000 0.565000 ;
@@ -75,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -105,25 +122,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.055000 0.255000 2.225000 0.735000 ;
-        RECT 2.055000 0.735000 5.045000 0.905000 ;
-        RECT 2.055000 1.445000 5.045000 1.615000 ;
-        RECT 2.055000 1.615000 2.225000 2.465000 ;
-        RECT 2.995000 0.255000 3.165000 0.735000 ;
-        RECT 2.995000 1.615000 3.165000 2.465000 ;
-        RECT 3.935000 0.255000 4.105000 0.735000 ;
-        RECT 3.935000 1.615000 4.105000 2.465000 ;
-        RECT 4.690000 0.905000 5.045000 1.445000 ;
-        RECT 4.875000 0.255000 5.045000 0.735000 ;
-        RECT 4.875000 1.615000 5.045000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.745000 1.615000 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.lef
index 9129642..0fe6306 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.lef
@@ -37,22 +37,6 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 13.340000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 13.340000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  4.016500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 12.920000 0.905000 13.220000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 13.340000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 13.340000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 13.340000 0.085000 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
index ec73ed1..77bf859 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
@@ -43,12 +43,41 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  2.801500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  4.016500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  5.735000 0.255000  6.035000 0.260000 ;
+        RECT  5.735000 0.260000  6.115000 0.735000 ;
+        RECT  5.735000 0.735000 13.220000 0.905000 ;
+        RECT  5.735000 1.445000 13.220000 1.615000 ;
+        RECT  5.735000 1.615000  6.115000 2.465000 ;
+        RECT  6.675000 0.260000  7.055000 0.735000 ;
+        RECT  6.675000 1.615000  7.055000 2.465000 ;
+        RECT  6.805000 0.255000  6.975000 0.260000 ;
+        RECT  7.615000 0.260000  7.995000 0.735000 ;
+        RECT  7.615000 1.615000  7.995000 2.465000 ;
+        RECT  7.745000 0.255000  7.915000 0.260000 ;
+        RECT  8.555000 0.260000  8.935000 0.735000 ;
+        RECT  8.555000 1.615000  8.935000 2.465000 ;
+        RECT  9.495000 0.260000  9.875000 0.735000 ;
+        RECT  9.495000 1.615000  9.875000 2.465000 ;
+        RECT 10.435000 0.260000 10.815000 0.735000 ;
+        RECT 10.435000 1.615000 10.815000 2.465000 ;
+        RECT 11.375000 0.260000 11.755000 0.735000 ;
+        RECT 11.375000 1.615000 11.755000 2.465000 ;
+        RECT 12.315000 0.260000 12.695000 0.735000 ;
+        RECT 12.315000 1.615000 12.695000 2.465000 ;
+        RECT 12.920000 0.905000 13.220000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 13.340000 0.085000 ;
         RECT  0.175000  0.085000  0.345000 0.905000 ;
         RECT  1.635000  0.085000  1.805000 0.565000 ;
@@ -99,9 +128,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  4.020000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 13.340000 2.805000 ;
@@ -153,36 +181,6 @@
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  4.016500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  5.735000 0.255000  6.035000 0.260000 ;
-        RECT  5.735000 0.260000  6.115000 0.735000 ;
-        RECT  5.735000 0.735000 13.220000 0.905000 ;
-        RECT  5.735000 1.445000 13.220000 1.615000 ;
-        RECT  5.735000 1.615000  6.115000 2.465000 ;
-        RECT  6.675000 0.260000  7.055000 0.735000 ;
-        RECT  6.675000 1.615000  7.055000 2.465000 ;
-        RECT  6.805000 0.255000  6.975000 0.260000 ;
-        RECT  7.615000 0.260000  7.995000 0.735000 ;
-        RECT  7.615000 1.615000  7.995000 2.465000 ;
-        RECT  7.745000 0.255000  7.915000 0.260000 ;
-        RECT  8.555000 0.260000  8.935000 0.735000 ;
-        RECT  8.555000 1.615000  8.935000 2.465000 ;
-        RECT  9.495000 0.260000  9.875000 0.735000 ;
-        RECT  9.495000 1.615000  9.875000 2.465000 ;
-        RECT 10.435000 0.260000 10.815000 0.735000 ;
-        RECT 10.435000 1.615000 10.815000 2.465000 ;
-        RECT 11.375000 0.260000 11.755000 0.735000 ;
-        RECT 11.375000 1.615000 11.755000 2.465000 ;
-        RECT 12.315000 0.260000 12.695000 0.735000 ;
-        RECT 12.315000 1.615000 12.695000 2.465000 ;
-        RECT 12.920000 0.905000 13.220000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.260000  0.895000 0.905000 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.lef
index 1d724a4..9144cfd 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.lef
@@ -37,22 +37,6 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -72,6 +56,22 @@
         RECT 6.860000 0.905000 7.240000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
index de2f5fe..4ddd341 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
@@ -43,12 +43,30 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.409500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.480000 0.260000 3.860000 0.735000 ;
+        RECT 3.480000 0.735000 7.240000 0.905000 ;
+        RECT 3.480000 1.445000 7.240000 1.615000 ;
+        RECT 3.480000 1.615000 3.860000 2.465000 ;
+        RECT 4.420000 0.260000 4.800000 0.735000 ;
+        RECT 4.420000 1.615000 4.800000 2.465000 ;
+        RECT 5.360000 0.260000 5.740000 0.735000 ;
+        RECT 5.360000 1.615000 5.740000 2.465000 ;
+        RECT 6.300000 0.260000 6.680000 0.735000 ;
+        RECT 6.300000 1.615000 6.680000 2.465000 ;
+        RECT 6.860000 0.905000 7.240000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.360000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.565000 ;
         RECT 2.200000  0.085000 2.370000 0.565000 ;
@@ -79,9 +97,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.044400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.360000 2.805000 ;
@@ -113,25 +130,6 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.480000 0.260000 3.860000 0.735000 ;
-        RECT 3.480000 0.735000 7.240000 0.905000 ;
-        RECT 3.480000 1.445000 7.240000 1.615000 ;
-        RECT 3.480000 1.615000 3.860000 2.465000 ;
-        RECT 4.420000 0.260000 4.800000 0.735000 ;
-        RECT 4.420000 1.615000 4.800000 2.465000 ;
-        RECT 5.360000 0.260000 5.740000 0.735000 ;
-        RECT 5.360000 1.615000 5.740000 2.465000 ;
-        RECT 6.300000 0.260000 6.680000 0.735000 ;
-        RECT 6.300000 1.615000 6.680000 2.465000 ;
-        RECT 6.860000 0.905000 7.240000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 0.260000 0.425000 0.735000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.lef
index c42f87f..52b1130 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.lef
@@ -37,22 +37,6 @@
         RECT 0.090000 1.075000 1.365000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.420000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 12.420000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  4.016500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 11.930000 0.905000 12.205000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.420000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 12.420000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
index 5bd0230..5273d58 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
@@ -43,12 +43,41 @@
         RECT 0.090000 1.075000 1.365000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  2.600000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  4.016500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  4.745000 0.255000  5.045000 0.260000 ;
+        RECT  4.745000 0.260000  5.125000 0.735000 ;
+        RECT  4.745000 0.735000 12.205000 0.905000 ;
+        RECT  4.745000 1.445000 12.205000 1.615000 ;
+        RECT  4.745000 1.615000  5.125000 2.465000 ;
+        RECT  5.685000 0.260000  6.065000 0.735000 ;
+        RECT  5.685000 1.615000  6.065000 2.465000 ;
+        RECT  5.815000 0.255000  5.985000 0.260000 ;
+        RECT  6.625000 0.260000  7.005000 0.735000 ;
+        RECT  6.625000 1.615000  7.005000 2.465000 ;
+        RECT  6.755000 0.255000  6.925000 0.260000 ;
+        RECT  7.565000 0.260000  7.945000 0.735000 ;
+        RECT  7.565000 1.615000  7.945000 2.465000 ;
+        RECT  8.505000 0.260000  8.885000 0.735000 ;
+        RECT  8.505000 1.615000  8.885000 2.465000 ;
+        RECT  9.445000 0.260000  9.825000 0.735000 ;
+        RECT  9.445000 1.615000  9.825000 2.465000 ;
+        RECT 10.385000 0.260000 10.765000 0.735000 ;
+        RECT 10.385000 1.615000 10.765000 2.465000 ;
+        RECT 11.325000 0.260000 11.705000 0.735000 ;
+        RECT 11.325000 1.615000 11.705000 2.465000 ;
+        RECT 11.930000 0.905000 12.205000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 12.420000 0.085000 ;
         RECT  0.645000  0.085000  0.815000 0.565000 ;
         RECT  1.585000  0.085000  1.755000 0.565000 ;
@@ -96,9 +125,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.750000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 12.420000 2.805000 ;
@@ -147,36 +175,6 @@
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  4.016500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  4.745000 0.255000  5.045000 0.260000 ;
-        RECT  4.745000 0.260000  5.125000 0.735000 ;
-        RECT  4.745000 0.735000 12.205000 0.905000 ;
-        RECT  4.745000 1.445000 12.205000 1.615000 ;
-        RECT  4.745000 1.615000  5.125000 2.465000 ;
-        RECT  5.685000 0.260000  6.065000 0.735000 ;
-        RECT  5.685000 1.615000  6.065000 2.465000 ;
-        RECT  5.815000 0.255000  5.985000 0.260000 ;
-        RECT  6.625000 0.260000  7.005000 0.735000 ;
-        RECT  6.625000 1.615000  7.005000 2.465000 ;
-        RECT  6.755000 0.255000  6.925000 0.260000 ;
-        RECT  7.565000 0.260000  7.945000 0.735000 ;
-        RECT  7.565000 1.615000  7.945000 2.465000 ;
-        RECT  8.505000 0.260000  8.885000 0.735000 ;
-        RECT  8.505000 1.615000  8.885000 2.465000 ;
-        RECT  9.445000 0.260000  9.825000 0.735000 ;
-        RECT  9.445000 1.615000  9.825000 2.465000 ;
-        RECT 10.385000 0.260000 10.765000 0.735000 ;
-        RECT 10.385000 1.615000 10.765000 2.465000 ;
-        RECT 11.325000 0.260000 11.705000 0.735000 ;
-        RECT 11.325000 1.615000 11.705000 2.465000 ;
-        RECT 11.930000 0.905000 12.205000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 0.260000  0.425000 0.735000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.lef
index 792840e..432842f 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 1.075000 0.505000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -72,6 +56,22 @@
         RECT 6.415000 0.905000 6.805000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
index 985e13a..78947eb 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
@@ -43,12 +43,30 @@
         RECT 0.085000 1.075000 0.505000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.378000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.915000 0.260000 3.295000 0.735000 ;
+        RECT 2.915000 0.735000 6.805000 0.905000 ;
+        RECT 2.915000 1.445000 6.805000 1.615000 ;
+        RECT 2.915000 1.615000 3.295000 2.465000 ;
+        RECT 3.855000 0.260000 4.235000 0.735000 ;
+        RECT 3.855000 1.615000 4.235000 2.465000 ;
+        RECT 4.795000 0.260000 5.175000 0.735000 ;
+        RECT 4.795000 1.615000 5.175000 2.465000 ;
+        RECT 5.735000 0.260000 6.115000 0.735000 ;
+        RECT 5.735000 1.615000 6.115000 2.465000 ;
+        RECT 6.415000 0.905000 6.805000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.175000  0.085000 0.345000 0.905000 ;
         RECT 1.635000  0.085000 1.805000 0.565000 ;
@@ -78,9 +96,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -111,25 +128,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.915000 0.260000 3.295000 0.735000 ;
-        RECT 2.915000 0.735000 6.805000 0.905000 ;
-        RECT 2.915000 1.445000 6.805000 1.615000 ;
-        RECT 2.915000 1.615000 3.295000 2.465000 ;
-        RECT 3.855000 0.260000 4.235000 0.735000 ;
-        RECT 3.855000 1.615000 4.235000 2.465000 ;
-        RECT 4.795000 0.260000 5.175000 0.735000 ;
-        RECT 4.795000 1.615000 5.175000 2.465000 ;
-        RECT 5.735000 0.260000 6.115000 0.735000 ;
-        RECT 5.735000 1.615000 6.115000 2.465000 ;
-        RECT 6.415000 0.905000 6.805000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.515000 0.260000 0.895000 0.905000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.lef
index 90fceab..50d87dc 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.lef
@@ -37,22 +37,6 @@
         RECT 1.365000 0.985000 1.745000 1.355000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.374500 ;
     DIRECTION OUTPUT ;
@@ -64,6 +48,22 @@
         RECT 0.085000 1.560000 0.355000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
index e36e583..ab6b082 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
@@ -43,12 +43,22 @@
         RECT 1.365000 0.985000 1.745000 1.355000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.338000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.374500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.255000 0.345000 0.760000 ;
+        RECT 0.085000 0.760000 0.255000 1.560000 ;
+        RECT 0.085000 1.560000 0.355000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
         RECT 0.525000  0.085000 1.275000 0.465000 ;
       LAYER mcon ;
@@ -61,9 +71,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.529300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -77,17 +86,6 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.374500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.345000 0.760000 ;
-        RECT 0.085000 0.760000 0.255000 1.560000 ;
-        RECT 0.085000 1.560000 0.355000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.425000 1.060000 0.760000 1.390000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.lef
index ac1f90b..1646339 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.lef
@@ -37,22 +37,6 @@
         RECT 0.525000 1.075000 1.320000 1.305000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.420400 ;
     DIRECTION OUTPUT ;
@@ -76,6 +60,22 @@
         RECT 7.175000 1.665000 7.445000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
index 89601ed..54bc3e2 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
@@ -43,12 +43,34 @@
         RECT 0.525000 1.075000 1.320000 1.305000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.348200 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  2.420400 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.445000 1.475000 7.445000 1.665000 ;
+        RECT 2.445000 1.665000 2.745000 2.465000 ;
+        RECT 2.475000 0.280000 2.745000 0.715000 ;
+        RECT 2.475000 0.715000 7.445000 0.905000 ;
+        RECT 3.415000 0.280000 3.685000 0.715000 ;
+        RECT 3.415000 1.665000 3.685000 2.465000 ;
+        RECT 4.355000 0.280000 4.625000 0.715000 ;
+        RECT 4.355000 1.665000 4.625000 2.465000 ;
+        RECT 5.295000 0.280000 5.565000 0.715000 ;
+        RECT 5.295000 1.665000 5.565000 2.465000 ;
+        RECT 6.235000 0.280000 6.505000 0.715000 ;
+        RECT 6.235000 1.665000 6.505000 2.465000 ;
+        RECT 6.960000 0.905000 7.445000 1.475000 ;
+        RECT 7.175000 0.280000 7.445000 0.715000 ;
+        RECT 7.175000 1.665000 7.445000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.610000 ;
         RECT 1.035000  0.085000 1.365000 0.545000 ;
@@ -83,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -121,29 +142,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  2.420400 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.445000 1.475000 7.445000 1.665000 ;
-        RECT 2.445000 1.665000 2.745000 2.465000 ;
-        RECT 2.475000 0.280000 2.745000 0.715000 ;
-        RECT 2.475000 0.715000 7.445000 0.905000 ;
-        RECT 3.415000 0.280000 3.685000 0.715000 ;
-        RECT 3.415000 1.665000 3.685000 2.465000 ;
-        RECT 4.355000 0.280000 4.625000 0.715000 ;
-        RECT 4.355000 1.665000 4.625000 2.465000 ;
-        RECT 5.295000 0.280000 5.565000 0.715000 ;
-        RECT 5.295000 1.665000 5.565000 2.465000 ;
-        RECT 6.235000 0.280000 6.505000 0.715000 ;
-        RECT 6.235000 1.665000 6.505000 2.465000 ;
-        RECT 6.960000 0.905000 7.445000 1.475000 ;
-        RECT 7.175000 0.280000 7.445000 0.715000 ;
-        RECT 7.175000 1.665000 7.445000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.565000 1.495000 1.805000 1.665000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.lef
index ce82a8f..f6ebfce 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 0.765000 0.400000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.120000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.120000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  3.529800 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 9.245000 1.720000  9.535000 2.460000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.120000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.120000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
index 83a655c..b620a2c 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
@@ -43,12 +43,39 @@
         RECT 0.085000 0.765000 0.400000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.467900 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  3.529800 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.530000 0.280000  2.790000 0.735000 ;
+        RECT 2.530000 0.735000 10.025000 0.905000 ;
+        RECT 2.530000 1.495000 10.025000 1.720000 ;
+        RECT 2.530000 1.720000  8.535000 1.735000 ;
+        RECT 2.530000 1.735000  2.790000 2.460000 ;
+        RECT 3.490000 0.280000  3.750000 0.735000 ;
+        RECT 3.490000 1.735000  3.750000 2.460000 ;
+        RECT 4.450000 0.280000  4.710000 0.735000 ;
+        RECT 4.450000 1.735000  4.710000 2.460000 ;
+        RECT 5.345000 0.280000  5.670000 0.735000 ;
+        RECT 5.410000 1.735000  5.670000 2.460000 ;
+        RECT 6.355000 0.280000  6.615000 0.735000 ;
+        RECT 6.355000 1.735000  6.615000 2.460000 ;
+        RECT 7.315000 0.280000  7.575000 0.735000 ;
+        RECT 7.315000 1.735000  7.575000 2.460000 ;
+        RECT 8.275000 0.280000  8.535000 0.735000 ;
+        RECT 8.275000 1.735000  8.535000 2.460000 ;
+        RECT 8.760000 0.905000 10.025000 1.495000 ;
+        RECT 9.245000 0.280000  9.505000 0.735000 ;
+        RECT 9.245000 1.720000  9.535000 2.460000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 10.120000 0.085000 ;
         RECT 0.085000  0.085000  0.390000 0.595000 ;
         RECT 1.090000  0.085000  1.350000 0.610000 ;
@@ -89,9 +116,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.245000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.120000 2.805000 ;
@@ -134,34 +160,6 @@
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  3.529800 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.530000 0.280000  2.790000 0.735000 ;
-        RECT 2.530000 0.735000 10.025000 0.905000 ;
-        RECT 2.530000 1.495000 10.025000 1.720000 ;
-        RECT 2.530000 1.720000  8.535000 1.735000 ;
-        RECT 2.530000 1.735000  2.790000 2.460000 ;
-        RECT 3.490000 0.280000  3.750000 0.735000 ;
-        RECT 3.490000 1.735000  3.750000 2.460000 ;
-        RECT 4.450000 0.280000  4.710000 0.735000 ;
-        RECT 4.450000 1.735000  4.710000 2.460000 ;
-        RECT 5.345000 0.280000  5.670000 0.735000 ;
-        RECT 5.410000 1.735000  5.670000 2.460000 ;
-        RECT 6.355000 0.280000  6.615000 0.735000 ;
-        RECT 6.355000 1.735000  6.615000 2.460000 ;
-        RECT 7.315000 0.280000  7.575000 0.735000 ;
-        RECT 7.315000 1.735000  7.575000 2.460000 ;
-        RECT 8.275000 0.280000  8.535000 0.735000 ;
-        RECT 8.275000 1.735000  8.535000 2.460000 ;
-        RECT 8.760000 0.905000 10.025000 1.495000 ;
-        RECT 9.245000 0.280000  9.505000 0.735000 ;
-        RECT 9.245000 1.720000  9.535000 2.460000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.620000 0.265000 0.870000 1.075000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.lef
index 1d191d0..c742a42 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.lef
@@ -37,22 +37,6 @@
         RECT 0.425000 0.745000 0.835000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.445400 ;
     DIRECTION OUTPUT ;
@@ -66,6 +50,22 @@
         RECT 1.485000 0.825000 1.875000 1.855000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
index 5bac9b5..96ad305 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
@@ -43,12 +43,24 @@
         RECT 0.425000 0.745000 0.835000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.245700 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.445400 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.140000 0.255000 1.345000 0.655000 ;
+        RECT 1.140000 0.655000 1.875000 0.825000 ;
+        RECT 1.160000 1.855000 1.875000 2.030000 ;
+        RECT 1.160000 2.030000 1.345000 2.435000 ;
+        RECT 1.485000 0.825000 1.875000 1.855000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.605000  0.085000 0.880000 0.565000 ;
         RECT 1.515000  0.085000 1.900000 0.485000 ;
@@ -63,9 +75,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.615000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -81,19 +92,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.445400 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.140000 0.255000 1.345000 0.655000 ;
-        RECT 1.140000 0.655000 1.875000 0.825000 ;
-        RECT 1.160000 1.855000 1.875000 2.030000 ;
-        RECT 1.160000 2.030000 1.345000 2.435000 ;
-        RECT 1.485000 0.825000 1.875000 1.855000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.585000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.lef
index 5a8e11e..b6df8fd 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.lef
@@ -37,22 +37,6 @@
         RECT 0.425000 0.755000 0.825000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.898200 ;
     DIRECTION OUTPUT ;
@@ -70,6 +54,22 @@
         RECT 2.410000 0.905000 2.910000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
index 17b797b..ba439b9 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
@@ -43,12 +43,28 @@
         RECT 0.425000 0.755000 0.825000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.401100 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.898200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.050000 0.345000 1.405000 0.735000 ;
+        RECT 1.050000 0.735000 2.910000 0.905000 ;
+        RECT 1.145000 1.835000 2.365000 2.005000 ;
+        RECT 1.145000 2.005000 1.405000 2.465000 ;
+        RECT 2.105000 0.345000 2.365000 0.735000 ;
+        RECT 2.105000 1.415000 2.910000 1.650000 ;
+        RECT 2.105000 1.650000 2.365000 1.835000 ;
+        RECT 2.105000 2.005000 2.365000 2.465000 ;
+        RECT 2.410000 0.905000 2.910000 1.415000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.605000  0.085000 0.880000 0.565000 ;
         RECT 1.625000  0.085000 1.880000 0.565000 ;
@@ -66,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.960000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -87,23 +102,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.898200 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.050000 0.345000 1.405000 0.735000 ;
-        RECT 1.050000 0.735000 2.910000 0.905000 ;
-        RECT 1.145000 1.835000 2.365000 2.005000 ;
-        RECT 1.145000 2.005000 1.405000 2.465000 ;
-        RECT 2.105000 0.345000 2.365000 0.735000 ;
-        RECT 2.105000 1.415000 2.910000 1.650000 ;
-        RECT 2.105000 1.650000 2.365000 1.835000 ;
-        RECT 2.105000 2.005000 2.365000 2.465000 ;
-        RECT 2.410000 0.905000 2.910000 1.415000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.385000 0.585000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.lef
index d23613b..3b567ea 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 0.715000 0.395000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.212300 ;
     DIRECTION OUTPUT ;
@@ -70,6 +54,22 @@
         RECT 3.745000 0.905000 4.075000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
index cfda866..4fb5ae8 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
@@ -43,12 +43,28 @@
         RECT 0.085000 0.715000 0.395000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.724500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.212300 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.505000 0.255000 1.835000 0.735000 ;
+        RECT 1.505000 0.735000 4.075000 0.905000 ;
+        RECT 1.505000 1.495000 4.075000 1.665000 ;
+        RECT 1.505000 1.665000 1.835000 2.460000 ;
+        RECT 2.445000 0.255000 2.775000 0.735000 ;
+        RECT 2.445000 1.665000 2.775000 2.460000 ;
+        RECT 3.385000 0.255000 3.715000 0.735000 ;
+        RECT 3.385000 1.665000 3.715000 2.460000 ;
+        RECT 3.745000 0.905000 4.075000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.145000  0.085000 0.395000 0.545000 ;
         RECT 1.065000  0.085000 1.335000 0.610000 ;
@@ -71,9 +87,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -97,23 +112,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.212300 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.505000 0.255000 1.835000 0.735000 ;
-        RECT 1.505000 0.735000 4.075000 0.905000 ;
-        RECT 1.505000 1.495000 4.075000 1.665000 ;
-        RECT 1.505000 1.665000 1.835000 2.460000 ;
-        RECT 2.445000 0.255000 2.775000 0.735000 ;
-        RECT 2.445000 1.665000 2.775000 2.460000 ;
-        RECT 3.385000 0.255000 3.715000 0.735000 ;
-        RECT 3.385000 1.665000 3.715000 2.460000 ;
-        RECT 3.745000 0.905000 4.075000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.565000 0.265000 0.895000 1.075000 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.lef
index 49b0150..73b64f9 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 0.715000 0.400000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.775400 ;
     DIRECTION OUTPUT ;
@@ -72,6 +56,22 @@
         RECT 4.450000 1.735000 4.710000 2.460000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
index a370b34..f9c549e 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
@@ -43,12 +43,30 @@
         RECT 0.085000 0.715000 0.400000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.779100 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.775400 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.570000 0.280000 1.830000 0.735000 ;
+        RECT 1.570000 0.735000 5.230000 0.905000 ;
+        RECT 1.570000 1.495000 5.230000 1.735000 ;
+        RECT 1.570000 1.735000 1.830000 2.460000 ;
+        RECT 2.530000 0.280000 2.790000 0.735000 ;
+        RECT 2.530000 1.735000 2.790000 2.460000 ;
+        RECT 3.490000 0.280000 3.750000 0.735000 ;
+        RECT 3.490000 1.735000 3.750000 2.460000 ;
+        RECT 4.160000 0.905000 5.230000 1.495000 ;
+        RECT 4.450000 0.280000 4.710000 0.735000 ;
+        RECT 4.450000 1.735000 4.710000 2.460000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.145000  0.085000 0.390000 0.545000 ;
         RECT 1.090000  0.085000 1.350000 0.610000 ;
@@ -74,9 +92,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.750000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -103,25 +120,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.775400 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.570000 0.280000 1.830000 0.735000 ;
-        RECT 1.570000 0.735000 5.230000 0.905000 ;
-        RECT 1.570000 1.495000 5.230000 1.735000 ;
-        RECT 1.570000 1.735000 1.830000 2.460000 ;
-        RECT 2.530000 0.280000 2.790000 0.735000 ;
-        RECT 2.530000 1.735000 2.790000 2.460000 ;
-        RECT 3.490000 0.280000 3.750000 0.735000 ;
-        RECT 3.490000 1.735000 3.750000 2.460000 ;
-        RECT 4.160000 0.905000 5.230000 1.495000 ;
-        RECT 4.450000 0.280000 4.710000 0.735000 ;
-        RECT 4.450000 1.735000 4.710000 2.460000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.620000 0.265000 0.870000 1.075000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.lef
index 5a81ca9..af622aa 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 0.375000 0.325000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.375900 ;
     DIRECTION OUTPUT ;
@@ -64,6 +48,22 @@
         RECT 0.515000 1.290000 0.895000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
index 76aec34..eafdd40 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
@@ -43,12 +43,22 @@
         RECT 0.085000 0.375000 0.325000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.119700 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.375900 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.255000 0.890000 0.760000 ;
+        RECT 0.515000 0.760000 1.395000 1.290000 ;
+        RECT 0.515000 1.290000 0.895000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
         RECT 1.115000  0.085000 1.395000 0.590000 ;
       LAYER mcon ;
@@ -61,9 +71,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.470400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -78,17 +87,6 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.375900 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.255000 0.890000 0.760000 ;
-        RECT 0.515000 0.760000 1.395000 1.290000 ;
-        RECT 0.515000 1.290000 0.895000 2.465000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.lef
index 8f6a0a5..88acaf2 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.lef
@@ -37,22 +37,6 @@
         RECT 0.455000 1.035000 7.925000 1.290000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.290400 ;
     DIRECTION OUTPUT ;
@@ -80,6 +64,22 @@
         RECT 8.115000 1.630000 8.385000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
index 8d46564..fe490fc 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
@@ -43,12 +43,38 @@
         RECT 0.455000 1.035000 7.925000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.323000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  3.290400 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.115000 0.695000 8.655000 0.865000 ;
+        RECT 0.115000 0.865000 0.285000 1.460000 ;
+        RECT 0.115000 1.460000 8.655000 1.630000 ;
+        RECT 0.595000 1.630000 0.865000 2.465000 ;
+        RECT 1.535000 1.630000 1.805000 2.465000 ;
+        RECT 2.005000 0.255000 2.275000 0.695000 ;
+        RECT 2.475000 1.630000 2.745000 2.465000 ;
+        RECT 2.945000 0.255000 3.215000 0.695000 ;
+        RECT 3.415000 1.630000 3.685000 2.465000 ;
+        RECT 3.885000 0.255000 4.155000 0.695000 ;
+        RECT 4.355000 1.630000 4.625000 2.465000 ;
+        RECT 4.825000 0.255000 5.095000 0.695000 ;
+        RECT 5.295000 1.630000 5.565000 2.465000 ;
+        RECT 5.765000 0.255000 6.035000 0.695000 ;
+        RECT 6.235000 1.630000 6.505000 2.465000 ;
+        RECT 6.705000 0.255000 6.975000 0.695000 ;
+        RECT 7.175000 1.630000 7.445000 2.465000 ;
+        RECT 8.100000 0.865000 8.655000 1.460000 ;
+        RECT 8.115000 1.630000 8.385000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.200000 0.085000 ;
         RECT 1.165000  0.085000 1.835000 0.525000 ;
         RECT 2.445000  0.085000 2.775000 0.525000 ;
@@ -83,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.860000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.200000 2.805000 ;
@@ -124,33 +149,6 @@
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  3.290400 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.115000 0.695000 8.655000 0.865000 ;
-        RECT 0.115000 0.865000 0.285000 1.460000 ;
-        RECT 0.115000 1.460000 8.655000 1.630000 ;
-        RECT 0.595000 1.630000 0.865000 2.465000 ;
-        RECT 1.535000 1.630000 1.805000 2.465000 ;
-        RECT 2.005000 0.255000 2.275000 0.695000 ;
-        RECT 2.475000 1.630000 2.745000 2.465000 ;
-        RECT 2.945000 0.255000 3.215000 0.695000 ;
-        RECT 3.415000 1.630000 3.685000 2.465000 ;
-        RECT 3.885000 0.255000 4.155000 0.695000 ;
-        RECT 4.355000 1.630000 4.625000 2.465000 ;
-        RECT 4.825000 0.255000 5.095000 0.695000 ;
-        RECT 5.295000 1.630000 5.565000 2.465000 ;
-        RECT 5.765000 0.255000 6.035000 0.695000 ;
-        RECT 6.235000 1.630000 6.505000 2.465000 ;
-        RECT 6.705000 0.255000 6.975000 0.695000 ;
-        RECT 7.175000 1.630000 7.445000 2.465000 ;
-        RECT 8.100000 0.865000 8.655000 1.460000 ;
-        RECT 8.115000 1.630000 8.385000 2.465000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.lef
index 9f31c4a..d3a71ef 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.lef
@@ -37,22 +37,6 @@
         RECT 0.345000 0.895000 2.355000 1.275000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.420000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 12.420000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  4.928900 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 11.375000 1.665000 11.630000 2.450000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.420000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 12.420000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
index 73037d0..c90ffc3 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
@@ -55,12 +55,41 @@
         RECT 10.285000 1.260000 11.135000 1.305000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.228500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  4.928900 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  0.625000 1.455000 11.630000 1.665000 ;
+        RECT  0.625000 1.665000  0.880000 2.465000 ;
+        RECT  1.585000 1.665000  1.840000 2.450000 ;
+        RECT  2.575000 0.280000  2.800000 1.415000 ;
+        RECT  2.575000 1.415000  9.705000 1.455000 ;
+        RECT  2.575000 1.665000  2.800000 2.465000 ;
+        RECT  3.505000 0.280000  3.760000 1.415000 ;
+        RECT  3.505000 1.665000  3.760000 2.450000 ;
+        RECT  4.465000 0.280000  4.705000 1.415000 ;
+        RECT  4.465000 1.665000  4.705000 2.450000 ;
+        RECT  5.455000 0.280000  5.805000 1.415000 ;
+        RECT  5.455000 1.665000  5.830000 2.450000 ;
+        RECT  6.575000 0.280000  6.825000 1.415000 ;
+        RECT  6.575000 1.665000  6.825000 2.450000 ;
+        RECT  7.535000 0.280000  7.785000 1.415000 ;
+        RECT  7.535000 1.665000  7.785000 2.450000 ;
+        RECT  8.495000 0.280000  8.745000 1.415000 ;
+        RECT  8.495000 1.665000  8.745000 2.450000 ;
+        RECT  9.455000 0.280000  9.705000 1.415000 ;
+        RECT  9.455000 1.665000  9.705000 2.450000 ;
+        RECT 10.415000 1.665000 10.655000 2.450000 ;
+        RECT 11.375000 1.665000 11.630000 2.450000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 12.420000 0.085000 ;
         RECT 2.055000  0.085000  2.325000 0.610000 ;
         RECT 3.020000  0.085000  3.285000 0.610000 ;
@@ -104,9 +133,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.895000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 12.420000 2.805000 ;
@@ -156,36 +184,6 @@
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  4.928900 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.625000 1.455000 11.630000 1.665000 ;
-        RECT  0.625000 1.665000  0.880000 2.465000 ;
-        RECT  1.585000 1.665000  1.840000 2.450000 ;
-        RECT  2.575000 0.280000  2.800000 1.415000 ;
-        RECT  2.575000 1.415000  9.705000 1.455000 ;
-        RECT  2.575000 1.665000  2.800000 2.465000 ;
-        RECT  3.505000 0.280000  3.760000 1.415000 ;
-        RECT  3.505000 1.665000  3.760000 2.450000 ;
-        RECT  4.465000 0.280000  4.705000 1.415000 ;
-        RECT  4.465000 1.665000  4.705000 2.450000 ;
-        RECT  5.455000 0.280000  5.805000 1.415000 ;
-        RECT  5.455000 1.665000  5.830000 2.450000 ;
-        RECT  6.575000 0.280000  6.825000 1.415000 ;
-        RECT  6.575000 1.665000  6.825000 2.450000 ;
-        RECT  7.535000 0.280000  7.785000 1.415000 ;
-        RECT  7.535000 1.665000  7.785000 2.450000 ;
-        RECT  8.495000 0.280000  8.745000 1.415000 ;
-        RECT  8.495000 1.665000  8.745000 2.450000 ;
-        RECT  9.455000 0.280000  9.705000 1.415000 ;
-        RECT  9.455000 1.665000  9.705000 2.450000 ;
-        RECT 10.415000 1.665000 10.655000 2.450000 ;
-        RECT 11.375000 1.665000 11.630000 2.450000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.lef
index 20cbfb0..d31f636 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 1.065000 1.335000 1.290000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.728600 ;
     DIRECTION OUTPUT ;
@@ -67,6 +51,22 @@
         RECT 1.520000 0.895000 2.155000 1.460000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
index 7b74c08..c0a8869 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
@@ -43,12 +43,25 @@
         RECT 0.085000 1.065000 1.335000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.241500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.728600 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.155000 1.460000 2.155000 1.630000 ;
+        RECT 0.155000 1.630000 0.410000 2.435000 ;
+        RECT 1.110000 1.630000 1.370000 2.435000 ;
+        RECT 1.125000 0.280000 1.350000 0.725000 ;
+        RECT 1.125000 0.725000 2.155000 0.895000 ;
+        RECT 1.520000 0.895000 2.155000 1.460000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.560000  0.085000 0.905000 0.610000 ;
         RECT 1.520000  0.085000 1.900000 0.555000 ;
@@ -63,9 +76,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.575000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -81,20 +93,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.728600 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.155000 1.460000 2.155000 1.630000 ;
-        RECT 0.155000 1.630000 0.410000 2.435000 ;
-        RECT 1.110000 1.630000 1.370000 2.435000 ;
-        RECT 1.125000 0.280000 1.350000 0.725000 ;
-        RECT 1.125000 0.725000 2.155000 0.895000 ;
-        RECT 1.520000 0.895000 2.155000 1.460000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.lef
index 9dff5f3..e237e6c 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.lef
@@ -37,22 +37,6 @@
         RECT 0.445000 1.065000 2.910000 1.290000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.177200 ;
     DIRECTION OUTPUT ;
@@ -70,6 +54,22 @@
         RECT 3.270000 0.895000 3.570000 1.460000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
index 96fed84..6219e0c 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
@@ -43,12 +43,28 @@
         RECT 0.445000 1.065000 2.910000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.485100 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.177200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.105000 0.725000 3.570000 0.895000 ;
+        RECT 0.105000 0.895000 0.275000 1.460000 ;
+        RECT 0.105000 1.460000 3.570000 1.630000 ;
+        RECT 0.655000 1.630000 0.910000 2.435000 ;
+        RECT 1.130000 0.280000 1.390000 0.725000 ;
+        RECT 1.615000 1.630000 1.870000 2.435000 ;
+        RECT 2.090000 0.280000 2.345000 0.725000 ;
+        RECT 2.570000 1.630000 2.830000 2.435000 ;
+        RECT 3.270000 0.895000 3.570000 1.460000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.565000  0.085000 0.910000 0.555000 ;
         RECT 1.610000  0.085000 1.870000 0.555000 ;
@@ -67,9 +83,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.270000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -90,23 +105,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.177200 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.105000 0.725000 3.570000 0.895000 ;
-        RECT 0.105000 0.895000 0.275000 1.460000 ;
-        RECT 0.105000 1.460000 3.570000 1.630000 ;
-        RECT 0.655000 1.630000 0.910000 2.435000 ;
-        RECT 1.130000 0.280000 1.390000 0.725000 ;
-        RECT 1.615000 1.630000 1.870000 2.435000 ;
-        RECT 2.090000 0.280000 2.345000 0.725000 ;
-        RECT 2.570000 1.630000 2.830000 2.435000 ;
-        RECT 3.270000 0.895000 3.570000 1.460000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.lef
index 3e462d6..646c98b 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.lef
@@ -37,22 +37,6 @@
         RECT 0.455000 1.035000 5.565000 1.290000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.386400 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 6.060000 0.865000 6.330000 1.460000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
index 1816371..72d3b36 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
@@ -43,12 +43,33 @@
         RECT 0.455000 1.035000 5.565000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.701400 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.386400 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.115000 0.695000 6.330000 0.865000 ;
+        RECT 0.115000 0.865000 0.285000 1.460000 ;
+        RECT 0.115000 1.460000 6.330000 1.630000 ;
+        RECT 0.615000 1.630000 0.855000 2.435000 ;
+        RECT 1.555000 1.630000 1.795000 2.435000 ;
+        RECT 1.685000 0.280000 1.875000 0.695000 ;
+        RECT 2.495000 1.630000 2.745000 2.435000 ;
+        RECT 2.645000 0.280000 2.835000 0.695000 ;
+        RECT 3.430000 1.630000 3.675000 2.435000 ;
+        RECT 3.605000 0.280000 3.795000 0.695000 ;
+        RECT 4.420000 1.630000 4.725000 2.435000 ;
+        RECT 4.665000 0.280000 4.855000 0.695000 ;
+        RECT 5.465000 1.630000 5.705000 2.435000 ;
+        RECT 6.060000 0.865000 6.330000 1.460000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 1.135000  0.085000 1.465000 0.525000 ;
         RECT 2.095000  0.085000 2.425000 0.525000 ;
@@ -75,9 +96,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.095000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -107,28 +127,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.386400 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.115000 0.695000 6.330000 0.865000 ;
-        RECT 0.115000 0.865000 0.285000 1.460000 ;
-        RECT 0.115000 1.460000 6.330000 1.630000 ;
-        RECT 0.615000 1.630000 0.855000 2.435000 ;
-        RECT 1.555000 1.630000 1.795000 2.435000 ;
-        RECT 1.685000 0.280000 1.875000 0.695000 ;
-        RECT 2.495000 1.630000 2.745000 2.435000 ;
-        RECT 2.645000 0.280000 2.835000 0.695000 ;
-        RECT 3.430000 1.630000 3.675000 2.435000 ;
-        RECT 3.605000 0.280000 3.795000 0.695000 ;
-        RECT 4.420000 1.630000 4.725000 2.435000 ;
-        RECT 4.665000 0.280000 4.855000 0.695000 ;
-        RECT 5.465000 1.630000 5.705000 2.435000 ;
-        RECT 6.060000 0.865000 6.330000 1.460000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.lef
index e37f81f..b4b5ce8 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.lef
@@ -37,22 +37,6 @@
         RECT 0.145000 0.995000 0.600000 1.665000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.436800 ;
     DIRECTION OUTPUT ;
@@ -63,6 +47,22 @@
         RECT 0.785000 0.750000 1.235000 2.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
index e5ecc1c..ad2b8ed 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
@@ -43,12 +43,21 @@
         RECT 0.145000 0.995000 0.600000 1.665000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.156750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.436750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.785000 0.315000 1.545000 0.750000 ;
+        RECT 0.785000 0.750000 1.235000 2.455000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
         RECT 0.295000  0.085000 0.615000 0.745000 ;
       LAYER mcon ;
@@ -61,9 +70,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.650000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -79,16 +87,6 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.436750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.785000 0.315000 1.545000 0.750000 ;
-        RECT 0.785000 0.750000 1.235000 2.455000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.lef
index c10f049..830ea28 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 0.745000 0.425000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.694000 ;
     DIRECTION OUTPUT ;
@@ -66,6 +50,22 @@
         RECT 1.655000 1.295000 1.985000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
index 1a088b6..4429f7a 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
@@ -43,12 +43,24 @@
         RECT 0.085000 0.745000 0.425000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.288750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.694000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.605000 0.255000 1.165000 0.680000 ;
+        RECT 0.605000 0.680000 0.955000 1.015000 ;
+        RECT 0.605000 1.015000 1.985000 1.295000 ;
+        RECT 0.605000 1.295000 0.945000 2.465000 ;
+        RECT 1.655000 1.295000 1.985000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.575000 ;
         RECT 1.675000  0.085000 2.000000 0.775000 ;
@@ -64,9 +76,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.790000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -84,19 +95,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.694000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.605000 0.255000 1.165000 0.680000 ;
-        RECT 0.605000 0.680000 0.955000 1.015000 ;
-        RECT 0.605000 1.015000 1.985000 1.295000 ;
-        RECT 0.605000 1.295000 0.945000 2.465000 ;
-        RECT 1.655000 1.295000 1.985000 2.465000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.lef
index be68787..449888c 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.lef
@@ -62,22 +62,6 @@
         RECT 3.805000 1.055000 3.995000 1.440000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.405200 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 0.090000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
index 59275a5..fe2db71 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
@@ -68,12 +68,21 @@
         RECT 3.805000 1.055000 3.995000 1.440000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.476000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.405200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 0.255000 0.345000 1.495000 ;
+        RECT 0.090000 1.495000 0.425000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 3.250000  0.085000 3.765000 0.525000 ;
@@ -93,9 +102,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.805800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -116,16 +124,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.405200 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.255000 0.345000 1.495000 ;
-        RECT 0.090000 1.495000 0.425000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.655000 1.610000 0.825000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.lef
index 54db42e..fcaa0c7 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.lef
@@ -62,22 +62,6 @@
         RECT 4.265000 1.055000 4.455000 1.440000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.430400 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 0.555000 1.495000 0.895000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
index f709cea..b9f72eb 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
@@ -68,12 +68,21 @@
         RECT 4.265000 1.055000 4.455000 1.440000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.632000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.430400 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.555000 0.255000 0.805000 1.495000 ;
+        RECT 0.555000 1.495000 0.895000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.135000  0.085000 0.385000 0.655000 ;
         RECT 0.975000  0.085000 1.355000 0.485000 ;
@@ -95,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.066400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -120,16 +128,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.430400 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.555000 0.255000 0.805000 1.495000 ;
-        RECT 0.555000 1.495000 0.895000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.975000 0.655000 2.070000 0.825000 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.lef
index 4c0a023..edd776e 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.lef
@@ -62,22 +62,6 @@
         RECT 5.185000 1.055000 5.375000 1.440000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.860800 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 1.475000 1.495000 1.835000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
index 992f2bb..a2f0279 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
@@ -68,12 +68,26 @@
         RECT 5.185000 1.055000 5.375000 1.440000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.801600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.860800 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.565000 1.495000 0.895000 2.465000 ;
+        RECT 0.590000 0.255000 0.850000 1.065000 ;
+        RECT 0.590000 1.065000 1.745000 1.325000 ;
+        RECT 0.590000 1.325000 0.850000 1.495000 ;
+        RECT 1.475000 0.255000 1.745000 1.065000 ;
+        RECT 1.475000 1.325000 1.745000 1.495000 ;
+        RECT 1.475000 1.495000 1.835000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.175000  0.085000 0.420000 0.655000 ;
         RECT 1.055000  0.085000 1.305000 0.655000 ;
@@ -98,9 +112,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.358800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -126,21 +139,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.860800 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.565000 1.495000 0.895000 2.465000 ;
-        RECT 0.590000 0.255000 0.850000 1.065000 ;
-        RECT 0.590000 1.065000 1.745000 1.325000 ;
-        RECT 0.590000 1.325000 0.850000 1.495000 ;
-        RECT 1.475000 0.255000 1.745000 1.065000 ;
-        RECT 1.475000 1.325000 1.745000 1.495000 ;
-        RECT 1.475000 1.495000 1.835000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 1.915000 0.655000 2.990000 0.825000 ;
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.lef b/cells/conb/sky130_fd_sc_hdll__conb_1.lef
index 5346bde..65b6bbb 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.lef
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.lef
@@ -29,6 +29,7 @@
   SIZE  1.380000 BY  2.720000 ;
   SITE unithd ;
   PIN HI
+    ANTENNADIFFAREA  0.000000 ;
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
@@ -37,6 +38,7 @@
     END
   END HI
   PIN LO
+    ANTENNADIFFAREA  0.000000 ;
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
@@ -46,7 +48,7 @@
   END LO
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
@@ -54,7 +56,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
index b61e1bc..92c2dc6 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
@@ -52,7 +52,7 @@
   END LO
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 1.380000 0.085000 ;
@@ -67,7 +67,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.380000 2.805000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.lef b/cells/decap/sky130_fd_sc_hdll__decap_12.lef
index 75dba09..fb08e6b 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
index 0d0baa0..82df14e 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
@@ -35,10 +35,8 @@
   SYMMETRY X Y R90 ;
   SITE unithd ;
   PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  4.115100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
@@ -62,10 +60,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  2.601500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.lef b/cells/decap/sky130_fd_sc_hdll__decap_3.lef
index ef236f0..d84d6f0 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
index 01536dd..1af50de 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
@@ -35,10 +35,8 @@
   SYMMETRY X Y R90 ;
   SITE unithd ;
   PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  0.513300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 1.380000 0.085000 ;
@@ -53,10 +51,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  0.324500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.380000 2.805000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.lef b/cells/decap/sky130_fd_sc_hdll__decap_4.lef
index a057c6b..bd90588 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
index 39ebee0..7bdc9c6 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
@@ -35,10 +35,8 @@
   SYMMETRY X Y R90 ;
   SITE unithd ;
   PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  0.913500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
@@ -54,10 +52,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  0.577500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.lef b/cells/decap/sky130_fd_sc_hdll__decap_6.lef
index e9a62ac..d7520f2 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
index 52123b2..4ab6b76 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
@@ -35,10 +35,8 @@
   SYMMETRY X Y R90 ;
   SITE unithd ;
   PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  1.713900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
@@ -56,10 +54,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  1.083500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.lef b/cells/decap/sky130_fd_sc_hdll__decap_8.lef
index cc04ff1..e36993a 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
index 575b41a..fa5cbd0 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
@@ -35,10 +35,8 @@
   SYMMETRY X Y R90 ;
   SITE unithd ;
   PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  2.514300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
@@ -58,10 +56,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  1.589500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.lef
index d2d7fc0..679e0b7 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.lef
@@ -70,7 +70,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
@@ -78,7 +78,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
index 2217598..b9e01d5 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
@@ -83,9 +83,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  1.178900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 9.660000 0.085000 ;
@@ -121,9 +120,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.314500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.660000 2.805000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.lef
index 4533dc2..5f8b3e6 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.lef
@@ -74,7 +74,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
@@ -82,7 +82,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
index d771de9..87c03e8 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
@@ -87,9 +87,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  1.315400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 10.120000 0.085000 ;
@@ -127,9 +126,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.584500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.120000 2.805000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.lef
index 63b305d..b18e1a0 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.lef
@@ -76,7 +76,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
@@ -84,7 +84,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.500000 2.960000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
index a353eea..ea6b8ee 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
@@ -91,9 +91,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  1.581500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 11.500000 0.085000 ;
@@ -135,9 +134,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.881700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.500000 2.805000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.lef
index e6b4bcf..38d8ea5 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.lef
@@ -71,7 +71,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 10.120000 0.085000 ;
@@ -87,7 +87,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.120000 2.805000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
index b3a0406..0d5cf79 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
@@ -84,9 +84,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.186550 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 10.120000 0.085000 ;
@@ -124,9 +123,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.388300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.120000 2.805000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.lef
index efa79dc..4c51464 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.lef
@@ -73,7 +73,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 10.580000 0.085000 ;
@@ -90,7 +90,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 10.580000 2.805000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
index 91c186c..712c2cc 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
@@ -86,9 +86,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.330550 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 10.580000 0.085000 ;
@@ -128,9 +127,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.678900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 10.580000 2.805000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.lef
index f78b98f..2b784a5 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.lef
@@ -77,7 +77,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 11.960000 0.085000 ;
@@ -95,7 +95,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.960000 2.805000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
index e7e94ad..7f8a2d9 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
@@ -90,9 +90,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.599300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 11.960000 0.085000 ;
@@ -136,9 +135,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.968300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.960000 2.805000 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.lef b/cells/diode/sky130_fd_sc_hdll__diode_2.lef
index dda3642..9a700ed 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.lef
@@ -39,11 +39,11 @@
   END DIODE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.lef b/cells/diode/sky130_fd_sc_hdll__diode_4.lef
index d88a74d..1898df4 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.lef
@@ -39,11 +39,11 @@
   END DIODE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.lef b/cells/diode/sky130_fd_sc_hdll__diode_6.lef
index 4ba9699..7c95b4d 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.lef
@@ -39,11 +39,11 @@
   END DIODE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.lef b/cells/diode/sky130_fd_sc_hdll__diode_8.lef
index 322e2d9..126e193 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.lef
@@ -39,11 +39,11 @@
   END DIODE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.lef
index 44441ff..16eec2c 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.lef
@@ -70,7 +70,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
@@ -78,7 +78,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
index d7be7f8..3e0067a 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
@@ -75,9 +75,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  0.564250 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
@@ -106,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.lef
index 40d8074..36ea320 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.lef
@@ -71,7 +71,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
@@ -79,7 +79,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
index ed7a3c8..e653013 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
@@ -76,9 +76,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  0.804750 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
@@ -108,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.lef
index 659e736..085ddde 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.lef
@@ -76,7 +76,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
@@ -84,7 +84,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
index 0bd3841..bb3dd1d 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
@@ -81,9 +81,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  1.006250 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
@@ -116,9 +115,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.lef
index 1738784..c5b34d6 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.lef
@@ -70,7 +70,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
@@ -78,7 +78,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
index f47438f..75531ab 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
@@ -75,9 +75,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  0.564250 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
@@ -106,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.lef
index b3e537a..8cb8b7e 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.lef
@@ -71,7 +71,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
@@ -79,7 +79,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
index 470f6db..eabc060 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
@@ -76,9 +76,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  0.804750 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
@@ -108,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.lef
index 2bdfda4..bc602db 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.lef
@@ -76,7 +76,7 @@
   END RESET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
@@ -84,7 +84,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
index fbc58e3..30cab14 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
@@ -81,9 +81,8 @@
     END
   END RESET_B
   PIN VGND
-    ANTENNADIFFAREA  1.006250 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
@@ -116,9 +115,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.lef
index 3efb98f..8aa81a0 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.lef
@@ -57,7 +57,7 @@
   END Q
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
@@ -65,7 +65,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
index 1ab0457..d08f527 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
@@ -62,9 +62,8 @@
     END
   END Q
   PIN VGND
-    ANTENNADIFFAREA  0.600900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
@@ -91,9 +90,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.784600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.lef
index 6d97d8c..6762133 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.lef
@@ -61,7 +61,7 @@
   END Q
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
@@ -69,7 +69,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
index 71419fa..e637bc7 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
@@ -66,9 +66,8 @@
     END
   END Q
   PIN VGND
-    ANTENNADIFFAREA  0.776000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
@@ -97,9 +96,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.044600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.lef
index 73b4f87..6adbba3 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.lef
@@ -63,7 +63,7 @@
   END Q
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
@@ -71,7 +71,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
index 534346f..0fdd426 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
@@ -68,9 +68,8 @@
     END
   END Q
   PIN VGND
-    ANTENNADIFFAREA  0.993750 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 7.360000 0.085000 ;
@@ -102,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.349600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.360000 2.805000 ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.lef b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.lef
index 80245cb..79c611c 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.449000 ;
     DIRECTION OUTPUT ;
@@ -64,6 +48,22 @@
         RECT 2.950000 0.825000 3.120000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
index c03a642..f7fe502 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
@@ -43,12 +43,22 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.503900 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.449000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.830000 0.255000 3.120000 0.825000 ;
+        RECT 2.860000 1.495000 3.120000 2.465000 ;
+        RECT 2.950000 0.825000 3.120000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.600000  0.085000 0.815000 0.545000 ;
         RECT 2.145000  0.085000 2.555000 0.565000 ;
@@ -65,9 +75,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -85,17 +94,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.449000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.830000 0.255000 3.120000 0.825000 ;
-        RECT 2.860000 1.495000 3.120000 2.465000 ;
-        RECT 2.950000 0.825000 3.120000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 1.785000 0.945000 2.005000 ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.lef b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.lef
index 93ebb4c..78dc48d 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.464000 ;
     DIRECTION OUTPUT ;
@@ -64,6 +48,22 @@
         RECT 2.860000 0.825000 3.110000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
index 42d45ef..dc89826 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
@@ -43,12 +43,22 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.491300 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.464000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.780000 0.255000 3.110000 0.825000 ;
+        RECT 2.780000 1.495000 3.110000 2.465000 ;
+        RECT 2.860000 0.825000 3.110000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.600000  0.085000 0.815000 0.545000 ;
         RECT 2.145000  0.085000 2.555000 0.565000 ;
@@ -65,9 +75,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -85,17 +94,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.464000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.780000 0.255000 3.110000 0.825000 ;
-        RECT 2.780000 1.495000 3.110000 2.465000 ;
-        RECT 2.860000 0.825000 3.110000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 1.785000 0.945000 2.005000 ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.lef b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.lef
index 9a5bfc1..60d6f6a 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -64,6 +48,22 @@
         RECT 3.325000 0.825000 3.595000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
index b4b27aa..fcc045d 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
@@ -43,12 +43,22 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.363600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.445500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.190000 0.255000 3.595000 0.825000 ;
+        RECT 3.190000 1.495000 3.595000 2.465000 ;
+        RECT 3.325000 0.825000 3.595000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.600000  0.085000 0.815000 0.545000 ;
         RECT 2.690000  0.085000 3.020000 0.565000 ;
@@ -66,9 +76,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.449100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -87,17 +96,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.445500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.190000 0.255000 3.595000 0.825000 ;
-        RECT 3.190000 1.495000 3.595000 2.465000 ;
-        RECT 3.325000 0.825000 3.595000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 1.785000 0.945000 2.005000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.lef
index 0642756..5c5e14e 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.lef
@@ -46,22 +46,6 @@
         RECT 0.960000 1.075000 1.290000 1.630000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.700500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 3.315000 0.825000 3.585000 1.495000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT -0.005000  2.635000 3.680000 2.805000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
index e184f60..8e30fbd 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.960000 1.075000 1.290000 1.630000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.365250 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.700500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.125000 1.495000 3.585000 2.465000 ;
+        RECT 3.255000 0.255000 3.585000 0.825000 ;
+        RECT 3.315000 0.825000 3.585000 1.495000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.445000 ;
         RECT 2.345000  0.085000 3.085000 0.565000 ;
@@ -75,9 +85,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.465600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT -0.005000 2.635000 3.680000 2.805000 ;
@@ -96,17 +105,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.700500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.125000 1.495000 3.585000 2.465000 ;
-        RECT 3.255000 0.255000 3.585000 0.825000 ;
-        RECT 3.315000 0.825000 3.585000 1.495000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.280000 0.345000 0.615000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.lef
index 55b77d2..9453488 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.lef
@@ -46,22 +46,6 @@
         RECT 0.945000 0.765000 1.300000 1.275000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 4.230000 0.855000 4.460000 1.445000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
index 9dcea65..f77aff8 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
@@ -52,12 +52,24 @@
         RECT 0.945000 0.765000 1.300000 1.275000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.354000 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.530500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.985000 1.445000 4.460000 1.625000 ;
+        RECT 1.985000 1.625000 3.995000 1.765000 ;
+        RECT 3.545000 0.635000 4.460000 0.855000 ;
+        RECT 3.595000 1.765000 3.995000 2.125000 ;
+        RECT 4.230000 0.855000 4.460000 1.445000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.515000  0.085000 0.900000 0.595000 ;
         RECT 2.490000  0.085000 2.870000 0.485000 ;
@@ -77,9 +89,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.525400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -100,19 +111,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.530500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.985000 1.445000 4.460000 1.625000 ;
-        RECT 1.985000 1.625000 3.995000 1.765000 ;
-        RECT 3.545000 0.635000 4.460000 0.855000 ;
-        RECT 3.595000 1.765000 3.995000 2.125000 ;
-        RECT 4.230000 0.855000 4.460000 1.445000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.280000 0.345000 2.465000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.lef
index 50867f4..4fe4c31 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.lef
@@ -46,22 +46,6 @@
         RECT 1.000000 0.765000 1.380000 1.425000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 6.105000 0.855000 6.335000 1.445000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
index c990462..24ecb30 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
@@ -52,12 +52,22 @@
         RECT 1.000000 0.765000 1.380000 1.425000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.724750 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.995000 1.445000 6.335000 1.725000 ;
+        RECT 4.495000 0.615000 6.335000 0.855000 ;
+        RECT 6.105000 0.855000 6.335000 1.445000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.515000  0.085000 0.980000 0.595000 ;
         RECT 2.495000  0.085000 2.875000 0.485000 ;
@@ -82,9 +92,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.940200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -110,17 +119,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.995000 1.445000 6.335000 1.725000 ;
-        RECT 4.495000 0.615000 6.335000 0.855000 ;
-        RECT 6.105000 0.855000 6.335000 1.445000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.280000 0.345000 0.665000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.lef
index 52126fa..378a272 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.lef
@@ -48,22 +48,6 @@
         RECT 1.020000 1.325000 1.405000 1.695000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 10.675000 0.855000 10.925000 1.445000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
index 7ad1448..ff402d2 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
@@ -54,12 +54,22 @@
         RECT 1.020000 1.325000 1.405000 1.695000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  1.417000 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  2.145000 1.445000 10.925000 1.725000 ;
+        RECT  7.225000 0.615000 10.925000 0.855000 ;
+        RECT 10.675000 0.855000 10.925000 1.445000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 11.040000 0.085000 ;
         RECT 0.085000  0.085000  0.445000 0.825000 ;
         RECT 1.020000  0.085000  1.405000 0.445000 ;
@@ -97,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.958400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 11.040000 2.805000 ;
@@ -138,17 +147,6 @@
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  2.145000 1.445000 10.925000 1.725000 ;
-        RECT  7.225000 0.615000 10.925000 0.855000 ;
-        RECT 10.675000 0.855000 10.925000 1.445000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.650000 0.280000  0.850000 1.615000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_1.lef
index c856a5b..b792218 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.955000 0.510000 1.725000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.471500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 1.970000 0.595000 2.210000 1.785000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
index 86c6494..86abd92 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.085000 0.955000 0.510000 1.725000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.525500 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.471500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.400000 1.785000 2.675000 2.465000 ;
+        RECT 1.970000 0.255000 2.675000 0.595000 ;
+        RECT 1.970000 0.595000 2.210000 1.785000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.540000  0.085000 1.590000 0.445000 ;
       LAYER mcon ;
@@ -72,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.314400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -90,17 +99,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.471500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.400000 1.785000 2.675000 2.465000 ;
-        RECT 1.970000 0.255000 2.675000 0.595000 ;
-        RECT 1.970000 0.595000 2.210000 1.785000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.370000 0.615000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_2.lef
index 1a70a3e..18153c5 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.995000 0.325000 1.385000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.768000 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 3.035000 1.695000 3.535000 2.465000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
index a718bd1..d16a1d6 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.085000 0.995000 0.325000 1.385000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.284700 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.768000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.145000 1.445000 3.535000 1.695000 ;
+        RECT 2.445000 0.595000 2.815000 1.445000 ;
+        RECT 3.035000 1.695000 3.535000 2.465000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 1.600000  0.085000 1.930000 0.485000 ;
@@ -75,9 +85,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.552600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -96,17 +105,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.768000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.145000 1.445000 3.535000 1.695000 ;
-        RECT 2.445000 0.595000 2.815000 1.445000 ;
-        RECT 3.035000 1.695000 3.535000 2.465000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.655000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_4.lef
index 70fdb62..95ed017 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 4.430000 1.480000 4.810000 2.075000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
index e69ab42..2dca144 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.617500 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.490000 0.620000 4.810000 1.480000 ;
+        RECT 3.490000 1.480000 3.870000 2.075000 ;
+        RECT 4.430000 1.480000 4.810000 2.075000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 1.605000  0.085000 1.935000 0.485000 ;
@@ -80,9 +90,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.866300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -106,17 +115,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.490000 0.620000 4.810000 1.480000 ;
-        RECT 3.490000 1.480000 3.870000 2.075000 ;
-        RECT 4.430000 1.480000 4.810000 2.075000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.655000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_8.lef
index 5531ef7..6bacac3 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 8.870000 0.825000 9.095000 1.455000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
index c54b1a3..f69fe03 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
@@ -52,12 +52,26 @@
         RECT 0.090000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  1.043250 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 5.370000 0.620000 9.095000 0.825000 ;
+        RECT 5.370000 1.455000 9.095000 1.625000 ;
+        RECT 5.370000 1.625000 5.750000 2.125000 ;
+        RECT 6.310000 1.625000 6.690000 2.125000 ;
+        RECT 7.250000 1.625000 7.630000 2.125000 ;
+        RECT 8.190000 1.625000 8.570000 2.125000 ;
+        RECT 8.870000 0.825000 9.095000 1.455000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.200000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 1.605000  0.085000 1.935000 0.485000 ;
@@ -90,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.411500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.200000 2.805000 ;
@@ -126,21 +139,6 @@
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 5.370000 0.620000 9.095000 0.825000 ;
-        RECT 5.370000 1.455000 9.095000 1.625000 ;
-        RECT 5.370000 1.625000 5.750000 2.125000 ;
-        RECT 6.310000 1.625000 6.690000 2.125000 ;
-        RECT 7.250000 1.625000 7.630000 2.125000 ;
-        RECT 8.190000 1.625000 8.570000 2.125000 ;
-        RECT 8.870000 0.825000 9.095000 1.455000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.345000 0.655000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_1.lef
index 8d50d21..cec0a20 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.995000 0.595000 1.725000 ;
     END
   END TE
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.488000 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 1.980000 2.125000 2.625000 2.465000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
index 0e253c1..9743988 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.085000 0.995000 0.595000 1.725000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  0.194000 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.488000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.980000 0.255000 2.625000 0.805000 ;
+        RECT 1.980000 0.805000 2.155000 2.125000 ;
+        RECT 1.980000 2.125000 2.625000 2.465000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.515000  0.085000 1.500000 0.485000 ;
       LAYER mcon ;
@@ -72,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.845700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -90,17 +99,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.488000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.980000 0.255000 2.625000 0.805000 ;
-        RECT 1.980000 0.805000 2.155000 2.125000 ;
-        RECT 1.980000 2.125000 2.625000 2.465000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.655000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_2.lef
index 4e09941..e958eec 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -71,6 +55,22 @@
         RECT 2.645000 0.595000 3.075000 2.125000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
index d00c563..f7aabcf 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
@@ -52,12 +52,20 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  0.410000 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.530500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.645000 0.595000 3.075000 2.125000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.515000  0.085000 0.925000 0.485000 ;
         RECT 1.510000  0.085000 1.880000 0.485000 ;
@@ -75,9 +83,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.445400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -96,15 +103,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.530500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.645000 0.595000 3.075000 2.125000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.655000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_4.lef
index 6ca0053..dc4dd5e 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 4.430000 1.615000 4.810000 2.125000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
index 7458218..2916f40 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
@@ -52,12 +52,24 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  0.598000 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.490000 0.635000 5.410000 0.850000 ;
+        RECT 3.490000 0.850000 4.030000 1.445000 ;
+        RECT 3.490000 1.445000 4.810000 1.615000 ;
+        RECT 3.490000 1.615000 3.870000 2.125000 ;
+        RECT 4.430000 1.615000 4.810000 2.125000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 1.475000  0.085000 1.855000 0.485000 ;
@@ -80,9 +92,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.815200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -106,19 +117,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.490000 0.635000 5.410000 0.850000 ;
-        RECT 3.490000 0.850000 4.030000 1.445000 ;
-        RECT 3.490000 1.445000 4.810000 1.615000 ;
-        RECT 3.490000 1.615000 3.870000 2.125000 ;
-        RECT 4.430000 1.615000 4.810000 2.125000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.655000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_8.lef
index e1197df..9fd3ac2 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 8.190000 1.615000 8.570000 2.125000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
index 26e1451..a1ec39b 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
@@ -52,12 +52,26 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  1.014000 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  1.992000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 5.370000 0.635000 9.095000 0.850000 ;
+        RECT 5.370000 0.850000 5.800000 1.445000 ;
+        RECT 5.370000 1.445000 8.570000 1.615000 ;
+        RECT 5.370000 1.615000 5.750000 2.125000 ;
+        RECT 6.310000 1.615000 6.690000 2.125000 ;
+        RECT 7.250000 1.615000 7.630000 2.125000 ;
+        RECT 8.190000 1.615000 8.570000 2.125000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.200000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 1.475000  0.085000 1.855000 0.485000 ;
@@ -90,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.360400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.200000 2.805000 ;
@@ -126,21 +139,6 @@
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  1.992000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 5.370000 0.635000 9.095000 0.850000 ;
-        RECT 5.370000 0.850000 5.800000 1.445000 ;
-        RECT 5.370000 1.445000 8.570000 1.615000 ;
-        RECT 5.370000 1.615000 5.750000 2.125000 ;
-        RECT 6.310000 1.615000 6.690000 2.125000 ;
-        RECT 7.250000 1.615000 7.630000 2.125000 ;
-        RECT 8.190000 1.615000 8.570000 2.125000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.655000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.lef b/cells/fill/sky130_fd_sc_hdll__fill_1.lef
index 2ba6dce..48e0d06 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
index e7398d9..239ddf6 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
@@ -36,7 +36,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 0.460000 0.085000 ;
@@ -48,7 +48,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 0.460000 2.805000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.lef b/cells/fill/sky130_fd_sc_hdll__fill_2.lef
index 8eca13a..c3fb0c2 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.920000 2.960000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
index e040260..0f9fc55 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
@@ -36,7 +36,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 0.920000 0.085000 ;
@@ -49,7 +49,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 0.920000 2.805000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.lef b/cells/fill/sky130_fd_sc_hdll__fill_4.lef
index 08b5096..207df22 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
index 5fd42cf..73a6408 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
@@ -36,7 +36,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
@@ -51,7 +51,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.lef b/cells/fill/sky130_fd_sc_hdll__fill_8.lef
index f66ce78..ee4ec0a 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
index f89f8d1..0ee7cba 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
@@ -36,7 +36,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
@@ -55,7 +55,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.lef b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.lef
index 20484ad..361f42e 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.lef
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.lef
@@ -47,22 +47,6 @@
         RECT 0.855000 1.075000 1.275000 1.325000 ;
     END
   END SLEEP_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.539000 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 1.955000 0.545000 2.205000 1.915000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
index f59fed4..b7e3feb 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
@@ -53,12 +53,22 @@
         RECT 0.855000 1.075000 1.275000 1.325000 ;
     END
   END SLEEP_B
-  PIN VGND
-    ANTENNADIFFAREA  0.244600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.539000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.595000 0.255000 2.205000 0.545000 ;
+        RECT 1.745000 1.915000 2.205000 2.465000 ;
+        RECT 1.955000 0.545000 2.205000 1.915000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 1.175000  0.085000 1.425000 0.545000 ;
       LAYER mcon ;
@@ -72,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.469100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -90,17 +99,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.539000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.595000 0.255000 2.205000 0.545000 ;
-        RECT 1.745000 1.915000 2.205000 2.465000 ;
-        RECT 1.955000 0.545000 2.205000 1.915000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.125000 0.355000 0.455000 0.715000 ;
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.lef b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.lef
index f278c96..7d41f87 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.lef
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.lef
@@ -46,22 +46,6 @@
         RECT 0.145000 0.765000 0.445000 1.615000 ;
     END
   END SLEEP
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 2.905000 0.775000 3.080000 1.580000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
index b9ab052..24b46e3 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.145000 0.765000 0.445000 1.615000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.419700 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.505000 1.580000 3.080000 2.365000 ;
+        RECT 2.620000 0.255000 3.080000 0.775000 ;
+        RECT 2.905000 0.775000 3.080000 1.580000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.590000 ;
         RECT 2.070000  0.085000 2.400000 0.580000 ;
@@ -74,9 +84,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -94,17 +103,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.505000 1.580000 3.080000 2.365000 ;
-        RECT 2.620000 0.255000 3.080000 0.775000 ;
-        RECT 2.905000 0.775000 3.080000 1.580000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.175000 1.785000 0.895000 2.015000 ;
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.lef b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.lef
index 27c3ab0..1bdcd64 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.lef
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END SLEEP_B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 2.910000 0.760000 3.080000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
index 575f246..f55958e 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END SLEEP_B
-  PIN VGND
-    ANTENNADIFFAREA  0.597450 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.472000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.675000 0.415000 3.080000 0.760000 ;
+        RECT 2.675000 1.495000 3.080000 2.465000 ;
+        RECT 2.910000 0.760000 3.080000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.640000  0.085000 1.375000 0.565000 ;
         RECT 1.995000  0.085000 2.425000 0.485000 ;
@@ -74,9 +84,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -94,17 +103,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.472000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.675000 0.415000 3.080000 0.760000 ;
-        RECT 2.675000 1.495000 3.080000 2.465000 ;
-        RECT 2.910000 0.760000 3.080000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.110000 0.265000 0.420000 0.735000 ;
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.lef b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.lef
index f4a9c76..f0f06fa 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.lef
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.lef
@@ -46,22 +46,6 @@
         RECT 1.000000 0.765000 1.315000 1.325000 ;
     END
   END SLEEP
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.650500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 1.900000 0.825000 2.215000 1.845000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
index bb1c3ca..c8da7ce 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 1.000000 0.765000 1.315000 1.325000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.351700 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.650500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.665000 0.255000 2.215000 0.825000 ;
+        RECT 1.795000 1.845000 2.215000 2.465000 ;
+        RECT 1.900000 0.825000 2.215000 1.845000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.190000  0.085000 0.430000 0.595000 ;
         RECT 1.220000  0.085000 1.435000 0.595000 ;
@@ -72,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -89,17 +98,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.650500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.665000 0.255000 2.215000 0.825000 ;
-        RECT 1.795000 1.845000 2.215000 2.465000 ;
-        RECT 1.900000 0.825000 2.215000 1.845000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.150000 1.495000 1.705000 1.665000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.lef b/cells/inv/sky130_fd_sc_hdll__inv_1.lef
index a0b0393..33af3b4 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.lef
@@ -37,22 +37,6 @@
         RECT 0.095000 1.075000 0.650000 1.315000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.380000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.380000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -64,6 +48,22 @@
         RECT 0.995000 0.885000 1.285000 1.485000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.380000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
index 7dfb9d0..fbf6de0 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
@@ -43,12 +43,22 @@
         RECT 0.095000 1.075000 0.650000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.770000 0.255000 1.285000 0.885000 ;
+        RECT 0.770000 1.485000 1.285000 2.465000 ;
+        RECT 0.995000 0.885000 1.285000 1.485000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.380000 0.085000 ;
         RECT 0.320000  0.085000 0.550000 0.905000 ;
       LAYER mcon ;
@@ -60,9 +70,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.380000 2.805000 ;
@@ -75,17 +84,6 @@
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.770000 0.255000 1.285000 0.885000 ;
-        RECT 0.770000 1.485000 1.285000 2.465000 ;
-        RECT 0.995000 0.885000 1.285000 1.485000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.lef b/cells/inv/sky130_fd_sc_hdll__inv_12.lef
index d176bc7..6ea718e 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.lef
@@ -37,22 +37,6 @@
         RECT 0.680000 1.075000 5.800000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.020500 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 5.970000 0.905000 6.320000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
index d9abbf5..2164fe1 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
@@ -43,12 +43,35 @@
         RECT 0.680000 1.075000 5.800000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.384500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  3.020500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.715000 6.320000 0.905000 ;
+        RECT 0.085000 0.905000 0.510000 1.495000 ;
+        RECT 0.085000 1.495000 6.320000 1.665000 ;
+        RECT 0.680000 0.255000 1.060000 0.715000 ;
+        RECT 0.680000 1.665000 1.060000 2.465000 ;
+        RECT 1.620000 0.255000 2.000000 0.715000 ;
+        RECT 1.620000 1.665000 2.000000 2.465000 ;
+        RECT 2.560000 0.255000 2.940000 0.715000 ;
+        RECT 2.560000 1.665000 2.940000 2.465000 ;
+        RECT 3.500000 0.255000 3.880000 0.715000 ;
+        RECT 3.500000 1.665000 3.880000 2.465000 ;
+        RECT 4.440000 0.255000 4.820000 0.715000 ;
+        RECT 4.440000 1.665000 4.820000 2.465000 ;
+        RECT 5.380000 0.255000 5.760000 0.715000 ;
+        RECT 5.380000 1.665000 5.760000 2.465000 ;
+        RECT 5.970000 0.905000 6.320000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.255000  0.085000 0.510000 0.545000 ;
         RECT 1.280000  0.085000 1.450000 0.545000 ;
@@ -77,9 +100,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.000000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -109,30 +131,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  3.020500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.715000 6.320000 0.905000 ;
-        RECT 0.085000 0.905000 0.510000 1.495000 ;
-        RECT 0.085000 1.495000 6.320000 1.665000 ;
-        RECT 0.680000 0.255000 1.060000 0.715000 ;
-        RECT 0.680000 1.665000 1.060000 2.465000 ;
-        RECT 1.620000 0.255000 2.000000 0.715000 ;
-        RECT 1.620000 1.665000 2.000000 2.465000 ;
-        RECT 2.560000 0.255000 2.940000 0.715000 ;
-        RECT 2.560000 1.665000 2.940000 2.465000 ;
-        RECT 3.500000 0.255000 3.880000 0.715000 ;
-        RECT 3.500000 1.665000 3.880000 2.465000 ;
-        RECT 4.440000 0.255000 4.820000 0.715000 ;
-        RECT 4.440000 1.665000 4.820000 2.465000 ;
-        RECT 5.380000 0.255000 5.760000 0.715000 ;
-        RECT 5.380000 1.665000 5.760000 2.465000 ;
-        RECT 5.970000 0.905000 6.320000 1.495000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.lef b/cells/inv/sky130_fd_sc_hdll__inv_16.lef
index 5e174dc..90c6bf9 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.lef
@@ -37,22 +37,6 @@
         RECT 0.085000 1.075000 6.125000 1.315000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.984000 ;
     DIRECTION OUTPUT ;
@@ -80,6 +64,22 @@
         RECT 7.160000 1.665000 7.540000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
index 25c4771..f770078 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
@@ -43,12 +43,38 @@
         RECT 0.085000 1.075000 6.125000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.826500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  3.984000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.580000 0.255000 0.960000 0.715000 ;
+        RECT 0.580000 0.715000 7.540000 0.905000 ;
+        RECT 0.580000 1.495000 7.540000 1.665000 ;
+        RECT 0.580000 1.665000 0.960000 2.465000 ;
+        RECT 1.520000 0.255000 1.900000 0.715000 ;
+        RECT 1.520000 1.665000 1.900000 2.465000 ;
+        RECT 2.460000 0.255000 2.840000 0.715000 ;
+        RECT 2.460000 1.665000 2.840000 2.465000 ;
+        RECT 3.400000 0.255000 3.780000 0.715000 ;
+        RECT 3.400000 1.665000 3.780000 2.465000 ;
+        RECT 4.340000 0.255000 4.720000 0.715000 ;
+        RECT 4.340000 1.665000 4.720000 2.465000 ;
+        RECT 5.280000 0.255000 5.660000 0.715000 ;
+        RECT 5.280000 1.665000 5.660000 2.465000 ;
+        RECT 6.220000 0.255000 6.600000 0.715000 ;
+        RECT 6.220000 1.665000 6.600000 2.465000 ;
+        RECT 7.015000 0.905000 7.540000 1.495000 ;
+        RECT 7.160000 0.255000 7.540000 0.715000 ;
+        RECT 7.160000 1.665000 7.540000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.180000  0.085000 0.410000 0.885000 ;
         RECT 1.180000  0.085000 1.350000 0.545000 ;
@@ -83,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -121,33 +146,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  3.984000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.580000 0.255000 0.960000 0.715000 ;
-        RECT 0.580000 0.715000 7.540000 0.905000 ;
-        RECT 0.580000 1.495000 7.540000 1.665000 ;
-        RECT 0.580000 1.665000 0.960000 2.465000 ;
-        RECT 1.520000 0.255000 1.900000 0.715000 ;
-        RECT 1.520000 1.665000 1.900000 2.465000 ;
-        RECT 2.460000 0.255000 2.840000 0.715000 ;
-        RECT 2.460000 1.665000 2.840000 2.465000 ;
-        RECT 3.400000 0.255000 3.780000 0.715000 ;
-        RECT 3.400000 1.665000 3.780000 2.465000 ;
-        RECT 4.340000 0.255000 4.720000 0.715000 ;
-        RECT 4.340000 1.665000 4.720000 2.465000 ;
-        RECT 5.280000 0.255000 5.660000 0.715000 ;
-        RECT 5.280000 1.665000 5.660000 2.465000 ;
-        RECT 6.220000 0.255000 6.600000 0.715000 ;
-        RECT 6.220000 1.665000 6.600000 2.465000 ;
-        RECT 7.015000 0.905000 7.540000 1.495000 ;
-        RECT 7.160000 0.255000 7.540000 0.715000 ;
-        RECT 7.160000 1.665000 7.540000 2.465000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.lef b/cells/inv/sky130_fd_sc_hdll__inv_2.lef
index bf9a542..5160b3d 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.lef
@@ -37,22 +37,6 @@
         RECT 0.105000 1.075000 0.435000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -64,6 +48,22 @@
         RECT 0.605000 0.885000 0.905000 1.485000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
index 1f36828..b5960a8 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
@@ -43,12 +43,22 @@
         RECT 0.105000 1.075000 0.435000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.370500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.525000 0.255000 0.905000 0.885000 ;
+        RECT 0.525000 1.485000 0.905000 2.465000 ;
+        RECT 0.605000 0.885000 0.905000 1.485000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
         RECT 0.125000  0.085000 0.355000 0.905000 ;
         RECT 1.125000  0.085000 1.335000 0.905000 ;
@@ -62,9 +72,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -79,17 +88,6 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.525000 0.255000 0.905000 0.885000 ;
-        RECT 0.525000 1.485000 0.905000 2.465000 ;
-        RECT 0.605000 0.885000 0.905000 1.485000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.lef b/cells/inv/sky130_fd_sc_hdll__inv_4.lef
index 8ac6e39..9a6288a 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.lef
@@ -37,22 +37,6 @@
         RECT 0.105000 1.075000 1.885000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -69,6 +53,22 @@
         RECT 2.395000 0.905000 2.665000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
index be7710a..bb48646 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
@@ -43,12 +43,27 @@
         RECT 0.105000 1.075000 1.885000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.737750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.565000 0.255000 0.945000 0.725000 ;
+        RECT 0.565000 0.725000 2.665000 0.905000 ;
+        RECT 0.565000 1.495000 2.665000 1.665000 ;
+        RECT 0.565000 1.665000 0.945000 2.465000 ;
+        RECT 1.505000 0.255000 1.885000 0.725000 ;
+        RECT 1.505000 1.665000 2.665000 1.685000 ;
+        RECT 1.505000 1.685000 1.885000 2.465000 ;
+        RECT 2.395000 0.905000 2.665000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.130000  0.085000 0.395000 0.545000 ;
         RECT 1.165000  0.085000 1.335000 0.545000 ;
@@ -65,9 +80,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.075000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -85,22 +99,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.565000 0.255000 0.945000 0.725000 ;
-        RECT 0.565000 0.725000 2.665000 0.905000 ;
-        RECT 0.565000 1.495000 2.665000 1.665000 ;
-        RECT 0.565000 1.665000 0.945000 2.465000 ;
-        RECT 1.505000 0.255000 1.885000 0.725000 ;
-        RECT 1.505000 1.665000 2.665000 1.685000 ;
-        RECT 1.505000 1.685000 1.885000 2.465000 ;
-        RECT 2.395000 0.905000 2.665000 1.495000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.lef b/cells/inv/sky130_fd_sc_hdll__inv_6.lef
index 8b137b7..5301f04 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.lef
@@ -37,22 +37,6 @@
         RECT 0.285000 1.075000 2.695000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.494000 ;
     DIRECTION OUTPUT ;
@@ -71,6 +55,22 @@
         RECT 2.865000 0.905000 3.265000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
index cd9813c..c342df9 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
@@ -43,12 +43,29 @@
         RECT 0.285000 1.075000 2.695000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.760500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.494000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.495000 3.265000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 0.645000 0.255000 0.815000 0.725000 ;
+        RECT 0.645000 0.725000 3.265000 0.905000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 1.585000 0.255000 1.755000 0.725000 ;
+        RECT 2.395000 1.665000 3.265000 1.685000 ;
+        RECT 2.395000 1.685000 2.775000 2.465000 ;
+        RECT 2.525000 0.255000 2.695000 0.725000 ;
+        RECT 2.865000 0.905000 3.265000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.130000  0.085000 0.395000 0.545000 ;
         RECT 1.115000  0.085000 1.285000 0.545000 ;
@@ -68,9 +85,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.130000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -91,24 +107,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.494000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.495000 3.265000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 0.645000 0.255000 0.815000 0.725000 ;
-        RECT 0.645000 0.725000 3.265000 0.905000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 1.585000 0.255000 1.755000 0.725000 ;
-        RECT 2.395000 1.665000 3.265000 1.685000 ;
-        RECT 2.395000 1.685000 2.775000 2.465000 ;
-        RECT 2.525000 0.255000 2.695000 0.725000 ;
-        RECT 2.865000 0.905000 3.265000 1.495000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.lef b/cells/inv/sky130_fd_sc_hdll__inv_8.lef
index e1cd04a..862cbe2 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.lef
@@ -37,22 +37,6 @@
         RECT 0.680000 1.075000 3.885000 1.325000 ;
     END
   END A
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 4.185000 0.905000 4.505000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
index 3acecbe..4946adf 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
@@ -43,12 +43,31 @@
         RECT 0.680000 1.075000 3.885000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.962000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.715000 4.505000 0.905000 ;
+        RECT 0.085000 0.905000 0.430000 1.495000 ;
+        RECT 0.085000 1.495000 4.505000 1.665000 ;
+        RECT 0.680000 0.255000 1.060000 0.715000 ;
+        RECT 0.680000 1.665000 1.060000 2.465000 ;
+        RECT 1.620000 0.255000 2.000000 0.715000 ;
+        RECT 1.620000 1.665000 2.000000 2.465000 ;
+        RECT 2.560000 0.255000 2.940000 0.715000 ;
+        RECT 2.560000 1.665000 2.940000 2.465000 ;
+        RECT 3.500000 0.255000 3.880000 0.715000 ;
+        RECT 3.500000 1.665000 3.880000 2.465000 ;
+        RECT 4.185000 0.905000 4.505000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.255000  0.085000 0.510000 0.545000 ;
         RECT 1.280000  0.085000 1.450000 0.545000 ;
@@ -71,9 +90,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -97,26 +115,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.715000 4.505000 0.905000 ;
-        RECT 0.085000 0.905000 0.430000 1.495000 ;
-        RECT 0.085000 1.495000 4.505000 1.665000 ;
-        RECT 0.680000 0.255000 1.060000 0.715000 ;
-        RECT 0.680000 1.665000 1.060000 2.465000 ;
-        RECT 1.620000 0.255000 2.000000 0.715000 ;
-        RECT 1.620000 1.665000 2.000000 2.465000 ;
-        RECT 2.560000 0.255000 2.940000 0.715000 ;
-        RECT 2.560000 1.665000 2.940000 2.465000 ;
-        RECT 3.500000 0.255000 3.880000 0.715000 ;
-        RECT 3.500000 1.665000 3.880000 2.465000 ;
-        RECT 4.185000 0.905000 4.505000 1.495000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.lef
index a0849fb..29fb07a 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.lef
@@ -46,22 +46,6 @@
         RECT 1.010000 1.065000 1.425000 1.325000 ;
     END
   END SLEEP
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.478000 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 2.025000 0.815000 2.205000 1.850000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
index 3ed262d..7cfaaa0 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
@@ -52,12 +52,23 @@
         RECT 1.010000 1.065000 1.425000 1.325000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.423000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.478000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.285000 0.255000 1.635000 0.645000 ;
+        RECT 1.285000 0.645000 2.205000 0.815000 ;
+        RECT 1.755000 1.850000 2.205000 2.465000 ;
+        RECT 2.025000 0.815000 2.205000 1.850000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.905000  0.085000 1.115000 0.895000 ;
         RECT 1.805000  0.085000 2.135000 0.475000 ;
@@ -72,9 +83,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.328800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -89,18 +99,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.478000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.285000 0.255000 1.635000 0.645000 ;
-        RECT 1.285000 0.645000 2.205000 0.815000 ;
-        RECT 1.755000 1.850000 2.205000 2.465000 ;
-        RECT 2.025000 0.815000 2.205000 1.850000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.330000 0.370000 0.675000 0.545000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.lef
index a8eeb50..cd453d6 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.lef
@@ -47,22 +47,6 @@
         RECT 10.650000 1.075000 17.600000 1.285000 ;
     END
   END SLEEP
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 18.400000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 18.400000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  5.713000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +82,22 @@
         RECT 17.770000 0.905000 18.305000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 18.400000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 18.400000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
index e0b878d..59e5337 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
@@ -53,12 +53,46 @@
         RECT 10.650000 1.075000 17.600000 1.285000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  4.095000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  5.713000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  3.325000 0.255000  3.705000 0.725000 ;
+        RECT  3.325000 0.725000 18.305000 0.905000 ;
+        RECT  4.265000 0.255000  4.645000 0.725000 ;
+        RECT  5.205000 0.255000  5.585000 0.725000 ;
+        RECT  6.145000 0.255000  6.525000 0.725000 ;
+        RECT  7.085000 0.255000  7.465000 0.725000 ;
+        RECT  8.025000 0.255000  8.405000 0.725000 ;
+        RECT  8.965000 0.255000  9.345000 0.725000 ;
+        RECT  9.905000 0.255000 10.285000 0.725000 ;
+        RECT 10.845000 0.255000 11.225000 0.725000 ;
+        RECT 10.935000 1.455000 18.305000 1.625000 ;
+        RECT 10.935000 1.625000 11.185000 2.125000 ;
+        RECT 11.785000 0.255000 12.165000 0.725000 ;
+        RECT 11.875000 1.625000 12.125000 2.125000 ;
+        RECT 12.725000 0.255000 13.105000 0.725000 ;
+        RECT 12.815000 1.625000 13.065000 2.125000 ;
+        RECT 13.665000 0.255000 14.045000 0.725000 ;
+        RECT 13.755000 1.625000 14.005000 2.125000 ;
+        RECT 14.605000 0.255000 14.985000 0.725000 ;
+        RECT 14.695000 1.625000 14.945000 2.125000 ;
+        RECT 15.545000 0.255000 15.925000 0.725000 ;
+        RECT 15.635000 1.625000 15.885000 2.125000 ;
+        RECT 16.485000 0.255000 16.865000 0.725000 ;
+        RECT 16.575000 1.625000 16.825000 2.125000 ;
+        RECT 17.425000 0.255000 17.805000 0.725000 ;
+        RECT 17.515000 1.625000 17.765000 2.125000 ;
+        RECT 17.770000 0.905000 18.305000 1.455000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 18.400000 0.085000 ;
         RECT  0.485000  0.085000  0.865000 0.825000 ;
         RECT  1.565000  0.085000  1.865000 0.895000 ;
@@ -125,9 +159,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.270000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 18.400000 2.805000 ;
@@ -187,41 +220,6 @@
         RECT 0.000000 2.480000 18.400000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  5.713000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  3.325000 0.255000  3.705000 0.725000 ;
-        RECT  3.325000 0.725000 18.305000 0.905000 ;
-        RECT  4.265000 0.255000  4.645000 0.725000 ;
-        RECT  5.205000 0.255000  5.585000 0.725000 ;
-        RECT  6.145000 0.255000  6.525000 0.725000 ;
-        RECT  7.085000 0.255000  7.465000 0.725000 ;
-        RECT  8.025000 0.255000  8.405000 0.725000 ;
-        RECT  8.965000 0.255000  9.345000 0.725000 ;
-        RECT  9.905000 0.255000 10.285000 0.725000 ;
-        RECT 10.845000 0.255000 11.225000 0.725000 ;
-        RECT 10.935000 1.455000 18.305000 1.625000 ;
-        RECT 10.935000 1.625000 11.185000 2.125000 ;
-        RECT 11.785000 0.255000 12.165000 0.725000 ;
-        RECT 11.875000 1.625000 12.125000 2.125000 ;
-        RECT 12.725000 0.255000 13.105000 0.725000 ;
-        RECT 12.815000 1.625000 13.065000 2.125000 ;
-        RECT 13.665000 0.255000 14.045000 0.725000 ;
-        RECT 13.755000 1.625000 14.005000 2.125000 ;
-        RECT 14.605000 0.255000 14.985000 0.725000 ;
-        RECT 14.695000 1.625000 14.945000 2.125000 ;
-        RECT 15.545000 0.255000 15.925000 0.725000 ;
-        RECT 15.635000 1.625000 15.885000 2.125000 ;
-        RECT 16.485000 0.255000 16.865000 0.725000 ;
-        RECT 16.575000 1.625000 16.825000 2.125000 ;
-        RECT 17.425000 0.255000 17.805000 0.725000 ;
-        RECT 17.515000 1.625000 17.765000 2.125000 ;
-        RECT 17.770000 0.905000 18.305000 1.455000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT  0.685000 1.495000  1.115000 2.465000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.lef
index e69ee46..be0d1f4 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.lef
@@ -47,22 +47,6 @@
         RECT 0.480000 1.065000 0.970000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.771000 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 1.525000 0.895000 1.815000 2.125000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
index ca459bb..340e3e2 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
@@ -53,12 +53,23 @@
         RECT 0.480000 1.065000 0.970000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.653450 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.771000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 1.855000 0.895000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 1.525000 0.895000 1.815000 2.125000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.085000  0.085000 0.365000 0.895000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -78,9 +89,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -99,18 +109,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.771000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 1.855000 0.895000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 1.525000 0.895000 1.815000 2.125000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 1.445000 1.345000 1.655000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.lef
index 48b6019..f5095a5 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.lef
@@ -46,22 +46,6 @@
         RECT 0.360000 1.075000 1.950000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.477000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
index 1eb7e34..634bcef 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
@@ -52,12 +52,28 @@
         RECT 0.360000 1.075000 1.950000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  1.150500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.477000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 3.735000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 2.415000 0.255000 2.795000 0.725000 ;
+        RECT 2.545000 0.905000 2.875000 1.445000 ;
+        RECT 2.545000 1.445000 3.655000 1.745000 ;
+        RECT 2.545000 1.745000 2.715000 2.125000 ;
+        RECT 3.355000 0.255000 3.735000 0.725000 ;
+        RECT 3.485000 1.745000 3.655000 2.125000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.085000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -83,9 +99,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -109,23 +124,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.477000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 3.735000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 2.415000 0.255000 2.795000 0.725000 ;
-        RECT 2.545000 0.905000 2.875000 1.445000 ;
-        RECT 2.545000 1.445000 3.655000 1.745000 ;
-        RECT 2.545000 1.745000 2.715000 2.125000 ;
-        RECT 3.355000 0.255000 3.735000 0.725000 ;
-        RECT 3.485000 1.745000 3.655000 2.125000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 1.455000 2.325000 1.665000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.lef
index b8d56ff..9cde279 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.lef
@@ -47,22 +47,6 @@
         RECT 5.790000 1.075000 8.880000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.889000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +70,22 @@
         RECT 9.050000 0.905000 9.565000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
index 1e4c17e..ec2aed2 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
@@ -53,12 +53,34 @@
         RECT 5.790000 1.075000 8.880000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  2.249000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  2.889000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.125000 0.255000 2.505000 0.725000 ;
+        RECT 2.125000 0.725000 9.565000 0.905000 ;
+        RECT 3.065000 0.255000 3.445000 0.725000 ;
+        RECT 4.005000 0.255000 4.385000 0.725000 ;
+        RECT 4.945000 0.255000 5.325000 0.725000 ;
+        RECT 5.885000 0.255000 6.265000 0.725000 ;
+        RECT 5.975000 1.445000 9.565000 1.615000 ;
+        RECT 5.975000 1.615000 6.225000 2.125000 ;
+        RECT 6.825000 0.255000 7.205000 0.725000 ;
+        RECT 6.915000 1.615000 7.165000 2.125000 ;
+        RECT 7.765000 0.255000 8.145000 0.725000 ;
+        RECT 7.855000 1.615000 8.105000 2.125000 ;
+        RECT 8.705000 0.255000 9.085000 0.725000 ;
+        RECT 8.795000 1.615000 9.045000 2.125000 ;
+        RECT 9.050000 0.905000 9.565000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.660000 0.085000 ;
         RECT 0.485000  0.085000 0.705000 0.895000 ;
         RECT 1.445000  0.085000 1.955000 0.905000 ;
@@ -97,9 +119,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.660000 2.805000 ;
@@ -135,29 +156,6 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  2.889000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.125000 0.255000 2.505000 0.725000 ;
-        RECT 2.125000 0.725000 9.565000 0.905000 ;
-        RECT 3.065000 0.255000 3.445000 0.725000 ;
-        RECT 4.005000 0.255000 4.385000 0.725000 ;
-        RECT 4.945000 0.255000 5.325000 0.725000 ;
-        RECT 5.885000 0.255000 6.265000 0.725000 ;
-        RECT 5.975000 1.445000 9.565000 1.615000 ;
-        RECT 5.975000 1.615000 6.225000 2.125000 ;
-        RECT 6.825000 0.255000 7.205000 0.725000 ;
-        RECT 6.915000 1.615000 7.165000 2.125000 ;
-        RECT 7.765000 0.255000 8.145000 0.725000 ;
-        RECT 7.855000 1.615000 8.105000 2.125000 ;
-        RECT 8.705000 0.255000 9.085000 0.725000 ;
-        RECT 8.795000 1.615000 9.045000 2.125000 ;
-        RECT 9.050000 0.905000 9.565000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 1.455000 0.945000 2.465000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_1.lef
index e1dea1b..50cb7cd 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.lef
@@ -61,22 +61,6 @@
         RECT 3.245000 1.630000 3.415000 2.295000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 0.090000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
index 2041277..627ce3c 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
@@ -67,12 +67,21 @@
         RECT 3.245000 1.630000 3.415000 2.295000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.474500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 0.255000 0.345000 1.495000 ;
+        RECT 0.090000 1.495000 0.425000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 3.250000  0.085000 3.765000 0.620000 ;
@@ -92,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.492600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -115,16 +123,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.255000 0.345000 1.495000 ;
-        RECT 0.090000 1.495000 0.425000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.655000 1.610000 0.825000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.lef
index a9dc2a3..97344d5 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.lef
@@ -55,22 +55,6 @@
         RECT 2.925000 1.075000 4.275000 1.325000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 16.560000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 16.560000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.793000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 15.285000 1.665000 15.615000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 16.560000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 16.560000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.560000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
index f1a7366..3fea01a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
@@ -61,12 +61,34 @@
         RECT 2.925000 1.075000 4.275000 1.325000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  2.970500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  2.793000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 10.585000 0.255000 10.915000 0.725000 ;
+        RECT 10.585000 0.725000 15.615000 0.905000 ;
+        RECT 10.585000 1.495000 15.615000 1.665000 ;
+        RECT 10.585000 1.665000 10.915000 2.465000 ;
+        RECT 11.525000 0.255000 11.855000 0.725000 ;
+        RECT 11.525000 1.665000 11.855000 2.465000 ;
+        RECT 12.465000 0.255000 12.795000 0.725000 ;
+        RECT 12.465000 1.665000 12.795000 2.465000 ;
+        RECT 13.405000 0.255000 13.735000 0.725000 ;
+        RECT 13.405000 1.665000 13.735000 2.465000 ;
+        RECT 14.345000 0.255000 14.675000 0.725000 ;
+        RECT 14.345000 1.665000 14.675000 2.465000 ;
+        RECT 15.285000 0.255000 15.615000 0.725000 ;
+        RECT 15.285000 0.905000 15.615000 1.495000 ;
+        RECT 15.285000 1.665000 15.615000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 16.560000 0.085000 ;
         RECT  2.525000  0.085000  2.795000 0.550000 ;
         RECT  3.465000  0.085000  3.735000 0.545000 ;
@@ -123,9 +145,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.690000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 16.560000 2.805000 ;
@@ -183,29 +204,6 @@
         RECT 0.000000 2.480000 16.560000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  2.793000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 10.585000 0.255000 10.915000 0.725000 ;
-        RECT 10.585000 0.725000 15.615000 0.905000 ;
-        RECT 10.585000 1.495000 15.615000 1.665000 ;
-        RECT 10.585000 1.665000 10.915000 2.465000 ;
-        RECT 11.525000 0.255000 11.855000 0.725000 ;
-        RECT 11.525000 1.665000 11.855000 2.465000 ;
-        RECT 12.465000 0.255000 12.795000 0.725000 ;
-        RECT 12.465000 1.665000 12.795000 2.465000 ;
-        RECT 13.405000 0.255000 13.735000 0.725000 ;
-        RECT 13.405000 1.665000 13.735000 2.465000 ;
-        RECT 14.345000 0.255000 14.675000 0.725000 ;
-        RECT 14.345000 1.665000 14.675000 2.465000 ;
-        RECT 15.285000 0.255000 15.615000 0.725000 ;
-        RECT 15.285000 0.905000 15.615000 1.495000 ;
-        RECT 15.285000 1.665000 15.615000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000  2.305000 0.425000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef
index 3995ece..2b74483 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef
@@ -55,22 +55,6 @@
         RECT 2.925000 1.075000 4.275000 1.325000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 18.400000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 18.400000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  3.724000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +82,22 @@
         RECT 17.165000 1.665000 17.495000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 18.400000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 18.400000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
index 35927ab..7388b38 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
@@ -61,12 +61,38 @@
         RECT 2.925000 1.075000 4.275000 1.325000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  3.451500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  3.724000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 10.585000 0.255000 10.915000 0.725000 ;
+        RECT 10.585000 0.725000 17.495000 0.905000 ;
+        RECT 10.585000 1.495000 17.495000 1.665000 ;
+        RECT 10.585000 1.665000 10.915000 2.465000 ;
+        RECT 11.525000 0.255000 11.855000 0.725000 ;
+        RECT 11.525000 1.665000 11.855000 2.465000 ;
+        RECT 12.465000 0.255000 12.795000 0.725000 ;
+        RECT 12.465000 1.665000 12.795000 2.465000 ;
+        RECT 13.405000 0.255000 13.735000 0.725000 ;
+        RECT 13.405000 1.665000 13.735000 2.465000 ;
+        RECT 14.345000 0.255000 14.675000 0.725000 ;
+        RECT 14.345000 1.665000 14.675000 2.465000 ;
+        RECT 15.285000 0.255000 15.615000 0.725000 ;
+        RECT 15.285000 1.665000 15.615000 2.465000 ;
+        RECT 16.225000 0.255000 16.555000 0.725000 ;
+        RECT 16.225000 1.665000 16.555000 2.465000 ;
+        RECT 17.085000 0.905000 17.495000 1.495000 ;
+        RECT 17.165000 0.255000 17.495000 0.725000 ;
+        RECT 17.165000 1.665000 17.495000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 18.400000 0.085000 ;
         RECT  2.525000  0.085000  2.795000 0.550000 ;
         RECT  3.465000  0.085000  3.735000 0.545000 ;
@@ -129,9 +155,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  4.270000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 18.400000 2.805000 ;
@@ -195,33 +220,6 @@
         RECT 0.000000 2.480000 18.400000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  3.724000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 10.585000 0.255000 10.915000 0.725000 ;
-        RECT 10.585000 0.725000 17.495000 0.905000 ;
-        RECT 10.585000 1.495000 17.495000 1.665000 ;
-        RECT 10.585000 1.665000 10.915000 2.465000 ;
-        RECT 11.525000 0.255000 11.855000 0.725000 ;
-        RECT 11.525000 1.665000 11.855000 2.465000 ;
-        RECT 12.465000 0.255000 12.795000 0.725000 ;
-        RECT 12.465000 1.665000 12.795000 2.465000 ;
-        RECT 13.405000 0.255000 13.735000 0.725000 ;
-        RECT 13.405000 1.665000 13.735000 2.465000 ;
-        RECT 14.345000 0.255000 14.675000 0.725000 ;
-        RECT 14.345000 1.665000 14.675000 2.465000 ;
-        RECT 15.285000 0.255000 15.615000 0.725000 ;
-        RECT 15.285000 1.665000 15.615000 2.465000 ;
-        RECT 16.225000 0.255000 16.555000 0.725000 ;
-        RECT 16.225000 1.665000 16.555000 2.465000 ;
-        RECT 17.085000 0.905000 17.495000 1.495000 ;
-        RECT 17.165000 0.255000 17.495000 0.725000 ;
-        RECT 17.165000 1.665000 17.495000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000  2.305000 0.425000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef
index 8ed7372..1dfda6b 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef
@@ -59,22 +59,6 @@
         RECT 3.355000 0.755000 3.545000 1.625000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 0.515000 1.595000 0.875000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
index 2b07c0b..4a0718d 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
@@ -65,12 +65,21 @@
         RECT 3.355000 0.755000 3.545000 1.625000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.555100 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.255000 0.800000 1.595000 ;
+        RECT 0.515000 1.595000 0.875000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.090000  0.085000 0.345000 0.885000 ;
         RECT 0.985000  0.085000 1.365000 0.465000 ;
@@ -91,9 +100,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.776400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -115,16 +123,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.255000 0.800000 1.595000 ;
-        RECT 0.515000 1.595000 0.875000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.970000 0.995000 1.265000 1.325000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef
index 33a9207..8dc6168 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef
@@ -59,22 +59,6 @@
         RECT 2.880000 0.995000 3.595000 1.325000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 5.650000 0.805000 5.880000 1.575000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
index 7c6153f..d33d37a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
@@ -65,12 +65,26 @@
         RECT 2.880000 0.995000 3.595000 1.325000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.835250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.215000 0.255000 4.385000 0.635000 ;
+        RECT 4.215000 0.635000 5.880000 0.805000 ;
+        RECT 4.215000 1.575000 5.880000 1.745000 ;
+        RECT 4.215000 1.745000 4.385000 2.465000 ;
+        RECT 5.155000 0.255000 5.325000 0.635000 ;
+        RECT 5.155000 1.745000 5.325000 2.465000 ;
+        RECT 5.650000 0.805000 5.880000 1.575000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.465000 ;
         RECT 3.615000  0.085000 3.995000 0.465000 ;
@@ -95,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.195000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -123,21 +136,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.215000 0.255000 4.385000 0.635000 ;
-        RECT 4.215000 0.635000 5.880000 0.805000 ;
-        RECT 4.215000 1.575000 5.880000 1.745000 ;
-        RECT 4.215000 1.745000 4.385000 2.465000 ;
-        RECT 5.155000 0.255000 5.325000 0.635000 ;
-        RECT 5.155000 1.745000 5.325000 2.465000 ;
-        RECT 5.650000 0.805000 5.880000 1.575000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.090000 0.295000 0.345000 0.625000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef
index acd1d59..026c309 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef
@@ -68,22 +68,6 @@
         RECT 9.745000 1.600000 10.035000 1.645000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -103,6 +87,22 @@
         RECT 3.465000 1.745000 3.635000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
index 404b75a..d6b28c2 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
@@ -90,12 +90,30 @@
         RECT 9.745000 1.600000 10.035000 1.645000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  1.508400 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.605000 0.255000 0.815000 0.635000 ;
+        RECT 0.605000 0.635000 3.635000 0.805000 ;
+        RECT 0.605000 0.805000 0.865000 1.575000 ;
+        RECT 0.605000 1.575000 3.635000 1.745000 ;
+        RECT 0.605000 1.745000 0.815000 2.465000 ;
+        RECT 1.585000 0.295000 1.755000 0.635000 ;
+        RECT 1.585000 1.745000 1.755000 2.465000 ;
+        RECT 2.525000 0.255000 2.695000 0.635000 ;
+        RECT 2.525000 1.745000 2.695000 2.465000 ;
+        RECT 3.465000 0.295000 3.635000 0.635000 ;
+        RECT 3.465000 1.745000 3.635000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 10.580000 0.085000 ;
         RECT 0.090000  0.085000  0.425000 0.465000 ;
         RECT 0.985000  0.085000  1.365000 0.465000 ;
@@ -133,9 +151,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.160000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.580000 2.805000 ;
@@ -174,25 +191,6 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.605000 0.255000 0.815000 0.635000 ;
-        RECT 0.605000 0.635000 3.635000 0.805000 ;
-        RECT 0.605000 0.805000 0.865000 1.575000 ;
-        RECT 0.605000 1.575000 3.635000 1.745000 ;
-        RECT 0.605000 1.745000 0.815000 2.465000 ;
-        RECT 1.585000 0.295000 1.755000 0.635000 ;
-        RECT 1.585000 1.745000 1.755000 2.465000 ;
-        RECT 2.525000 0.255000 2.695000 0.635000 ;
-        RECT 2.525000 1.745000 2.695000 2.465000 ;
-        RECT 3.465000 0.295000 3.635000 0.635000 ;
-        RECT 3.465000 1.745000 3.635000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT  1.085000 1.075000  3.975000 1.245000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef
index 75b36a9..5e9e396 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef
@@ -56,22 +56,6 @@
         RECT 3.365000 0.760000 3.750000 1.620000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.465500 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.605000 1.455000 0.890000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
index 5b4f441..4b48071 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
@@ -62,12 +62,21 @@
         RECT 3.365000 0.760000 3.750000 1.620000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.344500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.465500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.605000 0.595000 0.835000 1.455000 ;
+        RECT 0.605000 1.455000 0.890000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 2.025000  0.085000 2.195000 0.525000 ;
         RECT 3.515000  0.085000 3.735000 0.545000 ;
@@ -86,9 +95,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.820000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -108,16 +116,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.465500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.605000 0.595000 0.835000 1.455000 ;
-        RECT 0.605000 1.455000 0.890000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 1.855000 0.425000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef
index 88bae9d..88d1901 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef
@@ -56,22 +56,6 @@
         RECT 0.630000 0.725000 0.830000 0.995000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.796300 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 5.255000 0.465000 5.425000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
index b434ea3..409b405 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
@@ -62,12 +62,23 @@
         RECT 0.630000 0.725000 0.830000 0.995000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.585000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.796250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.965000 0.295000 5.425000 0.465000 ;
+        RECT 2.965000 2.255000 5.425000 2.425000 ;
+        RECT 5.200000 1.785000 5.425000 2.255000 ;
+        RECT 5.255000 0.465000 5.425000 1.785000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.515000  0.085000 0.885000 0.545000 ;
         RECT 1.585000  0.085000 1.835000 0.885000 ;
@@ -90,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -116,18 +126,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.796250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.965000 0.295000 5.425000 0.465000 ;
-        RECT 2.965000 2.255000 5.425000 2.425000 ;
-        RECT 5.200000 1.785000 5.425000 2.255000 ;
-        RECT 5.255000 0.465000 5.425000 1.785000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.345000 0.345000 0.675000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef
index 71dc8cc..631f37c 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef
@@ -58,22 +58,6 @@
         RECT 8.480000 0.995000 8.650000 1.425000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.339500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 0.095000 2.255000 4.185000 2.425000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
index 09fe611..3fa2cf1 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
@@ -64,12 +64,22 @@
         RECT 8.480000 0.995000 8.650000 1.425000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  1.030250 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.339500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 0.315000 4.185000 0.485000 ;
+        RECT 0.095000 0.485000 0.320000 2.255000 ;
+        RECT 0.095000 2.255000 4.185000 2.425000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.200000 0.085000 ;
         RECT 4.375000  0.085000 4.705000 0.465000 ;
         RECT 5.265000  0.085000 5.645000 0.465000 ;
@@ -102,9 +112,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.475000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.200000 2.805000 ;
@@ -138,17 +147,6 @@
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.339500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 0.315000 4.185000 0.485000 ;
-        RECT 0.095000 0.485000 0.320000 2.255000 ;
-        RECT 0.095000 2.255000 4.185000 2.425000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.515000 0.655000 1.850000 0.825000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef
index 1b818c3..e8d432a 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef
@@ -316,23 +316,6 @@
         RECT 14.815000 4.145000 15.215000 4.495000 ;
     END
   END S[15]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-        RECT 0.000000  5.200000 17.020000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -375,6 +358,23 @@
         RECT 15.725000 3.640000 16.015000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+        RECT 0.000000  5.200000 17.020000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 17.020000 0.085000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
index 06c7994..349e527 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
@@ -354,184 +354,6 @@
         RECT 14.815000 4.145000 15.215000 4.495000 ;
     END
   END S[15]
-  PIN VGND
-    ANTENNADIFFAREA  1.875900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.020000 0.085000 ;
-        RECT  0.130000  0.085000  0.390000 0.885000 ;
-        RECT  2.135000  0.085000  2.465000 0.660000 ;
-        RECT  4.210000  0.085000  4.530000 0.885000 ;
-        RECT  6.275000  0.085000  6.605000 0.660000 ;
-        RECT  8.350000  0.085000  8.670000 0.885000 ;
-        RECT 10.415000  0.085000 10.745000 0.660000 ;
-        RECT 12.490000  0.085000 12.810000 0.885000 ;
-        RECT 14.555000  0.085000 14.885000 0.660000 ;
-        RECT 16.630000  0.085000 16.890000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 5.355000 17.020000 5.525000 ;
-        RECT  0.130000 4.555000  0.390000 5.355000 ;
-        RECT  2.135000 4.780000  2.465000 5.355000 ;
-        RECT  4.210000 4.555000  4.530000 5.355000 ;
-        RECT  6.275000 4.780000  6.605000 5.355000 ;
-        RECT  8.350000 4.555000  8.670000 5.355000 ;
-        RECT 10.415000 4.780000 10.745000 5.355000 ;
-        RECT 12.490000 4.555000 12.810000 5.355000 ;
-        RECT 14.555000 4.780000 14.885000 5.355000 ;
-        RECT 16.630000 4.555000 16.890000 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 ;
-        RECT  7.505000 5.355000  7.675000 5.525000 ;
-        RECT  7.965000 5.355000  8.135000 5.525000 ;
-        RECT  8.425000 5.355000  8.595000 5.525000 ;
-        RECT  8.885000 5.355000  9.055000 5.525000 ;
-        RECT  9.345000 5.355000  9.515000 5.525000 ;
-        RECT  9.805000 5.355000  9.975000 5.525000 ;
-        RECT 10.265000 5.355000 10.435000 5.525000 ;
-        RECT 10.725000 5.355000 10.895000 5.525000 ;
-        RECT 11.185000 5.355000 11.355000 5.525000 ;
-        RECT 11.645000 5.355000 11.815000 5.525000 ;
-        RECT 12.105000 5.355000 12.275000 5.525000 ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-        RECT 13.485000 5.355000 13.655000 5.525000 ;
-        RECT 13.945000 5.355000 14.115000 5.525000 ;
-        RECT 14.405000 5.355000 14.575000 5.525000 ;
-        RECT 14.865000 5.355000 15.035000 5.525000 ;
-        RECT 15.325000 5.355000 15.495000 5.525000 ;
-        RECT 15.785000 5.355000 15.955000 5.525000 ;
-        RECT 16.245000 5.355000 16.415000 5.525000 ;
-        RECT 16.705000 5.355000 16.875000 5.525000 ;
-      LAYER met1 ;
-        RECT 0.000000 5.200000 17.020000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    ANTENNADIFFAREA  6.380000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000  0.920000 2.805000 ;
-        RECT  0.095000 1.495000  0.425000 2.635000 ;
-        RECT  0.095000 2.805000  0.425000 3.945000 ;
-        RECT  1.465000 2.635000  3.135000 2.805000 ;
-        RECT  2.135000 1.465000  2.465000 2.635000 ;
-        RECT  2.135000 2.805000  2.465000 3.975000 ;
-        RECT  3.680000 2.635000  5.060000 2.805000 ;
-        RECT  4.175000 1.495000  4.565000 2.635000 ;
-        RECT  4.175000 2.805000  4.565000 3.945000 ;
-        RECT  5.605000 2.635000  7.275000 2.805000 ;
-        RECT  6.275000 1.465000  6.605000 2.635000 ;
-        RECT  6.275000 2.805000  6.605000 3.975000 ;
-        RECT  7.820000 2.635000  9.200000 2.805000 ;
-        RECT  8.315000 1.495000  8.705000 2.635000 ;
-        RECT  8.315000 2.805000  8.705000 3.945000 ;
-        RECT  9.745000 2.635000 11.415000 2.805000 ;
-        RECT 10.415000 1.465000 10.745000 2.635000 ;
-        RECT 10.415000 2.805000 10.745000 3.975000 ;
-        RECT 11.960000 2.635000 13.340000 2.805000 ;
-        RECT 12.455000 1.495000 12.845000 2.635000 ;
-        RECT 12.455000 2.805000 12.845000 3.945000 ;
-        RECT 13.885000 2.635000 15.555000 2.805000 ;
-        RECT 14.555000 1.465000 14.885000 2.635000 ;
-        RECT 14.555000 2.805000 14.885000 3.975000 ;
-        RECT 16.100000 2.635000 17.020000 2.805000 ;
-        RECT 16.595000 1.495000 16.925000 2.635000 ;
-        RECT 16.595000 2.805000 16.925000 3.945000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
-        RECT 16.705000 2.635000 16.875000 2.805000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  5.705600 ;
     DIRECTION OUTPUT ;
@@ -696,6 +518,182 @@
         RECT 15.725000 3.640000 16.015000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 -0.085000 17.020000 0.085000 ;
+        RECT  0.130000  0.085000  0.390000 0.885000 ;
+        RECT  2.135000  0.085000  2.465000 0.660000 ;
+        RECT  4.210000  0.085000  4.530000 0.885000 ;
+        RECT  6.275000  0.085000  6.605000 0.660000 ;
+        RECT  8.350000  0.085000  8.670000 0.885000 ;
+        RECT 10.415000  0.085000 10.745000 0.660000 ;
+        RECT 12.490000  0.085000 12.810000 0.885000 ;
+        RECT 14.555000  0.085000 14.885000 0.660000 ;
+        RECT 16.630000  0.085000 16.890000 0.885000 ;
+      LAYER mcon ;
+        RECT  0.145000 -0.085000  0.315000 0.085000 ;
+        RECT  0.605000 -0.085000  0.775000 0.085000 ;
+        RECT  1.065000 -0.085000  1.235000 0.085000 ;
+        RECT  1.525000 -0.085000  1.695000 0.085000 ;
+        RECT  1.985000 -0.085000  2.155000 0.085000 ;
+        RECT  2.445000 -0.085000  2.615000 0.085000 ;
+        RECT  2.905000 -0.085000  3.075000 0.085000 ;
+        RECT  3.365000 -0.085000  3.535000 0.085000 ;
+        RECT  3.825000 -0.085000  3.995000 0.085000 ;
+        RECT  4.285000 -0.085000  4.455000 0.085000 ;
+        RECT  4.745000 -0.085000  4.915000 0.085000 ;
+        RECT  5.205000 -0.085000  5.375000 0.085000 ;
+        RECT  5.665000 -0.085000  5.835000 0.085000 ;
+        RECT  6.125000 -0.085000  6.295000 0.085000 ;
+        RECT  6.585000 -0.085000  6.755000 0.085000 ;
+        RECT  7.045000 -0.085000  7.215000 0.085000 ;
+        RECT  7.505000 -0.085000  7.675000 0.085000 ;
+        RECT  7.965000 -0.085000  8.135000 0.085000 ;
+        RECT  8.425000 -0.085000  8.595000 0.085000 ;
+        RECT  8.885000 -0.085000  9.055000 0.085000 ;
+        RECT  9.345000 -0.085000  9.515000 0.085000 ;
+        RECT  9.805000 -0.085000  9.975000 0.085000 ;
+        RECT 10.265000 -0.085000 10.435000 0.085000 ;
+        RECT 10.725000 -0.085000 10.895000 0.085000 ;
+        RECT 11.185000 -0.085000 11.355000 0.085000 ;
+        RECT 11.645000 -0.085000 11.815000 0.085000 ;
+        RECT 12.105000 -0.085000 12.275000 0.085000 ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+        RECT 13.485000 -0.085000 13.655000 0.085000 ;
+        RECT 13.945000 -0.085000 14.115000 0.085000 ;
+        RECT 14.405000 -0.085000 14.575000 0.085000 ;
+        RECT 14.865000 -0.085000 15.035000 0.085000 ;
+        RECT 15.325000 -0.085000 15.495000 0.085000 ;
+        RECT 15.785000 -0.085000 15.955000 0.085000 ;
+        RECT 16.245000 -0.085000 16.415000 0.085000 ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 5.355000 17.020000 5.525000 ;
+        RECT  0.130000 4.555000  0.390000 5.355000 ;
+        RECT  2.135000 4.780000  2.465000 5.355000 ;
+        RECT  4.210000 4.555000  4.530000 5.355000 ;
+        RECT  6.275000 4.780000  6.605000 5.355000 ;
+        RECT  8.350000 4.555000  8.670000 5.355000 ;
+        RECT 10.415000 4.780000 10.745000 5.355000 ;
+        RECT 12.490000 4.555000 12.810000 5.355000 ;
+        RECT 14.555000 4.780000 14.885000 5.355000 ;
+        RECT 16.630000 4.555000 16.890000 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 ;
+        RECT  7.505000 5.355000  7.675000 5.525000 ;
+        RECT  7.965000 5.355000  8.135000 5.525000 ;
+        RECT  8.425000 5.355000  8.595000 5.525000 ;
+        RECT  8.885000 5.355000  9.055000 5.525000 ;
+        RECT  9.345000 5.355000  9.515000 5.525000 ;
+        RECT  9.805000 5.355000  9.975000 5.525000 ;
+        RECT 10.265000 5.355000 10.435000 5.525000 ;
+        RECT 10.725000 5.355000 10.895000 5.525000 ;
+        RECT 11.185000 5.355000 11.355000 5.525000 ;
+        RECT 11.645000 5.355000 11.815000 5.525000 ;
+        RECT 12.105000 5.355000 12.275000 5.525000 ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+        RECT 13.485000 5.355000 13.655000 5.525000 ;
+        RECT 13.945000 5.355000 14.115000 5.525000 ;
+        RECT 14.405000 5.355000 14.575000 5.525000 ;
+        RECT 14.865000 5.355000 15.035000 5.525000 ;
+        RECT 15.325000 5.355000 15.495000 5.525000 ;
+        RECT 15.785000 5.355000 15.955000 5.525000 ;
+        RECT 16.245000 5.355000 16.415000 5.525000 ;
+        RECT 16.705000 5.355000 16.875000 5.525000 ;
+      LAYER met1 ;
+        RECT 0.000000 5.200000 17.020000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 2.635000  0.920000 2.805000 ;
+        RECT  0.095000 1.495000  0.425000 2.635000 ;
+        RECT  0.095000 2.805000  0.425000 3.945000 ;
+        RECT  1.465000 2.635000  3.135000 2.805000 ;
+        RECT  2.135000 1.465000  2.465000 2.635000 ;
+        RECT  2.135000 2.805000  2.465000 3.975000 ;
+        RECT  3.680000 2.635000  5.060000 2.805000 ;
+        RECT  4.175000 1.495000  4.565000 2.635000 ;
+        RECT  4.175000 2.805000  4.565000 3.945000 ;
+        RECT  5.605000 2.635000  7.275000 2.805000 ;
+        RECT  6.275000 1.465000  6.605000 2.635000 ;
+        RECT  6.275000 2.805000  6.605000 3.975000 ;
+        RECT  7.820000 2.635000  9.200000 2.805000 ;
+        RECT  8.315000 1.495000  8.705000 2.635000 ;
+        RECT  8.315000 2.805000  8.705000 3.945000 ;
+        RECT  9.745000 2.635000 11.415000 2.805000 ;
+        RECT 10.415000 1.465000 10.745000 2.635000 ;
+        RECT 10.415000 2.805000 10.745000 3.975000 ;
+        RECT 11.960000 2.635000 13.340000 2.805000 ;
+        RECT 12.455000 1.495000 12.845000 2.635000 ;
+        RECT 12.455000 2.805000 12.845000 3.945000 ;
+        RECT 13.885000 2.635000 15.555000 2.805000 ;
+        RECT 14.555000 1.465000 14.885000 2.635000 ;
+        RECT 14.555000 2.805000 14.885000 3.975000 ;
+        RECT 16.100000 2.635000 17.020000 2.805000 ;
+        RECT 16.595000 1.495000 16.925000 2.635000 ;
+        RECT 16.595000 2.805000 16.925000 3.945000 ;
+      LAYER mcon ;
+        RECT  0.145000 2.635000  0.315000 2.805000 ;
+        RECT  0.605000 2.635000  0.775000 2.805000 ;
+        RECT  1.525000 2.635000  1.695000 2.805000 ;
+        RECT  1.985000 2.635000  2.155000 2.805000 ;
+        RECT  2.445000 2.635000  2.615000 2.805000 ;
+        RECT  2.905000 2.635000  3.075000 2.805000 ;
+        RECT  3.825000 2.635000  3.995000 2.805000 ;
+        RECT  4.285000 2.635000  4.455000 2.805000 ;
+        RECT  4.745000 2.635000  4.915000 2.805000 ;
+        RECT  5.665000 2.635000  5.835000 2.805000 ;
+        RECT  6.125000 2.635000  6.295000 2.805000 ;
+        RECT  6.585000 2.635000  6.755000 2.805000 ;
+        RECT  7.045000 2.635000  7.215000 2.805000 ;
+        RECT  7.965000 2.635000  8.135000 2.805000 ;
+        RECT  8.425000 2.635000  8.595000 2.805000 ;
+        RECT  8.885000 2.635000  9.055000 2.805000 ;
+        RECT  9.805000 2.635000  9.975000 2.805000 ;
+        RECT 10.265000 2.635000 10.435000 2.805000 ;
+        RECT 10.725000 2.635000 10.895000 2.805000 ;
+        RECT 11.185000 2.635000 11.355000 2.805000 ;
+        RECT 12.105000 2.635000 12.275000 2.805000 ;
+        RECT 12.565000 2.635000 12.735000 2.805000 ;
+        RECT 13.025000 2.635000 13.195000 2.805000 ;
+        RECT 13.945000 2.635000 14.115000 2.805000 ;
+        RECT 14.405000 2.635000 14.575000 2.805000 ;
+        RECT 14.865000 2.635000 15.035000 2.805000 ;
+        RECT 15.325000 2.635000 15.495000 2.805000 ;
+        RECT 16.245000 2.635000 16.415000 2.805000 ;
+        RECT 16.705000 2.635000 16.875000 2.805000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef
index 6e77ab0..1304208 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef
@@ -284,23 +284,6 @@
         RECT 22.635000 4.145000 22.970000 4.415000 ;
     END
   END S[15]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 25.760000 0.240000 ;
-        RECT 0.000000  5.200000 25.760000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 25.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -343,6 +326,23 @@
         RECT 24.005000 3.640000 24.295000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 25.760000 0.240000 ;
+        RECT 0.000000  5.200000 25.760000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 25.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 25.760000 0.085000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
index 698e462..f98e230 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
@@ -322,12 +322,127 @@
         RECT 22.635000 4.145000 22.970000 4.415000 ;
     END
   END S[15]
-  PIN VGND
-    ANTENNADIFFAREA  1.965600 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  6.051200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  1.465000 1.755000  1.895000 2.125000 ;
+        RECT  1.465000 3.315000  1.895000 3.685000 ;
+        RECT  1.505000 0.595000  1.835000 0.885000 ;
+        RECT  1.505000 4.555000  1.835000 4.845000 ;
+        RECT  1.585000 0.885000  1.755000 1.755000 ;
+        RECT  1.585000 2.125000  1.755000 3.315000 ;
+        RECT  1.585000 3.685000  1.755000 4.555000 ;
+        RECT  4.545000 1.755000  4.975000 2.125000 ;
+        RECT  4.545000 3.315000  4.975000 3.685000 ;
+        RECT  4.605000 0.595000  4.935000 0.885000 ;
+        RECT  4.605000 4.555000  4.935000 4.845000 ;
+        RECT  4.685000 0.885000  4.855000 1.755000 ;
+        RECT  4.685000 2.125000  4.855000 3.315000 ;
+        RECT  4.685000 3.685000  4.855000 4.555000 ;
+        RECT  7.905000 1.755000  8.335000 2.125000 ;
+        RECT  7.905000 3.315000  8.335000 3.685000 ;
+        RECT  7.945000 0.595000  8.275000 0.885000 ;
+        RECT  7.945000 4.555000  8.275000 4.845000 ;
+        RECT  8.025000 0.885000  8.195000 1.755000 ;
+        RECT  8.025000 2.125000  8.195000 3.315000 ;
+        RECT  8.025000 3.685000  8.195000 4.555000 ;
+        RECT 10.985000 1.755000 11.415000 2.125000 ;
+        RECT 10.985000 3.315000 11.415000 3.685000 ;
+        RECT 11.045000 0.595000 11.375000 0.885000 ;
+        RECT 11.045000 4.555000 11.375000 4.845000 ;
+        RECT 11.125000 0.885000 11.295000 1.755000 ;
+        RECT 11.125000 2.125000 11.295000 3.315000 ;
+        RECT 11.125000 3.685000 11.295000 4.555000 ;
+        RECT 14.345000 1.755000 14.775000 2.125000 ;
+        RECT 14.345000 3.315000 14.775000 3.685000 ;
+        RECT 14.385000 0.595000 14.715000 0.885000 ;
+        RECT 14.385000 4.555000 14.715000 4.845000 ;
+        RECT 14.465000 0.885000 14.635000 1.755000 ;
+        RECT 14.465000 2.125000 14.635000 3.315000 ;
+        RECT 14.465000 3.685000 14.635000 4.555000 ;
+        RECT 17.425000 1.755000 17.855000 2.125000 ;
+        RECT 17.425000 3.315000 17.855000 3.685000 ;
+        RECT 17.485000 0.595000 17.815000 0.885000 ;
+        RECT 17.485000 4.555000 17.815000 4.845000 ;
+        RECT 17.565000 0.885000 17.735000 1.755000 ;
+        RECT 17.565000 2.125000 17.735000 3.315000 ;
+        RECT 17.565000 3.685000 17.735000 4.555000 ;
+        RECT 20.785000 1.755000 21.215000 2.125000 ;
+        RECT 20.785000 3.315000 21.215000 3.685000 ;
+        RECT 20.825000 0.595000 21.155000 0.885000 ;
+        RECT 20.825000 4.555000 21.155000 4.845000 ;
+        RECT 20.905000 0.885000 21.075000 1.755000 ;
+        RECT 20.905000 2.125000 21.075000 3.315000 ;
+        RECT 20.905000 3.685000 21.075000 4.555000 ;
+        RECT 23.865000 1.755000 24.295000 2.125000 ;
+        RECT 23.865000 3.315000 24.295000 3.685000 ;
+        RECT 23.925000 0.595000 24.255000 0.885000 ;
+        RECT 23.925000 4.555000 24.255000 4.845000 ;
+        RECT 24.005000 0.885000 24.175000 1.755000 ;
+        RECT 24.005000 2.125000 24.175000 3.315000 ;
+        RECT 24.005000 3.685000 24.175000 4.555000 ;
+      LAYER mcon ;
+        RECT  1.525000 1.785000  1.695000 1.955000 ;
+        RECT  1.525000 3.485000  1.695000 3.655000 ;
+        RECT  4.745000 1.785000  4.915000 1.955000 ;
+        RECT  4.745000 3.485000  4.915000 3.655000 ;
+        RECT  7.965000 1.785000  8.135000 1.955000 ;
+        RECT  7.965000 3.485000  8.135000 3.655000 ;
+        RECT 11.185000 1.785000 11.355000 1.955000 ;
+        RECT 11.185000 3.485000 11.355000 3.655000 ;
+        RECT 14.405000 1.785000 14.575000 1.955000 ;
+        RECT 14.405000 3.485000 14.575000 3.655000 ;
+        RECT 17.625000 1.785000 17.795000 1.955000 ;
+        RECT 17.625000 3.485000 17.795000 3.655000 ;
+        RECT 20.845000 1.785000 21.015000 1.955000 ;
+        RECT 20.845000 3.485000 21.015000 3.655000 ;
+        RECT 24.065000 1.785000 24.235000 1.955000 ;
+        RECT 24.065000 3.485000 24.235000 3.655000 ;
+      LAYER met1 ;
+        RECT  1.465000 1.755000  1.755000 1.800000 ;
+        RECT  1.465000 1.800000 24.295000 1.940000 ;
+        RECT  1.465000 1.940000  1.755000 1.985000 ;
+        RECT  1.465000 3.455000  1.755000 3.500000 ;
+        RECT  1.465000 3.500000 24.295000 3.640000 ;
+        RECT  1.465000 3.640000  1.755000 3.685000 ;
+        RECT  4.685000 1.755000  4.975000 1.800000 ;
+        RECT  4.685000 1.940000  4.975000 1.985000 ;
+        RECT  4.685000 3.455000  4.975000 3.500000 ;
+        RECT  4.685000 3.640000  4.975000 3.685000 ;
+        RECT  7.905000 1.755000  8.195000 1.800000 ;
+        RECT  7.905000 1.940000  8.195000 1.985000 ;
+        RECT  7.905000 3.455000  8.195000 3.500000 ;
+        RECT  7.905000 3.640000  8.195000 3.685000 ;
+        RECT 11.125000 1.755000 11.415000 1.800000 ;
+        RECT 11.125000 1.940000 11.415000 1.985000 ;
+        RECT 11.125000 3.455000 11.415000 3.500000 ;
+        RECT 11.125000 3.640000 11.415000 3.685000 ;
+        RECT 14.345000 1.755000 14.635000 1.800000 ;
+        RECT 14.345000 1.940000 14.635000 1.985000 ;
+        RECT 14.345000 3.455000 14.635000 3.500000 ;
+        RECT 14.345000 3.640000 14.635000 3.685000 ;
+        RECT 17.565000 1.755000 17.855000 1.800000 ;
+        RECT 17.565000 1.940000 17.855000 1.985000 ;
+        RECT 17.565000 3.455000 17.855000 3.500000 ;
+        RECT 17.565000 3.640000 17.855000 3.685000 ;
+        RECT 20.785000 1.755000 21.075000 1.800000 ;
+        RECT 20.785000 1.940000 21.075000 1.985000 ;
+        RECT 20.785000 3.455000 21.075000 3.500000 ;
+        RECT 20.785000 3.640000 21.075000 3.685000 ;
+        RECT 24.005000 1.755000 24.295000 1.800000 ;
+        RECT 24.005000 1.940000 24.295000 1.985000 ;
+        RECT 24.005000 3.455000 24.295000 3.500000 ;
+        RECT 24.005000 3.640000 24.295000 3.685000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 25.760000 0.085000 ;
         RECT  0.645000  0.085000  0.860000 0.545000 ;
         RECT  3.095000  0.085000  3.345000 0.660000 ;
@@ -478,9 +593,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  7.520000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000  1.415000 2.805000 ;
@@ -585,122 +699,6 @@
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  6.051200 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  1.465000 1.755000  1.895000 2.125000 ;
-        RECT  1.465000 3.315000  1.895000 3.685000 ;
-        RECT  1.505000 0.595000  1.835000 0.885000 ;
-        RECT  1.505000 4.555000  1.835000 4.845000 ;
-        RECT  1.585000 0.885000  1.755000 1.755000 ;
-        RECT  1.585000 2.125000  1.755000 3.315000 ;
-        RECT  1.585000 3.685000  1.755000 4.555000 ;
-        RECT  4.545000 1.755000  4.975000 2.125000 ;
-        RECT  4.545000 3.315000  4.975000 3.685000 ;
-        RECT  4.605000 0.595000  4.935000 0.885000 ;
-        RECT  4.605000 4.555000  4.935000 4.845000 ;
-        RECT  4.685000 0.885000  4.855000 1.755000 ;
-        RECT  4.685000 2.125000  4.855000 3.315000 ;
-        RECT  4.685000 3.685000  4.855000 4.555000 ;
-        RECT  7.905000 1.755000  8.335000 2.125000 ;
-        RECT  7.905000 3.315000  8.335000 3.685000 ;
-        RECT  7.945000 0.595000  8.275000 0.885000 ;
-        RECT  7.945000 4.555000  8.275000 4.845000 ;
-        RECT  8.025000 0.885000  8.195000 1.755000 ;
-        RECT  8.025000 2.125000  8.195000 3.315000 ;
-        RECT  8.025000 3.685000  8.195000 4.555000 ;
-        RECT 10.985000 1.755000 11.415000 2.125000 ;
-        RECT 10.985000 3.315000 11.415000 3.685000 ;
-        RECT 11.045000 0.595000 11.375000 0.885000 ;
-        RECT 11.045000 4.555000 11.375000 4.845000 ;
-        RECT 11.125000 0.885000 11.295000 1.755000 ;
-        RECT 11.125000 2.125000 11.295000 3.315000 ;
-        RECT 11.125000 3.685000 11.295000 4.555000 ;
-        RECT 14.345000 1.755000 14.775000 2.125000 ;
-        RECT 14.345000 3.315000 14.775000 3.685000 ;
-        RECT 14.385000 0.595000 14.715000 0.885000 ;
-        RECT 14.385000 4.555000 14.715000 4.845000 ;
-        RECT 14.465000 0.885000 14.635000 1.755000 ;
-        RECT 14.465000 2.125000 14.635000 3.315000 ;
-        RECT 14.465000 3.685000 14.635000 4.555000 ;
-        RECT 17.425000 1.755000 17.855000 2.125000 ;
-        RECT 17.425000 3.315000 17.855000 3.685000 ;
-        RECT 17.485000 0.595000 17.815000 0.885000 ;
-        RECT 17.485000 4.555000 17.815000 4.845000 ;
-        RECT 17.565000 0.885000 17.735000 1.755000 ;
-        RECT 17.565000 2.125000 17.735000 3.315000 ;
-        RECT 17.565000 3.685000 17.735000 4.555000 ;
-        RECT 20.785000 1.755000 21.215000 2.125000 ;
-        RECT 20.785000 3.315000 21.215000 3.685000 ;
-        RECT 20.825000 0.595000 21.155000 0.885000 ;
-        RECT 20.825000 4.555000 21.155000 4.845000 ;
-        RECT 20.905000 0.885000 21.075000 1.755000 ;
-        RECT 20.905000 2.125000 21.075000 3.315000 ;
-        RECT 20.905000 3.685000 21.075000 4.555000 ;
-        RECT 23.865000 1.755000 24.295000 2.125000 ;
-        RECT 23.865000 3.315000 24.295000 3.685000 ;
-        RECT 23.925000 0.595000 24.255000 0.885000 ;
-        RECT 23.925000 4.555000 24.255000 4.845000 ;
-        RECT 24.005000 0.885000 24.175000 1.755000 ;
-        RECT 24.005000 2.125000 24.175000 3.315000 ;
-        RECT 24.005000 3.685000 24.175000 4.555000 ;
-      LAYER mcon ;
-        RECT  1.525000 1.785000  1.695000 1.955000 ;
-        RECT  1.525000 3.485000  1.695000 3.655000 ;
-        RECT  4.745000 1.785000  4.915000 1.955000 ;
-        RECT  4.745000 3.485000  4.915000 3.655000 ;
-        RECT  7.965000 1.785000  8.135000 1.955000 ;
-        RECT  7.965000 3.485000  8.135000 3.655000 ;
-        RECT 11.185000 1.785000 11.355000 1.955000 ;
-        RECT 11.185000 3.485000 11.355000 3.655000 ;
-        RECT 14.405000 1.785000 14.575000 1.955000 ;
-        RECT 14.405000 3.485000 14.575000 3.655000 ;
-        RECT 17.625000 1.785000 17.795000 1.955000 ;
-        RECT 17.625000 3.485000 17.795000 3.655000 ;
-        RECT 20.845000 1.785000 21.015000 1.955000 ;
-        RECT 20.845000 3.485000 21.015000 3.655000 ;
-        RECT 24.065000 1.785000 24.235000 1.955000 ;
-        RECT 24.065000 3.485000 24.235000 3.655000 ;
-      LAYER met1 ;
-        RECT  1.465000 1.755000  1.755000 1.800000 ;
-        RECT  1.465000 1.800000 24.295000 1.940000 ;
-        RECT  1.465000 1.940000  1.755000 1.985000 ;
-        RECT  1.465000 3.455000  1.755000 3.500000 ;
-        RECT  1.465000 3.500000 24.295000 3.640000 ;
-        RECT  1.465000 3.640000  1.755000 3.685000 ;
-        RECT  4.685000 1.755000  4.975000 1.800000 ;
-        RECT  4.685000 1.940000  4.975000 1.985000 ;
-        RECT  4.685000 3.455000  4.975000 3.500000 ;
-        RECT  4.685000 3.640000  4.975000 3.685000 ;
-        RECT  7.905000 1.755000  8.195000 1.800000 ;
-        RECT  7.905000 1.940000  8.195000 1.985000 ;
-        RECT  7.905000 3.455000  8.195000 3.500000 ;
-        RECT  7.905000 3.640000  8.195000 3.685000 ;
-        RECT 11.125000 1.755000 11.415000 1.800000 ;
-        RECT 11.125000 1.940000 11.415000 1.985000 ;
-        RECT 11.125000 3.455000 11.415000 3.500000 ;
-        RECT 11.125000 3.640000 11.415000 3.685000 ;
-        RECT 14.345000 1.755000 14.635000 1.800000 ;
-        RECT 14.345000 1.940000 14.635000 1.985000 ;
-        RECT 14.345000 3.455000 14.635000 3.500000 ;
-        RECT 14.345000 3.640000 14.635000 3.685000 ;
-        RECT 17.565000 1.755000 17.855000 1.800000 ;
-        RECT 17.565000 1.940000 17.855000 1.985000 ;
-        RECT 17.565000 3.455000 17.855000 3.500000 ;
-        RECT 17.565000 3.640000 17.855000 3.685000 ;
-        RECT 20.785000 1.755000 21.075000 1.800000 ;
-        RECT 20.785000 1.940000 21.075000 1.985000 ;
-        RECT 20.785000 3.455000 21.075000 3.500000 ;
-        RECT 20.785000 3.640000 21.075000 3.685000 ;
-        RECT 24.005000 1.755000 24.295000 1.800000 ;
-        RECT 24.005000 1.940000 24.295000 1.985000 ;
-        RECT 24.005000 3.455000 24.295000 3.500000 ;
-        RECT 24.005000 3.640000 24.295000 3.685000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef
index 5a5d324..f9db04d 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef
@@ -284,23 +284,6 @@
         RECT 45.625000 4.115000 46.220000 4.445000 ;
     END
   END S[15]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 51.980000 0.240000 ;
-        RECT 0.000000  5.200000 51.980000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 51.980000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -375,6 +358,23 @@
         RECT 48.705000 3.640000 48.995000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 51.980000 0.240000 ;
+        RECT 0.000000  5.200000 51.980000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 51.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 51.980000 0.085000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
index 19d270c..90ddd58 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
@@ -322,12 +322,218 @@
         RECT 45.625000 4.115000 46.220000 4.445000 ;
     END
   END S[15]
-  PIN VGND
-    ANTENNADIFFAREA  6.635200 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    ANTENNADIFFAREA  0.089250 ;
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 0.265000 26.135000 0.810000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 4.630000 26.135000 5.175000 ;
+    END
+  END VNB
+  PIN VPB
+    ANTENNADIFFAREA  0.297500 ;
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 1.470000 26.135000 2.455000 ;
+        RECT 25.845000 2.985000 26.135000 3.970000 ;
+    END
+  END VPB
+  PIN Z
+    ANTENNADIFFAREA  12.10240 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  2.865000 0.595000  3.195000 0.885000 ;
+        RECT  2.865000 4.555000  3.195000 4.845000 ;
+        RECT  2.965000 0.885000  3.195000 1.065000 ;
+        RECT  2.965000 1.065000  4.235000 1.365000 ;
+        RECT  2.965000 1.365000  3.295000 4.075000 ;
+        RECT  2.965000 4.075000  4.235000 4.375000 ;
+        RECT  2.965000 4.375000  3.195000 4.555000 ;
+        RECT  3.705000 0.595000  4.035000 1.065000 ;
+        RECT  3.705000 4.375000  4.035000 4.845000 ;
+        RECT  3.905000 1.365000  4.235000 4.075000 ;
+        RECT  8.645000 1.065000  9.915000 1.365000 ;
+        RECT  8.645000 1.365000  8.975000 4.075000 ;
+        RECT  8.645000 4.075000  9.915000 4.375000 ;
+        RECT  8.845000 0.595000  9.175000 1.065000 ;
+        RECT  8.845000 4.375000  9.175000 4.845000 ;
+        RECT  9.585000 1.365000  9.915000 4.075000 ;
+        RECT  9.685000 0.595000 10.015000 0.885000 ;
+        RECT  9.685000 0.885000  9.915000 1.065000 ;
+        RECT  9.685000 4.375000  9.915000 4.555000 ;
+        RECT  9.685000 4.555000 10.015000 4.845000 ;
+        RECT 15.745000 0.595000 16.075000 0.885000 ;
+        RECT 15.745000 4.555000 16.075000 4.845000 ;
+        RECT 15.845000 0.885000 16.075000 1.065000 ;
+        RECT 15.845000 1.065000 17.115000 1.365000 ;
+        RECT 15.845000 1.365000 16.175000 4.075000 ;
+        RECT 15.845000 4.075000 17.115000 4.375000 ;
+        RECT 15.845000 4.375000 16.075000 4.555000 ;
+        RECT 16.585000 0.595000 16.915000 1.065000 ;
+        RECT 16.585000 4.375000 16.915000 4.845000 ;
+        RECT 16.785000 1.365000 17.115000 4.075000 ;
+        RECT 21.525000 1.065000 22.795000 1.365000 ;
+        RECT 21.525000 1.365000 21.855000 4.075000 ;
+        RECT 21.525000 4.075000 22.795000 4.375000 ;
+        RECT 21.725000 0.595000 22.055000 1.065000 ;
+        RECT 21.725000 4.375000 22.055000 4.845000 ;
+        RECT 22.465000 1.365000 22.795000 4.075000 ;
+        RECT 22.565000 0.595000 22.895000 0.885000 ;
+        RECT 22.565000 0.885000 22.795000 1.065000 ;
+        RECT 22.565000 4.375000 22.795000 4.555000 ;
+        RECT 22.565000 4.555000 22.895000 4.845000 ;
+        RECT 29.085000 0.595000 29.415000 0.885000 ;
+        RECT 29.085000 4.555000 29.415000 4.845000 ;
+        RECT 29.185000 0.885000 29.415000 1.065000 ;
+        RECT 29.185000 1.065000 30.455000 1.365000 ;
+        RECT 29.185000 1.365000 29.515000 4.075000 ;
+        RECT 29.185000 4.075000 30.455000 4.375000 ;
+        RECT 29.185000 4.375000 29.415000 4.555000 ;
+        RECT 29.925000 0.595000 30.255000 1.065000 ;
+        RECT 29.925000 4.375000 30.255000 4.845000 ;
+        RECT 30.125000 1.365000 30.455000 4.075000 ;
+        RECT 34.865000 1.065000 36.135000 1.365000 ;
+        RECT 34.865000 1.365000 35.195000 4.075000 ;
+        RECT 34.865000 4.075000 36.135000 4.375000 ;
+        RECT 35.065000 0.595000 35.395000 1.065000 ;
+        RECT 35.065000 4.375000 35.395000 4.845000 ;
+        RECT 35.805000 1.365000 36.135000 4.075000 ;
+        RECT 35.905000 0.595000 36.235000 0.885000 ;
+        RECT 35.905000 0.885000 36.135000 1.065000 ;
+        RECT 35.905000 4.375000 36.135000 4.555000 ;
+        RECT 35.905000 4.555000 36.235000 4.845000 ;
+        RECT 41.965000 0.595000 42.295000 0.885000 ;
+        RECT 41.965000 4.555000 42.295000 4.845000 ;
+        RECT 42.065000 0.885000 42.295000 1.065000 ;
+        RECT 42.065000 1.065000 43.335000 1.365000 ;
+        RECT 42.065000 1.365000 42.395000 4.075000 ;
+        RECT 42.065000 4.075000 43.335000 4.375000 ;
+        RECT 42.065000 4.375000 42.295000 4.555000 ;
+        RECT 42.805000 0.595000 43.135000 1.065000 ;
+        RECT 42.805000 4.375000 43.135000 4.845000 ;
+        RECT 43.005000 1.365000 43.335000 4.075000 ;
+        RECT 47.745000 1.065000 49.015000 1.365000 ;
+        RECT 47.745000 1.365000 48.075000 4.075000 ;
+        RECT 47.745000 4.075000 49.015000 4.375000 ;
+        RECT 47.945000 0.595000 48.275000 1.065000 ;
+        RECT 47.945000 4.375000 48.275000 4.845000 ;
+        RECT 48.685000 1.365000 49.015000 4.075000 ;
+        RECT 48.785000 0.595000 49.115000 0.885000 ;
+        RECT 48.785000 0.885000 49.015000 1.065000 ;
+        RECT 48.785000 4.375000 49.015000 4.555000 ;
+        RECT 48.785000 4.555000 49.115000 4.845000 ;
+      LAYER mcon ;
+        RECT  3.045000 1.785000  3.215000 1.955000 ;
+        RECT  3.045000 3.485000  3.215000 3.655000 ;
+        RECT  3.985000 1.785000  4.155000 1.955000 ;
+        RECT  3.985000 3.485000  4.155000 3.655000 ;
+        RECT  8.725000 1.785000  8.895000 1.955000 ;
+        RECT  8.725000 3.485000  8.895000 3.655000 ;
+        RECT  9.665000 1.785000  9.835000 1.955000 ;
+        RECT  9.665000 3.485000  9.835000 3.655000 ;
+        RECT 15.925000 1.785000 16.095000 1.955000 ;
+        RECT 15.925000 3.485000 16.095000 3.655000 ;
+        RECT 16.865000 1.785000 17.035000 1.955000 ;
+        RECT 16.865000 3.485000 17.035000 3.655000 ;
+        RECT 21.605000 1.785000 21.775000 1.955000 ;
+        RECT 21.605000 3.485000 21.775000 3.655000 ;
+        RECT 22.545000 1.785000 22.715000 1.955000 ;
+        RECT 22.545000 3.485000 22.715000 3.655000 ;
+        RECT 29.265000 1.785000 29.435000 1.955000 ;
+        RECT 29.265000 3.485000 29.435000 3.655000 ;
+        RECT 30.205000 1.785000 30.375000 1.955000 ;
+        RECT 30.205000 3.485000 30.375000 3.655000 ;
+        RECT 34.945000 1.785000 35.115000 1.955000 ;
+        RECT 34.945000 3.485000 35.115000 3.655000 ;
+        RECT 35.885000 1.785000 36.055000 1.955000 ;
+        RECT 35.885000 3.485000 36.055000 3.655000 ;
+        RECT 42.145000 1.785000 42.315000 1.955000 ;
+        RECT 42.145000 3.485000 42.315000 3.655000 ;
+        RECT 43.085000 1.785000 43.255000 1.955000 ;
+        RECT 43.085000 3.485000 43.255000 3.655000 ;
+        RECT 47.825000 1.785000 47.995000 1.955000 ;
+        RECT 47.825000 3.485000 47.995000 3.655000 ;
+        RECT 48.765000 1.785000 48.935000 1.955000 ;
+        RECT 48.765000 3.485000 48.935000 3.655000 ;
+      LAYER met1 ;
+        RECT  2.985000 1.755000  3.275000 1.800000 ;
+        RECT  2.985000 1.800000 48.995000 1.940000 ;
+        RECT  2.985000 1.940000  3.275000 1.985000 ;
+        RECT  2.985000 3.455000  3.275000 3.500000 ;
+        RECT  2.985000 3.500000 48.995000 3.640000 ;
+        RECT  2.985000 3.640000  3.275000 3.685000 ;
+        RECT  3.925000 1.755000  4.215000 1.800000 ;
+        RECT  3.925000 1.940000  4.215000 1.985000 ;
+        RECT  3.925000 3.455000  4.215000 3.500000 ;
+        RECT  3.925000 3.640000  4.215000 3.685000 ;
+        RECT  8.665000 1.755000  8.955000 1.800000 ;
+        RECT  8.665000 1.940000  8.955000 1.985000 ;
+        RECT  8.665000 3.455000  8.955000 3.500000 ;
+        RECT  8.665000 3.640000  8.955000 3.685000 ;
+        RECT  9.605000 1.755000  9.895000 1.800000 ;
+        RECT  9.605000 1.940000  9.895000 1.985000 ;
+        RECT  9.605000 3.455000  9.895000 3.500000 ;
+        RECT  9.605000 3.640000  9.895000 3.685000 ;
+        RECT 15.865000 1.755000 16.155000 1.800000 ;
+        RECT 15.865000 1.940000 16.155000 1.985000 ;
+        RECT 15.865000 3.455000 16.155000 3.500000 ;
+        RECT 15.865000 3.640000 16.155000 3.685000 ;
+        RECT 16.805000 1.755000 17.095000 1.800000 ;
+        RECT 16.805000 1.940000 17.095000 1.985000 ;
+        RECT 16.805000 3.455000 17.095000 3.500000 ;
+        RECT 16.805000 3.640000 17.095000 3.685000 ;
+        RECT 21.545000 1.755000 21.835000 1.800000 ;
+        RECT 21.545000 1.940000 21.835000 1.985000 ;
+        RECT 21.545000 3.455000 21.835000 3.500000 ;
+        RECT 21.545000 3.640000 21.835000 3.685000 ;
+        RECT 22.485000 1.755000 22.775000 1.800000 ;
+        RECT 22.485000 1.940000 22.775000 1.985000 ;
+        RECT 22.485000 3.455000 22.775000 3.500000 ;
+        RECT 22.485000 3.640000 22.775000 3.685000 ;
+        RECT 29.205000 1.755000 29.495000 1.800000 ;
+        RECT 29.205000 1.940000 29.495000 1.985000 ;
+        RECT 29.205000 3.455000 29.495000 3.500000 ;
+        RECT 29.205000 3.640000 29.495000 3.685000 ;
+        RECT 30.145000 1.755000 30.435000 1.800000 ;
+        RECT 30.145000 1.940000 30.435000 1.985000 ;
+        RECT 30.145000 3.455000 30.435000 3.500000 ;
+        RECT 30.145000 3.640000 30.435000 3.685000 ;
+        RECT 34.885000 1.755000 35.175000 1.800000 ;
+        RECT 34.885000 1.940000 35.175000 1.985000 ;
+        RECT 34.885000 3.455000 35.175000 3.500000 ;
+        RECT 34.885000 3.640000 35.175000 3.685000 ;
+        RECT 35.825000 1.755000 36.115000 1.800000 ;
+        RECT 35.825000 1.940000 36.115000 1.985000 ;
+        RECT 35.825000 3.455000 36.115000 3.500000 ;
+        RECT 35.825000 3.640000 36.115000 3.685000 ;
+        RECT 42.085000 1.755000 42.375000 1.800000 ;
+        RECT 42.085000 1.940000 42.375000 1.985000 ;
+        RECT 42.085000 3.455000 42.375000 3.500000 ;
+        RECT 42.085000 3.640000 42.375000 3.685000 ;
+        RECT 43.025000 1.755000 43.315000 1.800000 ;
+        RECT 43.025000 1.940000 43.315000 1.985000 ;
+        RECT 43.025000 3.455000 43.315000 3.500000 ;
+        RECT 43.025000 3.640000 43.315000 3.685000 ;
+        RECT 47.765000 1.755000 48.055000 1.800000 ;
+        RECT 47.765000 1.940000 48.055000 1.985000 ;
+        RECT 47.765000 3.455000 48.055000 3.500000 ;
+        RECT 47.765000 3.640000 48.055000 3.685000 ;
+        RECT 48.705000 1.755000 48.995000 1.800000 ;
+        RECT 48.705000 1.940000 48.995000 1.985000 ;
+        RECT 48.705000 3.455000 48.995000 3.500000 ;
+        RECT 48.705000 3.640000 48.995000 3.685000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 51.980000 0.085000 ;
         RECT  0.145000  0.085000  0.395000 0.885000 ;
         RECT  1.065000  0.085000  1.335000 0.545000 ;
@@ -647,29 +853,9 @@
         RECT 0.000000 5.200000 51.980000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    ANTENNADIFFAREA  0.089250 ;
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 0.265000 26.135000 0.810000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 4.630000 26.135000 5.175000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 1.470000 26.135000 2.455000 ;
-        RECT 25.845000 2.985000 26.135000 3.970000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  20.364799 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000  2.795000 2.805000 ;
@@ -847,194 +1033,6 @@
         RECT 0.000000 2.480000 51.980000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  12.10240 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  2.865000 0.595000  3.195000 0.885000 ;
-        RECT  2.865000 4.555000  3.195000 4.845000 ;
-        RECT  2.965000 0.885000  3.195000 1.065000 ;
-        RECT  2.965000 1.065000  4.235000 1.365000 ;
-        RECT  2.965000 1.365000  3.295000 4.075000 ;
-        RECT  2.965000 4.075000  4.235000 4.375000 ;
-        RECT  2.965000 4.375000  3.195000 4.555000 ;
-        RECT  3.705000 0.595000  4.035000 1.065000 ;
-        RECT  3.705000 4.375000  4.035000 4.845000 ;
-        RECT  3.905000 1.365000  4.235000 4.075000 ;
-        RECT  8.645000 1.065000  9.915000 1.365000 ;
-        RECT  8.645000 1.365000  8.975000 4.075000 ;
-        RECT  8.645000 4.075000  9.915000 4.375000 ;
-        RECT  8.845000 0.595000  9.175000 1.065000 ;
-        RECT  8.845000 4.375000  9.175000 4.845000 ;
-        RECT  9.585000 1.365000  9.915000 4.075000 ;
-        RECT  9.685000 0.595000 10.015000 0.885000 ;
-        RECT  9.685000 0.885000  9.915000 1.065000 ;
-        RECT  9.685000 4.375000  9.915000 4.555000 ;
-        RECT  9.685000 4.555000 10.015000 4.845000 ;
-        RECT 15.745000 0.595000 16.075000 0.885000 ;
-        RECT 15.745000 4.555000 16.075000 4.845000 ;
-        RECT 15.845000 0.885000 16.075000 1.065000 ;
-        RECT 15.845000 1.065000 17.115000 1.365000 ;
-        RECT 15.845000 1.365000 16.175000 4.075000 ;
-        RECT 15.845000 4.075000 17.115000 4.375000 ;
-        RECT 15.845000 4.375000 16.075000 4.555000 ;
-        RECT 16.585000 0.595000 16.915000 1.065000 ;
-        RECT 16.585000 4.375000 16.915000 4.845000 ;
-        RECT 16.785000 1.365000 17.115000 4.075000 ;
-        RECT 21.525000 1.065000 22.795000 1.365000 ;
-        RECT 21.525000 1.365000 21.855000 4.075000 ;
-        RECT 21.525000 4.075000 22.795000 4.375000 ;
-        RECT 21.725000 0.595000 22.055000 1.065000 ;
-        RECT 21.725000 4.375000 22.055000 4.845000 ;
-        RECT 22.465000 1.365000 22.795000 4.075000 ;
-        RECT 22.565000 0.595000 22.895000 0.885000 ;
-        RECT 22.565000 0.885000 22.795000 1.065000 ;
-        RECT 22.565000 4.375000 22.795000 4.555000 ;
-        RECT 22.565000 4.555000 22.895000 4.845000 ;
-        RECT 29.085000 0.595000 29.415000 0.885000 ;
-        RECT 29.085000 4.555000 29.415000 4.845000 ;
-        RECT 29.185000 0.885000 29.415000 1.065000 ;
-        RECT 29.185000 1.065000 30.455000 1.365000 ;
-        RECT 29.185000 1.365000 29.515000 4.075000 ;
-        RECT 29.185000 4.075000 30.455000 4.375000 ;
-        RECT 29.185000 4.375000 29.415000 4.555000 ;
-        RECT 29.925000 0.595000 30.255000 1.065000 ;
-        RECT 29.925000 4.375000 30.255000 4.845000 ;
-        RECT 30.125000 1.365000 30.455000 4.075000 ;
-        RECT 34.865000 1.065000 36.135000 1.365000 ;
-        RECT 34.865000 1.365000 35.195000 4.075000 ;
-        RECT 34.865000 4.075000 36.135000 4.375000 ;
-        RECT 35.065000 0.595000 35.395000 1.065000 ;
-        RECT 35.065000 4.375000 35.395000 4.845000 ;
-        RECT 35.805000 1.365000 36.135000 4.075000 ;
-        RECT 35.905000 0.595000 36.235000 0.885000 ;
-        RECT 35.905000 0.885000 36.135000 1.065000 ;
-        RECT 35.905000 4.375000 36.135000 4.555000 ;
-        RECT 35.905000 4.555000 36.235000 4.845000 ;
-        RECT 41.965000 0.595000 42.295000 0.885000 ;
-        RECT 41.965000 4.555000 42.295000 4.845000 ;
-        RECT 42.065000 0.885000 42.295000 1.065000 ;
-        RECT 42.065000 1.065000 43.335000 1.365000 ;
-        RECT 42.065000 1.365000 42.395000 4.075000 ;
-        RECT 42.065000 4.075000 43.335000 4.375000 ;
-        RECT 42.065000 4.375000 42.295000 4.555000 ;
-        RECT 42.805000 0.595000 43.135000 1.065000 ;
-        RECT 42.805000 4.375000 43.135000 4.845000 ;
-        RECT 43.005000 1.365000 43.335000 4.075000 ;
-        RECT 47.745000 1.065000 49.015000 1.365000 ;
-        RECT 47.745000 1.365000 48.075000 4.075000 ;
-        RECT 47.745000 4.075000 49.015000 4.375000 ;
-        RECT 47.945000 0.595000 48.275000 1.065000 ;
-        RECT 47.945000 4.375000 48.275000 4.845000 ;
-        RECT 48.685000 1.365000 49.015000 4.075000 ;
-        RECT 48.785000 0.595000 49.115000 0.885000 ;
-        RECT 48.785000 0.885000 49.015000 1.065000 ;
-        RECT 48.785000 4.375000 49.015000 4.555000 ;
-        RECT 48.785000 4.555000 49.115000 4.845000 ;
-      LAYER mcon ;
-        RECT  3.045000 1.785000  3.215000 1.955000 ;
-        RECT  3.045000 3.485000  3.215000 3.655000 ;
-        RECT  3.985000 1.785000  4.155000 1.955000 ;
-        RECT  3.985000 3.485000  4.155000 3.655000 ;
-        RECT  8.725000 1.785000  8.895000 1.955000 ;
-        RECT  8.725000 3.485000  8.895000 3.655000 ;
-        RECT  9.665000 1.785000  9.835000 1.955000 ;
-        RECT  9.665000 3.485000  9.835000 3.655000 ;
-        RECT 15.925000 1.785000 16.095000 1.955000 ;
-        RECT 15.925000 3.485000 16.095000 3.655000 ;
-        RECT 16.865000 1.785000 17.035000 1.955000 ;
-        RECT 16.865000 3.485000 17.035000 3.655000 ;
-        RECT 21.605000 1.785000 21.775000 1.955000 ;
-        RECT 21.605000 3.485000 21.775000 3.655000 ;
-        RECT 22.545000 1.785000 22.715000 1.955000 ;
-        RECT 22.545000 3.485000 22.715000 3.655000 ;
-        RECT 29.265000 1.785000 29.435000 1.955000 ;
-        RECT 29.265000 3.485000 29.435000 3.655000 ;
-        RECT 30.205000 1.785000 30.375000 1.955000 ;
-        RECT 30.205000 3.485000 30.375000 3.655000 ;
-        RECT 34.945000 1.785000 35.115000 1.955000 ;
-        RECT 34.945000 3.485000 35.115000 3.655000 ;
-        RECT 35.885000 1.785000 36.055000 1.955000 ;
-        RECT 35.885000 3.485000 36.055000 3.655000 ;
-        RECT 42.145000 1.785000 42.315000 1.955000 ;
-        RECT 42.145000 3.485000 42.315000 3.655000 ;
-        RECT 43.085000 1.785000 43.255000 1.955000 ;
-        RECT 43.085000 3.485000 43.255000 3.655000 ;
-        RECT 47.825000 1.785000 47.995000 1.955000 ;
-        RECT 47.825000 3.485000 47.995000 3.655000 ;
-        RECT 48.765000 1.785000 48.935000 1.955000 ;
-        RECT 48.765000 3.485000 48.935000 3.655000 ;
-      LAYER met1 ;
-        RECT  2.985000 1.755000  3.275000 1.800000 ;
-        RECT  2.985000 1.800000 48.995000 1.940000 ;
-        RECT  2.985000 1.940000  3.275000 1.985000 ;
-        RECT  2.985000 3.455000  3.275000 3.500000 ;
-        RECT  2.985000 3.500000 48.995000 3.640000 ;
-        RECT  2.985000 3.640000  3.275000 3.685000 ;
-        RECT  3.925000 1.755000  4.215000 1.800000 ;
-        RECT  3.925000 1.940000  4.215000 1.985000 ;
-        RECT  3.925000 3.455000  4.215000 3.500000 ;
-        RECT  3.925000 3.640000  4.215000 3.685000 ;
-        RECT  8.665000 1.755000  8.955000 1.800000 ;
-        RECT  8.665000 1.940000  8.955000 1.985000 ;
-        RECT  8.665000 3.455000  8.955000 3.500000 ;
-        RECT  8.665000 3.640000  8.955000 3.685000 ;
-        RECT  9.605000 1.755000  9.895000 1.800000 ;
-        RECT  9.605000 1.940000  9.895000 1.985000 ;
-        RECT  9.605000 3.455000  9.895000 3.500000 ;
-        RECT  9.605000 3.640000  9.895000 3.685000 ;
-        RECT 15.865000 1.755000 16.155000 1.800000 ;
-        RECT 15.865000 1.940000 16.155000 1.985000 ;
-        RECT 15.865000 3.455000 16.155000 3.500000 ;
-        RECT 15.865000 3.640000 16.155000 3.685000 ;
-        RECT 16.805000 1.755000 17.095000 1.800000 ;
-        RECT 16.805000 1.940000 17.095000 1.985000 ;
-        RECT 16.805000 3.455000 17.095000 3.500000 ;
-        RECT 16.805000 3.640000 17.095000 3.685000 ;
-        RECT 21.545000 1.755000 21.835000 1.800000 ;
-        RECT 21.545000 1.940000 21.835000 1.985000 ;
-        RECT 21.545000 3.455000 21.835000 3.500000 ;
-        RECT 21.545000 3.640000 21.835000 3.685000 ;
-        RECT 22.485000 1.755000 22.775000 1.800000 ;
-        RECT 22.485000 1.940000 22.775000 1.985000 ;
-        RECT 22.485000 3.455000 22.775000 3.500000 ;
-        RECT 22.485000 3.640000 22.775000 3.685000 ;
-        RECT 29.205000 1.755000 29.495000 1.800000 ;
-        RECT 29.205000 1.940000 29.495000 1.985000 ;
-        RECT 29.205000 3.455000 29.495000 3.500000 ;
-        RECT 29.205000 3.640000 29.495000 3.685000 ;
-        RECT 30.145000 1.755000 30.435000 1.800000 ;
-        RECT 30.145000 1.940000 30.435000 1.985000 ;
-        RECT 30.145000 3.455000 30.435000 3.500000 ;
-        RECT 30.145000 3.640000 30.435000 3.685000 ;
-        RECT 34.885000 1.755000 35.175000 1.800000 ;
-        RECT 34.885000 1.940000 35.175000 1.985000 ;
-        RECT 34.885000 3.455000 35.175000 3.500000 ;
-        RECT 34.885000 3.640000 35.175000 3.685000 ;
-        RECT 35.825000 1.755000 36.115000 1.800000 ;
-        RECT 35.825000 1.940000 36.115000 1.985000 ;
-        RECT 35.825000 3.455000 36.115000 3.500000 ;
-        RECT 35.825000 3.640000 36.115000 3.685000 ;
-        RECT 42.085000 1.755000 42.375000 1.800000 ;
-        RECT 42.085000 1.940000 42.375000 1.985000 ;
-        RECT 42.085000 3.455000 42.375000 3.500000 ;
-        RECT 42.085000 3.640000 42.375000 3.685000 ;
-        RECT 43.025000 1.755000 43.315000 1.800000 ;
-        RECT 43.025000 1.940000 43.315000 1.985000 ;
-        RECT 43.025000 3.455000 43.315000 3.500000 ;
-        RECT 43.025000 3.640000 43.315000 3.685000 ;
-        RECT 47.765000 1.755000 48.055000 1.800000 ;
-        RECT 47.765000 1.940000 48.055000 1.985000 ;
-        RECT 47.765000 3.455000 48.055000 3.500000 ;
-        RECT 47.765000 3.640000 48.055000 3.685000 ;
-        RECT 48.705000 1.755000 48.995000 1.800000 ;
-        RECT 48.705000 1.940000 48.995000 1.985000 ;
-        RECT 48.705000 3.455000 48.995000 3.500000 ;
-        RECT 48.705000 3.640000 48.995000 3.685000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef
index 699e190..3cc2eee 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef
@@ -100,22 +100,6 @@
         RECT 6.585000 0.945000 6.935000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -133,6 +117,22 @@
         RECT 7.445000 1.940000 7.735000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
index fc95ca9..e236707 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
@@ -114,78 +114,6 @@
         RECT 6.585000 0.945000 6.935000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    ANTENNADIFFAREA  0.999700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.130000  0.085000 0.390000 0.885000 ;
-        RECT 2.135000  0.085000 2.465000 0.660000 ;
-        RECT 4.210000  0.085000 4.530000 0.885000 ;
-        RECT 6.275000  0.085000 6.605000 0.660000 ;
-        RECT 8.350000  0.085000 8.610000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    ANTENNADIFFAREA  1.690000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.095000 1.495000 0.425000 2.635000 ;
-        RECT 2.165000 1.465000 2.465000 2.635000 ;
-        RECT 4.175000 1.495000 4.565000 2.635000 ;
-        RECT 6.275000 1.465000 6.575000 2.635000 ;
-        RECT 8.315000 1.495000 8.645000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.426400 ;
     DIRECTION OUTPUT ;
@@ -233,6 +161,76 @@
         RECT 7.445000 1.940000 7.735000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 8.740000 0.085000 ;
+        RECT 0.130000  0.085000 0.390000 0.885000 ;
+        RECT 2.135000  0.085000 2.465000 0.660000 ;
+        RECT 4.210000  0.085000 4.530000 0.885000 ;
+        RECT 6.275000  0.085000 6.605000 0.660000 ;
+        RECT 8.350000  0.085000 8.610000 0.885000 ;
+      LAYER mcon ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+        RECT 0.605000 -0.085000 0.775000 0.085000 ;
+        RECT 1.065000 -0.085000 1.235000 0.085000 ;
+        RECT 1.525000 -0.085000 1.695000 0.085000 ;
+        RECT 1.985000 -0.085000 2.155000 0.085000 ;
+        RECT 2.445000 -0.085000 2.615000 0.085000 ;
+        RECT 2.905000 -0.085000 3.075000 0.085000 ;
+        RECT 3.365000 -0.085000 3.535000 0.085000 ;
+        RECT 3.825000 -0.085000 3.995000 0.085000 ;
+        RECT 4.285000 -0.085000 4.455000 0.085000 ;
+        RECT 4.745000 -0.085000 4.915000 0.085000 ;
+        RECT 5.205000 -0.085000 5.375000 0.085000 ;
+        RECT 5.665000 -0.085000 5.835000 0.085000 ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+        RECT 7.045000 -0.085000 7.215000 0.085000 ;
+        RECT 7.505000 -0.085000 7.675000 0.085000 ;
+        RECT 7.965000 -0.085000 8.135000 0.085000 ;
+        RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 8.740000 2.805000 ;
+        RECT 0.095000 1.495000 0.425000 2.635000 ;
+        RECT 2.165000 1.465000 2.465000 2.635000 ;
+        RECT 4.175000 1.495000 4.565000 2.635000 ;
+        RECT 6.275000 1.465000 6.575000 2.635000 ;
+        RECT 8.315000 1.495000 8.645000 2.635000 ;
+      LAYER mcon ;
+        RECT 0.145000 2.635000 0.315000 2.805000 ;
+        RECT 0.605000 2.635000 0.775000 2.805000 ;
+        RECT 1.065000 2.635000 1.235000 2.805000 ;
+        RECT 1.525000 2.635000 1.695000 2.805000 ;
+        RECT 1.985000 2.635000 2.155000 2.805000 ;
+        RECT 2.445000 2.635000 2.615000 2.805000 ;
+        RECT 2.905000 2.635000 3.075000 2.805000 ;
+        RECT 3.365000 2.635000 3.535000 2.805000 ;
+        RECT 3.825000 2.635000 3.995000 2.805000 ;
+        RECT 4.285000 2.635000 4.455000 2.805000 ;
+        RECT 4.745000 2.635000 4.915000 2.805000 ;
+        RECT 5.205000 2.635000 5.375000 2.805000 ;
+        RECT 5.665000 2.635000 5.835000 2.805000 ;
+        RECT 6.125000 2.635000 6.295000 2.805000 ;
+        RECT 6.585000 2.635000 6.755000 2.805000 ;
+        RECT 7.045000 2.635000 7.215000 2.805000 ;
+        RECT 7.505000 2.635000 7.675000 2.805000 ;
+        RECT 7.965000 2.635000 8.135000 2.805000 ;
+        RECT 8.425000 2.635000 8.595000 2.805000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 1.240000 1.175000 1.630000 1.465000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef
index 316564e..781446e 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef
@@ -92,22 +92,6 @@
         RECT 9.755000 1.025000 10.090000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.880000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 12.880000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -125,6 +109,22 @@
         RECT 11.125000 1.940000 11.415000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.880000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 12.880000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.880000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
index 3178bec..f35b183 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
@@ -106,12 +106,46 @@
         RECT 9.755000 1.025000 10.090000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    ANTENNADIFFAREA  0.982800 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  1.512800 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  1.465000 1.755000  1.895000 2.125000 ;
+        RECT  1.505000 0.595000  1.835000 0.885000 ;
+        RECT  1.585000 0.885000  1.755000 1.755000 ;
+        RECT  4.545000 1.755000  4.975000 2.125000 ;
+        RECT  4.605000 0.595000  4.935000 0.885000 ;
+        RECT  4.685000 0.885000  4.855000 1.755000 ;
+        RECT  7.905000 1.755000  8.335000 2.125000 ;
+        RECT  7.945000 0.595000  8.275000 0.885000 ;
+        RECT  8.025000 0.885000  8.195000 1.755000 ;
+        RECT 10.985000 1.755000 11.415000 2.125000 ;
+        RECT 11.045000 0.595000 11.375000 0.885000 ;
+        RECT 11.125000 0.885000 11.295000 1.755000 ;
+      LAYER mcon ;
+        RECT  1.525000 1.785000  1.695000 1.955000 ;
+        RECT  4.745000 1.785000  4.915000 1.955000 ;
+        RECT  7.965000 1.785000  8.135000 1.955000 ;
+        RECT 11.185000 1.785000 11.355000 1.955000 ;
+      LAYER met1 ;
+        RECT  1.465000 1.755000  1.755000 1.800000 ;
+        RECT  1.465000 1.800000 11.415000 1.940000 ;
+        RECT  1.465000 1.940000  1.755000 1.985000 ;
+        RECT  4.685000 1.755000  4.975000 1.800000 ;
+        RECT  4.685000 1.940000  4.975000 1.985000 ;
+        RECT  7.905000 1.755000  8.195000 1.800000 ;
+        RECT  7.905000 1.940000  8.195000 1.985000 ;
+        RECT 11.125000 1.755000 11.415000 1.800000 ;
+        RECT 11.125000 1.940000 11.415000 1.985000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 12.880000 0.085000 ;
         RECT  0.645000  0.085000  0.860000 0.545000 ;
         RECT  3.095000  0.085000  3.345000 0.660000 ;
@@ -153,9 +187,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.880000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 12.880000 2.805000 ;
@@ -202,41 +235,6 @@
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  1.512800 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  1.465000 1.755000  1.895000 2.125000 ;
-        RECT  1.505000 0.595000  1.835000 0.885000 ;
-        RECT  1.585000 0.885000  1.755000 1.755000 ;
-        RECT  4.545000 1.755000  4.975000 2.125000 ;
-        RECT  4.605000 0.595000  4.935000 0.885000 ;
-        RECT  4.685000 0.885000  4.855000 1.755000 ;
-        RECT  7.905000 1.755000  8.335000 2.125000 ;
-        RECT  7.945000 0.595000  8.275000 0.885000 ;
-        RECT  8.025000 0.885000  8.195000 1.755000 ;
-        RECT 10.985000 1.755000 11.415000 2.125000 ;
-        RECT 11.045000 0.595000 11.375000 0.885000 ;
-        RECT 11.125000 0.885000 11.295000 1.755000 ;
-      LAYER mcon ;
-        RECT  1.525000 1.785000  1.695000 1.955000 ;
-        RECT  4.745000 1.785000  4.915000 1.955000 ;
-        RECT  7.965000 1.785000  8.135000 1.955000 ;
-        RECT 11.185000 1.785000 11.355000 1.955000 ;
-      LAYER met1 ;
-        RECT  1.465000 1.755000  1.755000 1.800000 ;
-        RECT  1.465000 1.800000 11.415000 1.940000 ;
-        RECT  1.465000 1.940000  1.755000 1.985000 ;
-        RECT  4.685000 1.755000  4.975000 1.800000 ;
-        RECT  4.685000 1.940000  4.975000 1.985000 ;
-        RECT  7.905000 1.755000  8.195000 1.800000 ;
-        RECT  7.905000 1.940000  8.195000 1.985000 ;
-        RECT 11.125000 1.755000 11.415000 1.800000 ;
-        RECT 11.125000 1.940000 11.415000 1.985000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef
index 365ea03..cb07a65 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef
@@ -92,22 +92,6 @@
         RECT 19.405000 0.995000 20.000000 1.325000 ;
     END
   END S[3]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 25.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 25.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -133,6 +117,22 @@
         RECT 22.485000 1.940000 22.775000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 25.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 25.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 25.760000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
index 5871d8d..81243c0 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
@@ -106,12 +106,70 @@
         RECT 19.405000 0.995000 20.000000 1.325000 ;
     END
   END S[3]
-  PIN VGND
-    ANTENNADIFFAREA  3.317600 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  3.025600 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  2.865000 0.595000  3.195000 0.885000 ;
+        RECT  2.965000 0.885000  3.195000 1.065000 ;
+        RECT  2.965000 1.065000  4.235000 1.365000 ;
+        RECT  2.965000 1.365000  3.295000 2.125000 ;
+        RECT  3.705000 0.595000  4.035000 1.065000 ;
+        RECT  3.905000 1.365000  4.235000 2.125000 ;
+        RECT  8.645000 1.065000  9.915000 1.365000 ;
+        RECT  8.645000 1.365000  8.975000 2.125000 ;
+        RECT  8.845000 0.595000  9.175000 1.065000 ;
+        RECT  9.585000 1.365000  9.915000 2.125000 ;
+        RECT  9.685000 0.595000 10.015000 0.885000 ;
+        RECT  9.685000 0.885000  9.915000 1.065000 ;
+        RECT 15.745000 0.595000 16.075000 0.885000 ;
+        RECT 15.845000 0.885000 16.075000 1.065000 ;
+        RECT 15.845000 1.065000 17.115000 1.365000 ;
+        RECT 15.845000 1.365000 16.175000 2.125000 ;
+        RECT 16.585000 0.595000 16.915000 1.065000 ;
+        RECT 16.785000 1.365000 17.115000 2.125000 ;
+        RECT 21.525000 1.065000 22.795000 1.365000 ;
+        RECT 21.525000 1.365000 21.855000 2.125000 ;
+        RECT 21.725000 0.595000 22.055000 1.065000 ;
+        RECT 22.465000 1.365000 22.795000 2.125000 ;
+        RECT 22.565000 0.595000 22.895000 0.885000 ;
+        RECT 22.565000 0.885000 22.795000 1.065000 ;
+      LAYER mcon ;
+        RECT  3.045000 1.785000  3.215000 1.955000 ;
+        RECT  3.985000 1.785000  4.155000 1.955000 ;
+        RECT  8.725000 1.785000  8.895000 1.955000 ;
+        RECT  9.665000 1.785000  9.835000 1.955000 ;
+        RECT 15.925000 1.785000 16.095000 1.955000 ;
+        RECT 16.865000 1.785000 17.035000 1.955000 ;
+        RECT 21.605000 1.785000 21.775000 1.955000 ;
+        RECT 22.545000 1.785000 22.715000 1.955000 ;
+      LAYER met1 ;
+        RECT  2.985000 1.755000  3.275000 1.800000 ;
+        RECT  2.985000 1.800000 22.775000 1.940000 ;
+        RECT  2.985000 1.940000  3.275000 1.985000 ;
+        RECT  3.925000 1.755000  4.215000 1.800000 ;
+        RECT  3.925000 1.940000  4.215000 1.985000 ;
+        RECT  8.665000 1.755000  8.955000 1.800000 ;
+        RECT  8.665000 1.940000  8.955000 1.985000 ;
+        RECT  9.605000 1.755000  9.895000 1.800000 ;
+        RECT  9.605000 1.940000  9.895000 1.985000 ;
+        RECT 15.865000 1.755000 16.155000 1.800000 ;
+        RECT 15.865000 1.940000 16.155000 1.985000 ;
+        RECT 16.805000 1.755000 17.095000 1.800000 ;
+        RECT 16.805000 1.940000 17.095000 1.985000 ;
+        RECT 21.545000 1.755000 21.835000 1.800000 ;
+        RECT 21.545000 1.940000 21.835000 1.985000 ;
+        RECT 22.485000 1.755000 22.775000 1.800000 ;
+        RECT 22.485000 1.940000 22.775000 1.985000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 25.760000 0.085000 ;
         RECT  0.145000  0.085000  0.395000 0.885000 ;
         RECT  1.065000  0.085000  1.335000 0.545000 ;
@@ -195,9 +253,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  5.091200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 25.760000 2.805000 ;
@@ -282,65 +339,6 @@
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  3.025600 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  2.865000 0.595000  3.195000 0.885000 ;
-        RECT  2.965000 0.885000  3.195000 1.065000 ;
-        RECT  2.965000 1.065000  4.235000 1.365000 ;
-        RECT  2.965000 1.365000  3.295000 2.125000 ;
-        RECT  3.705000 0.595000  4.035000 1.065000 ;
-        RECT  3.905000 1.365000  4.235000 2.125000 ;
-        RECT  8.645000 1.065000  9.915000 1.365000 ;
-        RECT  8.645000 1.365000  8.975000 2.125000 ;
-        RECT  8.845000 0.595000  9.175000 1.065000 ;
-        RECT  9.585000 1.365000  9.915000 2.125000 ;
-        RECT  9.685000 0.595000 10.015000 0.885000 ;
-        RECT  9.685000 0.885000  9.915000 1.065000 ;
-        RECT 15.745000 0.595000 16.075000 0.885000 ;
-        RECT 15.845000 0.885000 16.075000 1.065000 ;
-        RECT 15.845000 1.065000 17.115000 1.365000 ;
-        RECT 15.845000 1.365000 16.175000 2.125000 ;
-        RECT 16.585000 0.595000 16.915000 1.065000 ;
-        RECT 16.785000 1.365000 17.115000 2.125000 ;
-        RECT 21.525000 1.065000 22.795000 1.365000 ;
-        RECT 21.525000 1.365000 21.855000 2.125000 ;
-        RECT 21.725000 0.595000 22.055000 1.065000 ;
-        RECT 22.465000 1.365000 22.795000 2.125000 ;
-        RECT 22.565000 0.595000 22.895000 0.885000 ;
-        RECT 22.565000 0.885000 22.795000 1.065000 ;
-      LAYER mcon ;
-        RECT  3.045000 1.785000  3.215000 1.955000 ;
-        RECT  3.985000 1.785000  4.155000 1.955000 ;
-        RECT  8.725000 1.785000  8.895000 1.955000 ;
-        RECT  9.665000 1.785000  9.835000 1.955000 ;
-        RECT 15.925000 1.785000 16.095000 1.955000 ;
-        RECT 16.865000 1.785000 17.035000 1.955000 ;
-        RECT 21.605000 1.785000 21.775000 1.955000 ;
-        RECT 22.545000 1.785000 22.715000 1.955000 ;
-      LAYER met1 ;
-        RECT  2.985000 1.755000  3.275000 1.800000 ;
-        RECT  2.985000 1.800000 22.775000 1.940000 ;
-        RECT  2.985000 1.940000  3.275000 1.985000 ;
-        RECT  3.925000 1.755000  4.215000 1.800000 ;
-        RECT  3.925000 1.940000  4.215000 1.985000 ;
-        RECT  8.665000 1.755000  8.955000 1.800000 ;
-        RECT  8.665000 1.940000  8.955000 1.985000 ;
-        RECT  9.605000 1.755000  9.895000 1.800000 ;
-        RECT  9.605000 1.940000  9.895000 1.985000 ;
-        RECT 15.865000 1.755000 16.155000 1.800000 ;
-        RECT 15.865000 1.940000 16.155000 1.985000 ;
-        RECT 16.805000 1.755000 17.095000 1.800000 ;
-        RECT 16.805000 1.940000 17.095000 1.985000 ;
-        RECT 21.545000 1.755000 21.835000 1.800000 ;
-        RECT 21.545000 1.940000 21.835000 1.985000 ;
-        RECT 22.485000 1.755000 22.775000 1.800000 ;
-        RECT 22.485000 1.940000 22.775000 1.985000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef
index 3945733..52fd09a 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef
@@ -172,22 +172,6 @@
         RECT 14.815000 0.945000 15.215000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -213,6 +197,22 @@
         RECT 15.725000 1.940000 16.015000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 17.020000 0.085000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
index 4753b59..5600f2f 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
@@ -194,122 +194,6 @@
         RECT 14.815000 0.945000 15.215000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    ANTENNADIFFAREA  1.875900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.020000 0.085000 ;
-        RECT  0.130000  0.085000  0.390000 0.885000 ;
-        RECT  2.135000  0.085000  2.465000 0.660000 ;
-        RECT  4.210000  0.085000  4.530000 0.885000 ;
-        RECT  6.275000  0.085000  6.605000 0.660000 ;
-        RECT  8.350000  0.085000  8.670000 0.885000 ;
-        RECT 10.415000  0.085000 10.745000 0.660000 ;
-        RECT 12.490000  0.085000 12.810000 0.885000 ;
-        RECT 14.555000  0.085000 14.885000 0.660000 ;
-        RECT 16.630000  0.085000 16.890000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    ANTENNADIFFAREA  3.190000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 17.020000 2.805000 ;
-        RECT  0.095000 1.495000  0.425000 2.635000 ;
-        RECT  2.135000 1.465000  2.465000 2.635000 ;
-        RECT  4.175000 1.495000  4.565000 2.635000 ;
-        RECT  6.275000 1.465000  6.605000 2.635000 ;
-        RECT  8.315000 1.495000  8.705000 2.635000 ;
-        RECT 10.415000 1.465000 10.745000 2.635000 ;
-        RECT 12.455000 1.495000 12.845000 2.635000 ;
-        RECT 14.555000 1.465000 14.885000 2.635000 ;
-        RECT 16.595000 1.495000 16.925000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
-        RECT 16.705000 2.635000 16.875000 2.805000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  2.852800 ;
     DIRECTION OUTPUT ;
@@ -393,6 +277,120 @@
         RECT 15.725000 1.940000 16.015000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 -0.085000 17.020000 0.085000 ;
+        RECT  0.130000  0.085000  0.390000 0.885000 ;
+        RECT  2.135000  0.085000  2.465000 0.660000 ;
+        RECT  4.210000  0.085000  4.530000 0.885000 ;
+        RECT  6.275000  0.085000  6.605000 0.660000 ;
+        RECT  8.350000  0.085000  8.670000 0.885000 ;
+        RECT 10.415000  0.085000 10.745000 0.660000 ;
+        RECT 12.490000  0.085000 12.810000 0.885000 ;
+        RECT 14.555000  0.085000 14.885000 0.660000 ;
+        RECT 16.630000  0.085000 16.890000 0.885000 ;
+      LAYER mcon ;
+        RECT  0.145000 -0.085000  0.315000 0.085000 ;
+        RECT  0.605000 -0.085000  0.775000 0.085000 ;
+        RECT  1.065000 -0.085000  1.235000 0.085000 ;
+        RECT  1.525000 -0.085000  1.695000 0.085000 ;
+        RECT  1.985000 -0.085000  2.155000 0.085000 ;
+        RECT  2.445000 -0.085000  2.615000 0.085000 ;
+        RECT  2.905000 -0.085000  3.075000 0.085000 ;
+        RECT  3.365000 -0.085000  3.535000 0.085000 ;
+        RECT  3.825000 -0.085000  3.995000 0.085000 ;
+        RECT  4.285000 -0.085000  4.455000 0.085000 ;
+        RECT  4.745000 -0.085000  4.915000 0.085000 ;
+        RECT  5.205000 -0.085000  5.375000 0.085000 ;
+        RECT  5.665000 -0.085000  5.835000 0.085000 ;
+        RECT  6.125000 -0.085000  6.295000 0.085000 ;
+        RECT  6.585000 -0.085000  6.755000 0.085000 ;
+        RECT  7.045000 -0.085000  7.215000 0.085000 ;
+        RECT  7.505000 -0.085000  7.675000 0.085000 ;
+        RECT  7.965000 -0.085000  8.135000 0.085000 ;
+        RECT  8.425000 -0.085000  8.595000 0.085000 ;
+        RECT  8.885000 -0.085000  9.055000 0.085000 ;
+        RECT  9.345000 -0.085000  9.515000 0.085000 ;
+        RECT  9.805000 -0.085000  9.975000 0.085000 ;
+        RECT 10.265000 -0.085000 10.435000 0.085000 ;
+        RECT 10.725000 -0.085000 10.895000 0.085000 ;
+        RECT 11.185000 -0.085000 11.355000 0.085000 ;
+        RECT 11.645000 -0.085000 11.815000 0.085000 ;
+        RECT 12.105000 -0.085000 12.275000 0.085000 ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+        RECT 13.485000 -0.085000 13.655000 0.085000 ;
+        RECT 13.945000 -0.085000 14.115000 0.085000 ;
+        RECT 14.405000 -0.085000 14.575000 0.085000 ;
+        RECT 14.865000 -0.085000 15.035000 0.085000 ;
+        RECT 15.325000 -0.085000 15.495000 0.085000 ;
+        RECT 15.785000 -0.085000 15.955000 0.085000 ;
+        RECT 16.245000 -0.085000 16.415000 0.085000 ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 2.635000 17.020000 2.805000 ;
+        RECT  0.095000 1.495000  0.425000 2.635000 ;
+        RECT  2.135000 1.465000  2.465000 2.635000 ;
+        RECT  4.175000 1.495000  4.565000 2.635000 ;
+        RECT  6.275000 1.465000  6.605000 2.635000 ;
+        RECT  8.315000 1.495000  8.705000 2.635000 ;
+        RECT 10.415000 1.465000 10.745000 2.635000 ;
+        RECT 12.455000 1.495000 12.845000 2.635000 ;
+        RECT 14.555000 1.465000 14.885000 2.635000 ;
+        RECT 16.595000 1.495000 16.925000 2.635000 ;
+      LAYER mcon ;
+        RECT  0.145000 2.635000  0.315000 2.805000 ;
+        RECT  0.605000 2.635000  0.775000 2.805000 ;
+        RECT  1.065000 2.635000  1.235000 2.805000 ;
+        RECT  1.525000 2.635000  1.695000 2.805000 ;
+        RECT  1.985000 2.635000  2.155000 2.805000 ;
+        RECT  2.445000 2.635000  2.615000 2.805000 ;
+        RECT  2.905000 2.635000  3.075000 2.805000 ;
+        RECT  3.365000 2.635000  3.535000 2.805000 ;
+        RECT  3.825000 2.635000  3.995000 2.805000 ;
+        RECT  4.285000 2.635000  4.455000 2.805000 ;
+        RECT  4.745000 2.635000  4.915000 2.805000 ;
+        RECT  5.205000 2.635000  5.375000 2.805000 ;
+        RECT  5.665000 2.635000  5.835000 2.805000 ;
+        RECT  6.125000 2.635000  6.295000 2.805000 ;
+        RECT  6.585000 2.635000  6.755000 2.805000 ;
+        RECT  7.045000 2.635000  7.215000 2.805000 ;
+        RECT  7.505000 2.635000  7.675000 2.805000 ;
+        RECT  7.965000 2.635000  8.135000 2.805000 ;
+        RECT  8.425000 2.635000  8.595000 2.805000 ;
+        RECT  8.885000 2.635000  9.055000 2.805000 ;
+        RECT  9.345000 2.635000  9.515000 2.805000 ;
+        RECT  9.805000 2.635000  9.975000 2.805000 ;
+        RECT 10.265000 2.635000 10.435000 2.805000 ;
+        RECT 10.725000 2.635000 10.895000 2.805000 ;
+        RECT 11.185000 2.635000 11.355000 2.805000 ;
+        RECT 11.645000 2.635000 11.815000 2.805000 ;
+        RECT 12.105000 2.635000 12.275000 2.805000 ;
+        RECT 12.565000 2.635000 12.735000 2.805000 ;
+        RECT 13.025000 2.635000 13.195000 2.805000 ;
+        RECT 13.485000 2.635000 13.655000 2.805000 ;
+        RECT 13.945000 2.635000 14.115000 2.805000 ;
+        RECT 14.405000 2.635000 14.575000 2.805000 ;
+        RECT 14.865000 2.635000 15.035000 2.805000 ;
+        RECT 15.325000 2.635000 15.495000 2.805000 ;
+        RECT 15.785000 2.635000 15.955000 2.805000 ;
+        RECT 16.245000 2.635000 16.415000 2.805000 ;
+        RECT 16.705000 2.635000 16.875000 2.805000 ;
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef
index dc7bdd6..d63d660 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef
@@ -156,22 +156,6 @@
         RECT 22.635000 1.025000 22.970000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 25.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 25.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -197,6 +181,22 @@
         RECT 24.005000 1.940000 24.295000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 25.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 25.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 25.760000 0.085000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
index 08a83bb..54a1541 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
@@ -178,12 +178,70 @@
         RECT 22.635000 1.025000 22.970000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    ANTENNADIFFAREA  1.965600 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  3.025600 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  1.465000 1.755000  1.895000 2.125000 ;
+        RECT  1.505000 0.595000  1.835000 0.885000 ;
+        RECT  1.585000 0.885000  1.755000 1.755000 ;
+        RECT  4.545000 1.755000  4.975000 2.125000 ;
+        RECT  4.605000 0.595000  4.935000 0.885000 ;
+        RECT  4.685000 0.885000  4.855000 1.755000 ;
+        RECT  7.905000 1.755000  8.335000 2.125000 ;
+        RECT  7.945000 0.595000  8.275000 0.885000 ;
+        RECT  8.025000 0.885000  8.195000 1.755000 ;
+        RECT 10.985000 1.755000 11.415000 2.125000 ;
+        RECT 11.045000 0.595000 11.375000 0.885000 ;
+        RECT 11.125000 0.885000 11.295000 1.755000 ;
+        RECT 14.345000 1.755000 14.775000 2.125000 ;
+        RECT 14.385000 0.595000 14.715000 0.885000 ;
+        RECT 14.465000 0.885000 14.635000 1.755000 ;
+        RECT 17.425000 1.755000 17.855000 2.125000 ;
+        RECT 17.485000 0.595000 17.815000 0.885000 ;
+        RECT 17.565000 0.885000 17.735000 1.755000 ;
+        RECT 20.785000 1.755000 21.215000 2.125000 ;
+        RECT 20.825000 0.595000 21.155000 0.885000 ;
+        RECT 20.905000 0.885000 21.075000 1.755000 ;
+        RECT 23.865000 1.755000 24.295000 2.125000 ;
+        RECT 23.925000 0.595000 24.255000 0.885000 ;
+        RECT 24.005000 0.885000 24.175000 1.755000 ;
+      LAYER mcon ;
+        RECT  1.525000 1.785000  1.695000 1.955000 ;
+        RECT  4.745000 1.785000  4.915000 1.955000 ;
+        RECT  7.965000 1.785000  8.135000 1.955000 ;
+        RECT 11.185000 1.785000 11.355000 1.955000 ;
+        RECT 14.405000 1.785000 14.575000 1.955000 ;
+        RECT 17.625000 1.785000 17.795000 1.955000 ;
+        RECT 20.845000 1.785000 21.015000 1.955000 ;
+        RECT 24.065000 1.785000 24.235000 1.955000 ;
+      LAYER met1 ;
+        RECT  1.465000 1.755000  1.755000 1.800000 ;
+        RECT  1.465000 1.800000 24.295000 1.940000 ;
+        RECT  1.465000 1.940000  1.755000 1.985000 ;
+        RECT  4.685000 1.755000  4.975000 1.800000 ;
+        RECT  4.685000 1.940000  4.975000 1.985000 ;
+        RECT  7.905000 1.755000  8.195000 1.800000 ;
+        RECT  7.905000 1.940000  8.195000 1.985000 ;
+        RECT 11.125000 1.755000 11.415000 1.800000 ;
+        RECT 11.125000 1.940000 11.415000 1.985000 ;
+        RECT 14.345000 1.755000 14.635000 1.800000 ;
+        RECT 14.345000 1.940000 14.635000 1.985000 ;
+        RECT 17.565000 1.755000 17.855000 1.800000 ;
+        RECT 17.565000 1.940000 17.855000 1.985000 ;
+        RECT 20.785000 1.755000 21.075000 1.800000 ;
+        RECT 20.785000 1.940000 21.075000 1.985000 ;
+        RECT 24.005000 1.755000 24.295000 1.800000 ;
+        RECT 24.005000 1.940000 24.295000 1.985000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 25.760000 0.085000 ;
         RECT  0.645000  0.085000  0.860000 0.545000 ;
         RECT  3.095000  0.085000  3.345000 0.660000 ;
@@ -259,9 +317,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.760000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 25.760000 2.805000 ;
@@ -346,65 +403,6 @@
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  3.025600 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  1.465000 1.755000  1.895000 2.125000 ;
-        RECT  1.505000 0.595000  1.835000 0.885000 ;
-        RECT  1.585000 0.885000  1.755000 1.755000 ;
-        RECT  4.545000 1.755000  4.975000 2.125000 ;
-        RECT  4.605000 0.595000  4.935000 0.885000 ;
-        RECT  4.685000 0.885000  4.855000 1.755000 ;
-        RECT  7.905000 1.755000  8.335000 2.125000 ;
-        RECT  7.945000 0.595000  8.275000 0.885000 ;
-        RECT  8.025000 0.885000  8.195000 1.755000 ;
-        RECT 10.985000 1.755000 11.415000 2.125000 ;
-        RECT 11.045000 0.595000 11.375000 0.885000 ;
-        RECT 11.125000 0.885000 11.295000 1.755000 ;
-        RECT 14.345000 1.755000 14.775000 2.125000 ;
-        RECT 14.385000 0.595000 14.715000 0.885000 ;
-        RECT 14.465000 0.885000 14.635000 1.755000 ;
-        RECT 17.425000 1.755000 17.855000 2.125000 ;
-        RECT 17.485000 0.595000 17.815000 0.885000 ;
-        RECT 17.565000 0.885000 17.735000 1.755000 ;
-        RECT 20.785000 1.755000 21.215000 2.125000 ;
-        RECT 20.825000 0.595000 21.155000 0.885000 ;
-        RECT 20.905000 0.885000 21.075000 1.755000 ;
-        RECT 23.865000 1.755000 24.295000 2.125000 ;
-        RECT 23.925000 0.595000 24.255000 0.885000 ;
-        RECT 24.005000 0.885000 24.175000 1.755000 ;
-      LAYER mcon ;
-        RECT  1.525000 1.785000  1.695000 1.955000 ;
-        RECT  4.745000 1.785000  4.915000 1.955000 ;
-        RECT  7.965000 1.785000  8.135000 1.955000 ;
-        RECT 11.185000 1.785000 11.355000 1.955000 ;
-        RECT 14.405000 1.785000 14.575000 1.955000 ;
-        RECT 17.625000 1.785000 17.795000 1.955000 ;
-        RECT 20.845000 1.785000 21.015000 1.955000 ;
-        RECT 24.065000 1.785000 24.235000 1.955000 ;
-      LAYER met1 ;
-        RECT  1.465000 1.755000  1.755000 1.800000 ;
-        RECT  1.465000 1.800000 24.295000 1.940000 ;
-        RECT  1.465000 1.940000  1.755000 1.985000 ;
-        RECT  4.685000 1.755000  4.975000 1.800000 ;
-        RECT  4.685000 1.940000  4.975000 1.985000 ;
-        RECT  7.905000 1.755000  8.195000 1.800000 ;
-        RECT  7.905000 1.940000  8.195000 1.985000 ;
-        RECT 11.125000 1.755000 11.415000 1.800000 ;
-        RECT 11.125000 1.940000 11.415000 1.985000 ;
-        RECT 14.345000 1.755000 14.635000 1.800000 ;
-        RECT 14.345000 1.940000 14.635000 1.985000 ;
-        RECT 17.565000 1.755000 17.855000 1.800000 ;
-        RECT 17.565000 1.940000 17.855000 1.985000 ;
-        RECT 20.785000 1.755000 21.075000 1.800000 ;
-        RECT 20.785000 1.940000 21.075000 1.985000 ;
-        RECT 24.005000 1.755000 24.295000 1.800000 ;
-        RECT 24.005000 1.940000 24.295000 1.985000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef
index 7117e07..eeab5ad 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef
@@ -156,23 +156,6 @@
         RECT 24.160000 4.115000 24.755000 4.445000 ;
     END
   END S[7]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 24.840000 0.240000 ;
-        RECT 0.000000  5.200000 24.840000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 24.840000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -215,6 +198,23 @@
         RECT 22.325000 3.640000 22.615000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 24.840000 0.240000 ;
+        RECT 0.000000  5.200000 24.840000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 24.840000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 24.840000 0.085000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
index 52ef5b3..157852a 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
@@ -178,12 +178,111 @@
         RECT 24.160000 4.115000 24.755000 4.445000 ;
     END
   END S[7]
-  PIN VGND
-    ANTENNADIFFAREA  3.070600 ;
-    DIRECTION INOUT ;
+  PIN Z
+    ANTENNADIFFAREA  6.051200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  2.205000 1.065000  3.475000 1.365000 ;
+        RECT  2.205000 1.365000  2.535000 4.075000 ;
+        RECT  2.205000 4.075000  3.475000 4.375000 ;
+        RECT  2.405000 0.595000  2.735000 1.065000 ;
+        RECT  2.405000 4.375000  2.735000 4.845000 ;
+        RECT  3.145000 1.365000  3.475000 4.075000 ;
+        RECT  3.245000 0.595000  3.575000 0.885000 ;
+        RECT  3.245000 0.885000  3.475000 1.065000 ;
+        RECT  3.245000 4.375000  3.475000 4.555000 ;
+        RECT  3.245000 4.555000  3.575000 4.845000 ;
+        RECT  8.845000 0.595000  9.175000 0.885000 ;
+        RECT  8.845000 4.555000  9.175000 4.845000 ;
+        RECT  8.945000 0.885000  9.175000 1.065000 ;
+        RECT  8.945000 1.065000 10.215000 1.365000 ;
+        RECT  8.945000 1.365000  9.275000 4.075000 ;
+        RECT  8.945000 4.075000 10.215000 4.375000 ;
+        RECT  8.945000 4.375000  9.175000 4.555000 ;
+        RECT  9.685000 0.595000 10.015000 1.065000 ;
+        RECT  9.685000 4.375000 10.015000 4.845000 ;
+        RECT  9.885000 1.365000 10.215000 4.075000 ;
+        RECT 14.625000 1.065000 15.895000 1.365000 ;
+        RECT 14.625000 1.365000 14.955000 4.075000 ;
+        RECT 14.625000 4.075000 15.895000 4.375000 ;
+        RECT 14.825000 0.595000 15.155000 1.065000 ;
+        RECT 14.825000 4.375000 15.155000 4.845000 ;
+        RECT 15.565000 1.365000 15.895000 4.075000 ;
+        RECT 15.665000 0.595000 15.995000 0.885000 ;
+        RECT 15.665000 0.885000 15.895000 1.065000 ;
+        RECT 15.665000 4.375000 15.895000 4.555000 ;
+        RECT 15.665000 4.555000 15.995000 4.845000 ;
+        RECT 21.265000 0.595000 21.595000 0.885000 ;
+        RECT 21.265000 4.555000 21.595000 4.845000 ;
+        RECT 21.365000 0.885000 21.595000 1.065000 ;
+        RECT 21.365000 1.065000 22.635000 1.365000 ;
+        RECT 21.365000 1.365000 21.695000 4.075000 ;
+        RECT 21.365000 4.075000 22.635000 4.375000 ;
+        RECT 21.365000 4.375000 21.595000 4.555000 ;
+        RECT 22.105000 0.595000 22.435000 1.065000 ;
+        RECT 22.105000 4.375000 22.435000 4.845000 ;
+        RECT 22.305000 1.365000 22.635000 4.075000 ;
+      LAYER mcon ;
+        RECT  2.285000 1.785000  2.455000 1.955000 ;
+        RECT  2.285000 3.485000  2.455000 3.655000 ;
+        RECT  3.225000 1.785000  3.395000 1.955000 ;
+        RECT  3.225000 3.485000  3.395000 3.655000 ;
+        RECT  9.025000 1.785000  9.195000 1.955000 ;
+        RECT  9.025000 3.485000  9.195000 3.655000 ;
+        RECT  9.965000 1.785000 10.135000 1.955000 ;
+        RECT  9.965000 3.485000 10.135000 3.655000 ;
+        RECT 14.705000 1.785000 14.875000 1.955000 ;
+        RECT 14.705000 3.485000 14.875000 3.655000 ;
+        RECT 15.645000 1.785000 15.815000 1.955000 ;
+        RECT 15.645000 3.485000 15.815000 3.655000 ;
+        RECT 21.445000 1.785000 21.615000 1.955000 ;
+        RECT 21.445000 3.485000 21.615000 3.655000 ;
+        RECT 22.385000 1.785000 22.555000 1.955000 ;
+        RECT 22.385000 3.485000 22.555000 3.655000 ;
+      LAYER met1 ;
+        RECT  2.225000 1.755000  2.515000 1.800000 ;
+        RECT  2.225000 1.800000 22.615000 1.940000 ;
+        RECT  2.225000 1.940000  2.515000 1.985000 ;
+        RECT  2.225000 3.455000  2.515000 3.500000 ;
+        RECT  2.225000 3.500000 22.615000 3.640000 ;
+        RECT  2.225000 3.640000  2.515000 3.685000 ;
+        RECT  3.165000 1.755000  3.455000 1.800000 ;
+        RECT  3.165000 1.940000  3.455000 1.985000 ;
+        RECT  3.165000 3.455000  3.455000 3.500000 ;
+        RECT  3.165000 3.640000  3.455000 3.685000 ;
+        RECT  8.965000 1.755000  9.255000 1.800000 ;
+        RECT  8.965000 1.940000  9.255000 1.985000 ;
+        RECT  8.965000 3.455000  9.255000 3.500000 ;
+        RECT  8.965000 3.640000  9.255000 3.685000 ;
+        RECT  9.905000 1.755000 10.195000 1.800000 ;
+        RECT  9.905000 1.940000 10.195000 1.985000 ;
+        RECT  9.905000 3.455000 10.195000 3.500000 ;
+        RECT  9.905000 3.640000 10.195000 3.685000 ;
+        RECT 14.645000 1.755000 14.935000 1.800000 ;
+        RECT 14.645000 1.940000 14.935000 1.985000 ;
+        RECT 14.645000 3.455000 14.935000 3.500000 ;
+        RECT 14.645000 3.640000 14.935000 3.685000 ;
+        RECT 15.585000 1.755000 15.875000 1.800000 ;
+        RECT 15.585000 1.940000 15.875000 1.985000 ;
+        RECT 15.585000 3.455000 15.875000 3.500000 ;
+        RECT 15.585000 3.640000 15.875000 3.685000 ;
+        RECT 21.385000 1.755000 21.675000 1.800000 ;
+        RECT 21.385000 1.940000 21.675000 1.985000 ;
+        RECT 21.385000 3.455000 21.675000 3.500000 ;
+        RECT 21.385000 3.640000 21.675000 3.685000 ;
+        RECT 22.325000 1.755000 22.615000 1.800000 ;
+        RECT 22.325000 1.940000 22.615000 1.985000 ;
+        RECT 22.325000 3.455000 22.615000 3.500000 ;
+        RECT 22.325000 3.640000 22.615000 3.685000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 24.840000 0.085000 ;
         RECT  0.270000  0.085000  0.560000 0.610000 ;
         RECT  1.190000  0.085000  1.480000 0.610000 ;
@@ -342,9 +441,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  9.422400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000  2.035000 2.805000 ;
@@ -431,106 +529,6 @@
         RECT 0.000000 2.480000 24.840000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  6.051200 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  2.205000 1.065000  3.475000 1.365000 ;
-        RECT  2.205000 1.365000  2.535000 4.075000 ;
-        RECT  2.205000 4.075000  3.475000 4.375000 ;
-        RECT  2.405000 0.595000  2.735000 1.065000 ;
-        RECT  2.405000 4.375000  2.735000 4.845000 ;
-        RECT  3.145000 1.365000  3.475000 4.075000 ;
-        RECT  3.245000 0.595000  3.575000 0.885000 ;
-        RECT  3.245000 0.885000  3.475000 1.065000 ;
-        RECT  3.245000 4.375000  3.475000 4.555000 ;
-        RECT  3.245000 4.555000  3.575000 4.845000 ;
-        RECT  8.845000 0.595000  9.175000 0.885000 ;
-        RECT  8.845000 4.555000  9.175000 4.845000 ;
-        RECT  8.945000 0.885000  9.175000 1.065000 ;
-        RECT  8.945000 1.065000 10.215000 1.365000 ;
-        RECT  8.945000 1.365000  9.275000 4.075000 ;
-        RECT  8.945000 4.075000 10.215000 4.375000 ;
-        RECT  8.945000 4.375000  9.175000 4.555000 ;
-        RECT  9.685000 0.595000 10.015000 1.065000 ;
-        RECT  9.685000 4.375000 10.015000 4.845000 ;
-        RECT  9.885000 1.365000 10.215000 4.075000 ;
-        RECT 14.625000 1.065000 15.895000 1.365000 ;
-        RECT 14.625000 1.365000 14.955000 4.075000 ;
-        RECT 14.625000 4.075000 15.895000 4.375000 ;
-        RECT 14.825000 0.595000 15.155000 1.065000 ;
-        RECT 14.825000 4.375000 15.155000 4.845000 ;
-        RECT 15.565000 1.365000 15.895000 4.075000 ;
-        RECT 15.665000 0.595000 15.995000 0.885000 ;
-        RECT 15.665000 0.885000 15.895000 1.065000 ;
-        RECT 15.665000 4.375000 15.895000 4.555000 ;
-        RECT 15.665000 4.555000 15.995000 4.845000 ;
-        RECT 21.265000 0.595000 21.595000 0.885000 ;
-        RECT 21.265000 4.555000 21.595000 4.845000 ;
-        RECT 21.365000 0.885000 21.595000 1.065000 ;
-        RECT 21.365000 1.065000 22.635000 1.365000 ;
-        RECT 21.365000 1.365000 21.695000 4.075000 ;
-        RECT 21.365000 4.075000 22.635000 4.375000 ;
-        RECT 21.365000 4.375000 21.595000 4.555000 ;
-        RECT 22.105000 0.595000 22.435000 1.065000 ;
-        RECT 22.105000 4.375000 22.435000 4.845000 ;
-        RECT 22.305000 1.365000 22.635000 4.075000 ;
-      LAYER mcon ;
-        RECT  2.285000 1.785000  2.455000 1.955000 ;
-        RECT  2.285000 3.485000  2.455000 3.655000 ;
-        RECT  3.225000 1.785000  3.395000 1.955000 ;
-        RECT  3.225000 3.485000  3.395000 3.655000 ;
-        RECT  9.025000 1.785000  9.195000 1.955000 ;
-        RECT  9.025000 3.485000  9.195000 3.655000 ;
-        RECT  9.965000 1.785000 10.135000 1.955000 ;
-        RECT  9.965000 3.485000 10.135000 3.655000 ;
-        RECT 14.705000 1.785000 14.875000 1.955000 ;
-        RECT 14.705000 3.485000 14.875000 3.655000 ;
-        RECT 15.645000 1.785000 15.815000 1.955000 ;
-        RECT 15.645000 3.485000 15.815000 3.655000 ;
-        RECT 21.445000 1.785000 21.615000 1.955000 ;
-        RECT 21.445000 3.485000 21.615000 3.655000 ;
-        RECT 22.385000 1.785000 22.555000 1.955000 ;
-        RECT 22.385000 3.485000 22.555000 3.655000 ;
-      LAYER met1 ;
-        RECT  2.225000 1.755000  2.515000 1.800000 ;
-        RECT  2.225000 1.800000 22.615000 1.940000 ;
-        RECT  2.225000 1.940000  2.515000 1.985000 ;
-        RECT  2.225000 3.455000  2.515000 3.500000 ;
-        RECT  2.225000 3.500000 22.615000 3.640000 ;
-        RECT  2.225000 3.640000  2.515000 3.685000 ;
-        RECT  3.165000 1.755000  3.455000 1.800000 ;
-        RECT  3.165000 1.940000  3.455000 1.985000 ;
-        RECT  3.165000 3.455000  3.455000 3.500000 ;
-        RECT  3.165000 3.640000  3.455000 3.685000 ;
-        RECT  8.965000 1.755000  9.255000 1.800000 ;
-        RECT  8.965000 1.940000  9.255000 1.985000 ;
-        RECT  8.965000 3.455000  9.255000 3.500000 ;
-        RECT  8.965000 3.640000  9.255000 3.685000 ;
-        RECT  9.905000 1.755000 10.195000 1.800000 ;
-        RECT  9.905000 1.940000 10.195000 1.985000 ;
-        RECT  9.905000 3.455000 10.195000 3.500000 ;
-        RECT  9.905000 3.640000 10.195000 3.685000 ;
-        RECT 14.645000 1.755000 14.935000 1.800000 ;
-        RECT 14.645000 1.940000 14.935000 1.985000 ;
-        RECT 14.645000 3.455000 14.935000 3.500000 ;
-        RECT 14.645000 3.640000 14.935000 3.685000 ;
-        RECT 15.585000 1.755000 15.875000 1.800000 ;
-        RECT 15.585000 1.940000 15.875000 1.985000 ;
-        RECT 15.585000 3.455000 15.875000 3.500000 ;
-        RECT 15.585000 3.640000 15.875000 3.685000 ;
-        RECT 21.385000 1.755000 21.675000 1.800000 ;
-        RECT 21.385000 1.940000 21.675000 1.985000 ;
-        RECT 21.385000 3.455000 21.675000 3.500000 ;
-        RECT 21.385000 3.640000 21.675000 3.685000 ;
-        RECT 22.325000 1.755000 22.615000 1.800000 ;
-        RECT 22.325000 1.940000 22.615000 1.985000 ;
-        RECT 22.325000 3.455000 22.615000 3.500000 ;
-        RECT 22.325000 3.640000 22.615000 3.685000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.690000 1.605000  1.020000 2.465000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef
index 9f7701f..7494da8 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef
@@ -46,22 +46,6 @@
         RECT 0.095000 1.055000 0.430000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 0.650000 0.885000 0.820000 1.485000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
index 4d23f5c..c6b8567 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.095000 1.055000 0.430000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.491500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 1.485000 0.915000 2.465000 ;
+        RECT 0.650000 0.255000 1.395000 0.885000 ;
+        RECT 0.650000 0.885000 0.820000 1.485000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
         RECT 0.085000  0.085000 0.395000 0.885000 ;
       LAYER mcon ;
@@ -70,9 +80,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -87,17 +96,6 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.491500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 1.485000 0.915000 2.465000 ;
-        RECT 0.650000 0.255000 1.395000 0.885000 ;
-        RECT 0.650000 0.885000 0.820000 1.485000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef
index 64aab9d..da34867 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef
@@ -46,22 +46,6 @@
         RECT 0.335000 1.055000 5.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.960000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.960000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  4.858000 ;
     DIRECTION OUTPUT ;
@@ -89,6 +73,22 @@
         RECT 10.965000 1.325000 11.235000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.960000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.960000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
index dd8d773..94e6d66 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
@@ -52,12 +52,38 @@
         RECT 0.335000 1.055000 5.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.443000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  4.858000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  0.565000 1.495000 11.235000 1.665000 ;
+        RECT  0.565000 1.665000  0.895000 2.465000 ;
+        RECT  1.505000 1.665000  1.835000 2.465000 ;
+        RECT  2.445000 1.665000  2.775000 2.465000 ;
+        RECT  3.385000 1.665000  3.715000 2.465000 ;
+        RECT  4.325000 1.665000  4.655000 2.465000 ;
+        RECT  5.265000 1.665000  5.595000 2.465000 ;
+        RECT  6.045000 1.055000  6.455000 1.495000 ;
+        RECT  6.155000 0.635000 11.235000 0.885000 ;
+        RECT  6.155000 0.885000  6.455000 1.055000 ;
+        RECT  6.205000 1.665000  6.535000 2.465000 ;
+        RECT  7.145000 1.665000  7.475000 2.465000 ;
+        RECT  8.085000 1.665000  8.415000 2.465000 ;
+        RECT  9.025000 1.665000  9.355000 2.465000 ;
+        RECT  9.965000 1.665000 10.295000 2.465000 ;
+        RECT 10.905000 1.665000 11.235000 2.465000 ;
+        RECT 10.965000 0.885000 11.235000 1.055000 ;
+        RECT 10.965000 1.055000 11.435000 1.325000 ;
+        RECT 10.965000 1.325000 11.235000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 11.960000 0.085000 ;
         RECT 0.595000  0.085000  0.865000 0.545000 ;
         RECT 1.535000  0.085000  1.805000 0.545000 ;
@@ -97,9 +123,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.730000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.960000 2.805000 ;
@@ -147,33 +172,6 @@
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  4.858000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.565000 1.495000 11.235000 1.665000 ;
-        RECT  0.565000 1.665000  0.895000 2.465000 ;
-        RECT  1.505000 1.665000  1.835000 2.465000 ;
-        RECT  2.445000 1.665000  2.775000 2.465000 ;
-        RECT  3.385000 1.665000  3.715000 2.465000 ;
-        RECT  4.325000 1.665000  4.655000 2.465000 ;
-        RECT  5.265000 1.665000  5.595000 2.465000 ;
-        RECT  6.045000 1.055000  6.455000 1.495000 ;
-        RECT  6.155000 0.635000 11.235000 0.885000 ;
-        RECT  6.155000 0.885000  6.455000 1.055000 ;
-        RECT  6.205000 1.665000  6.535000 2.465000 ;
-        RECT  7.145000 1.665000  7.475000 2.465000 ;
-        RECT  8.085000 1.665000  8.415000 2.465000 ;
-        RECT  9.025000 1.665000  9.355000 2.465000 ;
-        RECT  9.965000 1.665000 10.295000 2.465000 ;
-        RECT 10.905000 1.665000 11.235000 2.465000 ;
-        RECT 10.965000 0.885000 11.235000 1.055000 ;
-        RECT 10.965000 1.055000 11.435000 1.325000 ;
-        RECT 10.965000 1.325000 11.235000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.090000 0.255000  0.425000 0.715000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef
index 8f62124..31152ed 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef
@@ -46,22 +46,6 @@
         RECT 0.395000 1.055000 7.525000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 15.640000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 15.640000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  6.499000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 14.725000 1.325000 14.995000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 15.640000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 15.640000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.640000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
index 0e3699f..72c23ba 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
@@ -52,12 +52,42 @@
         RECT 0.395000 1.055000 7.525000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.924000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  6.499000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  0.565000 1.495000 14.995000 1.665000 ;
+        RECT  0.565000 1.665000  0.895000 2.465000 ;
+        RECT  1.505000 1.665000  1.835000 2.465000 ;
+        RECT  2.445000 1.665000  2.775000 2.465000 ;
+        RECT  3.385000 1.665000  3.715000 2.465000 ;
+        RECT  4.325000 1.665000  4.655000 2.465000 ;
+        RECT  5.265000 1.665000  5.595000 2.465000 ;
+        RECT  6.205000 1.665000  6.535000 2.465000 ;
+        RECT  7.145000 1.665000  7.475000 2.465000 ;
+        RECT  7.925000 1.055000  8.335000 1.495000 ;
+        RECT  8.035000 0.635000 14.995000 0.885000 ;
+        RECT  8.035000 0.885000  8.335000 1.055000 ;
+        RECT  8.085000 1.665000  8.415000 2.465000 ;
+        RECT  9.025000 1.665000  9.355000 2.465000 ;
+        RECT  9.965000 1.665000 10.295000 2.465000 ;
+        RECT 10.905000 1.665000 11.235000 2.465000 ;
+        RECT 11.845000 1.665000 12.175000 2.465000 ;
+        RECT 12.785000 1.665000 13.115000 2.465000 ;
+        RECT 13.725000 1.665000 14.055000 2.465000 ;
+        RECT 14.665000 1.665000 14.995000 2.465000 ;
+        RECT 14.725000 0.885000 14.995000 1.055000 ;
+        RECT 14.725000 1.055000 15.115000 1.325000 ;
+        RECT 14.725000 1.325000 14.995000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 15.640000 0.085000 ;
         RECT 0.595000  0.085000  0.865000 0.545000 ;
         RECT 1.535000  0.085000  1.805000 0.545000 ;
@@ -107,9 +137,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  4.890000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.640000 2.805000 ;
@@ -169,37 +198,6 @@
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  6.499000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.565000 1.495000 14.995000 1.665000 ;
-        RECT  0.565000 1.665000  0.895000 2.465000 ;
-        RECT  1.505000 1.665000  1.835000 2.465000 ;
-        RECT  2.445000 1.665000  2.775000 2.465000 ;
-        RECT  3.385000 1.665000  3.715000 2.465000 ;
-        RECT  4.325000 1.665000  4.655000 2.465000 ;
-        RECT  5.265000 1.665000  5.595000 2.465000 ;
-        RECT  6.205000 1.665000  6.535000 2.465000 ;
-        RECT  7.145000 1.665000  7.475000 2.465000 ;
-        RECT  7.925000 1.055000  8.335000 1.495000 ;
-        RECT  8.035000 0.635000 14.995000 0.885000 ;
-        RECT  8.035000 0.885000  8.335000 1.055000 ;
-        RECT  8.085000 1.665000  8.415000 2.465000 ;
-        RECT  9.025000 1.665000  9.355000 2.465000 ;
-        RECT  9.965000 1.665000 10.295000 2.465000 ;
-        RECT 10.905000 1.665000 11.235000 2.465000 ;
-        RECT 11.845000 1.665000 12.175000 2.465000 ;
-        RECT 12.785000 1.665000 13.115000 2.465000 ;
-        RECT 13.725000 1.665000 14.055000 2.465000 ;
-        RECT 14.665000 1.665000 14.995000 2.465000 ;
-        RECT 14.725000 0.885000 14.995000 1.055000 ;
-        RECT 14.725000 1.055000 15.115000 1.325000 ;
-        RECT 14.725000 1.325000 14.995000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.095000 0.255000  0.425000 0.715000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef
index a2dc5a2..1fbb01e 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 1.075000 0.895000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.820500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 1.950000 0.905000 2.230000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
index 2b14817..f17935f 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
@@ -52,12 +52,24 @@
         RECT 0.085000 1.075000 0.895000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.240500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.820500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.495000 2.230000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.455000 0.655000 2.230000 0.905000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 1.950000 0.905000 2.230000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.545000 ;
       LAYER mcon ;
@@ -72,9 +84,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.830000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -92,19 +103,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.820500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.495000 2.230000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.455000 0.655000 2.230000 0.905000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 1.950000 0.905000 2.230000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.425000 0.715000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef
index d701f93..57b4a8f 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef
@@ -46,22 +46,6 @@
         RECT 0.110000 1.075000 1.880000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.608500 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 3.335000 1.665000 3.715000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
index 096b969..1d2a84e 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
@@ -52,12 +52,26 @@
         RECT 0.110000 1.075000 1.880000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.416000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.608500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.495000 3.715000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 2.395000 0.635000 3.715000 0.805000 ;
+        RECT 2.395000 0.805000 2.695000 1.495000 ;
+        RECT 2.395000 1.665000 2.775000 2.465000 ;
+        RECT 3.335000 1.665000 3.715000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.545000 ;
         RECT 1.585000  0.085000 1.755000 0.545000 ;
@@ -77,9 +91,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -103,21 +116,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.608500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.495000 3.715000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 2.395000 0.635000 3.715000 0.805000 ;
-        RECT 2.395000 0.805000 2.695000 1.495000 ;
-        RECT 2.395000 1.665000 2.775000 2.465000 ;
-        RECT 3.335000 1.665000 3.715000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.715000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef
index 6b75d73..9e766a1 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef
@@ -46,22 +46,6 @@
         RECT 0.395000 1.055000 2.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.429000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 5.325000 1.325000 5.595000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
index 3c7115e..16995dc 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
@@ -52,12 +52,31 @@
         RECT 0.395000 1.055000 2.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.721500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.429000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.565000 1.495000 5.595000 1.665000 ;
+        RECT 0.565000 1.665000 0.895000 2.465000 ;
+        RECT 1.505000 1.665000 1.835000 2.465000 ;
+        RECT 2.445000 1.665000 2.775000 2.465000 ;
+        RECT 3.335000 0.635000 5.595000 0.885000 ;
+        RECT 3.335000 0.885000 3.635000 1.495000 ;
+        RECT 3.385000 1.665000 3.715000 2.465000 ;
+        RECT 4.325000 1.665000 4.655000 2.465000 ;
+        RECT 5.265000 1.665000 5.595000 2.465000 ;
+        RECT 5.325000 0.885000 5.595000 1.055000 ;
+        RECT 5.325000 1.055000 5.915000 1.325000 ;
+        RECT 5.325000 1.325000 5.595000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.595000  0.085000 0.865000 0.545000 ;
         RECT 1.535000  0.085000 1.805000 0.545000 ;
@@ -82,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -114,26 +132,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.429000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.565000 1.495000 5.595000 1.665000 ;
-        RECT 0.565000 1.665000 0.895000 2.465000 ;
-        RECT 1.505000 1.665000 1.835000 2.465000 ;
-        RECT 2.445000 1.665000 2.775000 2.465000 ;
-        RECT 3.335000 0.635000 5.595000 0.885000 ;
-        RECT 3.335000 0.885000 3.635000 1.495000 ;
-        RECT 3.385000 1.665000 3.715000 2.465000 ;
-        RECT 4.325000 1.665000 4.655000 2.465000 ;
-        RECT 5.265000 1.665000 5.595000 2.465000 ;
-        RECT 5.325000 0.885000 5.595000 1.055000 ;
-        RECT 5.325000 1.055000 5.915000 1.325000 ;
-        RECT 5.325000 1.325000 5.595000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.715000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef
index 576f56b..496c6b6 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef
@@ -46,22 +46,6 @@
         RECT 0.510000 1.075000 3.715000 1.295000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.184500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 7.225000 0.905000 7.475000 1.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
index e1366d4..c8c067a 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
@@ -52,12 +52,32 @@
         RECT 0.510000 1.075000 3.715000 1.295000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.864500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  3.184500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.465000 7.475000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 2.395000 1.665000 2.775000 2.465000 ;
+        RECT 3.335000 1.665000 3.715000 2.465000 ;
+        RECT 4.040000 1.075000 4.570000 1.465000 ;
+        RECT 4.275000 0.655000 7.475000 0.905000 ;
+        RECT 4.275000 0.905000 4.570000 1.075000 ;
+        RECT 4.275000 1.665000 4.655000 2.465000 ;
+        RECT 5.215000 1.665000 5.595000 2.465000 ;
+        RECT 6.155000 1.665000 6.535000 2.465000 ;
+        RECT 7.095000 1.665000 7.475000 2.465000 ;
+        RECT 7.225000 0.905000 7.475000 1.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.565000 ;
         RECT 1.585000  0.085000 1.755000 0.565000 ;
@@ -87,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.690000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -125,27 +144,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  3.184500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.465000 7.475000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 2.395000 1.665000 2.775000 2.465000 ;
-        RECT 3.335000 1.665000 3.715000 2.465000 ;
-        RECT 4.040000 1.075000 4.570000 1.465000 ;
-        RECT 4.275000 0.655000 7.475000 0.905000 ;
-        RECT 4.275000 0.905000 4.570000 1.075000 ;
-        RECT 4.275000 1.665000 4.655000 2.465000 ;
-        RECT 5.215000 1.665000 5.595000 2.465000 ;
-        RECT 6.155000 1.665000 6.535000 2.465000 ;
-        RECT 7.095000 1.665000 7.475000 2.465000 ;
-        RECT 7.225000 0.905000 7.475000 1.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.735000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef
index ebddc51..6de32b1 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef
@@ -46,22 +46,6 @@
         RECT 0.590000 1.075000 1.185000 1.315000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 1.820000 0.545000 2.190000 1.835000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
index b2dad47..76f09df 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
@@ -52,12 +52,23 @@
         RECT 0.590000 1.075000 1.185000 1.315000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.233000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.491500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.050000 1.835000 2.190000 2.005000 ;
+        RECT 1.050000 2.005000 1.430000 2.465000 ;
+        RECT 1.360000 0.255000 2.190000 0.545000 ;
+        RECT 1.820000 0.545000 2.190000 1.835000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.630000  0.085000 0.960000 0.545000 ;
       LAYER mcon ;
@@ -71,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.575700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -89,18 +99,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.491500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.050000 1.835000 2.190000 2.005000 ;
-        RECT 1.050000 2.005000 1.430000 2.465000 ;
-        RECT 1.360000 0.255000 2.190000 0.545000 ;
-        RECT 1.820000 0.545000 2.190000 1.835000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.525000 0.360000 0.735000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef
index 90f5116..2e979af 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef
@@ -47,22 +47,6 @@
         RECT 2.905000 1.275000 3.095000 1.655000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.825500 ;
     DIRECTION OUTPUT ;
@@ -76,6 +60,22 @@
         RECT 2.340000 1.495000 2.615000 1.835000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
index c3c5661..c1b4411 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
@@ -53,12 +53,24 @@
         RECT 2.905000 1.275000 3.095000 1.655000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.317200 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.825500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.135000 1.835000 2.615000 2.005000 ;
+        RECT 1.135000 2.005000 1.465000 2.465000 ;
+        RECT 1.455000 0.635000 1.785000 1.835000 ;
+        RECT 2.285000 2.005000 2.615000 2.465000 ;
+        RECT 2.340000 1.495000 2.615000 1.835000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.595000  0.085000 0.765000 0.775000 ;
         RECT 2.425000  0.085000 2.595000 0.525000 ;
@@ -75,9 +87,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.062800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -96,19 +107,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.825500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.135000 1.835000 2.615000 2.005000 ;
-        RECT 1.135000 2.005000 1.465000 2.465000 ;
-        RECT 1.455000 0.635000 1.785000 1.835000 ;
-        RECT 2.285000 2.005000 2.615000 2.465000 ;
-        RECT 2.340000 1.495000 2.615000 1.835000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.110000 0.510000 0.345000 0.840000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef
index 5f9e74e..2d8e028 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef
@@ -46,22 +46,6 @@
         RECT 3.405000 1.075000 5.390000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.576000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 4.340000 1.665000 4.720000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
index 11ab484..c572cc3 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
@@ -52,12 +52,26 @@
         RECT 3.405000 1.075000 5.390000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.617500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.576000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.505000 0.635000 2.840000 0.905000 ;
+        RECT 1.505000 1.445000 4.720000 1.665000 ;
+        RECT 1.505000 1.665000 1.885000 2.465000 ;
+        RECT 2.445000 1.665000 2.840000 2.465000 ;
+        RECT 2.575000 0.905000 2.840000 1.445000 ;
+        RECT 3.400000 1.665000 3.780000 2.465000 ;
+        RECT 4.340000 1.665000 4.720000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.645000  0.085000 0.840000 0.545000 ;
         RECT 3.530000  0.085000 3.700000 0.545000 ;
@@ -80,9 +94,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.825000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -109,21 +122,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.576000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.505000 0.635000 2.840000 0.905000 ;
-        RECT 1.505000 1.445000 4.720000 1.665000 ;
-        RECT 1.505000 1.665000 1.885000 2.465000 ;
-        RECT 2.445000 1.665000 2.840000 2.465000 ;
-        RECT 2.575000 0.905000 2.840000 1.445000 ;
-        RECT 3.400000 1.665000 3.780000 2.465000 ;
-        RECT 4.340000 1.665000 4.720000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.715000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef
index 1db0d6a..7eb1141 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef
@@ -55,22 +55,6 @@
         RECT 0.110000 0.745000 0.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.761500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 1.515000 1.665000 1.895000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
index f57e3b6..c50156b 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
@@ -61,12 +61,25 @@
         RECT 0.110000 0.745000 0.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.761500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.255000 1.895000 0.595000 ;
+        RECT 0.515000 0.595000 0.745000 1.495000 ;
+        RECT 0.515000 1.495000 1.895000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.515000 0.595000 1.895000 0.825000 ;
+        RECT 1.515000 1.665000 1.895000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.090000  0.085000 0.345000 0.575000 ;
       LAYER mcon ;
@@ -80,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -98,20 +110,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.761500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.255000 1.895000 0.595000 ;
-        RECT 0.515000 0.595000 0.745000 1.495000 ;
-        RECT 0.515000 1.495000 1.895000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.515000 0.595000 1.895000 0.825000 ;
-        RECT 1.515000 1.665000 1.895000 2.465000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef
index a44ba28..c3f8d0a 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef
@@ -55,22 +55,6 @@
         RECT 2.785000 1.075000 4.000000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.078000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.915000 1.665000 3.295000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
index d5322f1..6fcdcc3 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
@@ -61,12 +61,24 @@
         RECT 2.785000 1.075000 4.000000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.403000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.078000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.635000 0.895000 1.445000 ;
+        RECT 0.515000 1.445000 3.295000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 2.915000 1.665000 3.295000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 2.495000  0.085000 2.825000 0.465000 ;
         RECT 3.515000  0.085000 3.895000 0.885000 ;
@@ -85,9 +97,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -109,19 +120,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.078000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.635000 0.895000 1.445000 ;
-        RECT 0.515000 1.445000 3.295000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 2.915000 1.665000 3.295000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.295000 2.305000 0.465000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef
index c461df1..ff232a5 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef
@@ -55,22 +55,6 @@
         RECT 0.110000 1.075000 1.850000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 6.555000 0.905000 6.785000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
index 6a1989d..89e2994 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
@@ -61,12 +61,28 @@
         RECT 0.110000 1.075000 1.850000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.416000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.156000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.445000 6.785000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 2.395000 1.665000 2.775000 2.465000 ;
+        RECT 3.335000 1.665000 3.715000 2.465000 ;
+        RECT 4.795000 0.655000 6.785000 0.905000 ;
+        RECT 4.795000 1.665000 5.175000 2.465000 ;
+        RECT 5.735000 1.665000 6.115000 2.465000 ;
+        RECT 6.555000 0.905000 6.785000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.565000 ;
         RECT 1.585000  0.085000 1.755000 0.565000 ;
@@ -91,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.250000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -124,23 +139,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.156000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.445000 6.785000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 2.395000 1.665000 2.775000 2.465000 ;
-        RECT 3.335000 1.665000 3.715000 2.465000 ;
-        RECT 4.795000 0.655000 6.785000 0.905000 ;
-        RECT 4.795000 1.665000 5.175000 2.465000 ;
-        RECT 5.735000 1.665000 6.115000 2.465000 ;
-        RECT 6.555000 0.905000 6.785000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.735000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef
index 0630e0f..08d6602 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef
@@ -55,22 +55,6 @@
         RECT 1.015000 0.995000 1.335000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.775200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.410000 0.485000 2.675000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
index ec5a9ba..ea33905 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
@@ -61,12 +61,24 @@
         RECT 1.015000 0.995000 1.335000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.233000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.775250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.180000 1.495000 2.675000 1.665000 ;
+        RECT 1.180000 1.665000 1.560000 2.465000 ;
+        RECT 2.130000 0.255000 2.675000 0.485000 ;
+        RECT 2.130000 1.665000 2.675000 2.465000 ;
+        RECT 2.410000 0.485000 2.675000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.760000  0.085000 1.090000 0.485000 ;
       LAYER mcon ;
@@ -81,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.605700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -100,19 +111,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.775250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.180000 1.495000 2.675000 1.665000 ;
-        RECT 1.180000 1.665000 1.560000 2.465000 ;
-        RECT 2.130000 0.255000 2.675000 0.485000 ;
-        RECT 2.130000 1.665000 2.675000 2.465000 ;
-        RECT 2.410000 0.485000 2.675000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.445000 0.510000 0.655000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef
index 0ff24b4..5fae26d 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef
@@ -55,22 +55,6 @@
         RECT 1.065000 1.075000 1.890000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.110500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 4.250000 0.905000 4.490000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
index 2acdecf..28188fb 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
@@ -61,12 +61,27 @@
         RECT 1.065000 1.075000 1.890000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.429500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.110500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.110000 1.785000 4.490000 1.955000 ;
+        RECT 1.110000 1.955000 2.430000 2.005000 ;
+        RECT 1.110000 2.005000 1.490000 2.465000 ;
+        RECT 2.050000 2.005000 2.430000 2.465000 ;
+        RECT 3.560000 0.635000 4.490000 0.905000 ;
+        RECT 3.560000 1.955000 4.490000 2.005000 ;
+        RECT 3.560000 2.005000 3.860000 2.465000 ;
+        RECT 4.250000 0.905000 4.490000 1.785000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.630000  0.085000 0.940000 0.905000 ;
         RECT 1.710000  0.085000 1.960000 0.545000 ;
@@ -86,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.465700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -112,22 +126,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.110500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.110000 1.785000 4.490000 1.955000 ;
-        RECT 1.110000 1.955000 2.430000 2.005000 ;
-        RECT 1.110000 2.005000 1.490000 2.465000 ;
-        RECT 2.050000 2.005000 2.430000 2.465000 ;
-        RECT 3.560000 0.635000 4.490000 0.905000 ;
-        RECT 3.560000 1.955000 4.490000 2.005000 ;
-        RECT 3.560000 2.005000 3.860000 2.465000 ;
-        RECT 4.250000 0.905000 4.490000 1.785000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.410000 0.655000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef
index e8522d4..8acdbae 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef
@@ -55,22 +55,6 @@
         RECT 5.185000 1.075000 7.100000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 6.725000 1.665000 7.105000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
index 3f823bf..636f5d6 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
@@ -61,12 +61,30 @@
         RECT 5.185000 1.075000 7.100000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.845000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.156000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.505000 0.635000 3.215000 0.905000 ;
+        RECT 1.505000 1.445000 7.105000 1.665000 ;
+        RECT 1.505000 1.665000 1.885000 2.465000 ;
+        RECT 2.445000 1.665000 3.765000 2.005000 ;
+        RECT 2.445000 2.005000 2.825000 2.465000 ;
+        RECT 3.045000 0.905000 3.215000 1.075000 ;
+        RECT 3.045000 1.075000 3.555000 1.445000 ;
+        RECT 3.385000 2.005000 3.765000 2.465000 ;
+        RECT 4.325000 1.665000 4.705000 2.465000 ;
+        RECT 5.785000 1.665000 6.165000 2.465000 ;
+        RECT 6.725000 1.665000 7.105000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
         RECT 0.645000  0.085000 0.895000 0.545000 ;
         RECT 5.365000  0.085000 5.615000 0.545000 ;
@@ -95,9 +113,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
@@ -130,25 +147,6 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.156000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.505000 0.635000 3.215000 0.905000 ;
-        RECT 1.505000 1.445000 7.105000 1.665000 ;
-        RECT 1.505000 1.665000 1.885000 2.465000 ;
-        RECT 2.445000 1.665000 3.765000 2.005000 ;
-        RECT 2.445000 2.005000 2.825000 2.465000 ;
-        RECT 3.045000 0.905000 3.215000 1.075000 ;
-        RECT 3.045000 1.075000 3.555000 1.445000 ;
-        RECT 3.385000 2.005000 3.765000 2.465000 ;
-        RECT 4.325000 1.665000 4.705000 2.465000 ;
-        RECT 5.785000 1.665000 6.165000 2.465000 ;
-        RECT 6.725000 1.665000 7.105000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.425000 0.715000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef
index 15f80b1..757739f 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef
@@ -67,22 +67,6 @@
         RECT 0.110000 0.995000 0.395000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.867500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 1.775000 0.825000 1.945000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
index 392a34c..1955a53 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
@@ -73,12 +73,24 @@
         RECT 0.110000 0.995000 0.395000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.867500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.495000 1.945000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.535000 1.665000 1.865000 2.465000 ;
+        RECT 1.670000 0.255000 2.415000 0.825000 ;
+        RECT 1.775000 0.825000 1.945000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.825000 ;
       LAYER mcon ;
@@ -93,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -113,19 +124,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.867500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.495000 1.945000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.535000 1.665000 1.865000 2.465000 ;
-        RECT 1.670000 0.255000 2.415000 0.825000 ;
-        RECT 1.775000 0.825000 1.945000 1.495000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef
index 160e739..faad927 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef
@@ -64,22 +64,6 @@
         RECT 0.110000 1.075000 0.895000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 3.945000 1.665000 4.325000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
index f182d9d..95a6eb4 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
@@ -70,12 +70,26 @@
         RECT 0.110000 1.075000 0.895000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.208000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.368000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.445000 4.325000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 2.555000 1.665000 2.935000 2.465000 ;
+        RECT 3.720000 1.055000 4.325000 1.445000 ;
+        RECT 3.945000 0.635000 4.325000 1.055000 ;
+        RECT 3.945000 1.665000 4.325000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.545000 ;
       LAYER mcon ;
@@ -95,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.180000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -122,21 +135,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.368000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.445000 4.325000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 2.555000 1.665000 2.935000 2.465000 ;
-        RECT 3.720000 1.055000 4.325000 1.445000 ;
-        RECT 3.945000 0.635000 4.325000 1.055000 ;
-        RECT 3.945000 1.665000 4.325000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.735000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef
index e4aa261..3581c81 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef
@@ -64,22 +64,6 @@
         RECT 0.105000 1.075000 1.835000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 7.675000 1.665000 8.055000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
index f5880b4..4442dee 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
@@ -70,12 +70,30 @@
         RECT 0.105000 1.075000 1.835000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.416000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.736000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 1.445000 8.055000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.465000 ;
+        RECT 1.455000 1.665000 1.835000 2.465000 ;
+        RECT 2.395000 1.665000 2.775000 2.465000 ;
+        RECT 3.335000 1.665000 3.715000 2.465000 ;
+        RECT 4.795000 1.665000 5.175000 2.465000 ;
+        RECT 5.735000 1.665000 6.115000 2.465000 ;
+        RECT 6.545000 0.655000 8.055000 0.905000 ;
+        RECT 6.545000 0.905000 6.825000 1.445000 ;
+        RECT 6.735000 1.665000 7.115000 2.465000 ;
+        RECT 7.675000 1.665000 8.055000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.740000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 1.455000  0.085000 1.835000 0.485000 ;
@@ -104,9 +122,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.150000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.740000 2.805000 ;
@@ -143,25 +160,6 @@
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.736000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 1.445000 8.055000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.465000 ;
-        RECT 1.455000 1.665000 1.835000 2.465000 ;
-        RECT 2.395000 1.665000 2.775000 2.465000 ;
-        RECT 3.335000 1.665000 3.715000 2.465000 ;
-        RECT 4.795000 1.665000 5.175000 2.465000 ;
-        RECT 5.735000 1.665000 6.115000 2.465000 ;
-        RECT 6.545000 0.655000 8.055000 0.905000 ;
-        RECT 6.545000 0.905000 6.825000 1.445000 ;
-        RECT 6.735000 1.665000 7.115000 2.465000 ;
-        RECT 7.675000 1.665000 8.055000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.345000 0.655000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef
index f746cde..06b5728 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef
@@ -65,22 +65,6 @@
         RECT 1.010000 0.995000 1.330000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.882500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 2.875000 0.835000 3.135000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
index 6a30451..e5afe6d 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
@@ -71,12 +71,24 @@
         RECT 1.010000 0.995000 1.330000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.268750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.882500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.175000 1.495000 3.135000 1.665000 ;
+        RECT 1.175000 1.665000 1.555000 2.465000 ;
+        RECT 2.175000 1.665000 2.505000 2.465000 ;
+        RECT 2.775000 0.255000 3.135000 0.835000 ;
+        RECT 2.875000 0.835000 3.135000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.665000  0.085000 1.030000 0.485000 ;
       LAYER mcon ;
@@ -92,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.015700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -113,19 +124,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.882500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.175000 1.495000 3.135000 1.665000 ;
-        RECT 1.175000 1.665000 1.555000 2.465000 ;
-        RECT 2.175000 1.665000 2.505000 2.465000 ;
-        RECT 2.775000 0.255000 3.135000 0.835000 ;
-        RECT 2.875000 0.835000 3.135000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.445000 0.470000 0.655000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef
index 004bf5c..e42ff07 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef
@@ -64,22 +64,6 @@
         RECT 5.020000 1.075000 5.885000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 4.885000 1.665000 5.265000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
index 7e8323a..f69beff 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
@@ -70,12 +70,25 @@
         RECT 5.020000 1.075000 5.885000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.317200 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.368000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.505000 0.635000 1.885000 1.445000 ;
+        RECT 1.505000 1.445000 5.265000 1.665000 ;
+        RECT 1.505000 1.665000 1.885000 2.465000 ;
+        RECT 2.445000 1.665000 2.825000 2.465000 ;
+        RECT 3.855000 1.665000 4.235000 2.465000 ;
+        RECT 4.885000 1.665000 5.265000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.465000 ;
         RECT 5.065000  0.085000 5.235000 0.545000 ;
@@ -98,9 +111,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.223400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -128,20 +140,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.368000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.505000 0.635000 1.885000 1.445000 ;
-        RECT 1.505000 1.445000 5.265000 1.665000 ;
-        RECT 1.505000 1.665000 1.885000 2.465000 ;
-        RECT 2.445000 1.665000 2.825000 2.465000 ;
-        RECT 3.855000 1.665000 4.235000 2.465000 ;
-        RECT 4.885000 1.665000 5.265000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.345000 0.635000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef
index 0b4924f..c679a3c 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef
@@ -64,22 +64,6 @@
         RECT 7.665000 1.075000 9.505000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 8.605000 1.665000 8.985000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
index 85205b8..c2fab0b 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
@@ -70,12 +70,30 @@
         RECT 7.665000 1.075000 9.505000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.585000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.736000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.505000 0.635000 2.840000 0.905000 ;
+        RECT 1.505000 1.445000 8.985000 1.665000 ;
+        RECT 1.505000 1.665000 1.885000 2.465000 ;
+        RECT 2.410000 0.905000 2.840000 1.445000 ;
+        RECT 2.445000 1.665000 2.825000 2.465000 ;
+        RECT 3.385000 1.665000 3.765000 2.465000 ;
+        RECT 4.325000 1.665000 4.705000 2.465000 ;
+        RECT 5.785000 1.665000 6.165000 2.465000 ;
+        RECT 6.725000 1.665000 7.105000 2.465000 ;
+        RECT 7.665000 1.665000 8.045000 2.465000 ;
+        RECT 8.605000 1.665000 8.985000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.660000 0.085000 ;
         RECT 0.645000  0.085000 0.895000 0.545000 ;
         RECT 7.795000  0.085000 7.965000 0.545000 ;
@@ -107,9 +125,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.360000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.660000 2.805000 ;
@@ -149,25 +166,6 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.736000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.505000 0.635000 2.840000 0.905000 ;
-        RECT 1.505000 1.445000 8.985000 1.665000 ;
-        RECT 1.505000 1.665000 1.885000 2.465000 ;
-        RECT 2.410000 0.905000 2.840000 1.445000 ;
-        RECT 2.445000 1.665000 2.825000 2.465000 ;
-        RECT 3.385000 1.665000 3.765000 2.465000 ;
-        RECT 4.325000 1.665000 4.705000 2.465000 ;
-        RECT 5.785000 1.665000 6.165000 2.465000 ;
-        RECT 6.725000 1.665000 7.105000 2.465000 ;
-        RECT 7.665000 1.665000 8.045000 2.465000 ;
-        RECT 8.605000 1.665000 8.985000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.425000 0.735000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef
index 55dbf69..0913b96 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef
@@ -64,22 +64,6 @@
         RECT 0.995000 1.075000 1.325000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.901500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 2.410000 0.825000 2.680000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
index ada02c1..317423a 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
@@ -70,12 +70,25 @@
         RECT 0.995000 1.075000 1.325000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.337200 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.901500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.155000 1.495000 2.680000 1.665000 ;
+        RECT 1.155000 1.665000 1.485000 2.465000 ;
+        RECT 2.190000 1.665000 2.680000 2.005000 ;
+        RECT 2.190000 2.005000 2.580000 2.465000 ;
+        RECT 2.410000 0.255000 3.000000 0.825000 ;
+        RECT 2.410000 0.825000 2.680000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.645000  0.085000 0.880000 0.545000 ;
         RECT 3.190000  0.085000 3.540000 0.545000 ;
@@ -94,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.132500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -117,20 +129,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.901500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.155000 1.495000 2.680000 1.665000 ;
-        RECT 1.155000 1.665000 1.485000 2.465000 ;
-        RECT 2.190000 1.665000 2.680000 2.005000 ;
-        RECT 2.190000 2.005000 2.580000 2.465000 ;
-        RECT 2.410000 0.255000 3.000000 0.825000 ;
-        RECT 2.410000 0.825000 2.680000 1.495000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.485000 0.425000 0.715000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef
index dd6302c..13be068 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef
@@ -64,22 +64,6 @@
         RECT 5.315000 1.075000 6.295000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 5.495000 1.665000 5.875000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
index 182faab..fa2e1e5 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
@@ -70,12 +70,26 @@
         RECT 5.315000 1.075000 6.295000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.342400 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.368000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.185000 0.655000 2.630000 1.445000 ;
+        RECT 2.185000 1.445000 5.875000 1.665000 ;
+        RECT 2.185000 1.665000 2.485000 2.465000 ;
+        RECT 3.125000 1.665000 3.505000 2.465000 ;
+        RECT 3.495000 1.075000 4.045000 1.445000 ;
+        RECT 4.555000 1.665000 4.935000 2.465000 ;
+        RECT 5.495000 1.665000 5.875000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.515000  0.085000 0.815000 0.545000 ;
         RECT 5.625000  0.085000 5.795000 0.565000 ;
@@ -99,9 +113,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.021800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -130,21 +143,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.368000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.185000 0.655000 2.630000 1.445000 ;
-        RECT 2.185000 1.445000 5.875000 1.665000 ;
-        RECT 2.185000 1.665000 2.485000 2.465000 ;
-        RECT 3.125000 1.665000 3.505000 2.465000 ;
-        RECT 3.495000 1.075000 4.045000 1.445000 ;
-        RECT 4.555000 1.665000 4.935000 2.465000 ;
-        RECT 5.495000 1.665000 5.875000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.345000 0.730000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef
index d7fcd07..9e42bdb 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef
@@ -64,22 +64,6 @@
         RECT 8.395000 1.075000 10.340000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 9.485000 1.665000 9.865000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
index d0f36a2..59fbefa 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
@@ -70,12 +70,30 @@
         RECT 8.395000 1.075000 10.340000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.601250 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.736000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.355000 0.655000 4.015000 0.905000 ;
+        RECT 2.355000 1.445000 9.865000 1.665000 ;
+        RECT 2.355000 1.665000 2.655000 2.465000 ;
+        RECT 3.295000 1.665000 3.675000 2.465000 ;
+        RECT 3.665000 0.905000 4.015000 1.445000 ;
+        RECT 4.235000 1.665000 4.615000 2.465000 ;
+        RECT 5.175000 1.665000 5.555000 2.465000 ;
+        RECT 6.665000 1.665000 7.045000 2.465000 ;
+        RECT 7.605000 1.665000 7.985000 2.465000 ;
+        RECT 8.545000 1.665000 8.925000 2.465000 ;
+        RECT 9.485000 1.665000 9.865000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 10.580000 0.085000 ;
         RECT 0.515000  0.085000  0.895000 0.465000 ;
         RECT 8.595000  0.085000  8.925000 0.485000 ;
@@ -109,9 +127,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.425000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 10.580000 2.805000 ;
@@ -153,25 +170,6 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.736000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.355000 0.655000 4.015000 0.905000 ;
-        RECT 2.355000 1.445000 9.865000 1.665000 ;
-        RECT 2.355000 1.665000 2.655000 2.465000 ;
-        RECT 3.295000 1.665000 3.675000 2.465000 ;
-        RECT 3.665000 0.905000 4.015000 1.445000 ;
-        RECT 4.235000 1.665000 4.615000 2.465000 ;
-        RECT 5.175000 1.665000 5.555000 2.465000 ;
-        RECT 6.665000 1.665000 7.045000 2.465000 ;
-        RECT 7.605000 1.665000 7.985000 2.465000 ;
-        RECT 8.545000 1.665000 8.925000 2.465000 ;
-        RECT 9.485000 1.665000 9.865000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000  0.345000 0.635000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef
index cb51d2c..f2fb9f1 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 1.075000 0.435000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 0.605000 0.895000 0.775000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
index 482ee01..dfe3ff1 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
@@ -52,12 +52,23 @@
         RECT 0.085000 1.075000 0.435000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.591500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.445500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.095000 1.495000 0.775000 1.665000 ;
+        RECT 0.095000 1.665000 0.425000 2.450000 ;
+        RECT 0.515000 0.255000 0.895000 0.895000 ;
+        RECT 0.605000 0.895000 0.775000 1.495000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 1.840000 0.085000 ;
         RECT 0.105000  0.085000 0.345000 0.895000 ;
         RECT 1.065000  0.085000 1.575000 0.895000 ;
@@ -71,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -87,18 +97,6 @@
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.445500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.095000 1.495000 0.775000 1.665000 ;
-        RECT 0.095000 1.665000 0.425000 2.450000 ;
-        RECT 0.515000 0.255000 0.895000 0.895000 ;
-        RECT 0.605000 0.895000 0.775000 1.495000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef
index 002d36d..6a58b3e 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef
@@ -46,22 +46,6 @@
         RECT 1.030000 1.075000 1.900000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.771000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 2.095000 0.905000 2.310000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
index 84c46bc..2436657 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
@@ -52,12 +52,26 @@
         RECT 1.030000 1.075000 1.900000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.601250 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.771000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 1.855000 0.735000 ;
+        RECT 0.535000 0.735000 2.310000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 1.475000 1.445000 2.310000 1.665000 ;
+        RECT 1.475000 1.665000 1.855000 2.125000 ;
+        RECT 2.095000 0.905000 2.310000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -74,9 +88,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -92,21 +105,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.771000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 1.855000 0.735000 ;
-        RECT 0.535000 0.735000 2.310000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 1.475000 1.445000 2.310000 1.665000 ;
-        RECT 1.475000 1.665000 1.855000 2.125000 ;
-        RECT 2.095000 0.905000 2.310000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 1.305000 1.665000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef
index 3ec161e..2923f81 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef
@@ -46,22 +46,6 @@
         RECT 2.320000 1.075000 3.835000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.477000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 4.095000 0.905000 4.490000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
index ea1e86c..9c905e4 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
@@ -52,12 +52,28 @@
         RECT 2.320000 1.075000 3.835000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.942500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.477000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 4.490000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 2.415000 0.255000 2.795000 0.725000 ;
+        RECT 2.545000 1.445000 4.490000 1.745000 ;
+        RECT 2.545000 1.745000 2.715000 2.125000 ;
+        RECT 3.355000 0.255000 3.735000 0.725000 ;
+        RECT 3.485000 1.745000 3.655000 2.125000 ;
+        RECT 4.095000 0.905000 4.490000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -80,9 +96,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -103,23 +118,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.477000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 4.490000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 2.415000 0.255000 2.795000 0.725000 ;
-        RECT 2.545000 1.445000 4.490000 1.745000 ;
-        RECT 2.545000 1.745000 2.715000 2.125000 ;
-        RECT 3.355000 0.255000 3.735000 0.725000 ;
-        RECT 3.485000 1.745000 3.655000 2.125000 ;
-        RECT 4.095000 0.905000 4.490000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 2.325000 1.665000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef
index 5f4565b..cfc408e 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef
@@ -46,22 +46,6 @@
         RECT 4.200000 1.075000 7.290000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.889000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 7.460000 0.905000 8.025000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
index 4aaa07d..1b88f71 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
@@ -52,12 +52,34 @@
         RECT 4.200000 1.075000 7.290000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.774500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.889000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 8.025000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 2.415000 0.255000 2.795000 0.725000 ;
+        RECT 3.355000 0.255000 3.735000 0.725000 ;
+        RECT 4.295000 0.255000 4.675000 0.725000 ;
+        RECT 4.385000 1.445000 8.025000 1.615000 ;
+        RECT 4.385000 1.615000 4.635000 2.125000 ;
+        RECT 5.235000 0.255000 5.615000 0.725000 ;
+        RECT 5.325000 1.615000 5.575000 2.125000 ;
+        RECT 6.175000 0.255000 6.555000 0.725000 ;
+        RECT 6.265000 1.615000 6.515000 2.125000 ;
+        RECT 7.115000 0.255000 7.495000 0.725000 ;
+        RECT 7.205000 1.615000 7.455000 2.125000 ;
+        RECT 7.460000 0.905000 8.025000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -92,9 +114,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -125,29 +146,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.889000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 8.025000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 2.415000 0.255000 2.795000 0.725000 ;
-        RECT 3.355000 0.255000 3.735000 0.725000 ;
-        RECT 4.295000 0.255000 4.675000 0.725000 ;
-        RECT 4.385000 1.445000 8.025000 1.615000 ;
-        RECT 4.385000 1.615000 4.635000 2.125000 ;
-        RECT 5.235000 0.255000 5.615000 0.725000 ;
-        RECT 5.325000 1.615000 5.575000 2.125000 ;
-        RECT 6.175000 0.255000 6.555000 0.725000 ;
-        RECT 6.265000 1.615000 6.515000 2.125000 ;
-        RECT 7.115000 0.255000 7.495000 0.725000 ;
-        RECT 7.205000 1.615000 7.455000 2.125000 ;
-        RECT 7.460000 0.905000 8.025000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 4.165000 1.665000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef
index c1165af..89f150b 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef
@@ -46,22 +46,6 @@
         RECT 0.515000 0.975000 0.785000 1.745000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 2.035000 0.895000 2.215000 1.850000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
index 2411dc9..46958c1 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
@@ -52,12 +52,23 @@
         RECT 0.515000 0.975000 0.785000 1.745000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.491200 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.445500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.135000 0.255000 1.515000 0.725000 ;
+        RECT 1.135000 0.725000 2.215000 0.895000 ;
+        RECT 1.655000 1.850000 2.215000 2.465000 ;
+        RECT 2.035000 0.895000 2.215000 1.850000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.675000  0.085000 0.965000 0.625000 ;
         RECT 1.735000  0.085000 2.120000 0.555000 ;
@@ -72,9 +83,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.366600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -89,18 +99,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.445500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.135000 0.255000 1.515000 0.725000 ;
-        RECT 1.135000 0.725000 2.215000 0.895000 ;
-        RECT 1.655000 1.850000 2.215000 2.465000 ;
-        RECT 2.035000 0.895000 2.215000 1.850000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 0.290000 0.345000 1.915000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef
index 4f52640..b1f444b 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef
@@ -47,22 +47,6 @@
         RECT 3.270000 1.275000 3.535000 1.965000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.738500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 1.565000 0.895000 1.815000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
index 306504b..a97e505 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
@@ -53,12 +53,23 @@
         RECT 3.270000 1.275000 3.535000 1.965000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.685950 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.738500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.935000 0.725000 ;
+        RECT 0.535000 0.725000 1.855000 0.895000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 1.565000 0.895000 1.815000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.085000  0.085000 0.365000 0.895000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -78,9 +89,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -99,18 +109,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.738500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.935000 0.725000 ;
-        RECT 0.535000 0.725000 1.855000 0.895000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 1.565000 0.895000 1.815000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 1.445000 1.345000 1.655000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef
index e9288a0..6540954 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef
@@ -46,22 +46,6 @@
         RECT 4.925000 1.075000 5.425000 1.320000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.444500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
index 537f64f..3fed3eb 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
@@ -52,12 +52,28 @@
         RECT 4.925000 1.075000 5.425000 1.320000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  1.183000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.444500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 3.735000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 2.415000 0.255000 2.795000 0.725000 ;
+        RECT 2.545000 0.905000 2.875000 1.415000 ;
+        RECT 2.545000 1.415000 3.655000 1.745000 ;
+        RECT 2.545000 1.745000 2.715000 2.125000 ;
+        RECT 3.355000 0.255000 3.735000 0.725000 ;
+        RECT 3.485000 1.745000 3.655000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.085000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -83,9 +99,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -109,23 +124,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.444500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 3.735000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 2.415000 0.255000 2.795000 0.725000 ;
-        RECT 2.545000 0.905000 2.875000 1.415000 ;
-        RECT 2.545000 1.415000 3.655000 1.745000 ;
-        RECT 2.545000 1.745000 2.715000 2.125000 ;
-        RECT 3.355000 0.255000 3.735000 0.725000 ;
-        RECT 3.485000 1.745000 3.655000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 1.455000 2.325000 1.665000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef
index 75ae38b..1bcbf05 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef
@@ -56,22 +56,6 @@
         RECT 0.090000 0.995000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.647000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +70,22 @@
         RECT 1.245000 0.825000 1.415000 2.280000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
index 3e41761..0460469 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
@@ -62,12 +62,25 @@
         RECT 0.090000 0.995000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.630500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.647000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 0.385000 0.345000 0.655000 ;
+        RECT 0.090000 0.655000 1.415000 0.825000 ;
+        RECT 0.090000 1.495000 0.425000 2.280000 ;
+        RECT 0.090000 2.280000 1.415000 2.450000 ;
+        RECT 1.115000 0.385000 1.285000 0.655000 ;
+        RECT 1.245000 0.825000 1.415000 2.280000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.515000  0.085000 0.895000 0.485000 ;
         RECT 1.455000  0.085000 2.175000 0.485000 ;
@@ -82,9 +95,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -99,20 +111,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.647000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.385000 0.345000 0.655000 ;
-        RECT 0.090000 0.655000 1.415000 0.825000 ;
-        RECT 0.090000 1.495000 0.425000 2.280000 ;
-        RECT 0.090000 2.280000 1.415000 2.450000 ;
-        RECT 1.115000 0.385000 1.285000 0.655000 ;
-        RECT 1.245000 0.825000 1.415000 2.280000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef
index 9dfc0cf..2830a1f 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef
@@ -56,22 +56,6 @@
         RECT 2.445000 1.285000 2.935000 1.625000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.011500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 3.480000 0.905000 3.995000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
index 69f4349..c9d118f 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
@@ -62,12 +62,26 @@
         RECT 2.445000 1.285000 2.935000 1.625000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.861250 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.011500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 3.995000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 3.050000 0.255000 3.430000 0.725000 ;
+        RECT 3.180000 1.455000 3.995000 1.625000 ;
+        RECT 3.180000 1.625000 3.390000 2.125000 ;
+        RECT 3.480000 0.905000 3.995000 1.455000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -88,9 +102,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -109,21 +122,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.011500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 3.995000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 3.050000 0.255000 3.430000 0.725000 ;
-        RECT 3.180000 1.455000 3.995000 1.625000 ;
-        RECT 3.180000 1.625000 3.390000 2.125000 ;
-        RECT 3.480000 0.905000 3.995000 1.455000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.150000 1.455000 2.275000 1.625000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef
index 03d6647..12b3630 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef
@@ -59,22 +59,6 @@
         RECT 4.255000 1.075000 5.315000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.828000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 6.055000 0.905000 6.345000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
index 28c633d..05223f5 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
@@ -65,12 +65,31 @@
         RECT 4.255000 1.075000 5.315000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  1.423500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.828000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 6.345000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 2.415000 0.255000 2.795000 0.725000 ;
+        RECT 3.355000 0.255000 3.735000 0.725000 ;
+        RECT 3.915000 1.785000 6.345000 1.955000 ;
+        RECT 3.915000 1.955000 5.105000 1.965000 ;
+        RECT 3.915000 1.965000 4.165000 2.125000 ;
+        RECT 4.295000 0.255000 4.675000 0.725000 ;
+        RECT 4.855000 1.965000 5.105000 2.125000 ;
+        RECT 5.235000 0.255000 5.615000 0.725000 ;
+        RECT 6.055000 0.905000 6.345000 1.785000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -99,9 +118,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -126,26 +144,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.828000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 6.345000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 2.415000 0.255000 2.795000 0.725000 ;
-        RECT 3.355000 0.255000 3.735000 0.725000 ;
-        RECT 3.915000 1.785000 6.345000 1.955000 ;
-        RECT 3.915000 1.955000 5.105000 1.965000 ;
-        RECT 3.915000 1.965000 4.165000 2.125000 ;
-        RECT 4.295000 0.255000 4.675000 0.725000 ;
-        RECT 4.855000 1.965000 5.105000 2.125000 ;
-        RECT 5.235000 0.255000 5.615000 0.725000 ;
-        RECT 6.055000 0.905000 6.345000 1.785000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.150000 1.455000 2.285000 1.625000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef
index c8194ae..ffad7fb 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef
@@ -55,22 +55,6 @@
         RECT 1.985000 0.995000 2.335000 1.615000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.759000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 1.375000 0.310000 1.545000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
index 2394901..5523e4f 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
@@ -61,12 +61,24 @@
         RECT 1.985000 0.995000 2.335000 1.615000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.462000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.759000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.255000 0.605000 0.655000 ;
+        RECT 0.085000 0.655000 1.545000 0.825000 ;
+        RECT 0.085000 0.825000 0.255000 1.445000 ;
+        RECT 0.085000 1.445000 0.545000 2.455000 ;
+        RECT 1.375000 0.310000 1.545000 0.655000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.775000  0.085000 1.155000 0.485000 ;
         RECT 1.715000  0.085000 2.095000 0.825000 ;
@@ -82,9 +94,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -100,19 +111,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.759000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.605000 0.655000 ;
-        RECT 0.085000 0.655000 1.545000 0.825000 ;
-        RECT 0.085000 0.825000 0.255000 1.445000 ;
-        RECT 0.085000 1.445000 0.545000 2.455000 ;
-        RECT 1.375000 0.310000 1.545000 0.655000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.425000 1.075000 0.885000 1.245000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef
index 8fc1fd6..3f52717 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef
@@ -55,22 +55,6 @@
         RECT 4.330000 1.075000 4.915000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.979000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.935000 0.255000 3.355000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
index 672b61d..0340a1c 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
@@ -61,12 +61,24 @@
         RECT 4.330000 1.075000 4.915000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  1.066200 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.979000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 3.355000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 2.870000 0.905000 3.355000 2.045000 ;
+        RECT 2.935000 0.255000 3.355000 0.725000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -90,9 +102,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -114,19 +125,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.979000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 3.355000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 2.870000 0.905000 3.355000 2.045000 ;
-        RECT 2.935000 0.255000 3.355000 0.725000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 2.325000 1.625000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef
index 415d5d0..ad32113 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef
@@ -55,22 +55,6 @@
         RECT 0.110000 1.075000 0.445000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.925500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 6.905000 0.905000 7.245000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
index 58a27f9..f5270b0 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
@@ -61,12 +61,30 @@
         RECT 0.110000 1.075000 0.445000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  1.657500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.925500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.005000 0.255000 1.385000 0.725000 ;
+        RECT 1.005000 0.725000 7.245000 0.905000 ;
+        RECT 1.945000 0.255000 2.325000 0.725000 ;
+        RECT 3.405000 0.255000 3.785000 0.725000 ;
+        RECT 4.345000 0.255000 4.725000 0.725000 ;
+        RECT 5.285000 0.255000 5.665000 0.725000 ;
+        RECT 5.375000 1.455000 7.245000 1.625000 ;
+        RECT 5.375000 1.625000 5.625000 2.125000 ;
+        RECT 6.225000 0.255000 6.605000 0.725000 ;
+        RECT 6.315000 1.625000 6.565000 2.125000 ;
+        RECT 6.905000 0.905000 7.245000 1.455000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.360000 0.085000 ;
         RECT 0.665000  0.085000 0.835000 0.555000 ;
         RECT 1.605000  0.085000 1.775000 0.555000 ;
@@ -97,9 +115,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.360000 2.805000 ;
@@ -127,25 +144,6 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.925500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.005000 0.255000 1.385000 0.725000 ;
-        RECT 1.005000 0.725000 7.245000 0.905000 ;
-        RECT 1.945000 0.255000 2.325000 0.725000 ;
-        RECT 3.405000 0.255000 3.785000 0.725000 ;
-        RECT 4.345000 0.255000 4.725000 0.725000 ;
-        RECT 5.285000 0.255000 5.665000 0.725000 ;
-        RECT 5.375000 1.455000 7.245000 1.625000 ;
-        RECT 5.375000 1.625000 5.625000 2.125000 ;
-        RECT 6.225000 0.255000 6.605000 0.725000 ;
-        RECT 6.315000 1.625000 6.565000 2.125000 ;
-        RECT 6.905000 0.905000 7.245000 1.455000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.110000 0.255000 0.445000 0.735000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef
index 622ec76..1e92a03 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.745000 0.335000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.699000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 1.595000 0.385000 1.765000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
index 6bc341e..a0f116a 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
@@ -70,12 +70,25 @@
         RECT 0.085000 0.745000 0.335000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.604500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.699000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 1.495000 0.775000 1.665000 ;
+        RECT 0.090000 1.665000 0.425000 2.450000 ;
+        RECT 0.515000 0.385000 0.815000 0.655000 ;
+        RECT 0.515000 0.655000 1.765000 0.825000 ;
+        RECT 0.515000 0.825000 0.775000 1.495000 ;
+        RECT 1.595000 0.385000 1.765000 0.655000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.085000  0.085000 0.345000 0.575000 ;
         RECT 1.035000  0.085000 1.365000 0.485000 ;
@@ -92,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -110,20 +122,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.699000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 1.495000 0.775000 1.665000 ;
-        RECT 0.090000 1.665000 0.425000 2.450000 ;
-        RECT 0.515000 0.385000 0.815000 0.655000 ;
-        RECT 0.515000 0.655000 1.765000 0.825000 ;
-        RECT 0.515000 0.825000 0.775000 1.495000 ;
-        RECT 1.595000 0.385000 1.765000 0.655000 ;
-    END
-  END Y
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef
index 0702333..42cba2f 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef
@@ -64,22 +64,6 @@
         RECT 3.640000 1.075000 4.275000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.252000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 4.615000 0.905000 4.950000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
index d02afdc..c63f498 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
@@ -70,12 +70,27 @@
         RECT 3.640000 1.075000 4.275000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  1.066000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.252000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.570000 0.255000 0.950000 0.725000 ;
+        RECT 0.570000 0.725000 4.950000 0.905000 ;
+        RECT 1.510000 0.255000 1.890000 0.725000 ;
+        RECT 3.010000 0.255000 3.390000 0.725000 ;
+        RECT 3.950000 0.255000 4.330000 0.725000 ;
+        RECT 4.040000 1.455000 4.950000 1.625000 ;
+        RECT 4.040000 1.625000 4.290000 2.125000 ;
+        RECT 4.615000 0.905000 4.950000 1.455000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -99,9 +114,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -122,22 +136,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.252000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.570000 0.255000 0.950000 0.725000 ;
-        RECT 0.570000 0.725000 4.950000 0.905000 ;
-        RECT 1.510000 0.255000 1.890000 0.725000 ;
-        RECT 3.010000 0.255000 3.390000 0.725000 ;
-        RECT 3.950000 0.255000 4.330000 0.725000 ;
-        RECT 4.040000 1.455000 4.950000 1.625000 ;
-        RECT 4.040000 1.625000 4.290000 2.125000 ;
-        RECT 4.615000 0.905000 4.950000 1.455000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.150000 1.455000 2.285000 1.625000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef
index ddaa176..6f9a3e6 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef
@@ -64,22 +64,6 @@
         RECT 6.475000 1.075000 8.045000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.374000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 8.360000 0.905000 8.630000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
index 4e877e4..460917a 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
@@ -70,12 +70,32 @@
         RECT 6.475000 1.075000 8.045000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  2.047500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.374000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.915000 0.725000 ;
+        RECT 0.535000 0.725000 8.630000 0.905000 ;
+        RECT 1.475000 0.255000 1.855000 0.725000 ;
+        RECT 2.415000 0.255000 2.795000 0.725000 ;
+        RECT 3.355000 0.255000 3.735000 0.725000 ;
+        RECT 4.815000 0.255000 5.195000 0.725000 ;
+        RECT 5.755000 0.255000 6.135000 0.725000 ;
+        RECT 6.695000 0.255000 7.075000 0.725000 ;
+        RECT 6.785000 1.455000 8.630000 1.625000 ;
+        RECT 6.785000 1.625000 7.035000 2.125000 ;
+        RECT 7.635000 0.255000 8.015000 0.725000 ;
+        RECT 7.725000 1.625000 7.975000 2.125000 ;
+        RECT 8.360000 0.905000 8.630000 1.455000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.740000 0.085000 ;
         RECT 0.090000  0.085000 0.365000 0.905000 ;
         RECT 1.135000  0.085000 1.305000 0.555000 ;
@@ -111,9 +131,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.740000 2.805000 ;
@@ -143,27 +162,6 @@
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.374000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.915000 0.725000 ;
-        RECT 0.535000 0.725000 8.630000 0.905000 ;
-        RECT 1.475000 0.255000 1.855000 0.725000 ;
-        RECT 2.415000 0.255000 2.795000 0.725000 ;
-        RECT 3.355000 0.255000 3.735000 0.725000 ;
-        RECT 4.815000 0.255000 5.195000 0.725000 ;
-        RECT 5.755000 0.255000 6.135000 0.725000 ;
-        RECT 6.695000 0.255000 7.075000 0.725000 ;
-        RECT 6.785000 1.455000 8.630000 1.625000 ;
-        RECT 6.785000 1.625000 7.035000 2.125000 ;
-        RECT 7.635000 0.255000 8.015000 0.725000 ;
-        RECT 7.725000 1.625000 7.975000 2.125000 ;
-        RECT 8.360000 0.905000 8.630000 1.455000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 2.285000 1.625000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef
index c84f491..37ccc34 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef
@@ -64,22 +64,6 @@
         RECT 9.395000 1.075000 11.085000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.420000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 12.420000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.976000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +90,22 @@
         RECT 11.445000 1.625000 11.835000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.420000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 12.420000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
index bda1f5d..24489cc 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
@@ -70,12 +70,37 @@
         RECT 9.395000 1.075000 11.085000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  3.419000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.976000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  0.585000 0.255000  0.915000 0.725000 ;
+        RECT  0.585000 0.725000 11.835000 0.905000 ;
+        RECT  1.525000 0.255000  1.855000 0.725000 ;
+        RECT  2.465000 0.255000  2.795000 0.725000 ;
+        RECT  3.405000 0.255000  3.735000 0.725000 ;
+        RECT  4.345000 0.255000  4.675000 0.725000 ;
+        RECT  5.285000 0.255000  5.615000 0.725000 ;
+        RECT  6.745000 0.255000  7.075000 0.725000 ;
+        RECT  7.685000 0.255000  8.015000 0.725000 ;
+        RECT  8.625000 0.255000  8.955000 0.725000 ;
+        RECT  9.565000 0.255000  9.895000 0.725000 ;
+        RECT  9.605000 1.455000 11.835000 1.625000 ;
+        RECT  9.605000 1.625000  9.855000 2.125000 ;
+        RECT 10.505000 0.255000 10.835000 0.725000 ;
+        RECT 10.545000 1.625000 10.795000 2.125000 ;
+        RECT 11.445000 0.255000 11.835000 0.725000 ;
+        RECT 11.445000 0.905000 11.835000 1.455000 ;
+        RECT 11.445000 1.625000 11.835000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 12.420000 0.085000 ;
         RECT  0.115000  0.085000  0.415000 0.905000 ;
         RECT  1.085000  0.085000  1.355000 0.555000 ;
@@ -123,9 +148,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 12.420000 2.805000 ;
@@ -164,32 +188,6 @@
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.976000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.585000 0.255000  0.915000 0.725000 ;
-        RECT  0.585000 0.725000 11.835000 0.905000 ;
-        RECT  1.525000 0.255000  1.855000 0.725000 ;
-        RECT  2.465000 0.255000  2.795000 0.725000 ;
-        RECT  3.405000 0.255000  3.735000 0.725000 ;
-        RECT  4.345000 0.255000  4.675000 0.725000 ;
-        RECT  5.285000 0.255000  5.615000 0.725000 ;
-        RECT  6.745000 0.255000  7.075000 0.725000 ;
-        RECT  7.685000 0.255000  8.015000 0.725000 ;
-        RECT  8.625000 0.255000  8.955000 0.725000 ;
-        RECT  9.565000 0.255000  9.895000 0.725000 ;
-        RECT  9.605000 1.455000 11.835000 1.625000 ;
-        RECT  9.605000 1.625000  9.855000 2.125000 ;
-        RECT 10.505000 0.255000 10.835000 0.725000 ;
-        RECT 10.545000 1.625000 10.795000 2.125000 ;
-        RECT 11.445000 0.255000 11.835000 0.725000 ;
-        RECT 11.445000 0.905000 11.835000 1.455000 ;
-        RECT 11.445000 1.625000 11.835000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.115000 1.455000  3.225000 1.625000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef
index 2e554af..38c5c43 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef
@@ -64,22 +64,6 @@
         RECT 12.985000 1.075000 15.355000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 16.100000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 16.100000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.968000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +95,22 @@
         RECT 15.225000 1.625000 15.475000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 16.100000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 16.100000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.100000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
index 43c8d33..f3153ff 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
@@ -70,12 +70,42 @@
         RECT 12.985000 1.075000 15.355000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  4.355000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  3.968000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  0.565000 0.255000  0.895000 0.725000 ;
+        RECT  0.565000 0.725000 15.515000 0.905000 ;
+        RECT  1.505000 0.255000  1.835000 0.725000 ;
+        RECT  2.445000 0.255000  2.775000 0.725000 ;
+        RECT  3.385000 0.255000  3.715000 0.725000 ;
+        RECT  4.325000 0.255000  4.655000 0.725000 ;
+        RECT  5.265000 0.255000  5.595000 0.725000 ;
+        RECT  6.205000 0.255000  6.535000 0.725000 ;
+        RECT  7.145000 0.255000  7.475000 0.725000 ;
+        RECT  8.605000 0.255000  8.935000 0.725000 ;
+        RECT  9.545000 0.255000  9.875000 0.725000 ;
+        RECT 10.485000 0.255000 10.815000 0.725000 ;
+        RECT 11.425000 0.255000 11.755000 0.725000 ;
+        RECT 12.365000 0.255000 12.695000 0.725000 ;
+        RECT 12.405000 0.905000 12.815000 1.455000 ;
+        RECT 12.405000 1.455000 15.475000 1.625000 ;
+        RECT 12.405000 1.625000 12.655000 2.125000 ;
+        RECT 13.305000 0.255000 13.635000 0.725000 ;
+        RECT 13.345000 1.625000 13.595000 2.125000 ;
+        RECT 14.245000 0.255000 14.575000 0.725000 ;
+        RECT 14.285000 1.625000 14.535000 2.125000 ;
+        RECT 15.185000 0.255000 15.515000 0.725000 ;
+        RECT 15.225000 1.625000 15.475000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 16.100000 0.085000 ;
         RECT  0.135000  0.085000  0.395000 0.905000 ;
         RECT  1.065000  0.085000  1.335000 0.555000 ;
@@ -135,9 +165,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 16.100000 2.805000 ;
@@ -185,37 +214,6 @@
         RECT 0.000000 2.480000 16.100000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  3.968000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.565000 0.255000  0.895000 0.725000 ;
-        RECT  0.565000 0.725000 15.515000 0.905000 ;
-        RECT  1.505000 0.255000  1.835000 0.725000 ;
-        RECT  2.445000 0.255000  2.775000 0.725000 ;
-        RECT  3.385000 0.255000  3.715000 0.725000 ;
-        RECT  4.325000 0.255000  4.655000 0.725000 ;
-        RECT  5.265000 0.255000  5.595000 0.725000 ;
-        RECT  6.205000 0.255000  6.535000 0.725000 ;
-        RECT  7.145000 0.255000  7.475000 0.725000 ;
-        RECT  8.605000 0.255000  8.935000 0.725000 ;
-        RECT  9.545000 0.255000  9.875000 0.725000 ;
-        RECT 10.485000 0.255000 10.815000 0.725000 ;
-        RECT 11.425000 0.255000 11.755000 0.725000 ;
-        RECT 12.365000 0.255000 12.695000 0.725000 ;
-        RECT 12.405000 0.905000 12.815000 1.455000 ;
-        RECT 12.405000 1.455000 15.475000 1.625000 ;
-        RECT 12.405000 1.625000 12.655000 2.125000 ;
-        RECT 13.305000 0.255000 13.635000 0.725000 ;
-        RECT 13.345000 1.625000 13.595000 2.125000 ;
-        RECT 14.245000 0.255000 14.575000 0.725000 ;
-        RECT 14.285000 1.625000 14.535000 2.125000 ;
-        RECT 15.185000 0.255000 15.515000 0.725000 ;
-        RECT 15.225000 1.625000 15.475000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.095000 1.455000  4.145000 1.625000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef
index c19aa35..ae377ba 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef
@@ -64,22 +64,6 @@
         RECT 2.825000 0.995000 3.225000 1.615000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.913500 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 1.875000 0.310000 2.075000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
index dd9ad89..786d046 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
@@ -70,12 +70,23 @@
         RECT 2.825000 0.995000 3.225000 1.615000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.804600 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.913500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.655000 2.075000 0.825000 ;
+        RECT 0.085000 0.825000 0.345000 2.450000 ;
+        RECT 0.905000 0.300000 1.105000 0.655000 ;
+        RECT 1.875000 0.310000 2.075000 0.655000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.355000  0.085000 0.685000 0.480000 ;
         RECT 1.325000  0.085000 1.655000 0.485000 ;
@@ -94,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.479900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -114,18 +124,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.913500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.655000 2.075000 0.825000 ;
-        RECT 0.085000 0.825000 0.345000 2.450000 ;
-        RECT 0.905000 0.300000 1.105000 0.655000 ;
-        RECT 1.875000 0.310000 2.075000 0.655000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.525000 0.995000 0.745000 1.795000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef
index 559eb39..d9e402a 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef
@@ -65,22 +65,6 @@
         RECT 5.615000 1.285000 5.885000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.219500 ;
     DIRECTION OUTPUT ;
@@ -98,6 +82,22 @@
         RECT 4.065000 1.075000 4.490000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
index c504e44..8f2e9ff 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
@@ -71,12 +71,28 @@
         RECT 5.615000 1.285000 5.885000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.189700 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.219500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.255000 0.895000 0.725000 ;
+        RECT 0.515000 0.725000 4.270000 0.905000 ;
+        RECT 1.455000 0.255000 1.835000 0.725000 ;
+        RECT 2.950000 0.255000 3.330000 0.725000 ;
+        RECT 3.890000 0.255000 4.270000 0.725000 ;
+        RECT 3.980000 1.455000 4.490000 1.625000 ;
+        RECT 3.980000 1.625000 4.230000 2.125000 ;
+        RECT 4.065000 0.905000 4.270000 1.075000 ;
+        RECT 4.065000 1.075000 4.490000 1.455000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.085000  0.085000 0.345000 0.905000 ;
         RECT 1.115000  0.085000 1.285000 0.555000 ;
@@ -103,9 +119,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -129,23 +144,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.219500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.255000 0.895000 0.725000 ;
-        RECT 0.515000 0.725000 4.270000 0.905000 ;
-        RECT 1.455000 0.255000 1.835000 0.725000 ;
-        RECT 2.950000 0.255000 3.330000 0.725000 ;
-        RECT 3.890000 0.255000 4.270000 0.725000 ;
-        RECT 3.980000 1.455000 4.490000 1.625000 ;
-        RECT 3.980000 1.625000 4.230000 2.125000 ;
-        RECT 4.065000 0.905000 4.270000 1.075000 ;
-        RECT 4.065000 1.075000 4.490000 1.455000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 1.455000 2.305000 1.625000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef
index 4277f23..17febed 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef
@@ -64,22 +64,6 @@
         RECT 8.855000 1.075000 9.550000 1.285000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.341500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 7.705000 1.625000 7.955000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
index 64794a9..4ffca0b 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
@@ -70,12 +70,32 @@
         RECT 8.855000 1.075000 9.550000 1.285000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  2.281500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.341500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.255000 0.895000 0.725000 ;
+        RECT 0.515000 0.725000 7.995000 0.905000 ;
+        RECT 1.455000 0.255000 1.835000 0.725000 ;
+        RECT 2.395000 0.255000 2.775000 0.725000 ;
+        RECT 3.335000 0.255000 3.715000 0.725000 ;
+        RECT 4.795000 0.255000 5.175000 0.725000 ;
+        RECT 5.735000 0.255000 6.115000 0.725000 ;
+        RECT 6.675000 0.255000 7.055000 0.725000 ;
+        RECT 6.765000 0.905000 7.250000 1.455000 ;
+        RECT 6.765000 1.455000 7.955000 1.625000 ;
+        RECT 6.765000 1.625000 7.015000 2.125000 ;
+        RECT 7.615000 0.255000 7.995000 0.725000 ;
+        RECT 7.705000 1.625000 7.955000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.660000 0.085000 ;
         RECT 0.175000  0.085000 0.345000 0.895000 ;
         RECT 1.115000  0.085000 1.285000 0.555000 ;
@@ -114,9 +134,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.660000 2.805000 ;
@@ -149,27 +168,6 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.341500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.255000 0.895000 0.725000 ;
-        RECT 0.515000 0.725000 7.995000 0.905000 ;
-        RECT 1.455000 0.255000 1.835000 0.725000 ;
-        RECT 2.395000 0.255000 2.775000 0.725000 ;
-        RECT 3.335000 0.255000 3.715000 0.725000 ;
-        RECT 4.795000 0.255000 5.175000 0.725000 ;
-        RECT 5.735000 0.255000 6.115000 0.725000 ;
-        RECT 6.675000 0.255000 7.055000 0.725000 ;
-        RECT 6.765000 0.905000 7.250000 1.455000 ;
-        RECT 6.765000 1.455000 7.955000 1.625000 ;
-        RECT 6.765000 1.625000 7.015000 2.125000 ;
-        RECT 7.615000 0.255000 7.995000 0.725000 ;
-        RECT 7.705000 1.625000 7.955000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 1.455000 2.265000 1.625000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef
index b4bcf1e..57d1687 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef
@@ -64,22 +64,6 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.660000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.140000 0.310000 3.340000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
index c7a0391..686de4f 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
@@ -70,12 +70,24 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.767400 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.660000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.575000 1.955000 2.210000 2.125000 ;
+        RECT 1.960000 0.655000 3.340000 0.825000 ;
+        RECT 1.960000 0.825000 2.210000 1.955000 ;
+        RECT 2.170000 0.300000 2.370000 0.655000 ;
+        RECT 3.140000 0.310000 3.340000 0.655000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.705000  0.085000 0.875000 0.825000 ;
         RECT 1.620000  0.085000 1.950000 0.480000 ;
@@ -96,9 +108,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.523625 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -118,19 +129,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.660000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.575000 1.955000 2.210000 2.125000 ;
-        RECT 1.960000 0.655000 3.340000 0.825000 ;
-        RECT 1.960000 0.825000 2.210000 1.955000 ;
-        RECT 2.170000 0.300000 2.370000 0.655000 ;
-        RECT 3.140000 0.310000 3.340000 0.655000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.450000 0.405000 0.825000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef
index ff26ec3..f9cffe6 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef
@@ -64,22 +64,6 @@
         RECT 0.425000 0.995000 0.830000 1.695000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.219500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 5.455000 0.255000 5.835000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
index 1243b5e..384beb0 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
@@ -70,12 +70,26 @@
         RECT 0.425000 0.995000 0.830000 1.695000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.295950 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.219500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.095000 0.255000 2.475000 0.725000 ;
+        RECT 2.095000 0.725000 5.835000 0.905000 ;
+        RECT 3.035000 0.255000 3.415000 0.725000 ;
+        RECT 3.035000 1.445000 4.230000 1.705000 ;
+        RECT 3.810000 0.905000 4.230000 1.445000 ;
+        RECT 4.515000 0.255000 4.895000 0.725000 ;
+        RECT 5.455000 0.255000 5.835000 0.725000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.685000  0.085000 0.855000 0.825000 ;
         RECT 1.595000  0.085000 1.925000 0.480000 ;
@@ -103,9 +117,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.543625 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -130,21 +143,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.219500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.095000 0.255000 2.475000 0.725000 ;
-        RECT 2.095000 0.725000 5.835000 0.905000 ;
-        RECT 3.035000 0.255000 3.415000 0.725000 ;
-        RECT 3.035000 1.445000 4.230000 1.705000 ;
-        RECT 3.810000 0.905000 4.230000 1.445000 ;
-        RECT 4.515000 0.255000 4.895000 0.725000 ;
-        RECT 5.455000 0.255000 5.835000 0.725000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.450000 0.465000 0.825000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef
index 72d39e1..42fa44a 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef
@@ -64,22 +64,6 @@
         RECT 1.005000 1.075000 1.395000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.120000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.120000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.374000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 9.135000 0.255000 9.515000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.120000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.120000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
index b4a9128..f3a2400 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
@@ -70,12 +70,30 @@
         RECT 1.005000 1.075000 1.395000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  2.223000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.374000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.940000 1.415000 3.435000 1.705000 ;
+        RECT 2.035000 0.255000 2.415000 0.725000 ;
+        RECT 2.035000 0.725000 9.515000 0.905000 ;
+        RECT 2.975000 0.255000 3.355000 0.725000 ;
+        RECT 3.265000 0.905000 3.435000 1.415000 ;
+        RECT 3.915000 0.255000 4.295000 0.725000 ;
+        RECT 4.855000 0.255000 5.235000 0.725000 ;
+        RECT 6.315000 0.255000 6.695000 0.725000 ;
+        RECT 7.255000 0.255000 7.635000 0.725000 ;
+        RECT 8.195000 0.255000 8.575000 0.725000 ;
+        RECT 9.135000 0.255000 9.515000 0.725000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 10.120000 0.085000 ;
         RECT 0.665000  0.085000  0.835000 0.555000 ;
         RECT 1.695000  0.085000  1.865000 0.555000 ;
@@ -115,9 +133,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.120000 2.805000 ;
@@ -151,25 +168,6 @@
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.374000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.940000 1.415000 3.435000 1.705000 ;
-        RECT 2.035000 0.255000 2.415000 0.725000 ;
-        RECT 2.035000 0.725000 9.515000 0.905000 ;
-        RECT 2.975000 0.255000 3.355000 0.725000 ;
-        RECT 3.265000 0.905000 3.435000 1.415000 ;
-        RECT 3.915000 0.255000 4.295000 0.725000 ;
-        RECT 4.855000 0.255000 5.235000 0.725000 ;
-        RECT 6.315000 0.255000 6.695000 0.725000 ;
-        RECT 7.255000 0.255000 7.635000 0.725000 ;
-        RECT 8.195000 0.255000 8.575000 0.725000 ;
-        RECT 9.135000 0.255000 9.515000 0.725000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000  0.445000 0.725000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef
index 7b73577..2924c2c 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef
@@ -65,22 +65,6 @@
         RECT 3.640000 1.075000 4.005000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 0.085000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
index b2447c8..c9b7d50 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
@@ -71,12 +71,22 @@
         RECT 3.640000 1.075000 4.005000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.445250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.255000 0.425000 0.885000 ;
+        RECT 0.085000 0.885000 0.260000 1.495000 ;
+        RECT 0.085000 1.495000 0.425000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.645000  0.085000 0.895000 0.885000 ;
         RECT 1.635000  0.085000 1.860000 0.545000 ;
@@ -95,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.070000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -118,17 +127,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.425000 0.885000 ;
-        RECT 0.085000 0.885000 0.260000 1.495000 ;
-        RECT 0.085000 1.495000 0.425000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.430000 1.075000 1.175000 1.245000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef
index 83cb2b6..4ee6d3a 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.995000 0.360000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.534000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.765000 0.785000 4.035000 1.905000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
index cc5a974..61b9093 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
@@ -70,12 +70,24 @@
         RECT 0.085000 0.995000 0.360000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.744250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.534000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.945000 0.255000 3.325000 0.615000 ;
+        RECT 2.945000 0.615000 4.035000 0.785000 ;
+        RECT 3.085000 1.905000 4.035000 2.075000 ;
+        RECT 3.085000 2.075000 3.275000 2.465000 ;
+        RECT 3.765000 0.785000 4.035000 1.905000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 1.535000  0.085000 1.870000 0.465000 ;
         RECT 2.540000  0.085000 2.775000 0.525000 ;
@@ -95,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.120000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -118,19 +129,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.534000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.945000 0.255000 3.325000 0.615000 ;
-        RECT 2.945000 0.615000 4.035000 0.785000 ;
-        RECT 3.085000 1.905000 4.035000 2.075000 ;
-        RECT 3.085000 2.075000 3.275000 2.465000 ;
-        RECT 3.765000 0.785000 4.035000 1.905000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.090000 1.510000 3.025000 1.735000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef
index a337b59..da65b06 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef
@@ -68,22 +68,6 @@
         RECT 3.255000 1.035000 4.090000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.016000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +84,22 @@
         RECT 2.040000 1.700000 2.230000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
index cd07a42..50fc730 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
@@ -74,12 +74,27 @@
         RECT 3.255000 1.035000 4.090000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.069250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.016000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.635000 1.755000 0.805000 ;
+        RECT 0.085000 0.805000 0.365000 1.435000 ;
+        RECT 0.085000 1.435000 2.230000 1.700000 ;
+        RECT 0.645000 0.255000 0.815000 0.615000 ;
+        RECT 0.645000 0.615000 1.755000 0.635000 ;
+        RECT 1.080000 1.700000 1.260000 2.465000 ;
+        RECT 1.585000 0.255000 1.755000 0.615000 ;
+        RECT 2.040000 1.700000 2.230000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.465000 ;
         RECT 1.035000  0.085000 1.365000 0.445000 ;
@@ -107,9 +122,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.795000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -139,22 +153,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.016000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.635000 1.755000 0.805000 ;
-        RECT 0.085000 0.805000 0.365000 1.435000 ;
-        RECT 0.085000 1.435000 2.230000 1.700000 ;
-        RECT 0.645000 0.255000 0.815000 0.615000 ;
-        RECT 0.645000 0.615000 1.755000 0.635000 ;
-        RECT 1.080000 1.700000 1.260000 2.465000 ;
-        RECT 1.585000 0.255000 1.755000 0.615000 ;
-        RECT 2.040000 1.700000 2.230000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.535000 1.065000 2.620000 1.265000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef
index 996a621..6fa481d 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef
@@ -66,22 +66,6 @@
         RECT 1.915000 1.020000 2.270000 1.615000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.297000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 2.440000 0.825000 2.675000 1.815000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
index dc6a3b1..b7a7921 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
@@ -72,12 +72,25 @@
         RECT 1.915000 1.020000 2.270000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.214500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.297000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.995000 1.595000 1.325000 1.815000 ;
+        RECT 0.995000 1.815000 2.675000 2.045000 ;
+        RECT 0.995000 2.045000 1.325000 2.445000 ;
+        RECT 1.725000 0.255000 2.675000 0.825000 ;
+        RECT 2.075000 2.045000 2.675000 2.465000 ;
+        RECT 2.440000 0.825000 2.675000 1.815000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.570000  0.085000 0.900000 0.445000 ;
       LAYER mcon ;
@@ -92,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -111,20 +123,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.297000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.995000 1.595000 1.325000 1.815000 ;
-        RECT 0.995000 1.815000 2.675000 2.045000 ;
-        RECT 0.995000 2.045000 1.325000 2.445000 ;
-        RECT 1.725000 0.255000 2.675000 0.825000 ;
-        RECT 2.075000 2.045000 2.675000 2.465000 ;
-        RECT 2.440000 0.825000 2.675000 1.815000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 0.400000 0.615000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef
index 3ac5b2b..a1acb95 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef
@@ -65,22 +65,6 @@
         RECT 0.085000 0.995000 0.375000 1.970000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.114500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 3.025000 1.710000 3.405000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
index 309e0cb..f0c0f61 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
@@ -71,12 +71,24 @@
         RECT 0.085000 0.995000 0.375000 1.970000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.614250 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.114500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.545000 0.670000 0.925000 1.540000 ;
+        RECT 0.545000 1.540000 3.405000 1.710000 ;
+        RECT 0.545000 1.710000 0.855000 2.465000 ;
+        RECT 1.625000 1.710000 1.815000 2.465000 ;
+        RECT 3.025000 1.710000 3.405000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 2.595000  0.085000 2.925000 0.445000 ;
         RECT 3.525000  0.085000 3.905000 0.445000 ;
@@ -98,9 +110,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.150000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -124,19 +135,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.114500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.545000 0.670000 0.925000 1.540000 ;
-        RECT 0.545000 1.540000 3.405000 1.710000 ;
-        RECT 0.545000 1.710000 0.855000 2.465000 ;
-        RECT 1.625000 1.710000 1.815000 2.465000 ;
-        RECT 3.025000 1.710000 3.405000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 2.365000 0.445000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef
index ceb0744..c45c7f4 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef
@@ -70,22 +70,6 @@
         RECT 5.970000 1.075000 7.140000 1.345000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.218500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +86,22 @@
         RECT 7.980000 1.340000 8.480000 1.855000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
index 2f41bbd..236f7ed 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
@@ -76,12 +76,27 @@
         RECT 5.970000 1.075000 7.140000 1.345000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.832000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.218500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.955000 1.855000 8.480000 2.025000 ;
+        RECT 1.955000 2.025000 3.820000 2.105000 ;
+        RECT 4.495000 2.025000 8.480000 2.105000 ;
+        RECT 5.830000 0.270000 7.485000 0.450000 ;
+        RECT 7.265000 0.450000 7.485000 0.655000 ;
+        RECT 7.265000 0.655000 8.160000 0.825000 ;
+        RECT 7.980000 0.825000 8.160000 1.340000 ;
+        RECT 7.980000 1.340000 8.480000 1.855000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.740000 0.085000 ;
         RECT 0.525000  0.085000 0.905000 0.445000 ;
         RECT 1.535000  0.085000 1.865000 0.455000 ;
@@ -112,9 +127,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.480000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.740000 2.805000 ;
@@ -149,22 +163,6 @@
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.218500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.955000 1.855000 8.480000 2.025000 ;
-        RECT 1.955000 2.025000 3.820000 2.105000 ;
-        RECT 4.495000 2.025000 8.480000 2.105000 ;
-        RECT 5.830000 0.270000 7.485000 0.450000 ;
-        RECT 7.265000 0.450000 7.485000 0.655000 ;
-        RECT 7.265000 0.655000 8.160000 0.825000 ;
-        RECT 7.980000 0.825000 8.160000 1.340000 ;
-        RECT 7.980000 1.340000 8.480000 1.855000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.155000 0.535000 0.355000 0.625000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef
index 5da4e4a..9b88ff2 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef
@@ -56,22 +56,6 @@
         RECT 1.055000 1.075000 1.555000 1.305000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.085000 1.030000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
index e849bf2..eaeeb5b 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
@@ -62,12 +62,21 @@
         RECT 1.055000 1.075000 1.555000 1.305000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.383500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.472000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.255000 0.425000 1.030000 ;
+        RECT 0.085000 1.030000 0.365000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.615000  0.085000 0.785000 0.545000 ;
         RECT 1.980000  0.085000 2.150000 0.545000 ;
@@ -84,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.255000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -104,16 +112,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.472000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.425000 1.030000 ;
-        RECT 0.085000 1.030000 0.365000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.600000 0.715000 1.385000 0.905000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef
index ad9a663..9823667 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef
@@ -56,22 +56,6 @@
         RECT 1.525000 1.010000 1.955000 1.615000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.506200 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 0.530000 0.255000 0.825000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
index 0687221..4407e9e 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
@@ -62,12 +62,20 @@
         RECT 1.525000 1.010000 1.955000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.718250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.506250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.530000 0.255000 0.825000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.105000  0.085000 0.345000 0.885000 ;
         RECT 0.995000  0.085000 1.375000 0.465000 ;
@@ -86,9 +94,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.365000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -108,15 +115,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.506250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.530000 0.255000 0.825000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.995000 0.635000 1.895000 0.840000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef
index 38d5195..bdb9d7b 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef
@@ -57,22 +57,6 @@
         RECT 2.735000 1.075000 3.485000 1.615000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.029000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 1.975000 1.700000 2.155000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
index 4a541b3..44a8c20 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
@@ -63,12 +63,25 @@
         RECT 2.735000 1.075000 3.485000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.007500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.029000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.090000 0.635000 1.865000 0.805000 ;
+        RECT 0.090000 0.805000 0.350000 1.530000 ;
+        RECT 0.090000 1.530000 2.155000 1.700000 ;
+        RECT 0.645000 0.615000 1.865000 0.635000 ;
+        RECT 1.015000 1.700000 1.205000 2.465000 ;
+        RECT 1.975000 1.700000 2.155000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.465000 ;
         RECT 1.055000  0.085000 1.385000 0.445000 ;
@@ -94,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -123,20 +135,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.029000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.635000 1.865000 0.805000 ;
-        RECT 0.090000 0.805000 0.350000 1.530000 ;
-        RECT 0.090000 1.530000 2.155000 1.700000 ;
-        RECT 0.645000 0.615000 1.865000 0.635000 ;
-        RECT 1.015000 1.700000 1.205000 2.465000 ;
-        RECT 1.975000 1.700000 2.155000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.520000 0.995000 2.565000 1.335000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef
index 601f225..72cf527 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef
@@ -56,22 +56,6 @@
         RECT 1.655000 1.295000 2.215000 1.655000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.506200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 1.645000 0.275000 2.110000 0.955000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
index 9eb8e16..14c2b09 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
@@ -62,12 +62,23 @@
         RECT 1.655000 1.295000 2.215000 1.655000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.253500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.752250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.005000 1.505000 1.415000 2.465000 ;
+        RECT 1.245000 0.955000 2.110000 1.125000 ;
+        RECT 1.245000 1.125000 1.415000 1.505000 ;
+        RECT 1.645000 0.275000 2.110000 0.955000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.625000  0.085000 1.005000 0.445000 ;
       LAYER mcon ;
@@ -81,9 +92,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.651500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -99,18 +109,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.752250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.005000 1.505000 1.415000 2.465000 ;
-        RECT 1.245000 0.955000 2.110000 1.125000 ;
-        RECT 1.245000 1.125000 1.415000 1.505000 ;
-        RECT 1.645000 0.275000 2.110000 0.955000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.265000 0.380000 0.615000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef
index c8e0323..e149147 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef
@@ -57,22 +57,6 @@
         RECT 3.280000 0.765000 3.570000 1.400000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.814500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 2.695000 1.965000 3.110000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
index c807123..dbe9cd1 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
@@ -63,12 +63,23 @@
         RECT 3.280000 0.765000 3.570000 1.400000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.500500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.814500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.095000 1.785000 3.110000 1.965000 ;
+        RECT 1.095000 1.965000 1.395000 2.125000 ;
+        RECT 2.695000 0.595000 3.110000 1.785000 ;
+        RECT 2.695000 1.965000 3.110000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.665000  0.085000 0.835000 0.545000 ;
         RECT 1.675000  0.085000 1.845000 0.545000 ;
@@ -86,9 +97,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.995000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -108,18 +118,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.814500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.095000 1.785000 3.110000 1.965000 ;
-        RECT 1.095000 1.965000 1.395000 2.125000 ;
-        RECT 2.695000 0.595000 3.110000 1.785000 ;
-        RECT 2.695000 1.965000 3.110000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.105000 0.255000 0.435000 0.715000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef
index 1e6607a..e95d193 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef
@@ -58,22 +58,6 @@
         RECT 4.305000 1.015000 5.600000 1.275000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.661500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 5.920000 0.845000 6.330000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
index 1e06ac4..2aba00f 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
@@ -64,12 +64,27 @@
         RECT 4.305000 1.015000 5.600000 1.275000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.851500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.661500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.990000 1.855000 5.700000 2.025000 ;
+        RECT 4.335000 1.445000 6.330000 1.700000 ;
+        RECT 4.335000 1.700000 5.700000 1.855000 ;
+        RECT 4.430000 0.615000 6.330000 0.845000 ;
+        RECT 4.530000 2.025000 5.700000 2.085000 ;
+        RECT 4.530000 2.085000 4.740000 2.465000 ;
+        RECT 5.510000 2.085000 5.700000 2.465000 ;
+        RECT 5.920000 0.845000 6.330000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.550000  0.085000 0.930000 0.445000 ;
         RECT 1.510000  0.085000 1.890000 0.445000 ;
@@ -95,9 +110,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -125,22 +139,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.661500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.990000 1.855000 5.700000 2.025000 ;
-        RECT 4.335000 1.445000 6.330000 1.700000 ;
-        RECT 4.335000 1.700000 5.700000 1.855000 ;
-        RECT 4.430000 0.615000 6.330000 0.845000 ;
-        RECT 4.530000 2.025000 5.700000 2.085000 ;
-        RECT 4.530000 2.085000 4.740000 2.465000 ;
-        RECT 5.510000 2.085000 5.700000 2.465000 ;
-        RECT 5.920000 0.845000 6.330000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.120000 0.615000 4.260000 0.820000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef
index 4de09b9..2bebd8c 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef
@@ -55,22 +55,6 @@
         RECT 1.030000 0.995000 1.380000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.085000 1.480000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
index f721de6..87813aa 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
@@ -61,12 +61,22 @@
         RECT 1.030000 0.995000 1.380000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.376000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.439000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.450000 0.445000 0.825000 ;
+        RECT 0.085000 0.825000 0.340000 1.480000 ;
+        RECT 0.085000 1.480000 0.425000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.675000  0.085000 0.845000 0.825000 ;
         RECT 2.830000  0.085000 3.000000 0.555000 ;
@@ -84,9 +94,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.925700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -106,17 +115,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.439000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.450000 0.445000 0.825000 ;
-        RECT 0.085000 0.825000 0.340000 1.480000 ;
-        RECT 0.085000 1.480000 0.425000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.510000 0.995000 0.860000 1.325000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef
index 76820e1..3b42a0e 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef
@@ -56,22 +56,6 @@
         RECT 0.605000 1.325000 0.825000 1.695000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.571700 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 0.995000 1.495000 1.455000 1.695000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
index 42ea407..79158d9 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
@@ -62,12 +62,22 @@
         RECT 0.605000 1.325000 0.825000 1.695000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.566000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.571750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.995000 0.295000 1.380000 0.465000 ;
+        RECT 0.995000 0.465000 1.235000 1.495000 ;
+        RECT 0.995000 1.495000 1.455000 1.695000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.645000  0.085000 0.825000 0.825000 ;
         RECT 1.560000  0.085000 1.925000 0.465000 ;
@@ -87,9 +97,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.380700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -110,17 +119,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.571750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.995000 0.295000 1.380000 0.465000 ;
-        RECT 0.995000 0.465000 1.235000 1.495000 ;
-        RECT 0.995000 1.495000 1.455000 1.695000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.430000 0.345000 0.825000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef
index f108f33..3f25fb1 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef
@@ -56,22 +56,6 @@
         RECT 0.605000 1.285000 0.935000 1.705000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 2.045000 0.255000 2.375000 0.725000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
index 7371796..954206f 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
@@ -62,12 +62,24 @@
         RECT 0.605000 1.285000 0.935000 1.705000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.033500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.155000 0.255000 1.485000 0.725000 ;
+        RECT 1.155000 0.725000 2.375000 0.910000 ;
+        RECT 1.155000 0.910000 1.705000 1.445000 ;
+        RECT 1.155000 1.445000 2.425000 1.705000 ;
+        RECT 2.045000 0.255000 2.375000 0.725000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.765000  0.085000 0.935000 0.905000 ;
         RECT 1.705000  0.085000 1.875000 0.555000 ;
@@ -94,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -124,19 +135,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.155000 0.255000 1.485000 0.725000 ;
-        RECT 1.155000 0.725000 2.375000 0.910000 ;
-        RECT 1.155000 0.910000 1.705000 1.445000 ;
-        RECT 1.155000 1.445000 2.425000 1.705000 ;
-        RECT 2.045000 0.255000 2.375000 0.725000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.265000 0.545000 0.855000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef
index 2a1e2f8..d15516f 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 1.345000 0.355000 2.445000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.521500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 1.635000 1.625000 2.155000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
index 8058b8c..8083f7f 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
@@ -62,12 +62,22 @@
         RECT 0.085000 1.345000 0.355000 2.445000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.361500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.521500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.235000 0.255000 1.455000 1.445000 ;
+        RECT 1.235000 1.445000 2.155000 1.625000 ;
+        RECT 1.635000 1.625000 2.155000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.085000  0.085000 0.360000 0.825000 ;
         RECT 2.195000  0.085000 2.365000 0.555000 ;
@@ -84,9 +94,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.660700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -104,17 +113,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.521500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.235000 0.255000 1.455000 1.445000 ;
-        RECT 1.235000 1.445000 2.155000 1.625000 ;
-        RECT 1.635000 1.625000 2.155000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.525000 1.535000 1.065000 1.705000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef
index bf5a236..03d84f3 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 0.995000 0.480000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.788000 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 2.655000 1.615000 2.900000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
index b384f4c..4bd320f 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
@@ -61,12 +61,23 @@
         RECT 0.085000 0.995000 0.480000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.611200 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.788000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.185000 1.445000 2.900000 1.615000 ;
+        RECT 1.185000 1.615000 1.355000 2.465000 ;
+        RECT 1.510000 0.645000 2.005000 1.445000 ;
+        RECT 2.655000 1.615000 2.900000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.180000  0.085000 0.350000 0.825000 ;
         RECT 2.695000  0.085000 2.865000 0.555000 ;
@@ -87,9 +98,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.865700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -111,18 +121,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.788000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.185000 1.445000 2.900000 1.615000 ;
-        RECT 1.185000 1.615000 1.355000 2.465000 ;
-        RECT 1.510000 0.645000 2.005000 1.445000 ;
-        RECT 2.655000 1.615000 2.900000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.180000 1.495000 0.915000 1.665000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef
index 036789b..c3ef103 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 1.075000 0.510000 1.285000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.576000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 4.515000 1.625000 4.765000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
index a839157..10aa7db 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
@@ -61,12 +61,28 @@
         RECT 0.085000 1.075000 0.510000 1.285000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.111500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.576000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.035000 1.455000 4.765000 1.625000 ;
+        RECT 1.035000 1.625000 1.375000 2.465000 ;
+        RECT 1.520000 0.645000 2.925000 0.815000 ;
+        RECT 2.065000 1.625000 2.315000 2.465000 ;
+        RECT 2.695000 0.815000 2.925000 1.075000 ;
+        RECT 2.695000 1.075000 3.195000 1.445000 ;
+        RECT 2.695000 1.445000 4.765000 1.455000 ;
+        RECT 3.575000 1.625000 3.825000 2.125000 ;
+        RECT 4.515000 1.625000 4.765000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.360000 0.085000 ;
         RECT 0.225000  0.085000 0.395000 0.895000 ;
         RECT 3.615000  0.085000 3.785000 0.555000 ;
@@ -95,9 +111,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.360000 2.805000 ;
@@ -127,23 +142,6 @@
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.576000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.035000 1.455000 4.765000 1.625000 ;
-        RECT 1.035000 1.625000 1.375000 2.465000 ;
-        RECT 1.520000 0.645000 2.925000 0.815000 ;
-        RECT 2.065000 1.625000 2.315000 2.465000 ;
-        RECT 2.695000 0.815000 2.925000 1.075000 ;
-        RECT 2.695000 1.075000 3.195000 1.445000 ;
-        RECT 2.695000 1.445000 4.765000 1.455000 ;
-        RECT 3.575000 1.625000 3.825000 2.125000 ;
-        RECT 4.515000 1.625000 4.765000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.145000 1.455000 0.850000 1.625000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef
index d849b9e..a366ba6 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef
@@ -74,22 +74,6 @@
         RECT 0.085000 0.995000 0.415000 1.285000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.504500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 3.715000 0.825000 4.030000 1.875000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
index f191f08..08ae7a4 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
@@ -80,12 +80,22 @@
         RECT 0.085000 0.995000 0.415000 1.285000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.377000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.504500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.445000 0.265000 4.030000 0.825000 ;
+        RECT 3.465000 1.875000 4.030000 2.465000 ;
+        RECT 3.715000 0.825000 4.030000 1.875000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 2.085000  0.085000 2.425000 0.475000 ;
         RECT 3.105000  0.085000 3.275000 0.640000 ;
@@ -104,9 +114,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -126,17 +135,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.504500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.445000 0.265000 4.030000 0.825000 ;
-        RECT 3.465000 1.875000 4.030000 2.465000 ;
-        RECT 3.715000 0.825000 4.030000 1.875000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 1.455000 0.755000 1.495000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef
index 567e820..86f7aeb 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef
@@ -73,22 +73,6 @@
         RECT 0.085000 0.975000 0.345000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +86,22 @@
         RECT 4.180000 0.905000 4.490000 1.875000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
index 3eecf06..8793783 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
@@ -79,12 +79,24 @@
         RECT 0.085000 0.975000 0.345000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.546000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.530500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.545000 0.265000 3.925000 0.735000 ;
+        RECT 3.545000 0.735000 4.490000 0.905000 ;
+        RECT 3.545000 1.875000 4.490000 2.045000 ;
+        RECT 3.545000 2.045000 3.845000 2.465000 ;
+        RECT 4.180000 0.905000 4.490000 1.875000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 2.265000  0.085000 2.435000 0.555000 ;
         RECT 3.205000  0.085000 3.375000 0.905000 ;
@@ -105,9 +117,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -129,19 +140,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.530500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.545000 0.265000 3.925000 0.735000 ;
-        RECT 3.545000 0.735000 4.490000 0.905000 ;
-        RECT 3.545000 1.875000 4.490000 2.045000 ;
-        RECT 3.545000 2.045000 3.845000 2.465000 ;
-        RECT 4.180000 0.905000 4.490000 1.875000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.170000 0.255000 0.500000 0.635000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef
index dfdba03..57bb607 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef
@@ -78,22 +78,6 @@
         RECT 0.090000 1.075000 0.440000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -112,6 +96,22 @@
         RECT 7.365000 0.905000 7.710000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
index f78d055..cbe8492 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
@@ -84,12 +84,29 @@
         RECT 0.090000 1.075000 0.440000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.994500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 5.735000 0.255000 6.115000 0.725000 ;
+        RECT 5.735000 0.725000 7.055000 0.735000 ;
+        RECT 5.735000 0.735000 7.710000 0.905000 ;
+        RECT 5.865000 1.785000 6.500000 1.955000 ;
+        RECT 5.865000 1.955000 6.075000 2.465000 ;
+        RECT 6.330000 1.445000 7.710000 1.615000 ;
+        RECT 6.330000 1.615000 6.500000 1.785000 ;
+        RECT 6.675000 0.255000 7.055000 0.725000 ;
+        RECT 6.765000 1.615000 7.015000 2.465000 ;
+        RECT 7.365000 0.905000 7.710000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
         RECT 3.435000  0.085000 3.765000 0.465000 ;
         RECT 4.455000  0.085000 4.625000 0.555000 ;
@@ -119,9 +136,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.220000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
@@ -153,24 +169,6 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 5.735000 0.255000 6.115000 0.725000 ;
-        RECT 5.735000 0.725000 7.055000 0.735000 ;
-        RECT 5.735000 0.735000 7.710000 0.905000 ;
-        RECT 5.865000 1.785000 6.500000 1.955000 ;
-        RECT 5.865000 1.955000 6.075000 2.465000 ;
-        RECT 6.330000 1.445000 7.710000 1.615000 ;
-        RECT 6.330000 1.615000 6.500000 1.785000 ;
-        RECT 6.675000 0.255000 7.055000 0.725000 ;
-        RECT 6.765000 1.615000 7.015000 2.465000 ;
-        RECT 7.365000 0.905000 7.710000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 3.255000 0.475000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef
index 24302e3..3dd16c7 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef
@@ -76,22 +76,6 @@
         RECT 0.085000 0.995000 0.465000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.974500 ;
     DIRECTION OUTPUT ;
@@ -107,6 +91,22 @@
         RECT 1.900000 2.180000 2.505000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
index af51fd3..14f01cf 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
@@ -82,12 +82,26 @@
         RECT 0.085000 0.995000 0.465000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.175500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.974500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.365000 0.345000 0.645000 ;
+        RECT 0.085000 0.645000 0.845000 0.825000 ;
+        RECT 0.085000 1.495000 2.465000 1.705000 ;
+        RECT 0.085000 1.705000 0.365000 2.465000 ;
+        RECT 0.675000 0.825000 0.845000 1.495000 ;
+        RECT 1.900000 1.705000 2.465000 2.180000 ;
+        RECT 1.900000 2.180000 2.505000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 2.845000  0.085000 3.015000 0.525000 ;
       LAYER mcon ;
@@ -104,9 +118,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.240000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -125,21 +138,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.974500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.365000 0.345000 0.645000 ;
-        RECT 0.085000 0.645000 0.845000 0.825000 ;
-        RECT 0.085000 1.495000 2.465000 1.705000 ;
-        RECT 0.085000 1.705000 0.365000 2.465000 ;
-        RECT 0.675000 0.825000 0.845000 1.495000 ;
-        RECT 1.900000 1.705000 2.465000 2.180000 ;
-        RECT 1.900000 2.180000 2.505000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.515000 0.305000 2.065000 0.475000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef
index 0254bc9..62ecdd5 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef
@@ -78,22 +78,6 @@
         RECT 0.085000 1.075000 0.435000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.078000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +93,22 @@
         RECT 4.500000 1.955000 4.750000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
index b733c43..4b6a3e0 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
@@ -84,12 +84,26 @@
         RECT 0.085000 1.075000 0.435000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.383500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.078000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.520000 0.645000 0.900000 0.865000 ;
+        RECT 0.610000 1.445000 0.900000 1.785000 ;
+        RECT 0.610000 1.785000 4.750000 1.955000 ;
+        RECT 0.610000 1.955000 0.860000 2.465000 ;
+        RECT 0.655000 0.865000 0.900000 1.445000 ;
+        RECT 2.540000 1.955000 2.790000 2.125000 ;
+        RECT 4.500000 1.955000 4.750000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 4.070000  0.085000 4.240000 0.555000 ;
         RECT 5.010000  0.085000 5.180000 0.555000 ;
@@ -112,9 +126,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.745000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -140,21 +153,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.078000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.520000 0.645000 0.900000 0.865000 ;
-        RECT 0.610000 1.445000 0.900000 1.785000 ;
-        RECT 0.610000 1.785000 4.750000 1.955000 ;
-        RECT 0.610000 1.955000 0.860000 2.465000 ;
-        RECT 0.655000 0.865000 0.900000 1.445000 ;
-        RECT 2.540000 1.955000 2.790000 2.125000 ;
-        RECT 4.500000 1.955000 4.750000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.100000 0.255000 1.370000 0.475000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef
index 07cb3eb..9b5c990 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef
@@ -79,22 +79,6 @@
         RECT 0.090000 1.075000 1.900000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +95,22 @@
         RECT 4.345000 1.785000 8.565000 2.005000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
index 631bb2c..6adf15a 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
@@ -85,12 +85,27 @@
         RECT 0.090000 1.075000 1.900000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.767000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.156000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.645000 2.325000 0.865000 ;
+        RECT 0.625000 1.445000 4.565000 1.615000 ;
+        RECT 0.625000 1.615000 0.875000 2.465000 ;
+        RECT 1.565000 1.615000 2.325000 1.955000 ;
+        RECT 1.565000 1.955000 1.815000 2.465000 ;
+        RECT 2.120000 0.865000 2.325000 1.445000 ;
+        RECT 4.345000 1.615000 4.565000 1.785000 ;
+        RECT 4.345000 1.785000 8.565000 2.005000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 10.580000 0.085000 ;
         RECT 6.905000  0.085000  7.075000 0.555000 ;
         RECT 7.845000  0.085000  8.015000 0.555000 ;
@@ -125,9 +140,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.645000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 10.580000 2.805000 ;
@@ -166,22 +180,6 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.156000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.645000 2.325000 0.865000 ;
-        RECT 0.625000 1.445000 4.565000 1.615000 ;
-        RECT 0.625000 1.615000 0.875000 2.465000 ;
-        RECT 1.565000 1.615000 2.325000 1.955000 ;
-        RECT 1.565000 1.955000 1.815000 2.465000 ;
-        RECT 2.120000 0.865000 2.325000 1.445000 ;
-        RECT 4.345000 1.615000 4.565000 1.785000 ;
-        RECT 4.345000 1.785000 8.565000 2.005000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.115000 0.255000  6.135000 0.475000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef
index 0d52539..8732aab 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef
@@ -65,22 +65,6 @@
         RECT 1.730000 1.075000 2.155000 1.325000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 0.085000 0.365000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
index 3c11378..0e18494 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
@@ -71,12 +71,20 @@
         RECT 1.730000 1.075000 2.155000 1.325000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.383500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.472000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.365000 0.365000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.615000  0.085000 0.785000 0.545000 ;
         RECT 2.625000  0.085000 2.795000 0.525000 ;
@@ -94,9 +102,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.980000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -115,15 +122,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.472000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.365000 0.365000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.535000 0.715000 1.805000 0.895000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef
index ecd9f26..fdb1c5c 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef
@@ -65,22 +65,6 @@
         RECT 2.110000 1.075000 2.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 0.605000 0.365000 0.855000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
index 1ab4890..eeacc08 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
@@ -71,12 +71,20 @@
         RECT 2.110000 1.075000 2.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.565500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.491500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.605000 0.365000 0.855000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.185000  0.085000 0.355000 0.885000 ;
         RECT 1.125000  0.085000 1.305000 0.545000 ;
@@ -96,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.380000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -119,15 +126,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.491500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.605000 0.365000 0.855000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 1.075000 0.715000 2.365000 0.895000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef
index b9af1e2..3b843a7 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef
@@ -69,22 +69,6 @@
         RECT 3.350000 1.075000 4.030000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -100,6 +84,22 @@
         RECT 1.630000 1.615000 1.880000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
index 385d2dd..acfd2da 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
@@ -75,12 +75,26 @@
         RECT 3.350000 1.075000 4.030000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.942500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.725000 1.920000 0.905000 ;
+        RECT 0.085000 0.905000 0.370000 1.445000 ;
+        RECT 0.085000 1.445000 1.880000 1.615000 ;
+        RECT 0.600000 0.265000 0.980000 0.725000 ;
+        RECT 0.690000 1.615000 0.940000 2.465000 ;
+        RECT 1.540000 0.255000 1.920000 0.725000 ;
+        RECT 1.630000 1.615000 1.880000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.260000  0.085000 0.430000 0.555000 ;
         RECT 1.200000  0.085000 1.370000 0.555000 ;
@@ -108,9 +122,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.055000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -139,21 +152,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.725000 1.920000 0.905000 ;
-        RECT 0.085000 0.905000 0.370000 1.445000 ;
-        RECT 0.085000 1.445000 1.880000 1.615000 ;
-        RECT 0.600000 0.265000 0.980000 0.725000 ;
-        RECT 0.690000 1.615000 0.940000 2.465000 ;
-        RECT 1.540000 0.255000 1.920000 0.725000 ;
-        RECT 1.630000 1.615000 1.880000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.540000 1.075000 2.430000 1.275000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.lef
index 7b42a49..aa89ad9 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.lef
@@ -67,22 +67,6 @@
         RECT 1.050000 0.995000 1.350000 1.665000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.816800 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 1.130000 2.045000 1.680000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
index 0cede08..cab726a 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
@@ -73,12 +73,23 @@
         RECT 1.050000 0.995000 1.350000 1.665000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.816750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.495000 0.645000 0.895000 0.825000 ;
+        RECT 0.495000 0.825000 0.790000 1.835000 ;
+        RECT 0.495000 1.835000 1.680000 2.045000 ;
+        RECT 1.130000 2.045000 1.680000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 1.890000  0.085000 2.060000 0.525000 ;
       LAYER mcon ;
@@ -93,9 +104,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.550000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -112,18 +122,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.816750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.495000 0.645000 0.895000 0.825000 ;
-        RECT 0.495000 0.825000 0.790000 1.835000 ;
-        RECT 0.495000 1.835000 1.680000 2.045000 ;
-        RECT 1.130000 2.045000 1.680000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.295000 1.620000 0.475000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef
index 993edf4..95f5b00 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef
@@ -64,22 +64,6 @@
         RECT 1.325000 1.075000 2.125000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.061000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.065000 1.625000 3.315000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
index 0984786..646de47 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
@@ -70,12 +70,24 @@
         RECT 1.325000 1.075000 2.125000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.481000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.061000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.645000 2.645000 0.905000 ;
+        RECT 1.565000 1.445000 3.315000 1.625000 ;
+        RECT 1.565000 1.625000 1.815000 2.125000 ;
+        RECT 2.405000 0.905000 2.645000 1.445000 ;
+        RECT 3.065000 1.625000 3.315000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 3.155000  0.085000 3.325000 0.555000 ;
         RECT 4.045000  0.085000 4.215000 0.555000 ;
@@ -96,9 +108,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -120,19 +131,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.061000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.645000 2.645000 0.905000 ;
-        RECT 1.565000 1.445000 3.315000 1.625000 ;
-        RECT 1.565000 1.625000 1.815000 2.125000 ;
-        RECT 2.405000 0.905000 2.645000 1.445000 ;
-        RECT 3.065000 1.625000 3.315000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.305000 2.985000 0.475000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef
index 6c51ddd..0200eb2 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef
@@ -69,22 +69,6 @@
         RECT 5.660000 1.075000 7.160000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.959500 ;
     DIRECTION OUTPUT ;
@@ -104,6 +88,22 @@
         RECT 7.905000 0.820000 8.170000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
index 90dd8ce..9dffe6d 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
@@ -75,12 +75,30 @@
         RECT 5.660000 1.075000 7.160000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.799500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.959500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.955000 1.785000 4.370000 1.955000 ;
+        RECT 1.955000 1.955000 2.295000 2.125000 ;
+        RECT 2.985000 1.955000 3.235000 2.125000 ;
+        RECT 4.200000 1.445000 4.575000 1.615000 ;
+        RECT 4.200000 1.615000 4.370000 1.785000 ;
+        RECT 4.355000 0.645000 8.170000 0.820000 ;
+        RECT 4.355000 0.820000 4.575000 1.445000 ;
+        RECT 5.855000 1.785000 8.170000 1.955000 ;
+        RECT 5.855000 1.955000 6.105000 2.125000 ;
+        RECT 6.795000 1.955000 7.045000 2.125000 ;
+        RECT 7.905000 0.820000 8.170000 1.785000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.280000 0.085000 ;
         RECT 0.675000  0.085000 0.845000 0.555000 ;
         RECT 1.615000  0.085000 1.785000 0.555000 ;
@@ -110,9 +128,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -144,25 +161,6 @@
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.959500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.955000 1.785000 4.370000 1.955000 ;
-        RECT 1.955000 1.955000 2.295000 2.125000 ;
-        RECT 2.985000 1.955000 3.235000 2.125000 ;
-        RECT 4.200000 1.445000 4.575000 1.615000 ;
-        RECT 4.200000 1.615000 4.370000 1.785000 ;
-        RECT 4.355000 0.645000 8.170000 0.820000 ;
-        RECT 4.355000 0.820000 4.575000 1.445000 ;
-        RECT 5.855000 1.785000 8.170000 1.955000 ;
-        RECT 5.855000 1.955000 6.105000 2.125000 ;
-        RECT 6.795000 1.955000 7.045000 2.125000 ;
-        RECT 7.905000 0.820000 8.170000 1.785000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.125000 0.255000 0.455000 0.725000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef
index 79789bb..c81176f 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef
@@ -67,22 +67,6 @@
         RECT 3.335000 1.325000 3.535000 2.425000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.471500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 0.085000 1.795000 0.345000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
index f8ac56d..6fbd2ed 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
@@ -73,12 +73,22 @@
         RECT 3.335000 1.325000 3.535000 2.425000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.398850 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.471500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.255000 0.425000 0.825000 ;
+        RECT 0.085000 0.825000 0.260000 1.795000 ;
+        RECT 0.085000 1.795000 0.345000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.670000  0.085000 0.840000 0.750000 ;
         RECT 3.135000  0.085000 3.485000 0.555000 ;
@@ -97,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.839800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -120,17 +129,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.471500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.425000 0.825000 ;
-        RECT 0.085000 0.825000 0.260000 1.795000 ;
-        RECT 0.085000 1.795000 0.345000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.430000 0.995000 0.650000 1.445000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef
index e2bc7d0..01bbd22 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef
@@ -68,22 +68,6 @@
         RECT 3.655000 1.915000 3.995000 2.425000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 0.535000 1.795000 0.840000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
index 7e57c32..412e61a 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
@@ -74,12 +74,22 @@
         RECT 3.655000 1.915000 3.995000 2.425000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.545950 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.535000 0.255000 0.920000 0.825000 ;
+        RECT 0.535000 0.825000 0.755000 1.795000 ;
+        RECT 0.535000 1.795000 0.840000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.110000  0.085000 0.365000 0.910000 ;
         RECT 1.135000  0.085000 1.305000 0.750000 ;
@@ -100,9 +110,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.255800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -125,17 +134,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.535000 0.255000 0.920000 0.825000 ;
-        RECT 0.535000 0.825000 0.755000 1.795000 ;
-        RECT 0.535000 1.795000 0.840000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.925000 0.995000 1.145000 1.445000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef
index 0002a98..6118dd6 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef
@@ -68,22 +68,6 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 7.405000 0.905000 7.710000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
index a18434c..a10d68c 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
@@ -74,12 +74,28 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.137500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 5.735000 0.275000 6.115000 0.725000 ;
+        RECT 5.735000 0.725000 7.710000 0.905000 ;
+        RECT 5.825000 1.785000 7.015000 1.955000 ;
+        RECT 5.825000 1.955000 6.075000 2.465000 ;
+        RECT 6.675000 0.275000 7.055000 0.725000 ;
+        RECT 6.765000 1.415000 7.710000 1.655000 ;
+        RECT 6.765000 1.655000 7.015000 1.785000 ;
+        RECT 6.765000 1.955000 7.015000 2.465000 ;
+        RECT 7.405000 0.905000 7.710000 1.415000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.555000 ;
         RECT 1.585000  0.085000 1.755000 0.555000 ;
@@ -110,9 +126,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.510000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
@@ -145,23 +160,6 @@
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 5.735000 0.275000 6.115000 0.725000 ;
-        RECT 5.735000 0.725000 7.710000 0.905000 ;
-        RECT 5.825000 1.785000 7.015000 1.955000 ;
-        RECT 5.825000 1.955000 6.075000 2.465000 ;
-        RECT 6.675000 0.275000 7.055000 0.725000 ;
-        RECT 6.765000 1.415000 7.710000 1.655000 ;
-        RECT 6.765000 1.655000 7.015000 1.785000 ;
-        RECT 6.765000 1.955000 7.015000 2.465000 ;
-        RECT 7.405000 0.905000 7.710000 1.415000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 0.255000 0.425000 0.725000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef
index 86a4fb6..f7e8f89 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef
@@ -66,22 +66,6 @@
         RECT 2.445000 1.275000 2.615000 2.425000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.485500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 1.950000 1.665000 2.275000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
index 67e68ba..af273f7 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
@@ -72,12 +72,23 @@
         RECT 2.445000 1.275000 2.615000 2.425000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.386750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.485500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.610000 0.430000 1.930000 0.790000 ;
+        RECT 1.760000 0.790000 1.930000 1.445000 ;
+        RECT 1.760000 1.445000 2.275000 1.665000 ;
+        RECT 1.950000 1.665000 2.275000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.815000 ;
         RECT 2.520000  0.085000 2.690000 0.555000 ;
@@ -95,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.275000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -117,18 +127,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.485500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.610000 0.430000 1.930000 0.790000 ;
-        RECT 1.760000 0.790000 1.930000 1.445000 ;
-        RECT 1.760000 1.445000 2.275000 1.665000 ;
-        RECT 1.950000 1.665000 2.275000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.620000 1.495000 1.440000 1.665000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef
index 3560769..cc4e839 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef
@@ -68,22 +68,6 @@
         RECT 4.260000 1.075000 4.900000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.788000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +81,22 @@
         RECT 4.430000 1.955000 4.680000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
index 1c3bd26..6b2476f 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
@@ -74,12 +74,24 @@
         RECT 4.260000 1.075000 4.900000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.734500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.788000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.895000 0.645000 3.275000 1.075000 ;
+        RECT 2.895000 1.075000 3.465000 1.785000 ;
+        RECT 2.895000 1.785000 4.680000 1.955000 ;
+        RECT 2.895000 1.955000 3.235000 2.465000 ;
+        RECT 4.430000 1.955000 4.680000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.195000  0.085000 0.365000 0.895000 ;
         RECT 2.035000  0.085000 2.205000 0.555000 ;
@@ -104,9 +116,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.960000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -133,19 +144,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.788000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.895000 0.645000 3.275000 1.075000 ;
-        RECT 2.895000 1.075000 3.465000 1.785000 ;
-        RECT 2.895000 1.785000 4.680000 1.955000 ;
-        RECT 2.895000 1.955000 3.235000 2.465000 ;
-        RECT 4.430000 1.955000 4.680000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.535000 0.305000 1.855000 0.475000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef
index 2ef6799..47b15ec 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef
@@ -64,22 +64,6 @@
         RECT 7.065000 1.075000 8.675000 1.285000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.608500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 8.215000 1.625000 8.465000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
index 8c3938d..d9cb218 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
@@ -70,12 +70,26 @@
         RECT 7.065000 1.075000 8.675000 1.285000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.345500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.608500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.865000 0.645000 6.805000 0.905000 ;
+        RECT 4.875000 1.455000 8.465000 1.625000 ;
+        RECT 4.875000 1.625000 5.125000 2.465000 ;
+        RECT 5.815000 1.625000 6.065000 2.465000 ;
+        RECT 6.475000 0.905000 6.805000 1.455000 ;
+        RECT 7.275000 1.625000 7.525000 2.125000 ;
+        RECT 8.215000 1.625000 8.465000 2.125000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 11.040000 0.085000 ;
         RECT  2.545000  0.085000  2.715000 0.555000 ;
         RECT  3.485000  0.085000  3.655000 0.555000 ;
@@ -113,9 +127,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  3.080000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.040000 2.805000 ;
@@ -157,21 +170,6 @@
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.608500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.865000 0.645000 6.805000 0.905000 ;
-        RECT 4.875000 1.455000 8.465000 1.625000 ;
-        RECT 4.875000 1.625000 5.125000 2.465000 ;
-        RECT 5.815000 1.625000 6.065000 2.465000 ;
-        RECT 6.475000 0.905000 6.805000 1.455000 ;
-        RECT 7.275000 1.625000 7.525000 2.125000 ;
-        RECT 8.215000 1.625000 8.465000 2.125000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.085000 0.645000  1.855000 0.905000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef
index c492342..bd665b2 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef
@@ -65,22 +65,6 @@
         RECT 2.325000 0.995000 2.650000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.833500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 1.885000 0.825000 2.155000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT -0.015000  2.635000 2.760000 2.805000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
index c9e43f9..6688105 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
@@ -71,12 +71,21 @@
         RECT 2.325000 0.995000 2.650000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.377000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.833500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.885000 0.260000 2.495000 0.825000 ;
+        RECT 1.885000 0.825000 2.155000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.175000  0.085000 0.345000 0.905000 ;
         RECT 1.125000  0.085000 1.295000 0.565000 ;
@@ -92,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT -0.015000 2.635000 2.760000 2.805000 ;
@@ -111,16 +119,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.833500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.885000 0.260000 2.495000 0.825000 ;
-        RECT 1.885000 0.825000 2.155000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.515000 0.255000 0.895000 0.735000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef
index 7105dbb..c45c529 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef
@@ -64,22 +64,6 @@
         RECT 4.630000 0.755000 4.970000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.136000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 4.625000 1.665000 4.965000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
index b4f45a0..a27d0cd 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
@@ -70,12 +70,24 @@
         RECT 4.630000 0.755000 4.970000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.007500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.136000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.585000 1.495000 4.965000 1.665000 ;
+        RECT 2.585000 1.665000 2.915000 2.125000 ;
+        RECT 3.475000 1.665000 3.855000 2.465000 ;
+        RECT 4.075000 0.595000 4.455000 1.495000 ;
+        RECT 4.625000 1.665000 4.965000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.665000  0.085000 0.835000 0.545000 ;
         RECT 1.605000  0.085000 2.165000 0.545000 ;
@@ -97,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -121,19 +132,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.136000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.585000 1.495000 4.965000 1.665000 ;
-        RECT 2.585000 1.665000 2.915000 2.125000 ;
-        RECT 3.475000 1.665000 3.855000 2.465000 ;
-        RECT 4.075000 0.595000 4.455000 1.495000 ;
-        RECT 4.625000 1.665000 4.965000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.445000 0.715000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef
index 4702c35..baf8566 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef
@@ -64,22 +64,6 @@
         RECT 7.165000 1.055000 8.585000 1.275000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.851000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 8.300000 1.695000 8.625000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
index 0b40e2c..7f04e85 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
@@ -70,12 +70,25 @@
         RECT 7.165000 1.055000 8.585000 1.275000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.725750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.851000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.175000 1.445000 8.625000 1.695000 ;
+        RECT 6.420000 1.695000 6.590000 2.465000 ;
+        RECT 6.760000 0.645000 8.080000 0.885000 ;
+        RECT 6.760000 0.885000 6.995000 1.445000 ;
+        RECT 7.360000 1.695000 7.530000 2.465000 ;
+        RECT 8.300000 1.695000 8.625000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 8.740000 0.085000 ;
         RECT 0.665000  0.085000 0.835000 0.545000 ;
         RECT 1.605000  0.085000 1.775000 0.545000 ;
@@ -108,9 +121,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.740000 2.805000 ;
@@ -142,20 +154,6 @@
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.851000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.175000 1.445000 8.625000 1.695000 ;
-        RECT 6.420000 1.695000 6.590000 2.465000 ;
-        RECT 6.760000 0.645000 8.080000 0.885000 ;
-        RECT 6.760000 0.885000 6.995000 1.445000 ;
-        RECT 7.360000 1.695000 7.530000 2.465000 ;
-        RECT 8.300000 1.695000 8.625000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 0.445000 0.715000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef
index 8caf72b..4251161 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef
@@ -73,22 +73,6 @@
         RECT 0.920000 0.995000 1.305000 1.615000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.758800 ;
     DIRECTION OUTPUT ;
@@ -100,6 +84,22 @@
         RECT 0.530000 1.785000 1.530000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
index 76b1bf0..0b3ad08 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
@@ -79,12 +79,22 @@
         RECT 0.920000 0.995000 1.305000 1.615000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.601250 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.758750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.530000 0.655000 0.895000 0.825000 ;
+        RECT 0.530000 0.825000 0.750000 1.785000 ;
+        RECT 0.530000 1.785000 1.530000 2.465000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 1.645000  0.085000 1.975000 0.485000 ;
         RECT 2.725000  0.085000 3.095000 0.825000 ;
@@ -101,9 +111,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -121,17 +130,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.758750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.530000 0.655000 0.895000 0.825000 ;
-        RECT 0.530000 0.825000 0.750000 1.785000 ;
-        RECT 0.530000 1.785000 1.530000 2.465000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 1.440000 0.485000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef
index c2bd8e2..163d0f6 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef
@@ -73,22 +73,6 @@
         RECT 0.090000 1.075000 0.895000 1.325000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.061000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +87,22 @@
         RECT 3.025000 1.665000 3.405000 2.085000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
index d5b099f..c16c9db 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
@@ -79,12 +79,25 @@
         RECT 0.090000 1.075000 0.895000 1.325000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.059500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.061000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.655000 2.245000 0.905000 ;
+        RECT 0.515000 1.495000 3.405000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.095000 ;
+        RECT 1.985000 0.905000 2.245000 1.105000 ;
+        RECT 1.985000 1.105000 2.370000 1.495000 ;
+        RECT 3.025000 1.665000 3.405000 2.085000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 2.870000  0.085000 3.250000 0.545000 ;
         RECT 4.035000  0.085000 4.205000 0.545000 ;
@@ -109,9 +122,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -137,20 +149,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.061000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.655000 2.245000 0.905000 ;
-        RECT 0.515000 1.495000 3.405000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.095000 ;
-        RECT 1.985000 0.905000 2.245000 1.105000 ;
-        RECT 1.985000 1.105000 2.370000 1.495000 ;
-        RECT 3.025000 1.665000 3.405000 2.085000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.090000 0.255000 2.655000 0.485000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef
index 1f5ed55..a6eeb81 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef
@@ -73,22 +73,6 @@
         RECT 0.110000 1.075000 1.835000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -104,6 +88,22 @@
         RECT 5.750000 1.665000 6.130000 2.085000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
index 5871aa2..89cba7b 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
@@ -79,12 +79,26 @@
         RECT 0.110000 1.075000 1.835000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.413750 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  2.024500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.515000 0.655000 3.730000 0.905000 ;
+        RECT 0.515000 1.495000 6.130000 1.665000 ;
+        RECT 0.515000 1.665000 0.895000 2.085000 ;
+        RECT 1.455000 1.665000 1.850000 2.085000 ;
+        RECT 2.055000 0.905000 2.235000 1.495000 ;
+        RECT 4.860000 1.665000 5.190000 2.085000 ;
+        RECT 5.750000 1.665000 6.130000 2.085000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 11.040000 0.085000 ;
         RECT  4.420000  0.085000  4.590000 0.545000 ;
         RECT  5.360000  0.085000  5.690000 0.545000 ;
@@ -122,9 +136,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.040000 2.805000 ;
@@ -162,21 +175,6 @@
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  2.024500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.515000 0.655000 3.730000 0.905000 ;
-        RECT 0.515000 1.495000 6.130000 1.665000 ;
-        RECT 0.515000 1.665000 0.895000 2.085000 ;
-        RECT 1.455000 1.665000 1.850000 2.085000 ;
-        RECT 2.055000 0.905000 2.235000 1.495000 ;
-        RECT 4.860000 1.665000 5.190000 2.085000 ;
-        RECT 5.750000 1.665000 6.130000 2.085000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT  0.090000 0.255000  4.200000 0.465000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.lef
index f9d6a9d..c973cec 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.765000 0.440000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.551500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 1.915000 0.825000 2.215000 1.845000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
index 68650fa..b0ef654 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.085000 0.765000 0.440000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.330700 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.551500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.515000 0.255000 2.215000 0.825000 ;
+        RECT 1.645000 1.845000 2.215000 2.465000 ;
+        RECT 1.915000 0.825000 2.215000 1.845000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.300000 0.085000 ;
         RECT 0.110000  0.085000 0.350000 0.595000 ;
         RECT 1.130000  0.085000 1.345000 0.595000 ;
@@ -72,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -89,17 +98,6 @@
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.551500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.515000 0.255000 2.215000 0.825000 ;
-        RECT 1.645000 1.845000 2.215000 2.465000 ;
-        RECT 1.915000 0.825000 2.215000 1.845000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.120000 1.495000 1.745000 1.665000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.lef
index 2650819..5a82635 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.lef
@@ -46,22 +46,6 @@
         RECT 0.125000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 1.935000 0.825000 2.415000 1.835000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
index 7b5b6e6..eb02b45 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
@@ -52,12 +52,24 @@
         RECT 0.125000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.533700 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.530500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.540000 1.835000 2.415000 2.005000 ;
+        RECT 1.540000 2.005000 1.920000 2.465000 ;
+        RECT 1.670000 0.385000 1.840000 0.655000 ;
+        RECT 1.670000 0.655000 2.415000 0.825000 ;
+        RECT 1.935000 0.825000 2.415000 1.835000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.105000  0.085000 0.345000 0.595000 ;
         RECT 1.135000  0.085000 1.450000 0.595000 ;
@@ -74,9 +86,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.595700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -93,19 +104,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.530500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.540000 1.835000 2.415000 2.005000 ;
-        RECT 1.540000 2.005000 1.920000 2.465000 ;
-        RECT 1.670000 0.385000 1.840000 0.655000 ;
-        RECT 1.670000 0.655000 2.415000 0.825000 ;
-        RECT 1.935000 0.825000 2.415000 1.835000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.155000 1.495000 1.765000 1.665000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.lef
index 6159811..fcb9bda 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 2.825000 0.905000 3.170000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
index a1fbc5e..51eda3d 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
@@ -52,12 +52,28 @@
         RECT 0.090000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.841750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.590000 0.265000 1.970000 0.735000 ;
+        RECT 1.590000 0.735000 3.170000 0.905000 ;
+        RECT 1.590000 1.835000 2.910000 2.005000 ;
+        RECT 1.590000 2.005000 1.970000 2.465000 ;
+        RECT 2.530000 0.265000 2.910000 0.735000 ;
+        RECT 2.530000 1.495000 3.170000 1.665000 ;
+        RECT 2.530000 1.665000 2.910000 1.835000 ;
+        RECT 2.530000 2.005000 2.910000 2.465000 ;
+        RECT 2.825000 0.905000 3.170000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.105000  0.085000 0.345000 0.595000 ;
         RECT 1.160000  0.085000 1.330000 0.825000 ;
@@ -77,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.955000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -99,23 +114,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.590000 0.265000 1.970000 0.735000 ;
-        RECT 1.590000 0.735000 3.170000 0.905000 ;
-        RECT 1.590000 1.835000 2.910000 2.005000 ;
-        RECT 1.590000 2.005000 1.970000 2.465000 ;
-        RECT 2.530000 0.265000 2.910000 0.735000 ;
-        RECT 2.530000 1.495000 3.170000 1.665000 ;
-        RECT 2.530000 1.665000 2.910000 1.835000 ;
-        RECT 2.530000 2.005000 2.910000 2.465000 ;
-        RECT 2.825000 0.905000 3.170000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.155000 1.495000 1.765000 1.665000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.lef
index 4db3eca..9fa2ec5 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.lef
@@ -46,22 +46,6 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.396500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 5.015000 0.905000 5.415000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
index 492cdf0..4202f66 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
@@ -52,12 +52,28 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.722500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.396500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.985000 0.255000 3.285000 0.725000 ;
+        RECT 2.985000 0.725000 5.415000 0.905000 ;
+        RECT 2.985000 1.495000 5.415000 1.665000 ;
+        RECT 2.985000 1.665000 3.315000 2.465000 ;
+        RECT 3.925000 1.665000 4.255000 2.465000 ;
+        RECT 3.955000 0.255000 4.225000 0.725000 ;
+        RECT 4.865000 1.665000 5.195000 2.465000 ;
+        RECT 4.895000 0.255000 5.165000 0.725000 ;
+        RECT 5.015000 0.905000 5.415000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.145000  0.085000 0.415000 0.905000 ;
         RECT 1.085000  0.085000 1.355000 0.555000 ;
@@ -85,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -114,23 +129,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.396500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.985000 0.255000 3.285000 0.725000 ;
-        RECT 2.985000 0.725000 5.415000 0.905000 ;
-        RECT 2.985000 1.495000 5.415000 1.665000 ;
-        RECT 2.985000 1.665000 3.315000 2.465000 ;
-        RECT 3.925000 1.665000 4.255000 2.465000 ;
-        RECT 3.955000 0.255000 4.225000 0.725000 ;
-        RECT 4.865000 1.665000 5.195000 2.465000 ;
-        RECT 4.895000 0.255000 5.165000 0.725000 ;
-        RECT 5.015000 0.905000 5.415000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 1.355000 1.665000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.lef
index 2417921..c62836b 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.lef
@@ -46,22 +46,6 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.862000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 5.935000 0.905000 6.335000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
index 910508c..071c869 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
@@ -52,12 +52,30 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.963000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.862000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.985000 0.255000 3.285000 0.725000 ;
+        RECT 2.985000 0.725000 6.335000 0.905000 ;
+        RECT 2.985000 1.495000 6.335000 1.665000 ;
+        RECT 2.985000 1.665000 3.315000 2.465000 ;
+        RECT 3.925000 1.665000 4.255000 2.465000 ;
+        RECT 3.955000 0.255000 4.225000 0.725000 ;
+        RECT 4.865000 1.665000 5.195000 2.465000 ;
+        RECT 4.895000 0.255000 5.165000 0.725000 ;
+        RECT 5.805000 1.665000 6.135000 2.465000 ;
+        RECT 5.835000 0.255000 6.105000 0.725000 ;
+        RECT 5.935000 0.905000 6.335000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.900000 0.085000 ;
         RECT 0.145000  0.085000 0.415000 0.905000 ;
         RECT 1.085000  0.085000 1.355000 0.555000 ;
@@ -88,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.710000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.900000 2.805000 ;
@@ -120,25 +137,6 @@
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.862000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.985000 0.255000 3.285000 0.725000 ;
-        RECT 2.985000 0.725000 6.335000 0.905000 ;
-        RECT 2.985000 1.495000 6.335000 1.665000 ;
-        RECT 2.985000 1.665000 3.315000 2.465000 ;
-        RECT 3.925000 1.665000 4.255000 2.465000 ;
-        RECT 3.955000 0.255000 4.225000 0.725000 ;
-        RECT 4.865000 1.665000 5.195000 2.465000 ;
-        RECT 4.895000 0.255000 5.165000 0.725000 ;
-        RECT 5.805000 1.665000 6.135000 2.465000 ;
-        RECT 5.835000 0.255000 6.105000 0.725000 ;
-        RECT 5.935000 0.905000 6.335000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.090000 1.455000 1.355000 1.665000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef
index df7490d..9e9b534 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.455500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 2.705000 0.760000 3.090000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
index a0e4e50..7c65241 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
@@ -52,12 +52,22 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.572250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.455500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.605000 0.415000 3.090000 0.760000 ;
+        RECT 2.605000 1.495000 3.090000 2.465000 ;
+        RECT 2.705000 0.760000 3.090000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.640000  0.085000 1.375000 0.565000 ;
         RECT 1.935000  0.085000 2.365000 0.485000 ;
@@ -73,9 +83,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -92,17 +101,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.455500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.605000 0.415000 3.090000 0.760000 ;
-        RECT 2.605000 1.495000 3.090000 2.465000 ;
-        RECT 2.705000 0.760000 3.090000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.110000 0.265000 0.420000 0.735000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef
index 884c099..00c63e1 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.811500 ;
     DIRECTION OUTPUT ;
@@ -71,6 +55,22 @@
         RECT 2.790000 0.415000 3.110000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
index 01cc16e..8750712 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
@@ -52,12 +52,20 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.776400 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.811500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.790000 0.415000 3.110000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.640000  0.085000 1.370000 0.565000 ;
         RECT 2.030000  0.085000 2.360000 0.485000 ;
@@ -76,9 +84,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.719100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -98,15 +105,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.811500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.790000 0.415000 3.110000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.105000 0.265000 0.420000 0.735000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef
index 5ef87b0..2229c0c 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 1.075000 0.425000 1.955000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 4.105000 0.905000 4.490000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
index 1c260ed..5e009dd 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
@@ -52,12 +52,28 @@
         RECT 0.090000 1.075000 0.425000 1.955000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  1.112050 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.475000 0.290000 2.855000 0.735000 ;
+        RECT 2.475000 0.735000 4.490000 0.905000 ;
+        RECT 2.565000 1.785000 3.755000 1.955000 ;
+        RECT 2.565000 1.955000 2.815000 2.465000 ;
+        RECT 3.080000 1.445000 4.490000 1.615000 ;
+        RECT 3.080000 1.615000 3.755000 1.785000 ;
+        RECT 3.415000 0.290000 3.795000 0.735000 ;
+        RECT 3.505000 1.955000 3.755000 2.465000 ;
+        RECT 4.105000 0.905000 4.490000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.640000  0.085000 1.295000 0.565000 ;
         RECT 2.130000  0.085000 2.305000 0.905000 ;
@@ -79,9 +95,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.068400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -104,23 +119,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.475000 0.290000 2.855000 0.735000 ;
-        RECT 2.475000 0.735000 4.490000 0.905000 ;
-        RECT 2.565000 1.785000 3.755000 1.955000 ;
-        RECT 2.565000 1.955000 2.815000 2.465000 ;
-        RECT 3.080000 1.445000 4.490000 1.615000 ;
-        RECT 3.080000 1.615000 3.755000 1.785000 ;
-        RECT 3.415000 0.290000 3.795000 0.735000 ;
-        RECT 3.505000 1.955000 3.755000 2.465000 ;
-        RECT 4.105000 0.905000 4.490000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.110000 0.265000 0.420000 0.735000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.lef
index 6cf24ba..a37dd16 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 0.995000 0.430000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.810200 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 2.445000 0.760000 2.615000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
index a8ce90e..4fad2d6 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
@@ -62,12 +62,22 @@
         RECT 0.085000 0.995000 0.430000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.349650 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.810250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.340000 0.415000 2.615000 0.760000 ;
+        RECT 2.340000 1.495000 2.615000 2.465000 ;
+        RECT 2.445000 0.760000 2.615000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 2.760000 0.085000 ;
         RECT 0.525000  0.085000 0.905000 0.485000 ;
         RECT 1.465000  0.085000 1.895000 0.485000 ;
@@ -83,9 +93,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.760000 2.805000 ;
@@ -101,17 +110,6 @@
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.810250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.340000 0.415000 2.615000 0.760000 ;
-        RECT 2.340000 1.495000 2.615000 2.465000 ;
-        RECT 2.445000 0.760000 2.615000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.100000 0.305000 0.355000 0.655000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.lef
index 1c09719..89e5397 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 0.995000 0.385000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 2.470000 0.760000 2.655000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
index 6316975..d20eef6 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
@@ -62,12 +62,22 @@
         RECT 0.085000 0.995000 0.385000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.646900 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.530500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.330000 0.415000 2.655000 0.760000 ;
+        RECT 2.330000 1.495000 2.655000 2.465000 ;
+        RECT 2.470000 0.760000 2.655000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.530000  0.085000 0.910000 0.485000 ;
         RECT 1.470000  0.085000 2.090000 0.485000 ;
@@ -85,9 +95,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.825700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -105,17 +114,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.530500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.330000 0.415000 2.655000 0.760000 ;
-        RECT 2.330000 1.495000 2.655000 2.465000 ;
-        RECT 2.470000 0.760000 2.655000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.105000 0.305000 0.360000 0.655000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.lef
index 7ed7353..64cb2e9 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 4.115000 0.905000 4.455000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
index 9ac36b1..68c4101 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
@@ -62,12 +62,26 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  1.205750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.455000 0.265000 2.835000 0.735000 ;
+        RECT 2.455000 0.735000 4.455000 0.905000 ;
+        RECT 2.545000 1.445000 4.455000 1.615000 ;
+        RECT 2.545000 1.615000 2.795000 2.465000 ;
+        RECT 3.395000 0.265000 3.775000 0.735000 ;
+        RECT 3.485000 1.615000 3.735000 2.465000 ;
+        RECT 4.115000 0.905000 4.455000 1.445000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.555000 ;
         RECT 1.585000  0.085000 2.285000 0.555000 ;
@@ -89,9 +103,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -113,21 +126,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.455000 0.265000 2.835000 0.735000 ;
-        RECT 2.455000 0.735000 4.455000 0.905000 ;
-        RECT 2.545000 1.445000 4.455000 1.615000 ;
-        RECT 2.545000 1.615000 2.795000 2.465000 ;
-        RECT 3.395000 0.265000 3.775000 0.735000 ;
-        RECT 3.485000 1.615000 3.735000 2.465000 ;
-        RECT 4.115000 0.905000 4.455000 1.445000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.255000 0.425000 0.725000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef
index 536396c..3be20af 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef
@@ -56,22 +56,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463700 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 3.215000 0.760000 3.535000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
index 6e57f01..e69fd39 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
@@ -62,12 +62,22 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.478700 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.463750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.110000 0.415000 3.535000 0.760000 ;
+        RECT 3.110000 1.495000 3.535000 2.465000 ;
+        RECT 3.215000 0.760000 3.535000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.085000  0.085000 0.345000 0.905000 ;
         RECT 1.505000  0.085000 1.885000 0.485000 ;
@@ -86,9 +96,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -107,17 +116,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.463750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.110000 0.415000 3.535000 0.760000 ;
-        RECT 3.110000 1.495000 3.535000 2.465000 ;
-        RECT 3.215000 0.760000 3.535000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.485000 0.895000 0.905000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef
index db0b34d..bd4f5bd 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.741200 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.985000 1.495000 1.430000 1.700000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
index 42d2836..875e445 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
@@ -61,12 +61,22 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.555750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.741250 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.985000 0.265000 1.385000 0.595000 ;
+        RECT 0.985000 0.595000 1.235000 1.495000 ;
+        RECT 0.985000 1.495000 1.430000 1.700000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.645000  0.085000 0.815000 0.565000 ;
         RECT 1.865000  0.085000 2.035000 0.565000 ;
@@ -85,9 +95,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.616400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -106,17 +115,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.741250 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.985000 0.265000 1.385000 0.595000 ;
-        RECT 0.985000 0.595000 1.235000 1.495000 ;
-        RECT 0.985000 1.495000 1.430000 1.700000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.290000 0.345000 0.735000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef
index 087d896..41175c1 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.005000 0.255000 2.240000 0.735000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
index 810de60..bcc567a 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
@@ -61,12 +61,24 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.863500 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.010000 0.285000 1.430000 0.735000 ;
+        RECT 1.010000 0.735000 2.240000 0.905000 ;
+        RECT 1.010000 0.905000 1.270000 1.415000 ;
+        RECT 1.010000 1.415000 2.420000 1.700000 ;
+        RECT 2.005000 0.255000 2.240000 0.735000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.670000  0.085000 0.840000 0.565000 ;
         RECT 1.650000  0.085000 1.820000 0.565000 ;
@@ -88,9 +100,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.885700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -112,19 +123,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.010000 0.285000 1.430000 0.735000 ;
-        RECT 1.010000 0.735000 2.240000 0.905000 ;
-        RECT 1.010000 0.905000 1.270000 1.415000 ;
-        RECT 1.010000 1.415000 2.420000 1.700000 ;
-        RECT 2.005000 0.255000 2.240000 0.735000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.290000 0.345000 0.735000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.lef
index 0e95200..0225f1e 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.lef
@@ -64,22 +64,6 @@
         RECT 0.090000 0.755000 0.440000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.703000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 2.905000 0.760000 3.075000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
index f0a1fa6..10ea3ef 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
@@ -70,12 +70,22 @@
         RECT 0.090000 0.755000 0.440000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.479850 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.703000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.805000 0.415000 3.075000 0.760000 ;
+        RECT 2.805000 1.495000 3.075000 2.465000 ;
+        RECT 2.905000 0.760000 3.075000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.220000 0.085000 ;
         RECT 0.095000  0.085000 0.425000 0.585000 ;
         RECT 1.045000  0.085000 1.425000 0.485000 ;
@@ -93,9 +103,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -112,17 +121,6 @@
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.703000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.805000 0.415000 3.075000 0.760000 ;
-        RECT 2.805000 1.495000 3.075000 2.465000 ;
-        RECT 2.905000 0.760000 3.075000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.090000 1.495000 0.410000 1.785000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.lef
index d2c5b96..b9266b1 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.755000 0.435000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.802800 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 2.890000 0.760000 3.125000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
index 871e829..612e0c4 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
@@ -70,12 +70,22 @@
         RECT 0.085000 0.755000 0.435000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.666600 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.802750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.820000 0.415000 3.125000 0.760000 ;
+        RECT 2.820000 1.495000 3.125000 2.465000 ;
+        RECT 2.890000 0.760000 3.125000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.090000  0.085000 0.425000 0.585000 ;
         RECT 1.045000  0.085000 1.425000 0.485000 ;
@@ -95,9 +105,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.625700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -116,17 +125,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.802750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.820000 0.415000 3.125000 0.760000 ;
-        RECT 2.820000 1.495000 3.125000 2.465000 ;
-        RECT 2.890000 0.760000 3.125000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 1.495000 0.410000 1.785000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.lef
index 2a57e2e..2353d38 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.lef
@@ -68,22 +68,6 @@
         RECT 0.085000 0.755000 0.370000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 4.210000 0.905000 4.485000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
index c7f455e..c89156a 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
@@ -74,12 +74,26 @@
         RECT 0.085000 0.755000 0.370000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  1.075750 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.730000 1.455000 4.485000 1.625000 ;
+        RECT 2.730000 1.625000 2.980000 2.465000 ;
+        RECT 2.770000 0.255000 3.020000 0.725000 ;
+        RECT 2.770000 0.725000 4.485000 0.905000 ;
+        RECT 3.580000 0.255000 3.960000 0.725000 ;
+        RECT 3.670000 1.625000 3.920000 2.465000 ;
+        RECT 4.210000 0.905000 4.485000 1.455000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.120000  0.085000 0.370000 0.585000 ;
         RECT 1.120000  0.085000 1.500000 0.485000 ;
@@ -102,9 +116,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -126,21 +139,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.730000 1.455000 4.485000 1.625000 ;
-        RECT 2.730000 1.625000 2.980000 2.465000 ;
-        RECT 2.770000 0.255000 3.020000 0.725000 ;
-        RECT 2.770000 0.725000 4.485000 0.905000 ;
-        RECT 3.580000 0.255000 3.960000 0.725000 ;
-        RECT 3.670000 1.625000 3.920000 2.465000 ;
-        RECT 4.210000 0.905000 4.485000 1.455000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.115000 1.495000 0.760000 1.665000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef
index 20025d4..408c6dd 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.755000 0.425000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463700 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 3.725000 0.760000 3.995000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
index b5e0be5..2c94a54 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
@@ -70,12 +70,22 @@
         RECT 0.085000 0.755000 0.425000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.618450 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.463750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.620000 0.415000 3.995000 0.760000 ;
+        RECT 3.620000 1.495000 3.995000 2.465000 ;
+        RECT 3.725000 0.760000 3.995000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.085000  0.085000 0.425000 0.585000 ;
         RECT 1.085000  0.085000 1.415000 0.585000 ;
@@ -96,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -118,17 +127,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.463750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.620000 0.415000 3.995000 0.760000 ;
-        RECT 3.620000 1.495000 3.995000 2.465000 ;
-        RECT 3.725000 0.760000 3.995000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.645000 0.305000 0.890000 0.995000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef
index e0c6dc0..d8a57f3 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 1.075000 0.425000 1.435000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 1.020000 1.495000 1.350000 1.825000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
index 5f1ea04..1d7447d 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
@@ -70,12 +70,22 @@
         RECT 0.085000 1.075000 0.425000 1.435000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.677100 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.020000 0.260000 1.350000 0.790000 ;
+        RECT 1.020000 0.790000 1.235000 1.495000 ;
+        RECT 1.020000 1.495000 1.350000 1.825000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.140000 0.085000 ;
         RECT 0.680000  0.085000 0.850000 0.565000 ;
         RECT 1.535000  0.085000 1.965000 0.485000 ;
@@ -96,9 +106,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.722700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -118,17 +127,6 @@
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.020000 0.260000 1.350000 0.790000 ;
-        RECT 1.020000 0.790000 1.235000 1.495000 ;
-        RECT 1.020000 1.495000 1.350000 1.825000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.325000 0.350000 0.735000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef
index ed735cf..7c5f1e6 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef
@@ -65,22 +65,6 @@
         RECT 0.105000 0.995000 0.445000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 5.175000 0.905000 5.415000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
index 8c3b253..63718c0 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
@@ -71,12 +71,26 @@
         RECT 0.105000 0.995000 0.445000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.202300 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.695000 1.455000 5.415000 1.625000 ;
+        RECT 3.695000 1.625000 3.945000 2.465000 ;
+        RECT 3.735000 0.255000 3.985000 0.725000 ;
+        RECT 3.735000 0.725000 5.415000 0.905000 ;
+        RECT 4.545000 0.255000 4.925000 0.725000 ;
+        RECT 4.635000 1.625000 4.885000 2.465000 ;
+        RECT 5.175000 0.905000 5.415000 1.455000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.520000 0.085000 ;
         RECT 0.085000  0.085000 0.345000 0.825000 ;
         RECT 1.085000  0.085000 1.335000 0.585000 ;
@@ -102,9 +116,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.073400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.520000 2.805000 ;
@@ -129,21 +142,6 @@
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.695000 1.455000 5.415000 1.625000 ;
-        RECT 3.695000 1.625000 3.945000 2.465000 ;
-        RECT 3.735000 0.255000 3.985000 0.725000 ;
-        RECT 3.735000 0.725000 5.415000 0.905000 ;
-        RECT 4.545000 0.255000 4.925000 0.725000 ;
-        RECT 4.635000 1.625000 4.885000 2.465000 ;
-        RECT 5.175000 0.905000 5.415000 1.455000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.645000 0.435000 0.835000 0.995000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef
index 7f30d5b..284d967 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef
@@ -64,22 +64,6 @@
         RECT 0.980000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463700 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 4.235000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
index 80f1613..c9550dc 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
@@ -70,12 +70,22 @@
         RECT 0.980000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.620550 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.463750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.130000 0.415000 4.455000 0.760000 ;
+        RECT 4.130000 1.495000 4.455000 2.465000 ;
+        RECT 4.235000 0.760000 4.455000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 4.600000 0.085000 ;
         RECT 0.705000  0.085000 0.875000 0.825000 ;
         RECT 1.570000  0.085000 1.945000 0.485000 ;
@@ -97,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.564325 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -120,17 +129,6 @@
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.463750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.130000 0.415000 4.455000 0.760000 ;
-        RECT 4.130000 1.495000 4.455000 2.465000 ;
-        RECT 4.235000 0.760000 4.455000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.450000 0.400000 0.825000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef
index c3917aa..991f8ca 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef
@@ -64,22 +64,6 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 4.260000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
index 30b0b0c..8b68f29 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
@@ -70,12 +70,22 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.812100 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.498000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.155000 0.415000 4.455000 0.760000 ;
+        RECT 4.155000 1.495000 4.455000 2.465000 ;
+        RECT 4.260000 0.760000 4.455000 1.495000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.060000 0.085000 ;
         RECT 0.710000  0.085000 0.880000 0.825000 ;
         RECT 1.595000  0.085000 1.970000 0.485000 ;
@@ -99,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.859325 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -124,17 +133,6 @@
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.498000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.155000 0.415000 4.455000 0.760000 ;
-        RECT 4.155000 1.495000 4.455000 2.465000 ;
-        RECT 4.260000 0.760000 4.455000 1.495000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.450000 0.405000 0.825000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef
index afef598..834798f 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef
@@ -65,22 +65,6 @@
         RECT 0.995000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 5.625000 0.905000 5.855000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
index 27e2afb..055f9a2 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
@@ -71,12 +71,26 @@
         RECT 0.995000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.204400 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.185000 1.455000 5.855000 1.625000 ;
+        RECT 4.185000 1.625000 4.435000 2.465000 ;
+        RECT 4.225000 0.255000 4.475000 0.725000 ;
+        RECT 4.225000 0.725000 5.855000 0.905000 ;
+        RECT 5.035000 0.255000 5.415000 0.725000 ;
+        RECT 5.125000 1.625000 5.375000 2.465000 ;
+        RECT 5.625000 0.905000 5.855000 1.455000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.705000  0.085000 0.875000 0.825000 ;
         RECT 1.615000  0.085000 1.945000 0.480000 ;
@@ -103,9 +117,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.203625 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -131,21 +144,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.185000 1.455000 5.855000 1.625000 ;
-        RECT 4.185000 1.625000 4.435000 2.465000 ;
-        RECT 4.225000 0.255000 4.475000 0.725000 ;
-        RECT 4.225000 0.725000 5.855000 0.905000 ;
-        RECT 5.035000 0.255000 5.415000 0.725000 ;
-        RECT 5.125000 1.625000 5.375000 2.465000 ;
-        RECT 5.625000 0.905000 5.855000 1.455000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 0.450000 0.400000 0.825000 ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef
index 5f98e47..a439383 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef
@@ -27,7 +27,7 @@
   CLASS CORE ;
   SYMMETRY X Y R90 ;
   SIZE  5.980000 BY  2.720000 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -37,9 +37,21 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met5 ;
+        RECT 1.250000 0.560000 4.270000 2.160000 ;
+      LAYER via4 ;
+        RECT 1.560000 0.870000 2.360000 1.670000 ;
+        RECT 3.160000 0.870000 3.960000 1.670000 ;
+    END
+  END X
   PIN VGND
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
@@ -55,7 +67,7 @@
   END VGND
   PIN VPWR
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -69,18 +81,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met5 ;
-        RECT 1.250000 0.560000 4.270000 2.160000 ;
-      LAYER via4 ;
-        RECT 1.560000 0.870000 2.360000 1.670000 ;
-        RECT 3.160000 0.870000 3.960000 1.670000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
index 4394645..b87d02a 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
@@ -33,7 +33,7 @@
   ORIGIN  0.000000  0.000000 ;
   SIZE  5.980000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -43,11 +43,18 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.339000 ;
-    DIRECTION INPUT ;
+  PIN X
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met5 ;
+        RECT 1.250000 1.950000 4.270000 2.160000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.615000  0.085000 0.895000 0.565000 ;
@@ -75,9 +82,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -105,14 +111,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met5 ;
-        RECT 1.250000 1.950000 4.270000 2.160000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef
index 33ee629..caeff74 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef
@@ -27,7 +27,7 @@
   CLASS CORE ;
   SYMMETRY X Y R90 ;
   SIZE  5.980000 BY  2.720000 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -37,9 +37,21 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT -0.715000 1.030000 0.065000 1.350000 ;
+      LAYER via3 ;
+        RECT -0.625000 1.090000 -0.425000 1.290000 ;
+        RECT -0.225000 1.090000 -0.025000 1.290000 ;
+    END
+  END X
   PIN VGND
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
@@ -58,7 +70,7 @@
   END VGND
   PIN VPWR
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -75,18 +87,6 @@
         RECT 5.605000 2.645000 5.755000 2.795000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met3 ;
-        RECT -0.715000 1.030000 0.065000 1.350000 ;
-      LAYER via3 ;
-        RECT -0.625000 1.090000 -0.425000 1.290000 ;
-        RECT -0.225000 1.090000 -0.025000 1.290000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
index 5fbfd87..e908570 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
@@ -33,7 +33,7 @@
   ORIGIN  0.000000  0.000000 ;
   SIZE  5.980000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -43,11 +43,25 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.339000 ;
-    DIRECTION INPUT ;
+  PIN X
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met3 ;
+        RECT -0.715000 1.030000 0.065000 1.350000 ;
+      LAYER met4 ;
+        RECT -1.140000 0.770000 0.040000 1.950000 ;
+      LAYER met5 ;
+        RECT -1.260000 0.560000 1.060000 2.160000 ;
+      LAYER via3 ;
+        RECT -0.685000 1.030000 -0.365000 1.350000 ;
+        RECT -0.285000 1.030000  0.035000 1.350000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.615000  0.085000 0.895000 0.565000 ;
@@ -94,9 +108,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -143,21 +156,6 @@
         RECT 5.560000 2.560000 5.880000 2.880000 ;
     END
   END VPWR
-  PIN X
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met3 ;
-        RECT -0.715000 1.030000 0.065000 1.350000 ;
-      LAYER met4 ;
-        RECT -1.140000 0.770000 0.040000 1.950000 ;
-      LAYER met5 ;
-        RECT -1.260000 0.560000 1.060000 2.160000 ;
-      LAYER via3 ;
-        RECT -0.685000 1.030000 -0.365000 1.350000 ;
-        RECT -0.285000 1.030000  0.035000 1.350000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef
index c7c100a..27ed99c 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef
@@ -113,7 +113,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.640000 0.085000 ;
@@ -131,7 +131,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.640000 2.805000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
index 6428c98..02faf59 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
@@ -125,9 +125,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.524700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.640000 0.085000 ;
@@ -179,9 +178,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.152000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.640000 2.805000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef
index 4a72af2..67d3449 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef
@@ -100,7 +100,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
@@ -108,7 +108,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
index 6b557ca..b7b3a41 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
@@ -113,9 +113,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.540500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 14.260000 0.085000 ;
@@ -164,9 +163,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.880750 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 14.260000 2.805000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef
index 41e4193..96253d9 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef
@@ -100,7 +100,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
@@ -108,7 +108,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
index d170401..2651294 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
@@ -113,9 +113,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.778050 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 14.720000 0.085000 ;
@@ -166,9 +165,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.269200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 14.720000 2.805000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef
index a3ad3b5..bdeaf04 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef
@@ -89,7 +89,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
@@ -97,7 +97,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
index 3ff2bf0..e1cbf79 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
@@ -102,9 +102,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.353300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 12.880000 0.085000 ;
@@ -149,9 +148,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 12.880000 2.805000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef
index 03ddf87..7a4ecf3 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef
@@ -89,7 +89,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
@@ -97,7 +97,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
index 0d2acba..9c8b1c5 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
@@ -102,9 +102,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.353300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 12.880000 0.085000 ;
@@ -149,9 +148,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 12.880000 2.805000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef
index 772fb36..4678fc3 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef
@@ -89,7 +89,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
@@ -97,7 +97,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
index 28b42d5..97d3ce1 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
@@ -102,9 +102,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.619800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 13.340000 0.085000 ;
@@ -151,9 +150,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.059800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 13.340000 2.805000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef
index 020b183..f723b23 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef
@@ -94,7 +94,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
@@ -102,7 +102,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
index 0b2280a..ea651f1 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
@@ -108,9 +108,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.704300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 14.260000 0.085000 ;
@@ -160,9 +159,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.264800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 14.260000 2.805000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef
index 2d2904f..fa763f5 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef
@@ -104,7 +104,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
@@ -112,7 +112,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
index 7ef13cf..ab1fc9b 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
@@ -123,9 +123,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.460100 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 14.720000 0.085000 ;
@@ -176,9 +175,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.970500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 14.720000 2.805000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef
index cbdd649..a1eb76c 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef
@@ -104,7 +104,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
@@ -112,7 +112,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.640000 2.960000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
index 4ccf55a..c49f8fd 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
@@ -123,9 +123,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.905350 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.640000 0.085000 ;
@@ -180,9 +179,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.625500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.640000 2.805000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef
index 48e76aa..10a74d8 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef
@@ -91,7 +91,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
@@ -99,7 +99,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
index a02c2b2..db3c0c9 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
@@ -110,9 +110,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.284800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 13.340000 0.085000 ;
@@ -159,9 +158,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.599700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 13.340000 2.805000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef
index 73f59fa..7faf9d8 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef
@@ -93,7 +93,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
@@ -101,7 +101,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
index 2e56e3e..4011056 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
@@ -112,9 +112,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.503950 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 14.260000 0.085000 ;
@@ -164,9 +163,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.071800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 14.260000 2.805000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef
index f812f0f..49dae65 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef
@@ -97,7 +97,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
@@ -105,7 +105,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
index bb488e4..1a890bc 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
@@ -116,9 +116,8 @@
     END
   END SET_B
   PIN VGND
-    ANTENNADIFFAREA  1.732450 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.180000 0.085000 ;
@@ -171,9 +170,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.397400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.180000 2.805000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef
index a853bb4..7f93fd6 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef
@@ -88,7 +88,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
@@ -96,7 +96,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
index 4b73da2..fbc6390 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
@@ -93,9 +93,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.363800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 11.960000 0.085000 ;
@@ -138,9 +137,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.705550 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.960000 2.805000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef
index dd79694..8c8ddad 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef
@@ -86,7 +86,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
@@ -94,7 +94,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
index 1083633..4607591 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
@@ -91,9 +91,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.981300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 13.340000 0.085000 ;
@@ -141,9 +140,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.675550 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 13.340000 2.805000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef
index 4b5b6e0..09d0868 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef
@@ -79,7 +79,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
@@ -87,7 +87,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
index 85046fe..01bc8f5 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
@@ -84,9 +84,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.078200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 10.580000 0.085000 ;
@@ -125,9 +124,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.369900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.580000 2.805000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef
index 93cbfc4..a07c8fb 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef
@@ -79,7 +79,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
@@ -87,7 +87,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
index 818bb1c..3b8921d 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
@@ -84,9 +84,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.305350 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 11.040000 0.085000 ;
@@ -127,9 +126,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.711150 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.040000 2.805000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef
index b19fd53..8bcc5cf 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef
@@ -83,7 +83,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
@@ -91,7 +91,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
index 2b9b795..12a5b83 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
@@ -88,9 +88,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.480850 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 11.960000 0.085000 ;
@@ -134,9 +133,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.981150 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.960000 2.805000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef
index 152280e..be07a7a 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef
@@ -70,7 +70,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
@@ -78,7 +78,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
index 85d71f0..fb03f3d 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
@@ -81,9 +81,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  0.792650 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 7.360000 0.085000 ;
@@ -113,9 +112,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.382600 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.360000 2.805000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef
index f85cc4f..977004a 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef
@@ -75,7 +75,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
@@ -83,7 +83,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
index 5ec381d..8ee0a78 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
@@ -86,9 +86,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  0.946050 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 7.820000 0.085000 ;
@@ -120,9 +119,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.665400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 7.820000 2.805000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef
index 81748ab..4fe6d66 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef
@@ -80,7 +80,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
@@ -88,7 +88,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
index 116e1b5..dc77d5f 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
@@ -91,9 +91,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.307800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 9.200000 0.085000 ;
@@ -129,9 +128,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.223500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.200000 2.805000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef
index 7baf60f..26da1ec 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef
@@ -94,7 +94,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
@@ -102,7 +102,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
index 54e4578..3fbb746 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
@@ -99,9 +99,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.448700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.180000 0.085000 ;
@@ -152,9 +151,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.935350 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.180000 2.805000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef
index 3d4b7c9..324c007 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef
@@ -96,7 +96,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
@@ -104,7 +104,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 16.560000 2.960000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
index 37675a6..083fc05 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
@@ -101,9 +101,8 @@
     END
   END SCE
   PIN VGND
-    ANTENNADIFFAREA  1.789200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 16.560000 0.085000 ;
@@ -159,9 +158,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.495350 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 16.560000 2.805000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.lef
index 20e76b0..d4e23be 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
index bf2958e..2917983 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
@@ -34,18 +34,6 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    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
-  END VGND
   PIN VNB
     ANTENNADIFFAREA  0.089250 ;
     PORT
@@ -60,9 +48,21 @@
         RECT 0.085000 1.470000 0.375000 2.455000 ;
     END
   END VPB
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      LAYER mcon ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 0.460000 0.240000 ;
+    END
+  END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 0.460000 2.805000 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef
index 4c7cb5c..10d881f 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef
@@ -30,11 +30,11 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef
index 8c49bf5..57c591b 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef
@@ -30,11 +30,11 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef
index d6d0694..05327c5 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
index 3d236e8..42bc9dc 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
@@ -35,9 +35,8 @@
   SYMMETRY X Y R90 ;
   SITE unithd ;
   PIN VGND
-    ANTENNADIFFAREA  0.089250 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 0.460000 0.085000 ;
@@ -49,9 +48,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.148750 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 0.460000 2.805000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef
index ffd28b2..bf0cc43 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef
@@ -49,22 +49,6 @@
         RECT 1.945000 1.245000 2.165000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.545000 ;
     DIRECTION OUTPUT ;
@@ -78,6 +62,22 @@
         RECT 3.355000 0.825000 3.595000 1.755000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
index 582d0ee..38936d0 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
@@ -55,12 +55,24 @@
         RECT 1.945000 1.245000 2.165000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.442000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.545000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.515000 2.125000 2.895000 2.295000 ;
+        RECT 2.725000 1.755000 3.595000 1.955000 ;
+        RECT 2.725000 1.955000 2.895000 2.125000 ;
+        RECT 3.175000 0.345000 3.595000 0.825000 ;
+        RECT 3.355000 0.825000 3.595000 1.755000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 1.155000  0.085000 1.325000 0.905000 ;
         RECT 2.095000  0.085000 2.495000 0.475000 ;
@@ -78,9 +90,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -100,19 +111,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.545000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.515000 2.125000 2.895000 2.295000 ;
-        RECT 2.725000 1.755000 3.595000 1.955000 ;
-        RECT 2.725000 1.955000 2.895000 2.125000 ;
-        RECT 3.175000 0.345000 3.595000 0.825000 ;
-        RECT 3.355000 0.825000 3.595000 1.755000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.280000 0.550000 0.825000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef
index d8f0a1a..affeaa8 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef
@@ -50,22 +50,6 @@
         RECT 3.180000 1.285000 3.350000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.953000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 5.950000 0.475000 6.340000 1.415000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
index 036ac04..2e028f2 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
@@ -56,12 +56,26 @@
         RECT 3.180000 1.285000 3.350000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.734500 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  0.953000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 4.075000 1.795000 5.745000 1.965000 ;
+        RECT 4.075000 1.965000 4.285000 2.125000 ;
+        RECT 4.985000 0.305000 6.340000 0.475000 ;
+        RECT 5.495000 1.415000 6.340000 1.625000 ;
+        RECT 5.495000 1.625000 5.745000 1.795000 ;
+        RECT 5.495000 1.965000 5.745000 2.125000 ;
+        RECT 5.950000 0.475000 6.340000 1.415000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 1.600000  0.085000 1.770000 0.555000 ;
         RECT 2.630000  0.085000 2.800000 0.905000 ;
@@ -87,9 +101,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -117,21 +130,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  0.953000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 4.075000 1.795000 5.745000 1.965000 ;
-        RECT 4.075000 1.965000 4.285000 2.125000 ;
-        RECT 4.985000 0.305000 6.340000 0.475000 ;
-        RECT 5.495000 1.415000 6.340000 1.625000 ;
-        RECT 5.495000 1.625000 5.745000 1.795000 ;
-        RECT 5.495000 1.965000 5.745000 2.125000 ;
-        RECT 5.950000 0.475000 6.340000 1.415000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.645000 0.910000 0.895000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef
index f42e449..0fad8aa 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef
@@ -50,22 +50,6 @@
         RECT 6.100000 1.275000 6.270000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.858500 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 10.705000 0.905000 10.940000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
index 88e1e24..74058d8 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
@@ -56,12 +56,27 @@
         RECT 6.100000 1.275000 6.270000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.378000 ;
-    DIRECTION INOUT ;
+  PIN Y
+    ANTENNADIFFAREA  1.858500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  6.750000 1.785000  9.060000 2.045000 ;
+        RECT  8.730000 1.445000 10.940000 1.665000 ;
+        RECT  8.730000 1.665000  9.060000 1.785000 ;
+        RECT  8.730000 2.045000  9.060000 2.465000 ;
+        RECT  9.150000 0.655000 10.940000 0.905000 ;
+        RECT  9.710000 1.665000  9.960000 2.465000 ;
+        RECT 10.610000 1.665000 10.940000 2.465000 ;
+        RECT 10.705000 0.905000 10.940000 1.445000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 11.040000 0.085000 ;
         RECT 2.600000  0.085000  2.770000 0.555000 ;
         RECT 3.540000  0.085000  3.710000 0.555000 ;
@@ -100,9 +115,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  2.320000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.040000 2.805000 ;
@@ -143,22 +157,6 @@
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
-  PIN Y
-    ANTENNADIFFAREA  1.858500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  6.750000 1.785000  9.060000 2.045000 ;
-        RECT  8.730000 1.445000 10.940000 1.665000 ;
-        RECT  8.730000 1.665000  9.060000 1.785000 ;
-        RECT  8.730000 2.045000  9.060000 2.465000 ;
-        RECT  9.150000 0.655000 10.940000 0.905000 ;
-        RECT  9.710000 1.665000  9.960000 2.465000 ;
-        RECT 10.610000 1.665000 10.940000 2.465000 ;
-        RECT 10.705000 0.905000 10.940000 1.445000 ;
-    END
-  END Y
   OBS
     LAYER li1 ;
       RECT 0.085000 0.645000  1.910000 0.905000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef
index 24c8e3e..e843e19 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef
@@ -56,22 +56,6 @@
         RECT 1.715000 1.075000 2.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.085000 1.440000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
index 7e3fbcc..714a95d 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
@@ -62,12 +62,21 @@
         RECT 1.715000 1.075000 2.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.912400 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.472000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.350000 0.345000 1.440000 ;
+        RECT 0.085000 1.440000 0.365000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.200000 0.085000 ;
         RECT 0.515000  0.085000 0.815000 0.525000 ;
         RECT 3.675000  0.085000 3.845000 0.865000 ;
@@ -98,9 +107,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.225950 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.200000 2.805000 ;
@@ -132,16 +140,6 @@
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.472000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.350000 0.345000 1.440000 ;
-        RECT 0.085000 1.440000 0.365000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.515000 0.695000 1.205000 0.865000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef
index edd96d6..e85d110 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef
@@ -56,22 +56,6 @@
         RECT 2.225000 1.075000 2.840000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.550500 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 0.545000 0.350000 0.865000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
index e8c372b..7f42753 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
@@ -62,12 +62,20 @@
         RECT 2.225000 1.075000 2.840000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.854300 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.550500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.545000 0.350000 0.865000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.660000 0.085000 ;
         RECT 0.085000  0.085000 0.375000 0.735000 ;
         RECT 1.035000  0.085000 1.325000 0.525000 ;
@@ -100,9 +108,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.220950 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.660000 2.805000 ;
@@ -136,15 +143,6 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.550500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.545000 0.350000 0.865000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 1.045000 0.695000 1.715000 0.865000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef
index ae27c1c..d4ef10b 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef
@@ -56,22 +56,6 @@
         RECT 3.245000 1.075000 3.860000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 1.565000 1.440000 1.895000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
index ad25c8c..ea751d5 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
@@ -62,12 +62,26 @@
         RECT 3.245000 1.075000 3.860000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  1.074800 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.625000 0.375000 0.925000 0.995000 ;
+        RECT 0.625000 0.995000 1.860000 1.325000 ;
+        RECT 0.625000 1.325000 1.005000 2.425000 ;
+        RECT 1.565000 0.350000 1.875000 0.925000 ;
+        RECT 1.565000 0.925000 1.860000 0.995000 ;
+        RECT 1.565000 1.325000 1.860000 1.440000 ;
+        RECT 1.565000 1.440000 1.895000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 10.580000 0.085000 ;
         RECT 0.285000  0.085000  0.455000 0.735000 ;
         RECT 1.225000  0.085000  1.395000 0.735000 ;
@@ -103,9 +117,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.500950 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.580000 2.805000 ;
@@ -142,21 +155,6 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.625000 0.375000 0.925000 0.995000 ;
-        RECT 0.625000 0.995000 1.860000 1.325000 ;
-        RECT 0.625000 1.325000 1.005000 2.425000 ;
-        RECT 1.565000 0.350000 1.875000 0.925000 ;
-        RECT 1.565000 0.925000 1.860000 0.995000 ;
-        RECT 1.565000 1.325000 1.860000 1.440000 ;
-        RECT 1.565000 1.440000 1.895000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT  2.030000 0.995000  2.285000 1.325000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef
index 1592b17..aebcea2 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef
@@ -49,22 +49,6 @@
         RECT 1.720000 1.245000 1.890000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 3.225000 1.535000 3.545000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
index 7a55211..3c82ed0 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
@@ -55,12 +55,23 @@
         RECT 1.720000 1.245000 1.890000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.728000 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.880000 0.315000 3.085000 0.485000 ;
+        RECT 2.915000 0.485000 3.085000 1.365000 ;
+        RECT 2.915000 1.365000 3.545000 1.535000 ;
+        RECT 3.225000 1.535000 3.545000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 3.680000 0.085000 ;
         RECT 0.135000  0.085000 0.465000 0.475000 ;
         RECT 1.035000  0.085000 1.415000 0.475000 ;
@@ -79,9 +90,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -100,18 +110,6 @@
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.880000 0.315000 3.085000 0.485000 ;
-        RECT 2.915000 0.485000 3.085000 1.365000 ;
-        RECT 2.915000 1.365000 3.545000 1.535000 ;
-        RECT 3.225000 1.535000 3.545000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.085000 0.655000 2.745000 0.825000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef
index ac6bfa8..5bf831a 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef
@@ -54,22 +54,6 @@
         RECT 3.765000 1.260000 4.055000 1.305000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.806800 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 5.985000 0.905000 6.350000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
index ed30ecd..3cbaa79 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
@@ -66,12 +66,25 @@
         RECT 3.765000 1.260000 4.055000 1.305000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.069250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.806750 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 3.975000 0.645000 4.305000 0.725000 ;
+        RECT 3.975000 0.725000 6.350000 0.905000 ;
+        RECT 5.385000 0.645000 5.765000 0.725000 ;
+        RECT 5.475000 1.415000 6.350000 1.625000 ;
+        RECT 5.475000 1.625000 5.725000 2.125000 ;
+        RECT 5.985000 0.905000 6.350000 1.415000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 6.440000 0.085000 ;
         RECT 0.190000  0.085000 0.360000 0.555000 ;
         RECT 1.130000  0.085000 1.300000 0.555000 ;
@@ -99,9 +112,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.925000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 6.440000 2.805000 ;
@@ -127,20 +139,6 @@
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.806750 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 3.975000 0.645000 4.305000 0.725000 ;
-        RECT 3.975000 0.725000 6.350000 0.905000 ;
-        RECT 5.385000 0.645000 5.765000 0.725000 ;
-        RECT 5.475000 1.415000 6.350000 1.625000 ;
-        RECT 5.475000 1.625000 5.725000 2.125000 ;
-        RECT 5.985000 0.905000 6.350000 1.415000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.120000 0.725000 1.850000 0.905000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef
index 4de13bb..be97299 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef
@@ -51,22 +51,6 @@
         RECT 3.270000 1.105000 6.340000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.318500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 10.635000 0.905000 10.955000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      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 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
index 1f55757..c01289e 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
@@ -57,12 +57,38 @@
         RECT 3.270000 1.105000 6.340000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.979250 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  1.759450 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT  4.565000 0.645000  6.130000 0.905000 ;
+        RECT  5.650000 0.905000  6.130000 0.935000 ;
+        RECT  8.650000 0.725000  9.480000 0.735000 ;
+        RECT  8.650000 0.735000 10.955000 0.905000 ;
+        RECT  8.680000 1.445000 10.955000 1.625000 ;
+        RECT  8.680000 1.625000  9.910000 1.665000 ;
+        RECT  8.680000 1.665000  8.970000 2.125000 ;
+        RECT  9.100000 0.255000  9.480000 0.725000 ;
+        RECT  9.660000 1.665000  9.910000 2.125000 ;
+        RECT 10.040000 0.255000 10.420000 0.735000 ;
+        RECT 10.550000 1.625000 10.955000 2.465000 ;
+        RECT 10.635000 0.905000 10.955000 1.445000 ;
+      LAYER mcon ;
+        RECT 5.705000 0.725000 5.875000 0.895000 ;
+        RECT 8.765000 0.725000 8.935000 0.895000 ;
+      LAYER met1 ;
+        RECT 5.645000 0.695000 5.935000 0.780000 ;
+        RECT 5.645000 0.780000 8.995000 0.925000 ;
+        RECT 8.705000 0.695000 8.995000 0.780000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 11.040000 0.085000 ;
         RECT  0.085000  0.085000  0.360000 0.565000 ;
         RECT  1.130000  0.085000  1.300000 0.555000 ;
@@ -104,9 +130,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 11.040000 2.805000 ;
@@ -145,33 +170,6 @@
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.759450 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  4.565000 0.645000  6.130000 0.905000 ;
-        RECT  5.650000 0.905000  6.130000 0.935000 ;
-        RECT  8.650000 0.725000  9.480000 0.735000 ;
-        RECT  8.650000 0.735000 10.955000 0.905000 ;
-        RECT  8.680000 1.445000 10.955000 1.625000 ;
-        RECT  8.680000 1.625000  9.910000 1.665000 ;
-        RECT  8.680000 1.665000  8.970000 2.125000 ;
-        RECT  9.100000 0.255000  9.480000 0.725000 ;
-        RECT  9.660000 1.665000  9.910000 2.125000 ;
-        RECT 10.040000 0.255000 10.420000 0.735000 ;
-        RECT 10.550000 1.625000 10.955000 2.465000 ;
-        RECT 10.635000 0.905000 10.955000 1.445000 ;
-      LAYER mcon ;
-        RECT 5.705000 0.725000 5.875000 0.895000 ;
-        RECT 8.765000 0.725000 8.935000 0.895000 ;
-      LAYER met1 ;
-        RECT 5.645000 0.695000 5.935000 0.780000 ;
-        RECT 5.645000 0.780000 8.995000 0.925000 ;
-        RECT 8.705000 0.695000 8.995000 0.780000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT  0.085000 0.735000  3.730000 0.905000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef
index 2657f59..e26054b 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef
@@ -56,22 +56,6 @@
         RECT 1.960000 0.995000 2.645000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 0.085000 1.440000 0.610000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
index 5667a15..e135f7c 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
@@ -62,12 +62,22 @@
         RECT 1.960000 0.995000 2.645000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.970950 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.472000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.085000 0.350000 0.590000 0.925000 ;
+        RECT 0.085000 0.925000 0.400000 1.440000 ;
+        RECT 0.085000 1.440000 0.610000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.660000 0.085000 ;
         RECT 0.810000  0.085000 1.060000 0.525000 ;
         RECT 4.130000  0.085000 4.300000 0.865000 ;
@@ -99,9 +109,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.309400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.660000 2.805000 ;
@@ -134,17 +143,6 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.472000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.350000 0.590000 0.925000 ;
-        RECT 0.085000 0.925000 0.400000 1.440000 ;
-        RECT 0.085000 1.440000 0.610000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.800000 0.695000 1.450000 0.865000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef
index 6d565cd..6bc62c7 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef
@@ -56,22 +56,6 @@
         RECT 2.255000 0.995000 2.940000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.517500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 0.680000 0.350000 0.930000 0.660000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
index 2f0c7a9..44c8317 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
@@ -62,12 +62,24 @@
         RECT 2.255000 0.995000 2.940000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.896050 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.517500 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.330000 0.660000 0.930000 0.925000 ;
+        RECT 0.330000 0.925000 0.695000 1.440000 ;
+        RECT 0.330000 1.440000 0.905000 2.045000 ;
+        RECT 0.655000 2.045000 0.905000 2.465000 ;
+        RECT 0.680000 0.350000 0.930000 0.660000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 9.660000 0.085000 ;
         RECT 0.105000  0.085000 0.435000 0.465000 ;
         RECT 1.105000  0.085000 1.355000 0.525000 ;
@@ -100,9 +112,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.269400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 9.660000 2.805000 ;
@@ -136,19 +147,6 @@
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.517500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.330000 0.660000 0.930000 0.925000 ;
-        RECT 0.330000 0.925000 0.695000 1.440000 ;
-        RECT 0.330000 1.440000 0.905000 2.045000 ;
-        RECT 0.655000 2.045000 0.905000 2.465000 ;
-        RECT 0.680000 0.350000 0.930000 0.660000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 1.095000 0.995000 1.295000 1.325000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef
index 9a246ec..df8a867 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef
@@ -56,22 +56,6 @@
         RECT 3.130000 0.995000 3.815000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 1.685000 2.045000 1.855000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
index 85736db..4c176b2 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
@@ -62,12 +62,27 @@
         RECT 3.130000 0.995000 3.815000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  1.225400 ;
-    DIRECTION INOUT ;
+  PIN X
+    ANTENNADIFFAREA  0.996000 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 0.645000 0.350000 0.815000 0.660000 ;
+        RECT 0.645000 0.660000 1.755000 0.925000 ;
+        RECT 0.745000 1.440000 1.570000 1.455000 ;
+        RECT 0.745000 1.455000 1.855000 2.045000 ;
+        RECT 0.745000 2.045000 0.915000 2.465000 ;
+        RECT 1.205000 0.925000 1.570000 1.440000 ;
+        RECT 1.585000 0.350000 1.755000 0.660000 ;
+        RECT 1.685000 2.045000 1.855000 2.465000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT 0.000000 -0.085000 10.580000 0.085000 ;
         RECT 0.175000  0.085000  0.345000 0.545000 ;
         RECT 0.985000  0.085000  1.365000 0.465000 ;
@@ -103,9 +118,8 @@
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  1.490800 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 10.580000 2.805000 ;
@@ -142,22 +156,6 @@
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  0.996000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.645000 0.350000 0.815000 0.660000 ;
-        RECT 0.645000 0.660000 1.755000 0.925000 ;
-        RECT 0.745000 1.440000 1.570000 1.455000 ;
-        RECT 0.745000 1.455000 1.855000 2.045000 ;
-        RECT 0.745000 2.045000 0.915000 2.465000 ;
-        RECT 1.205000 0.925000 1.570000 1.440000 ;
-        RECT 1.585000 0.350000 1.755000 0.660000 ;
-        RECT 1.685000 2.045000 1.855000 2.465000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT  2.020000 0.965000  2.245000 1.325000 ;