verilog: Fixing power pins usage in non-powerpin mode.

Previously even when `USE_POWER_PIN` was not defined, the drive strength
wrappers where still defining the power pins as ports.

Fixes https://github.com/google/skywater-pdk/issues/181

Signed-off-by: Tim 'mithro' Ansell <tansell@google.com>
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 d977e1b..dfca282 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 11e5560..a50a054 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 3.305000 0.995000 3.585000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.832000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.755000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.447250 ;
     DIRECTION OUTPUT ;
@@ -106,6 +88,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_2.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_2.lef
index 408d192..62d7b9a 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 1fef04b..c405e9b 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 3.365000 1.045000 3.735000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.027000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.940000 ;
-    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 ;
@@ -105,6 +87,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_4.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_4.lef
index 16ed7fd..bc3cdcb 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 e77f9ee..0eccec3 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
@@ -72,15 +72,6 @@
         RECT 3.275000 0.985000 4.045000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.433250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -93,15 +84,6 @@
         RECT -0.190000 1.305000 7.550000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.550000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.071250 ;
     DIRECTION OUTPUT ;
@@ -118,6 +100,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/a211oi/sky130_fd_sc_hdll__a211oi_1.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.lef
index 53e0558..52890b5 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 3912baa..c729dfa 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 1.980000 0.995000 2.265000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.438750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.305000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.870250 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,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_2.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.lef
index 1177b3f..d01ea8b 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 eaec856..83ba3c0 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
@@ -68,15 +68,6 @@
         RECT 0.100000 0.995000 0.405000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.806000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -89,15 +80,6 @@
         RECT -0.190000 1.305000 5.250000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
-    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 ;
@@ -109,6 +91,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_4.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.lef
index 46486a4..83ec04d 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 8369e41..b98dc10 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
@@ -73,15 +73,6 @@
         RECT 6.830000 1.275000 7.050000 1.695000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.404000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -94,15 +85,6 @@
         RECT -0.190000 1.305000 8.470000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
-    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 ;
@@ -123,6 +105,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/a21bo/sky130_fd_sc_hdll__a21bo_1.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.lef
index 241e402..aff24d4 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 3a0b5f8..d5548e4 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.105000 0.325000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.907050 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.683400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.628750 ;
     DIRECTION OUTPUT ;
@@ -96,6 +78,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_2.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.lef
index 0330f9f..5acc5a1 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 660ad9e..7ef851d 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.225000 0.995000 1.695000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.788750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.937200 ;
-    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 ;
@@ -100,6 +82,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_4.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.lef
index 7889a72..ff1b14a 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 ca0b222..9ce6936 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
@@ -61,15 +61,6 @@
         RECT 0.470000 1.010000 0.850000 1.625000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.423500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -82,15 +73,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.470000 ;
-    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 ;
@@ -102,6 +84,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/a21boi/sky130_fd_sc_hdll__a21boi_1.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.lef
index c032c9a..31ac826 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 bfdcf8c..0062666 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.105000 0.975000 0.335000 1.665000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.434500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.535500 ;
-    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 ;
@@ -98,6 +80,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_2.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.lef
index cbda74d..8fc411c 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 45a49cc..abcc3b5 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
@@ -60,15 +60,6 @@
         RECT 0.120000 0.765000 0.425000 1.805000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.884500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -81,15 +72,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.705500 ;
-    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 ;
@@ -102,6 +84,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_4.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.lef
index c268a8f..664b4e9 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 350e166..47e6cf4 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
@@ -60,15 +60,6 @@
         RECT 0.450000 0.995000 0.670000 1.075000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.365000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -81,15 +72,6 @@
         RECT -0.190000 1.305000 7.550000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.465000 ;
-    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 ;
@@ -107,6 +89,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/a21o/sky130_fd_sc_hdll__a21o_1.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_1.lef
index e38195e..dfb5b89 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 e9553e5..2abc7d8 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.065000 1.015000 1.610000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.783250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.570000 ;
-    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 ;
@@ -97,6 +79,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_2.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_2.lef
index f5348be..31a3d9e 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 2748463..05d0654 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.865000 0.995000 2.240000 1.410000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.854750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.935000 ;
-    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 ;
@@ -96,6 +78,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_4.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_4.lef
index c2e0d36..f0cef9a 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 f67b0c3..b8bc617 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
@@ -61,15 +61,6 @@
         RECT 2.500000 0.995000 2.905000 1.525000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.365000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -82,15 +73,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.470000 ;
-    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 ;
@@ -104,6 +86,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_6.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_6.lef
index e72af17..5cc62f3 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 ff40b9f..59a3c57 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
@@ -61,15 +61,6 @@
         RECT 2.865000 1.055000 3.195000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.690000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -82,15 +73,6 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.700000 ;
-    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 ;
@@ -108,6 +90,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_8.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_8.lef
index d356711..2b36ffb 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 32eb4aa..c6b71e3 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
@@ -61,15 +61,6 @@
         RECT 2.865000 1.055000 3.195000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.930500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -82,15 +73,6 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.990000 ;
-    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 ;
@@ -110,6 +92,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/a21oi/sky130_fd_sc_hdll__a21oi_1.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.lef
index 31f60ca..10c8a0f 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 428ddcb..588764f 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.095000 0.675000 0.335000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.409500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.315000 ;
-    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 ;
@@ -101,6 +83,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_2.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.lef
index 9db0ada..a3a82f6 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 7d441d1..3b126fa 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
@@ -59,15 +59,6 @@
         RECT 3.035000 0.995000 3.535000 1.625000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.754000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -80,15 +71,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.590000 ;
-    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 ;
@@ -102,6 +84,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_4.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.lef
index a9949a5..6299f5e 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 78796f6..70bde60 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
@@ -60,15 +60,6 @@
         RECT 0.090000 1.035000 1.580000 1.415000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.014000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -81,15 +72,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.210000 ;
-    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 ;
@@ -107,6 +89,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/a221oi/sky130_fd_sc_hdll__a221oi_1.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.lef
index 9c579a2..96c7b98 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 7bc3262..a4fc008 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
@@ -77,15 +77,6 @@
         RECT 0.085000 1.075000 0.435000 1.285000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.432250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -98,15 +89,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.560000 ;
-    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 ;
@@ -126,6 +108,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_2.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.lef
index ad674ec..7822a3d 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 81d43df..9676767 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
@@ -80,15 +80,6 @@
         RECT 0.090000 1.075000 0.420000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.183000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -101,15 +92,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
-    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 ;
@@ -124,6 +106,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_4.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.lef
index af851c4..42f6182 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 e98c85b..54d7a3e 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
@@ -81,15 +81,6 @@
         RECT 0.090000 1.075000 1.435000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.485250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -102,15 +93,6 @@
         RECT -0.190000 1.305000 10.770000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
-    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 ;
@@ -133,6 +115,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/a222oi/sky130_fd_sc_hdll__a222oi_1.lef b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.lef
index 83882e6..bb1aaaa 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 7b505d3..7c06e3f 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
@@ -84,15 +84,6 @@
         RECT 0.765000 1.000000 1.235000 1.315000 ;
     END
   END C2
-  PIN VGND
-    ANTENNADIFFAREA  0.928000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -105,15 +96,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.350000 ;
-    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 ;
@@ -128,6 +110,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/a22o/sky130_fd_sc_hdll__a22o_1.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_1.lef
index 961e138..a229d3e 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 ca00a64..e74939f 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
@@ -68,15 +68,6 @@
         RECT 0.085000 1.075000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.435500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -89,15 +80,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.600000 ;
-    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 ;
@@ -109,6 +91,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_2.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_2.lef
index 72052a0..7b486e1 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 350a41d..a12c8ca 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
@@ -68,15 +68,6 @@
         RECT 0.090000 1.075000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.695500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -89,15 +80,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.010000 ;
-    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 ;
@@ -109,6 +91,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_4.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_4.lef
index 167f119..8fb0272 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 67109be..e315289 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
@@ -71,15 +71,6 @@
         RECT 4.200000 1.075000 4.580000 1.445000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.397500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -92,15 +83,6 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.430000 ;
-    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 ;
@@ -116,6 +98,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/a22oi/sky130_fd_sc_hdll__a22oi_1.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.lef
index 812dd9e..c6e79e8 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 cc047d7..50c4777 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
@@ -68,15 +68,6 @@
         RECT 0.125000 0.765000 0.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.429000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -89,15 +80,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
-    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 ;
@@ -114,6 +96,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_2.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.lef
index 7d60eb1..cdeb3e2 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 9c9997c..cf45386 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
@@ -66,12 +66,37 @@
         RECT 0.150000 1.075000 0.830000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.448500 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -93,22 +118,9 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 5.250000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.060000 2.805000 ;
@@ -132,20 +144,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 1568ea6..881ebeb 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 f3dc7aa..f12e9de 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.090000 1.075000 2.095000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.897000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 8.930000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
-    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 ;
@@ -111,6 +93,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/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.lef
index 9c59392..1590e9a 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 b33a3f3..79c6a12 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
@@ -66,12 +66,32 @@
         RECT 2.895000 1.040000 3.155000 1.655000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.774600 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -92,22 +112,9 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.330000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.467400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.140000 2.805000 ;
@@ -129,15 +136,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 ec15c2d..df3a331 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 d10a192..d4243fd 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
@@ -66,12 +66,34 @@
         RECT 3.300000 1.050000 3.760000 1.655000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.900650 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -94,22 +116,9 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.125000 -0.085000 0.295000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.849000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -133,17 +142,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 78a318c..bc32200 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 a772bb5..823855b 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
@@ -72,15 +72,6 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.716000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -93,15 +84,6 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.700000 ;
-    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 ;
@@ -119,6 +101,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/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.lef
index 4fa0074..f08d5e9 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 6a9c948..18fcf1d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
@@ -67,12 +67,35 @@
         RECT 2.445000 0.425000 2.615000 0.995000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.942500 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -92,22 +115,9 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.870000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.680000 2.805000 ;
@@ -128,18 +138,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 47af77c..e7a42a9 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 431a5bc..5ae0a6e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
@@ -68,15 +68,6 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.280500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -89,15 +80,6 @@
         RECT -0.325000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
-    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 ;
@@ -110,6 +92,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_4.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.lef
index fef89ba..cef01b4 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 306b7a2..bb64ac7 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
@@ -69,15 +69,6 @@
         RECT 1.875000 1.075000 3.425000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  2.067000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -90,15 +81,6 @@
         RECT -0.190000 1.305000 10.770000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.740000 ;
-    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 ;
@@ -115,6 +97,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/a31o/sky130_fd_sc_hdll__a31o_1.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_1.lef
index 1f10cdb..086c4e1 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 ce97491..a6ed012 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 2.445000 0.995000 2.745000 1.655000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.490750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.705000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.447250 ;
     DIRECTION OUTPUT ;
@@ -108,6 +90,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_2.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_2.lef
index 33acc0b..d5b5d6e 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 7196fde..96092b1 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
@@ -67,15 +67,6 @@
         RECT 3.195000 0.755000 3.535000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.546000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.910000 ;
-    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 ;
@@ -110,6 +92,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_4.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_4.lef
index 1bfdb84..9445565 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 47fb98c..62a8191 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
@@ -72,15 +72,6 @@
         RECT 4.215000 0.745000 4.455000 1.075000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.404000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -93,15 +84,6 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.760000 ;
-    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 ;
@@ -115,6 +97,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/a31oi/sky130_fd_sc_hdll__a31oi_1.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.lef
index 41076a8..3435a35 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 6996b46..e5e3db2 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 2.325000 0.995000 2.650000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.520000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.595000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.523750 ;
     DIRECTION OUTPUT ;
@@ -108,6 +90,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_2.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.lef
index 35bec7a..84958f1 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 0e1e564..8d13db4 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
@@ -67,15 +67,6 @@
         RECT 4.715000 1.275000 4.940000 1.625000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.468000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 5.250000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.470000 ;
-    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 ;
@@ -112,6 +94,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_4.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.lef
index 4e21eff..b9886da 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 b7bb292..39d42dc 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 6.270000 0.995000 7.605000 1.630000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.832000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 8.930000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.740000 ;
-    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 ;
@@ -109,6 +91,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/a32o/sky130_fd_sc_hdll__a32o_1.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_1.lef
index 54480c6..16959e7 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 1d759db..33f5eb4 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
@@ -77,15 +77,6 @@
         RECT 3.790000 1.325000 4.030000 1.615000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.604500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -98,15 +89,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.975000 ;
-    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 ;
@@ -118,6 +100,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_2.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_2.lef
index 36c5edf..cb3e846 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 10f68bb..779624d 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
@@ -76,15 +76,6 @@
         RECT 1.065000 0.745000 1.630000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.854750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -97,15 +88,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.010000 ;
-    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 ;
@@ -119,6 +101,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_4.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_4.lef
index fe497aa..48826c6 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 d649fff..9292d83 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
@@ -76,15 +76,6 @@
         RECT 7.440000 1.295000 7.635000 1.635000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.962000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -97,15 +88,6 @@
         RECT -0.190000 1.305000 8.470000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.700000 ;
-    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 ;
@@ -121,6 +103,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/a32oi/sky130_fd_sc_hdll__a32oi_1.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.lef
index bb20ebd..d5278ff 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 654c789..cd86564 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
@@ -75,15 +75,6 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.403000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -96,15 +87,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.560000 ;
-    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 ;
@@ -117,6 +99,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_2.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.lef
index b2ccc60..107a487 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 9934dab..8027fea 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
@@ -76,15 +76,6 @@
         RECT 0.145000 1.285000 0.325000 1.625000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.646750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -97,15 +88,6 @@
         RECT -0.195000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.080000 ;
-    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 ;
@@ -119,6 +101,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_4.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.lef
index 352c938..ea8b9ac 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 69ef3da..c160117 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
@@ -77,12 +77,39 @@
         RECT 0.110000 1.305000 0.330000 1.965000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.975000 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.690000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -120,22 +147,9 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 11.690000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  2.195000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 11.500000 2.805000 ;
@@ -176,22 +190,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 65295ab..c45b7b4 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 659d345..8f613d6 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
@@ -49,15 +49,6 @@
         RECT 0.885000 1.075000 1.235000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.240600 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -70,15 +61,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.445650 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.757250 ;
     DIRECTION OUTPUT ;
@@ -90,6 +72,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_2.lef b/cells/and2/sky130_fd_sc_hdll__and2_2.lef
index 75fc78f..f96c742 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 1720d99..8896f5a 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
@@ -49,15 +49,6 @@
         RECT 0.885000 1.075000 1.265000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.465600 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -70,15 +61,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.819100 ;
-    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 ;
@@ -90,6 +72,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_4.lef b/cells/and2/sky130_fd_sc_hdll__and2_4.lef
index 258aefd..c383a43 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 c33ead0..00c4c86 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.605000 0.995000 1.080000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.708500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.245000 ;
-    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 ;
@@ -94,6 +76,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_6.lef b/cells/and2/sky130_fd_sc_hdll__and2_6.lef
index 643526f..7609def 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 1b28be1..6dbd9d9 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
@@ -52,15 +52,6 @@
         RECT 1.705000 1.325000 1.885000 1.465000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.215500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -73,15 +64,6 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.720000 ;
-    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 ;
@@ -99,6 +81,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_8.lef b/cells/and2/sky130_fd_sc_hdll__and2_8.lef
index 6bd9f1b..020be1b 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 d086e55..598987f 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
@@ -52,15 +52,6 @@
         RECT 1.705000 1.325000 1.885000 1.465000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.456000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -73,15 +64,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.010000 ;
-    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 ;
@@ -101,6 +83,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/and2b/sky130_fd_sc_hdll__and2b_1.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_1.lef
index df6e5f6..f3e835e 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 bb135e4..d091cbf 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.630000 1.645000 2.275000 1.955000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.365300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.642200 ;
-    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 ;
@@ -89,6 +71,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_2.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_2.lef
index 38a7ec0..7036172 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 3a95734..765abd0 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.655000 1.645000 2.400000 1.955000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.541950 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.924800 ;
-    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 ;
@@ -89,6 +71,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_4.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_4.lef
index e994118..20c12ed 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 476a2a7..fd11f14 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.605000 0.995000 1.075000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.761000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.275700 ;
-    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 ;
@@ -90,6 +72,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/and3/sky130_fd_sc_hdll__and3_1.lef b/cells/and3/sky130_fd_sc_hdll__and3_1.lef
index c54df55..e369ccd 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 2e8dbbf..febcd13 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.390000 0.305000 1.760000 1.200000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.258000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.454800 ;
-    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 ;
@@ -98,6 +80,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_2.lef b/cells/and3/sky130_fd_sc_hdll__and3_2.lef
index 5a9ba73..fc985c7 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 825c24d..67d5139 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
@@ -58,12 +58,36 @@
         RECT 1.065000 0.750000 1.625000 1.245000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.509300 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -81,22 +105,9 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.832500 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -119,19 +130,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 92bb458..52c0ad9 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 385b9f5..d541251 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.525000 0.995000 2.050000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.708500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.435000 ;
-    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 ;
@@ -104,6 +86,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/and3b/sky130_fd_sc_hdll__and3b_1.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_1.lef
index 0383c46..c40a505 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 a6bbf44..22ffa42 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 2.280000 0.305000 2.645000 1.255000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.470450 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.591300 ;
-    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 ;
@@ -98,6 +80,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_2.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_2.lef
index 4cea065..828e1fe 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 1ddea58..55e7583 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.985000 0.765000 2.620000 1.245000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.693600 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.940900 ;
-    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 ;
@@ -101,6 +83,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_4.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_4.lef
index ce10eef..b80792b 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 682d0a9..d6cba40 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.490000 0.995000 1.865000 1.340000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.728500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 5.250000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.390700 ;
-    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 ;
@@ -100,6 +82,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/and4/sky130_fd_sc_hdll__and4_1.lef b/cells/and4/sky130_fd_sc_hdll__and4_1.lef
index 0d16114..bf1df64 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 45726f4..f5eeb69 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 1.885000 0.715000 2.165000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.275250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.560100 ;
-    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 ;
@@ -107,6 +89,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_2.lef b/cells/and4/sky130_fd_sc_hdll__and4_2.lef
index 8d4f4fe..9a04525 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 41f5ee5..720f0f9 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 1.885000 0.740000 2.155000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.515750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.994300 ;
-    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 ;
@@ -107,6 +89,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_4.lef b/cells/and4/sky130_fd_sc_hdll__and4_4.lef
index 598317d..4ce3666 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 00ee00e..bca4a92 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 1.985000 0.730000 2.275000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.624000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.510000 ;
-    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 ;
@@ -112,6 +94,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/and4b/sky130_fd_sc_hdll__and4b_1.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_1.lef
index 36c33fb..e378aeb 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 4527482..83ce28c 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 2.785000 0.665000 3.075000 1.695000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.342200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.711500 ;
-    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 ;
@@ -107,6 +89,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_2.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_2.lef
index c75c5cb..2e503e1 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 831d6ce..4cf9e39 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 2.785000 0.645000 3.115000 1.615000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.539650 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.856300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.555750 ;
     DIRECTION OUTPUT ;
@@ -109,6 +91,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_4.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_4.lef
index 5dd6cce..193b798 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 8f02245..7ccee8a 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 2.870000 0.995000 3.120000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.720500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 5.250000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.615700 ;
-    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 ;
@@ -109,6 +91,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/and4bb/sky130_fd_sc_hdll__and4bb_1.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.lef
index 0da5288..c7cf793 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 7871b48..41faafa 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 3.345000 0.420000 3.640000 1.635000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.386100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.677900 ;
-    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 ;
@@ -108,6 +90,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_2.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.lef
index dfa1997..0e52b55 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 117aa5c..e4819db 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 3.705000 0.425000 4.005000 1.405000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.612550 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 5.250000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.299000 ;
-    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 ;
@@ -106,6 +88,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_4.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.lef
index 645ef3e..b9a2d1f 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 3a226d6..6cdf76b 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 2.905000 0.995000 3.195000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.855200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.981400 ;
-    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 ;
@@ -109,6 +91,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/buf/sky130_fd_sc_hdll__buf_1.lef b/cells/buf/sky130_fd_sc_hdll__buf_1.lef
index 16be95a..dfa7025 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 09707be..7193264 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
@@ -39,12 +39,34 @@
         RECT 0.105000 0.985000 0.545000 1.355000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.176800 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -58,22 +80,9 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.030000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.244900 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.840000 2.805000 ;
@@ -89,17 +98,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 baa6659..d772b92 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 7b30821..dc43a2c 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
@@ -39,12 +39,46 @@
         RECT 0.135000 1.075000 1.810000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.820000 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.620000 -0.085000 0.790000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -80,22 +114,9 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.620000 -0.085000 0.790000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 8.470000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 8.280000 2.805000 ;
@@ -133,29 +154,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 5754a7c..2716423 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 4165bf0..117ccaf 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 1.075000 2.735000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  2.385500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.500000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 11.690000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.440000 ;
-    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 ;
@@ -101,6 +83,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_2.lef b/cells/buf/sky130_fd_sc_hdll__buf_2.lef
index f5fe361..4ca4548 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 54dffee..cfb91a4 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
@@ -39,12 +39,32 @@
         RECT 0.085000 0.985000 0.440000 1.355000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.444250 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -60,22 +80,9 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 2.490000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.709400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.300000 2.805000 ;
@@ -93,15 +100,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 d73ef6b..f3d7085 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 68c5a7b..dd18b39 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
@@ -39,12 +39,38 @@
         RECT 0.090000 1.075000 0.470000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.585000 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -63,22 +89,9 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 3.410000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 3.220000 2.805000 ;
@@ -99,21 +112,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 f3bef78..20dbfd8 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 d12b2aa..5c3c44e 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
@@ -39,12 +39,40 @@
         RECT 0.280000 1.075000 1.265000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.962000 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -68,22 +96,9 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 4.790000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 4.600000 2.805000 ;
@@ -109,23 +124,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 b181312..c7be03a 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 d28b2df..8830465 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
@@ -39,12 +39,42 @@
         RECT 0.140000 1.075000 1.340000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.176500 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
+  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 ;
@@ -72,22 +102,9 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.150000 -0.085000 0.320000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 6.170000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -117,25 +134,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 1668f25..3906e38 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 fcd77a7..c04b624 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  2.801500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 13.340000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 13.530000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  4.020000 ;
-    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 ;
@@ -99,6 +81,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_8.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.lef
index 01e46ac..581f96b 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 f8a298d..d4b162b 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.110000 1.075000 0.440000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.409500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 7.550000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.044400 ;
-    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 ;
@@ -88,6 +70,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/bufinv/sky130_fd_sc_hdll__bufinv_16.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.lef
index c01f3cd..28fe66b 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 3de14d1..0adb13b 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.090000 1.075000 1.365000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  2.600000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.420000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 12.610000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.750000 ;
-    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 ;
@@ -99,6 +81,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_8.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.lef
index f2f0c47..0cb7b3e 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 47c654e..7a09720 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 1.075000 0.505000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.378000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.990000 ;
-    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 ;
@@ -88,6 +70,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/clkbuf/sky130_fd_sc_hdll__clkbuf_1.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.lef
index 3d2948b..17178ef 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 fa3e892..51d454f 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
@@ -39,30 +39,12 @@
         RECT 1.365000 0.985000 1.745000 1.355000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.338000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VPB
     PORT
       LAYER nwell ;
         RECT -0.190000 1.305000 2.030000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.529300 ;
-    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 ;
@@ -74,6 +56,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_12.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.lef
index 558db1a..688402f 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 5ac5bbd..f3e0fea 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.525000 1.075000 1.320000 1.305000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.348200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 8.470000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.570000 ;
-    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 ;
@@ -92,6 +74,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_16.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.lef
index c9a515f..802a3cc 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 3b13052..c64703b 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 0.765000 0.400000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.467900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.120000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 10.310000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.245000 ;
-    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 ;
@@ -97,6 +79,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_2.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.lef
index d248717..9f17424 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 e962f0d..ad378f1 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.425000 0.745000 0.835000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.245700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.615000 ;
-    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 ;
@@ -82,6 +64,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_4.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.lef
index e31ad99..aa82e7b 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 8e0bb1b..4d670ba 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.425000 0.755000 0.825000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.401100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.960000 ;
-    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 ;
@@ -86,6 +68,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_6.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.lef
index a278bd8..bad0139 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 f98968c..cef78c5 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 0.715000 0.395000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.724500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
-    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 ;
@@ -86,6 +68,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_8.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.lef
index aff4893..2b3d570 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 ec164e6..1ce17c9 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 0.715000 0.400000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.779100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.750000 ;
-    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 ;
@@ -88,6 +70,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/clkinv/sky130_fd_sc_hdll__clkinv_1.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.lef
index b3c2455..63ef4d7 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 877418c..f2a4464 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 0.375000 0.325000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.119700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 2.030000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.470400 ;
-    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 ;
@@ -80,6 +62,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_12.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.lef
index a16292f..6484dbf 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 e4f458a..d85d3ce 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.455000 1.035000 7.925000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.323000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 9.390000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.860000 ;
-    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 ;
@@ -96,6 +78,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_16.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.lef
index 879578e..f4d82b5 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 c99440e..cb88931 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
@@ -43,15 +43,6 @@
         RECT 10.285000 1.260000 11.135000 1.305000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.228500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.420000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -64,15 +55,6 @@
         RECT -0.190000 1.305000 12.610000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.895000 ;
-    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 ;
@@ -103,6 +85,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_2.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.lef
index 0e8d055..6d0c988 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 e93643a..829f7a6 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 1.065000 1.335000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.241500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.575000 ;
-    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 ;
@@ -83,6 +65,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_4.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.lef
index ba18fcb..493528b 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 e758998..1185c26 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.445000 1.065000 2.910000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.485100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.270000 ;
-    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 ;
@@ -86,6 +68,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_8.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.lef
index c08da23..557ae89 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 a9ca538..0d1948e 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.455000 1.035000 5.565000 1.290000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.701400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.095000 ;
-    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 ;
@@ -91,6 +73,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/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.lef
index e8d05c1..ea86444 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 5c13234..d8b04fc 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.145000 0.995000 0.600000 1.665000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.156750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 2.030000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.650000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.436750 ;
     DIRECTION OUTPUT ;
@@ -79,6 +61,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_4.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.lef
index 62b9bde..3e6e51e 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 b7b8b3a..abd4e69 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 0.745000 0.425000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.288750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.790000 ;
-    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 ;
@@ -82,6 +64,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/clkmux2/sky130_fd_sc_hdll__clkmux2_1.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.lef
index f6e7ca8..1334f1a 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 6c1589b..6be7343 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
@@ -64,15 +64,6 @@
         RECT 3.805000 1.055000 3.995000 1.440000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.476000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -85,15 +76,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.805800 ;
-    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 ;
@@ -104,6 +86,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_2.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.lef
index 5d72721..c6cfe36 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 1fdda11..e6198f3 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
@@ -64,15 +64,6 @@
         RECT 4.265000 1.055000 4.455000 1.440000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.632000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -85,15 +76,6 @@
         RECT -0.190000 1.305000 5.250000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.066400 ;
-    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 ;
@@ -104,6 +86,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_4.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.lef
index 2be8ccf..5cb5e26 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 5998e4d..b2de467 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
@@ -64,15 +64,6 @@
         RECT 5.185000 1.055000 5.375000 1.440000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.801600 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -85,15 +76,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.358800 ;
-    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 ;
@@ -109,6 +91,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/conb/sky130_fd_sc_hdll__conb_1.lef b/cells/conb/sky130_fd_sc_hdll__conb_1.lef
index bbf3832..80ab158 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 8286dca..a661b37 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
@@ -46,14 +46,6 @@
         RECT 0.775000 0.915000 1.295000 2.465000 ;
     END
   END LO
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.380000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -66,9 +58,17 @@
         RECT -0.190000 1.305000 1.570000 2.910000 ;
     END
   END VPB
+  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 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_12.lef b/cells/decap/sky130_fd_sc_hdll__decap_12.lef
index 4bd5723..07d855f 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 d27a9d7..a08a0ac 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
@@ -30,16 +30,6 @@
   SIZE  5.520000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  4.115100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -52,11 +42,17 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  2.601500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.lef b/cells/decap/sky130_fd_sc_hdll__decap_3.lef
index cae860b..94f5018 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 b902698..3f93d36 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
@@ -30,16 +30,6 @@
   SIZE  1.380000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  0.513300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.380000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -52,11 +42,17 @@
         RECT -0.190000 1.305000 1.570000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  0.324500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.lef b/cells/decap/sky130_fd_sc_hdll__decap_4.lef
index e06b43b..ed5b57d 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 40ed3ef..3973802 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
@@ -30,16 +30,6 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  0.913500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -52,11 +42,17 @@
         RECT -0.190000 1.305000 2.030000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  0.577500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.lef b/cells/decap/sky130_fd_sc_hdll__decap_6.lef
index baa86f6..43d4f29 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 e82dafa..dc9ea64 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
@@ -30,16 +30,6 @@
   SIZE  2.760000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  1.713900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -52,11 +42,17 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  1.083500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.lef b/cells/decap/sky130_fd_sc_hdll__decap_8.lef
index 1d4a0be..e1779b1 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 4a40cdd..dac6c91 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
@@ -30,16 +30,6 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    ANTENNADIFFAREA  0.286000 ;
-    ANTENNAGATEAREA  2.514300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -52,11 +42,17 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.452400 ;
-    ANTENNAGATEAREA  1.589500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.lef
index 0f4f8f9..8f2d7e5 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 5767883..00c43d2 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
@@ -71,15 +71,6 @@
         RECT 7.575000 0.920000 7.865000 0.965000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.178900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -92,10 +83,17 @@
         RECT -0.190000 1.305000 9.850000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.314500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.lef
index d06b85e..0bc98f6 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 f6dad56..e3e11e4 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
@@ -75,15 +75,6 @@
         RECT 7.575000 0.920000 7.865000 0.965000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.315400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.120000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -96,10 +87,17 @@
         RECT -0.190000 1.305000 10.310000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.584500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.lef
index 01fd26b..3decd89 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 d004118..0aa59f4 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
@@ -77,15 +77,6 @@
         RECT 8.105000 0.735000 8.395000 0.780000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.581500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.500000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -98,10 +89,17 @@
         RECT -0.190000 1.305000 11.690000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.881700 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.lef
index 3e935bb..093b005 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 fb5a2fc..7357395 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
@@ -72,10 +72,21 @@
         RECT 7.445000 0.920000 7.735000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VGND
-    ANTENNADIFFAREA  1.186550 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 10.120000 0.085000 ;
@@ -114,22 +125,9 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.310000 2.910000 ;
-    END
-  END VPB
   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 47ae8f9..09aa3d8 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 edd260a..fbe9bdd 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
@@ -74,10 +74,21 @@
         RECT 7.445000 0.920000 7.735000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VGND
-    ANTENNADIFFAREA  1.330550 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 10.580000 0.085000 ;
@@ -118,22 +129,9 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 10.770000 2.910000 ;
-    END
-  END VPB
   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 2754219..5c8b67b 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 f2738d7..e0115c9 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
@@ -78,10 +78,21 @@
         RECT 7.445000 0.920000 7.735000 0.965000 ;
     END
   END SET_B
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VGND
-    ANTENNADIFFAREA  1.599300 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 11.960000 0.085000 ;
@@ -126,22 +137,9 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 12.150000 2.910000 ;
-    END
-  END VPB
   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 a10345f..52a95e2 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 e3f0f20..5008886 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 b664b7a..2280a1e 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 4ac7386..7a02cd6 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 1bf762d..fb7e72c 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 9b5afcc..7abc35a 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
@@ -70,15 +70,6 @@
         RECT 4.890000 0.995000 5.385000 1.325000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  0.564250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,10 +82,17 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.131000 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.lef
index 4751f3d..c130f91 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 5948846..a7a9865 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
@@ -71,15 +71,6 @@
         RECT 4.890000 0.995000 5.385000 1.325000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  0.804750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -92,10 +83,17 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.411000 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.lef
index 33c6c97..acfa5a8 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 0bdbfed..144beaa 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
@@ -76,15 +76,6 @@
         RECT 4.890000 0.995000 5.385000 1.325000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.006250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -97,10 +88,17 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.691000 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.lef
index 5006733..a35fecb 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 ec0a532..9f4dd1f 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
@@ -70,15 +70,6 @@
         RECT 4.890000 0.995000 5.385000 1.325000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  0.564250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,10 +82,17 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.131000 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.lef
index eaf1bdf..20788ec 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 5a34032..0e60a14 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
@@ -71,15 +71,6 @@
         RECT 4.890000 0.995000 5.385000 1.325000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  0.804750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -92,10 +83,17 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.411000 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.lef
index beeb531..889d372 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 d710b8f..d6feb64 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
@@ -76,15 +76,6 @@
         RECT 4.890000 0.995000 5.385000 1.325000 ;
     END
   END RESET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.006250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -97,10 +88,17 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.691000 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.lef
index 9f1c48e..a91f6e1 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 04a7dc4..8d83249 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 5.590000 0.415000 5.875000 2.455000 ;
     END
   END Q
-  PIN VGND
-    ANTENNADIFFAREA  0.600900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,10 +69,17 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.784600 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.lef
index 2110c98..4241b0d 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 6a8d75c..35c3a23 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
@@ -61,15 +61,6 @@
         RECT 5.740000 1.325000 5.910000 1.495000 ;
     END
   END Q
-  PIN VGND
-    ANTENNADIFFAREA  0.776000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -82,10 +73,17 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.044600 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.lef
index cd47b34..14530ce 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 44dc6a2..6c73b63 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
@@ -63,15 +63,6 @@
         RECT 6.535000 1.325000 6.805000 2.455000 ;
     END
   END Q
-  PIN VGND
-    ANTENNADIFFAREA  0.993750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -84,10 +75,17 @@
         RECT -0.190000 1.305000 7.550000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.349600 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.lef b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.lef
index 08d4793..651fc8c 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 9d1b935..4acf5af 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.503900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.623300 ;
-    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 ;
@@ -80,6 +62,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/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.lef b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.lef
index 82e1236..50bd3c6 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 7cad248..25de2be 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.491300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.623300 ;
-    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 ;
@@ -80,6 +62,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/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.lef b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.lef
index bb55cf2..06e5b83 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 2ede95d..d039a13 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 1.055000 0.605000 1.615000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.363600 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.449100 ;
-    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 ;
@@ -80,6 +62,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/ebufn/sky130_fd_sc_hdll__ebufn_1.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.lef
index e3750be..d8c1b0f 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 e19b63e..d2d6130 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.960000 1.075000 1.290000 1.630000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.365250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.465600 ;
-    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 ;
@@ -89,6 +71,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_2.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.lef
index eba1481..77217e9 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 01c58e2..b5c73ca 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.945000 0.765000 1.300000 1.275000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.354000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.525400 ;
-    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 ;
@@ -91,6 +73,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_4.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.lef
index bfd6ac1..5ab3de6 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 5b4ee2a..29d7e8a 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.000000 0.765000 1.380000 1.425000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.724750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.940200 ;
-    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 ;
@@ -89,6 +71,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_8.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.lef
index e7f2e3e..2624df1 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 f9ab309..b9d3435 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
@@ -50,15 +50,6 @@
         RECT 1.020000 1.325000 1.405000 1.695000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  1.417000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -71,15 +62,6 @@
         RECT -0.190000 1.305000 11.230000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.958400 ;
-    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 ;
@@ -91,6 +73,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/einvn/sky130_fd_sc_hdll__einvn_1.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_1.lef
index 9edb19f..6e21c28 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 263427f..366a5a1 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.955000 0.510000 1.725000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.525500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.314400 ;
-    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 ;
@@ -89,6 +71,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_2.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_2.lef
index 810d9d6..a94fde2 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 bea1a18..340d159 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.995000 0.325000 1.385000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.284700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.552600 ;
-    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 ;
@@ -89,6 +71,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_4.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_4.lef
index f8e1547..a91bbf7 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 d6c1a9c..063d124 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  0.617500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.866300 ;
-    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 ;
@@ -89,6 +71,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_8.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_8.lef
index 80457d2..7cfacd7 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 23610f3..4999022 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.090000 0.995000 0.345000 1.325000 ;
     END
   END TE_B
-  PIN VGND
-    ANTENNADIFFAREA  1.043250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 9.390000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.411500 ;
-    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 ;
@@ -93,6 +75,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/einvp/sky130_fd_sc_hdll__einvp_1.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_1.lef
index ccc6032..a0feac1 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 39fe8f5..22f0c5b 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.995000 0.595000 1.725000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  0.194000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.845700 ;
-    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 ;
@@ -89,6 +71,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_2.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_2.lef
index f3c8b04..b22f5c7 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 f7d7ee4..69c26d1 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  0.410000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.445400 ;
-    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 ;
@@ -87,6 +69,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_4.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_4.lef
index 582239b..32a999b 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 dae946e..2ee6b0d 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  0.598000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.815200 ;
-    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 ;
@@ -91,6 +73,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_8.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_8.lef
index 821812e..6d0daa0 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 d96c80d..df8a391 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.995000 0.330000 1.615000 ;
     END
   END TE
-  PIN VGND
-    ANTENNADIFFAREA  1.014000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 9.390000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.360400 ;
-    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 ;
@@ -93,6 +75,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/fill/sky130_fd_sc_hdll__fill_1.lef b/cells/fill/sky130_fd_sc_hdll__fill_1.lef
index 0911ac2..f933c5d 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 c84257b..445db14 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
@@ -30,14 +30,6 @@
   SIZE  0.460000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 0.460000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -50,9 +42,17 @@
         RECT -0.190000 1.305000 0.650000 2.910000 ;
     END
   END VPB
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 0.460000 0.240000 ;
+    END
+  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_2.lef b/cells/fill/sky130_fd_sc_hdll__fill_2.lef
index c92b70c..b54512d 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 3c09c4a..bafd4d4 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
@@ -30,14 +30,6 @@
   SIZE  0.920000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 0.920000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -50,9 +42,17 @@
         RECT -0.190000 1.305000 1.110000 2.910000 ;
     END
   END VPB
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 0.920000 0.240000 ;
+    END
+  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_4.lef b/cells/fill/sky130_fd_sc_hdll__fill_4.lef
index 5af74f7..2fc40b8 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 3f77c1b..9e5d407 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
@@ -30,14 +30,6 @@
   SIZE  1.840000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -50,9 +42,17 @@
         RECT -0.190000 1.305000 2.030000 2.910000 ;
     END
   END VPB
+  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 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_8.lef b/cells/fill/sky130_fd_sc_hdll__fill_8.lef
index a02ef06..badc53e 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 1d8bd82..d2d87d0 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
@@ -30,14 +30,6 @@
   SIZE  3.680000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
   SITE unithd ;
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -50,9 +42,17 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
+  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 SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.lef b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.lef
index 907e0a4..b9c3b28 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 64d33a1..e98faea 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
@@ -49,15 +49,6 @@
         RECT 0.855000 1.075000 1.275000 1.325000 ;
     END
   END SLEEP_B
-  PIN VGND
-    ANTENNADIFFAREA  0.244600 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -70,15 +61,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.469100 ;
-    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 ;
@@ -90,6 +72,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/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.lef b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.lef
index 546e417..2fe9817 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 6ed5e26..26f8e50 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.145000 0.765000 0.445000 1.615000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.419700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.623300 ;
-    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 ;
@@ -89,6 +71,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/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.lef b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.lef
index 7540ac5..a5c5929 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 58a46f0..cfcbc21 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END SLEEP_B
-  PIN VGND
-    ANTENNADIFFAREA  0.597450 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.424100 ;
-    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 ;
@@ -89,6 +71,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/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.lef b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.lef
index 7ad65ec..b769dbb 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 94b26fc..084ce86 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.000000 0.765000 1.315000 1.325000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.351700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.305700 ;
-    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 ;
@@ -89,6 +71,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/inv/sky130_fd_sc_hdll__inv_1.lef b/cells/inv/sky130_fd_sc_hdll__inv_1.lef
index 3f6b689..c3ece19 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 3294568..9831a33 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.095000 1.075000 0.650000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.380000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 1.570000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.270000 ;
-    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 ;
@@ -80,6 +62,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_12.lef b/cells/inv/sky130_fd_sc_hdll__inv_12.lef
index c5bbf70..0df84ac 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 f3fc1e6..557ab43 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.680000 1.075000 5.800000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.384500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.000000 ;
-    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 ;
@@ -93,6 +75,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_16.lef b/cells/inv/sky130_fd_sc_hdll__inv_16.lef
index 5230c6e..f6e5985 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 6547350..afe1a22 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.085000 1.075000 6.125000 1.315000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.826500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 8.470000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.570000 ;
-    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 ;
@@ -96,6 +78,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_2.lef b/cells/inv/sky130_fd_sc_hdll__inv_2.lef
index f9df3d9..0cc42a6 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 fd4635e..25c29d7 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.105000 1.075000 0.435000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.370500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 2.030000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.540000 ;
-    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 ;
@@ -80,6 +62,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_4.lef b/cells/inv/sky130_fd_sc_hdll__inv_4.lef
index 7bc369f..01501d2 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 0a93286..7e4ee70 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.105000 1.075000 1.885000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.737750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.075000 ;
-    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 ;
@@ -85,6 +67,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_6.lef b/cells/inv/sky130_fd_sc_hdll__inv_6.lef
index 778d1f7..5dfd60f 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 00d38fc..8c35537 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.285000 1.075000 2.695000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.760500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.130000 ;
-    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 ;
@@ -87,6 +69,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_8.lef b/cells/inv/sky130_fd_sc_hdll__inv_8.lef
index edb146f..e5ced34 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 c3aa002..db8bff0 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
@@ -39,15 +39,6 @@
         RECT 0.680000 1.075000 3.885000 1.325000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  0.962000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -60,15 +51,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
-    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 ;
@@ -89,6 +71,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/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.lef
index b557df2..eefb5f3 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 3de3e96..edc0383 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.010000 1.065000 1.425000 1.325000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.423000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.328800 ;
-    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 ;
@@ -90,6 +72,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_16.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.lef
index aad4162..cc9631a 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 d69ae46..4234efa 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
@@ -49,15 +49,6 @@
         RECT 10.650000 1.075000 17.600000 1.285000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  4.095000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 18.400000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -70,15 +61,6 @@
         RECT -0.190000 1.305000 18.590000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.270000 ;
-    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 ;
@@ -114,6 +96,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_2.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.lef
index 4b7f137..3ebf402 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 3e75921..2e03592 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
@@ -49,15 +49,6 @@
         RECT 0.480000 1.065000 0.970000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  0.653450 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -70,15 +61,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.403400 ;
-    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 ;
@@ -91,6 +73,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_4.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.lef
index 7242b39..22196da 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 e079d84..3cf5edb 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.360000 1.075000 1.950000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  1.150500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
-    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 ;
@@ -95,6 +77,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_8.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.lef
index e8c2a09..987cddc 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 ae94da4..6bbce67 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
@@ -49,15 +49,6 @@
         RECT 5.790000 1.075000 8.880000 1.275000 ;
     END
   END SLEEP
-  PIN VGND
-    ANTENNADIFFAREA  2.249000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -70,15 +61,6 @@
         RECT -0.190000 1.305000 9.850000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.760000 ;
-    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 ;
@@ -102,6 +84,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/mux2/sky130_fd_sc_hdll__mux2_1.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_1.lef
index 26e4c60..7e1b883 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 f9dfeda..f3cb704 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
@@ -63,15 +63,6 @@
         RECT 3.245000 1.630000 3.415000 2.295000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.474500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -84,15 +75,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.492600 ;
-    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 ;
@@ -103,6 +85,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_12.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.lef
index 2d87f7c..267808b 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
     ANTE