verilog: Fixing usage of cell reserved word.

`cell` is a Verilog reserved word.

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
     ANTENNADIFFAREA  2.793000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 15.285000 1.665000 15.615000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 16.560000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 16.560000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.560000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
index 50989ce..9d500fc 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
@@ -57,15 +57,6 @@
         RECT 2.925000 1.075000 4.275000 1.325000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  2.970500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 16.560000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 16.750000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.690000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 16.560000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.793000 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 15.285000 1.665000 15.615000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 16.560000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 16.560000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.560000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef
index 227023d..b09bfe4 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.lef
@@ -55,22 +55,6 @@
         RECT 2.925000 1.075000 4.275000 1.325000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 18.400000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 18.400000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  3.724000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +82,22 @@
         RECT 17.165000 1.665000 17.495000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 18.400000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 18.400000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
index 2b1a7ff..086ba7a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
@@ -57,15 +57,6 @@
         RECT 2.925000 1.075000 4.275000 1.325000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  3.451500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 18.400000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 18.590000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  4.270000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 18.400000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  3.724000 ;
     DIRECTION OUTPUT ;
@@ -114,6 +96,22 @@
         RECT 17.165000 1.665000 17.495000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 18.400000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 18.400000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 18.400000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef
index a1467f1..2b0da85 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.lef
@@ -59,22 +59,6 @@
         RECT 3.355000 0.755000 3.545000 1.625000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 0.515000 1.595000 0.875000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
index 3ad64a8..2fdbd7e 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
@@ -61,15 +61,6 @@
         RECT 3.355000 0.755000 3.545000 1.625000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.555100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -82,15 +73,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.776400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +83,22 @@
         RECT 0.515000 1.595000 0.875000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef
index e5d60f7..0c6778a 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.lef
@@ -59,22 +59,6 @@
         RECT 2.880000 0.995000 3.595000 1.325000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 5.650000 0.805000 5.880000 1.575000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
index d75938d..9118212 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
@@ -61,15 +61,6 @@
         RECT 2.880000 0.995000 3.595000 1.325000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.835250 ;
-    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.195000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +88,22 @@
         RECT 5.650000 0.805000 5.880000 1.575000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef
index b263260..0316a5c 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.lef
@@ -68,22 +68,6 @@
         RECT 9.745000 1.600000 10.035000 1.645000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -103,6 +87,22 @@
         RECT 3.465000 1.745000 3.635000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
index b51f2c2..19d888e 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
@@ -70,15 +70,6 @@
         RECT 9.745000 1.600000 10.035000 1.645000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  1.508400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,15 +82,6 @@
         RECT -0.190000 1.305000 10.770000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.160000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -119,6 +101,22 @@
         RECT 3.465000 1.745000 3.635000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef
index d96e932..123754f 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.lef
@@ -56,22 +56,6 @@
         RECT 3.365000 0.760000 3.750000 1.620000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.465500 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.605000 1.455000 0.890000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
index 2360c53..09a49b4 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 3.365000 0.760000 3.750000 1.620000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.344500 ;
-    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.820000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.465500 ;
     DIRECTION OUTPUT ;
@@ -98,6 +80,22 @@
         RECT 0.605000 1.455000 0.890000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef
index 47c1966..2d98796 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.lef
@@ -56,22 +56,6 @@
         RECT 0.630000 0.725000 0.830000 0.995000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.796300 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 5.255000 0.465000 5.425000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
index 90bc3e2..ce46d9e 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.630000 0.725000 0.830000 0.995000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  0.585000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.796250 ;
     DIRECTION OUTPUT ;
@@ -100,6 +82,22 @@
         RECT 5.255000 0.465000 5.425000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef
index 3fc6b30..8f09d90 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.lef
@@ -58,22 +58,6 @@
         RECT 8.480000 0.995000 8.650000 1.425000 ;
     END
   END S
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.339500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 0.095000 2.255000 4.185000 2.425000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
index bae74a2..9454cd5 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
@@ -60,15 +60,6 @@
         RECT 8.480000 0.995000 8.650000 1.425000 ;
     END
   END S
-  PIN VGND
-    ANTENNADIFFAREA  1.030250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -81,15 +72,6 @@
         RECT -0.190000 1.305000 9.390000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.475000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.339500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +83,22 @@
         RECT 0.095000 2.255000 4.185000 2.425000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef
index 08e1116..a42e2da 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.lef
@@ -316,23 +316,6 @@
         RECT 14.815000 4.145000 15.215000 4.495000 ;
     END
   END S[15]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-        RECT 0.000000  5.200000 17.020000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -375,6 +358,23 @@
         RECT 15.725000 3.640000 16.015000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+        RECT 0.000000  5.200000 17.020000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 17.020000 0.085000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
index 1bd5143..18ee42d 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
@@ -350,121 +350,6 @@
         RECT 14.815000 4.145000 15.215000 4.495000 ;
     END
   END S[15]
-  PIN VGND
-    ANTENNADIFFAREA  1.875900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.020000 0.085000 ;
-        RECT  0.130000  0.085000  0.390000 0.885000 ;
-        RECT  2.135000  0.085000  2.465000 0.660000 ;
-        RECT  4.210000  0.085000  4.530000 0.885000 ;
-        RECT  6.275000  0.085000  6.605000 0.660000 ;
-        RECT  8.350000  0.085000  8.670000 0.885000 ;
-        RECT 10.415000  0.085000 10.745000 0.660000 ;
-        RECT 12.490000  0.085000 12.810000 0.885000 ;
-        RECT 14.555000  0.085000 14.885000 0.660000 ;
-        RECT 16.630000  0.085000 16.890000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 5.355000 17.020000 5.525000 ;
-        RECT  0.130000 4.555000  0.390000 5.355000 ;
-        RECT  2.135000 4.780000  2.465000 5.355000 ;
-        RECT  4.210000 4.555000  4.530000 5.355000 ;
-        RECT  6.275000 4.780000  6.605000 5.355000 ;
-        RECT  8.350000 4.555000  8.670000 5.355000 ;
-        RECT 10.415000 4.780000 10.745000 5.355000 ;
-        RECT 12.490000 4.555000 12.810000 5.355000 ;
-        RECT 14.555000 4.780000 14.885000 5.355000 ;
-        RECT 16.630000 4.555000 16.890000 5.355000 ;
-      LAYER mcon ;
-        RECT  0.145000 5.355000  0.315000 5.525000 ;
-        RECT  0.605000 5.355000  0.775000 5.525000 ;
-        RECT  1.065000 5.355000  1.235000 5.525000 ;
-        RECT  1.525000 5.355000  1.695000 5.525000 ;
-        RECT  1.985000 5.355000  2.155000 5.525000 ;
-        RECT  2.445000 5.355000  2.615000 5.525000 ;
-        RECT  2.905000 5.355000  3.075000 5.525000 ;
-        RECT  3.365000 5.355000  3.535000 5.525000 ;
-        RECT  3.825000 5.355000  3.995000 5.525000 ;
-        RECT  4.285000 5.355000  4.455000 5.525000 ;
-        RECT  4.745000 5.355000  4.915000 5.525000 ;
-        RECT  5.205000 5.355000  5.375000 5.525000 ;
-        RECT  5.665000 5.355000  5.835000 5.525000 ;
-        RECT  6.125000 5.355000  6.295000 5.525000 ;
-        RECT  6.585000 5.355000  6.755000 5.525000 ;
-        RECT  7.045000 5.355000  7.215000 5.525000 ;
-        RECT  7.505000 5.355000  7.675000 5.525000 ;
-        RECT  7.965000 5.355000  8.135000 5.525000 ;
-        RECT  8.425000 5.355000  8.595000 5.525000 ;
-        RECT  8.885000 5.355000  9.055000 5.525000 ;
-        RECT  9.345000 5.355000  9.515000 5.525000 ;
-        RECT  9.805000 5.355000  9.975000 5.525000 ;
-        RECT 10.265000 5.355000 10.435000 5.525000 ;
-        RECT 10.725000 5.355000 10.895000 5.525000 ;
-        RECT 11.185000 5.355000 11.355000 5.525000 ;
-        RECT 11.645000 5.355000 11.815000 5.525000 ;
-        RECT 12.105000 5.355000 12.275000 5.525000 ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-        RECT 13.485000 5.355000 13.655000 5.525000 ;
-        RECT 13.945000 5.355000 14.115000 5.525000 ;
-        RECT 14.405000 5.355000 14.575000 5.525000 ;
-        RECT 14.865000 5.355000 15.035000 5.525000 ;
-        RECT 15.325000 5.355000 15.495000 5.525000 ;
-        RECT 15.785000 5.355000 15.955000 5.525000 ;
-        RECT 16.245000 5.355000 16.415000 5.525000 ;
-        RECT 16.705000 5.355000 16.875000 5.525000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 5.200000 17.020000 5.680000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -513,63 +398,6 @@
         RECT -0.190000 1.305000 17.210000 4.135000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  6.380000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.920000 2.805000 ;
-        RECT 0.095000 1.495000 0.425000 2.635000 ;
-        RECT 0.095000 2.805000 0.425000 3.945000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 11.960000 2.635000 13.340000 2.805000 ;
-        RECT 12.455000 1.495000 12.845000 2.635000 ;
-        RECT 12.455000 2.805000 12.845000 3.945000 ;
-      LAYER mcon ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 16.100000 2.635000 17.020000 2.805000 ;
-        RECT 16.595000 1.495000 16.925000 2.635000 ;
-        RECT 16.595000 2.805000 16.925000 3.945000 ;
-      LAYER mcon ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
-        RECT 16.705000 2.635000 16.875000 2.805000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 3.680000 2.635000 5.060000 2.805000 ;
-        RECT 4.175000 1.495000 4.565000 2.635000 ;
-        RECT 4.175000 2.805000 4.565000 3.945000 ;
-      LAYER mcon ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 7.820000 2.635000 9.200000 2.805000 ;
-        RECT 8.315000 1.495000 8.705000 2.635000 ;
-        RECT 8.315000 2.805000 8.705000 3.945000 ;
-      LAYER mcon ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  5.705600 ;
     DIRECTION OUTPUT ;
@@ -764,6 +592,176 @@
         RECT 15.725000 3.640000 16.015000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 -0.085000 17.020000 0.085000 ;
+        RECT  0.130000  0.085000  0.390000 0.885000 ;
+        RECT  2.135000  0.085000  2.465000 0.660000 ;
+        RECT  4.210000  0.085000  4.530000 0.885000 ;
+        RECT  6.275000  0.085000  6.605000 0.660000 ;
+        RECT  8.350000  0.085000  8.670000 0.885000 ;
+        RECT 10.415000  0.085000 10.745000 0.660000 ;
+        RECT 12.490000  0.085000 12.810000 0.885000 ;
+        RECT 14.555000  0.085000 14.885000 0.660000 ;
+        RECT 16.630000  0.085000 16.890000 0.885000 ;
+      LAYER mcon ;
+        RECT  0.145000 -0.085000  0.315000 0.085000 ;
+        RECT  0.605000 -0.085000  0.775000 0.085000 ;
+        RECT  1.065000 -0.085000  1.235000 0.085000 ;
+        RECT  1.525000 -0.085000  1.695000 0.085000 ;
+        RECT  1.985000 -0.085000  2.155000 0.085000 ;
+        RECT  2.445000 -0.085000  2.615000 0.085000 ;
+        RECT  2.905000 -0.085000  3.075000 0.085000 ;
+        RECT  3.365000 -0.085000  3.535000 0.085000 ;
+        RECT  3.825000 -0.085000  3.995000 0.085000 ;
+        RECT  4.285000 -0.085000  4.455000 0.085000 ;
+        RECT  4.745000 -0.085000  4.915000 0.085000 ;
+        RECT  5.205000 -0.085000  5.375000 0.085000 ;
+        RECT  5.665000 -0.085000  5.835000 0.085000 ;
+        RECT  6.125000 -0.085000  6.295000 0.085000 ;
+        RECT  6.585000 -0.085000  6.755000 0.085000 ;
+        RECT  7.045000 -0.085000  7.215000 0.085000 ;
+        RECT  7.505000 -0.085000  7.675000 0.085000 ;
+        RECT  7.965000 -0.085000  8.135000 0.085000 ;
+        RECT  8.425000 -0.085000  8.595000 0.085000 ;
+        RECT  8.885000 -0.085000  9.055000 0.085000 ;
+        RECT  9.345000 -0.085000  9.515000 0.085000 ;
+        RECT  9.805000 -0.085000  9.975000 0.085000 ;
+        RECT 10.265000 -0.085000 10.435000 0.085000 ;
+        RECT 10.725000 -0.085000 10.895000 0.085000 ;
+        RECT 11.185000 -0.085000 11.355000 0.085000 ;
+        RECT 11.645000 -0.085000 11.815000 0.085000 ;
+        RECT 12.105000 -0.085000 12.275000 0.085000 ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+        RECT 13.485000 -0.085000 13.655000 0.085000 ;
+        RECT 13.945000 -0.085000 14.115000 0.085000 ;
+        RECT 14.405000 -0.085000 14.575000 0.085000 ;
+        RECT 14.865000 -0.085000 15.035000 0.085000 ;
+        RECT 15.325000 -0.085000 15.495000 0.085000 ;
+        RECT 15.785000 -0.085000 15.955000 0.085000 ;
+        RECT 16.245000 -0.085000 16.415000 0.085000 ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 5.355000 17.020000 5.525000 ;
+        RECT  0.130000 4.555000  0.390000 5.355000 ;
+        RECT  2.135000 4.780000  2.465000 5.355000 ;
+        RECT  4.210000 4.555000  4.530000 5.355000 ;
+        RECT  6.275000 4.780000  6.605000 5.355000 ;
+        RECT  8.350000 4.555000  8.670000 5.355000 ;
+        RECT 10.415000 4.780000 10.745000 5.355000 ;
+        RECT 12.490000 4.555000 12.810000 5.355000 ;
+        RECT 14.555000 4.780000 14.885000 5.355000 ;
+        RECT 16.630000 4.555000 16.890000 5.355000 ;
+      LAYER mcon ;
+        RECT  0.145000 5.355000  0.315000 5.525000 ;
+        RECT  0.605000 5.355000  0.775000 5.525000 ;
+        RECT  1.065000 5.355000  1.235000 5.525000 ;
+        RECT  1.525000 5.355000  1.695000 5.525000 ;
+        RECT  1.985000 5.355000  2.155000 5.525000 ;
+        RECT  2.445000 5.355000  2.615000 5.525000 ;
+        RECT  2.905000 5.355000  3.075000 5.525000 ;
+        RECT  3.365000 5.355000  3.535000 5.525000 ;
+        RECT  3.825000 5.355000  3.995000 5.525000 ;
+        RECT  4.285000 5.355000  4.455000 5.525000 ;
+        RECT  4.745000 5.355000  4.915000 5.525000 ;
+        RECT  5.205000 5.355000  5.375000 5.525000 ;
+        RECT  5.665000 5.355000  5.835000 5.525000 ;
+        RECT  6.125000 5.355000  6.295000 5.525000 ;
+        RECT  6.585000 5.355000  6.755000 5.525000 ;
+        RECT  7.045000 5.355000  7.215000 5.525000 ;
+        RECT  7.505000 5.355000  7.675000 5.525000 ;
+        RECT  7.965000 5.355000  8.135000 5.525000 ;
+        RECT  8.425000 5.355000  8.595000 5.525000 ;
+        RECT  8.885000 5.355000  9.055000 5.525000 ;
+        RECT  9.345000 5.355000  9.515000 5.525000 ;
+        RECT  9.805000 5.355000  9.975000 5.525000 ;
+        RECT 10.265000 5.355000 10.435000 5.525000 ;
+        RECT 10.725000 5.355000 10.895000 5.525000 ;
+        RECT 11.185000 5.355000 11.355000 5.525000 ;
+        RECT 11.645000 5.355000 11.815000 5.525000 ;
+        RECT 12.105000 5.355000 12.275000 5.525000 ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+        RECT 13.485000 5.355000 13.655000 5.525000 ;
+        RECT 13.945000 5.355000 14.115000 5.525000 ;
+        RECT 14.405000 5.355000 14.575000 5.525000 ;
+        RECT 14.865000 5.355000 15.035000 5.525000 ;
+        RECT 15.325000 5.355000 15.495000 5.525000 ;
+        RECT 15.785000 5.355000 15.955000 5.525000 ;
+        RECT 16.245000 5.355000 16.415000 5.525000 ;
+        RECT 16.705000 5.355000 16.875000 5.525000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 5.200000 17.020000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.000000 2.635000 0.920000 2.805000 ;
+        RECT 0.095000 1.495000 0.425000 2.635000 ;
+        RECT 0.095000 2.805000 0.425000 3.945000 ;
+      LAYER mcon ;
+        RECT 0.145000 2.635000 0.315000 2.805000 ;
+        RECT 0.605000 2.635000 0.775000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 11.960000 2.635000 13.340000 2.805000 ;
+        RECT 12.455000 1.495000 12.845000 2.635000 ;
+        RECT 12.455000 2.805000 12.845000 3.945000 ;
+      LAYER mcon ;
+        RECT 12.105000 2.635000 12.275000 2.805000 ;
+        RECT 12.565000 2.635000 12.735000 2.805000 ;
+        RECT 13.025000 2.635000 13.195000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 16.100000 2.635000 17.020000 2.805000 ;
+        RECT 16.595000 1.495000 16.925000 2.635000 ;
+        RECT 16.595000 2.805000 16.925000 3.945000 ;
+      LAYER mcon ;
+        RECT 16.245000 2.635000 16.415000 2.805000 ;
+        RECT 16.705000 2.635000 16.875000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.680000 2.635000 5.060000 2.805000 ;
+        RECT 4.175000 1.495000 4.565000 2.635000 ;
+        RECT 4.175000 2.805000 4.565000 3.945000 ;
+      LAYER mcon ;
+        RECT 3.825000 2.635000 3.995000 2.805000 ;
+        RECT 4.285000 2.635000 4.455000 2.805000 ;
+        RECT 4.745000 2.635000 4.915000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.820000 2.635000 9.200000 2.805000 ;
+        RECT 8.315000 1.495000 8.705000 2.635000 ;
+        RECT 8.315000 2.805000 8.705000 3.945000 ;
+      LAYER mcon ;
+        RECT 7.965000 2.635000 8.135000 2.805000 ;
+        RECT 8.425000 2.635000 8.595000 2.805000 ;
+        RECT 8.885000 2.635000 9.055000 2.805000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef
index 82348c2..431191a 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.lef
@@ -284,23 +284,6 @@
         RECT 22.635000 4.145000 22.970000 4.415000 ;
     END
   END S[15]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 25.760000 0.240000 ;
-        RECT 0.000000  5.200000 25.760000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 25.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -343,6 +326,23 @@
         RECT 24.005000 3.640000 24.295000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 25.760000 0.240000 ;
+        RECT 0.000000  5.200000 25.760000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 25.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 25.760000 0.085000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
index 5d224b8..83e8867 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
@@ -318,12 +318,138 @@
         RECT 22.635000 4.145000 22.970000 4.415000 ;
     END
   END S[15]
-  PIN VGND
-    ANTENNADIFFAREA  1.965600 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 5.355000 19.175000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 5.355000 19.635000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 5.355000 6.755000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 4.135000 ;
+    END
+  END VPB
+  PIN Z
+    ANTENNADIFFAREA  6.051200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 1.465000 1.755000 1.895000 2.125000 ;
+        RECT 1.465000 3.315000 1.895000 3.685000 ;
+        RECT 1.505000 0.595000 1.835000 0.885000 ;
+        RECT 1.505000 4.555000 1.835000 4.845000 ;
+        RECT 1.585000 0.885000 1.755000 1.755000 ;
+        RECT 1.585000 2.125000 1.755000 3.315000 ;
+        RECT 1.585000 3.685000 1.755000 4.555000 ;
+      LAYER mcon ;
+        RECT 1.525000 1.785000 1.695000 1.955000 ;
+        RECT 1.525000 3.485000 1.695000 3.655000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT  1.465000 1.755000  1.755000 1.800000 ;
+        RECT  1.465000 1.800000 24.295000 1.940000 ;
+        RECT  1.465000 1.940000  1.755000 1.985000 ;
+        RECT  1.465000 3.455000  1.755000 3.500000 ;
+        RECT  1.465000 3.500000 24.295000 3.640000 ;
+        RECT  1.465000 3.640000  1.755000 3.685000 ;
+        RECT  4.685000 1.755000  4.975000 1.800000 ;
+        RECT  4.685000 1.940000  4.975000 1.985000 ;
+        RECT  4.685000 3.455000  4.975000 3.500000 ;
+        RECT  4.685000 3.640000  4.975000 3.685000 ;
+        RECT  7.905000 1.755000  8.195000 1.800000 ;
+        RECT  7.905000 1.940000  8.195000 1.985000 ;
+        RECT  7.905000 3.455000  8.195000 3.500000 ;
+        RECT  7.905000 3.640000  8.195000 3.685000 ;
+        RECT 11.125000 1.755000 11.415000 1.800000 ;
+        RECT 11.125000 1.940000 11.415000 1.985000 ;
+        RECT 11.125000 3.455000 11.415000 3.500000 ;
+        RECT 11.125000 3.640000 11.415000 3.685000 ;
+        RECT 14.345000 1.755000 14.635000 1.800000 ;
+        RECT 14.345000 1.940000 14.635000 1.985000 ;
+        RECT 14.345000 3.455000 14.635000 3.500000 ;
+        RECT 14.345000 3.640000 14.635000 3.685000 ;
+        RECT 17.565000 1.755000 17.855000 1.800000 ;
+        RECT 17.565000 1.940000 17.855000 1.985000 ;
+        RECT 17.565000 3.455000 17.855000 3.500000 ;
+        RECT 17.565000 3.640000 17.855000 3.685000 ;
+        RECT 20.785000 1.755000 21.075000 1.800000 ;
+        RECT 20.785000 1.940000 21.075000 1.985000 ;
+        RECT 20.785000 3.455000 21.075000 3.500000 ;
+        RECT 20.785000 3.640000 21.075000 3.685000 ;
+        RECT 24.005000 1.755000 24.295000 1.800000 ;
+        RECT 24.005000 1.940000 24.295000 1.985000 ;
+        RECT 24.005000 3.455000 24.295000 3.500000 ;
+        RECT 24.005000 3.640000 24.295000 3.685000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 25.760000 0.085000 ;
         RECT  0.645000  0.085000  0.860000 0.545000 ;
         RECT  3.095000  0.085000  3.345000 0.660000 ;
@@ -477,82 +603,9 @@
         RECT 0.000000 5.200000 25.760000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 -0.085000 19.175000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 5.355000 19.175000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 -0.085000 19.635000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 5.355000 19.635000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 5.355000 25.615000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 5.355000 6.755000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  7.520000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 1.415000 2.805000 ;
@@ -639,61 +692,6 @@
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  6.051200 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 1.465000 1.755000 1.895000 2.125000 ;
-        RECT 1.465000 3.315000 1.895000 3.685000 ;
-        RECT 1.505000 0.595000 1.835000 0.885000 ;
-        RECT 1.505000 4.555000 1.835000 4.845000 ;
-        RECT 1.585000 0.885000 1.755000 1.755000 ;
-        RECT 1.585000 2.125000 1.755000 3.315000 ;
-        RECT 1.585000 3.685000 1.755000 4.555000 ;
-      LAYER mcon ;
-        RECT 1.525000 1.785000 1.695000 1.955000 ;
-        RECT 1.525000 3.485000 1.695000 3.655000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT  1.465000 1.755000  1.755000 1.800000 ;
-        RECT  1.465000 1.800000 24.295000 1.940000 ;
-        RECT  1.465000 1.940000  1.755000 1.985000 ;
-        RECT  1.465000 3.455000  1.755000 3.500000 ;
-        RECT  1.465000 3.500000 24.295000 3.640000 ;
-        RECT  1.465000 3.640000  1.755000 3.685000 ;
-        RECT  4.685000 1.755000  4.975000 1.800000 ;
-        RECT  4.685000 1.940000  4.975000 1.985000 ;
-        RECT  4.685000 3.455000  4.975000 3.500000 ;
-        RECT  4.685000 3.640000  4.975000 3.685000 ;
-        RECT  7.905000 1.755000  8.195000 1.800000 ;
-        RECT  7.905000 1.940000  8.195000 1.985000 ;
-        RECT  7.905000 3.455000  8.195000 3.500000 ;
-        RECT  7.905000 3.640000  8.195000 3.685000 ;
-        RECT 11.125000 1.755000 11.415000 1.800000 ;
-        RECT 11.125000 1.940000 11.415000 1.985000 ;
-        RECT 11.125000 3.455000 11.415000 3.500000 ;
-        RECT 11.125000 3.640000 11.415000 3.685000 ;
-        RECT 14.345000 1.755000 14.635000 1.800000 ;
-        RECT 14.345000 1.940000 14.635000 1.985000 ;
-        RECT 14.345000 3.455000 14.635000 3.500000 ;
-        RECT 14.345000 3.640000 14.635000 3.685000 ;
-        RECT 17.565000 1.755000 17.855000 1.800000 ;
-        RECT 17.565000 1.940000 17.855000 1.985000 ;
-        RECT 17.565000 3.455000 17.855000 3.500000 ;
-        RECT 17.565000 3.640000 17.855000 3.685000 ;
-        RECT 20.785000 1.755000 21.075000 1.800000 ;
-        RECT 20.785000 1.940000 21.075000 1.985000 ;
-        RECT 20.785000 3.455000 21.075000 3.500000 ;
-        RECT 20.785000 3.640000 21.075000 3.685000 ;
-        RECT 24.005000 1.755000 24.295000 1.800000 ;
-        RECT 24.005000 1.940000 24.295000 1.985000 ;
-        RECT 24.005000 3.455000 24.295000 3.500000 ;
-        RECT 24.005000 3.640000 24.295000 3.685000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef
index 2a08fe8..f971376 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.lef
@@ -284,23 +284,6 @@
         RECT 45.625000 4.115000 46.220000 4.445000 ;
     END
   END S[15]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 51.980000 0.240000 ;
-        RECT 0.000000  5.200000 51.980000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 51.980000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -375,6 +358,23 @@
         RECT 48.705000 3.640000 48.995000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 51.980000 0.240000 ;
+        RECT 0.000000  5.200000 51.980000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 51.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 51.980000 0.085000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
index 5873c65..00a6bb0 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
@@ -318,12 +318,189 @@
         RECT 45.625000 4.115000 46.220000 4.445000 ;
     END
   END S[15]
-  PIN VGND
-    ANTENNADIFFAREA  6.635200 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 0.265000 26.135000 0.810000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 4.630000 26.135000 5.175000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 -0.085000 26.535000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 5.355000 26.535000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 -0.085000 38.955000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 5.355000 38.955000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 -0.085000 39.415000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 5.355000 39.415000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 -0.085000 51.835000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 5.355000 51.835000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    ANTENNADIFFAREA  0.297500 ;
+    PORT
+      LAYER li1 ;
+        RECT 25.845000 1.470000 26.135000 2.455000 ;
+        RECT 25.845000 2.985000 26.135000 3.970000 ;
+    END
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 52.170000 4.135000 ;
+    END
+  END VPB
+  PIN Z
+    ANTENNADIFFAREA  12.10240 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.865000 0.595000 3.195000 0.885000 ;
+        RECT 2.865000 4.555000 3.195000 4.845000 ;
+        RECT 2.965000 0.885000 3.195000 1.065000 ;
+        RECT 2.965000 1.065000 4.235000 1.365000 ;
+        RECT 2.965000 1.365000 3.295000 4.075000 ;
+        RECT 2.965000 4.075000 4.235000 4.375000 ;
+        RECT 2.965000 4.375000 3.195000 4.555000 ;
+        RECT 3.705000 0.595000 4.035000 1.065000 ;
+        RECT 3.705000 4.375000 4.035000 4.845000 ;
+        RECT 3.905000 1.365000 4.235000 4.075000 ;
+      LAYER mcon ;
+        RECT 3.045000 1.785000 3.215000 1.955000 ;
+        RECT 3.045000 3.485000 3.215000 3.655000 ;
+        RECT 3.985000 1.785000 4.155000 1.955000 ;
+        RECT 3.985000 3.485000 4.155000 3.655000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT  2.985000 1.755000  3.275000 1.800000 ;
+        RECT  2.985000 1.800000 48.995000 1.940000 ;
+        RECT  2.985000 1.940000  3.275000 1.985000 ;
+        RECT  2.985000 3.455000  3.275000 3.500000 ;
+        RECT  2.985000 3.500000 48.995000 3.640000 ;
+        RECT  2.985000 3.640000  3.275000 3.685000 ;
+        RECT  3.925000 1.755000  4.215000 1.800000 ;
+        RECT  3.925000 1.940000  4.215000 1.985000 ;
+        RECT  3.925000 3.455000  4.215000 3.500000 ;
+        RECT  3.925000 3.640000  4.215000 3.685000 ;
+        RECT  8.665000 1.755000  8.955000 1.800000 ;
+        RECT  8.665000 1.940000  8.955000 1.985000 ;
+        RECT  8.665000 3.455000  8.955000 3.500000 ;
+        RECT  8.665000 3.640000  8.955000 3.685000 ;
+        RECT  9.605000 1.755000  9.895000 1.800000 ;
+        RECT  9.605000 1.940000  9.895000 1.985000 ;
+        RECT  9.605000 3.455000  9.895000 3.500000 ;
+        RECT  9.605000 3.640000  9.895000 3.685000 ;
+        RECT 15.865000 1.755000 16.155000 1.800000 ;
+        RECT 15.865000 1.940000 16.155000 1.985000 ;
+        RECT 15.865000 3.455000 16.155000 3.500000 ;
+        RECT 15.865000 3.640000 16.155000 3.685000 ;
+        RECT 16.805000 1.755000 17.095000 1.800000 ;
+        RECT 16.805000 1.940000 17.095000 1.985000 ;
+        RECT 16.805000 3.455000 17.095000 3.500000 ;
+        RECT 16.805000 3.640000 17.095000 3.685000 ;
+        RECT 21.545000 1.755000 21.835000 1.800000 ;
+        RECT 21.545000 1.940000 21.835000 1.985000 ;
+        RECT 21.545000 3.455000 21.835000 3.500000 ;
+        RECT 21.545000 3.640000 21.835000 3.685000 ;
+        RECT 22.485000 1.755000 22.775000 1.800000 ;
+        RECT 22.485000 1.940000 22.775000 1.985000 ;
+        RECT 22.485000 3.455000 22.775000 3.500000 ;
+        RECT 22.485000 3.640000 22.775000 3.685000 ;
+        RECT 29.205000 1.755000 29.495000 1.800000 ;
+        RECT 29.205000 1.940000 29.495000 1.985000 ;
+        RECT 29.205000 3.455000 29.495000 3.500000 ;
+        RECT 29.205000 3.640000 29.495000 3.685000 ;
+        RECT 30.145000 1.755000 30.435000 1.800000 ;
+        RECT 30.145000 1.940000 30.435000 1.985000 ;
+        RECT 30.145000 3.455000 30.435000 3.500000 ;
+        RECT 30.145000 3.640000 30.435000 3.685000 ;
+        RECT 34.885000 1.755000 35.175000 1.800000 ;
+        RECT 34.885000 1.940000 35.175000 1.985000 ;
+        RECT 34.885000 3.455000 35.175000 3.500000 ;
+        RECT 34.885000 3.640000 35.175000 3.685000 ;
+        RECT 35.825000 1.755000 36.115000 1.800000 ;
+        RECT 35.825000 1.940000 36.115000 1.985000 ;
+        RECT 35.825000 3.455000 36.115000 3.500000 ;
+        RECT 35.825000 3.640000 36.115000 3.685000 ;
+        RECT 42.085000 1.755000 42.375000 1.800000 ;
+        RECT 42.085000 1.940000 42.375000 1.985000 ;
+        RECT 42.085000 3.455000 42.375000 3.500000 ;
+        RECT 42.085000 3.640000 42.375000 3.685000 ;
+        RECT 43.025000 1.755000 43.315000 1.800000 ;
+        RECT 43.025000 1.940000 43.315000 1.985000 ;
+        RECT 43.025000 3.455000 43.315000 3.500000 ;
+        RECT 43.025000 3.640000 43.315000 3.685000 ;
+        RECT 47.765000 1.755000 48.055000 1.800000 ;
+        RECT 47.765000 1.940000 48.055000 1.985000 ;
+        RECT 47.765000 3.455000 48.055000 3.500000 ;
+        RECT 47.765000 3.640000 48.055000 3.685000 ;
+        RECT 48.705000 1.755000 48.995000 1.800000 ;
+        RECT 48.705000 1.940000 48.995000 1.985000 ;
+        RECT 48.705000 3.455000 48.995000 3.500000 ;
+        RECT 48.705000 3.640000 48.995000 3.685000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 51.980000 0.085000 ;
         RECT  0.145000  0.085000  0.395000 0.885000 ;
         RECT  1.065000  0.085000  1.335000 0.545000 ;
@@ -647,96 +824,9 @@
         RECT 0.000000 5.200000 51.980000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 0.265000 26.135000 0.810000 ;
-    END
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 4.630000 26.135000 5.175000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 5.355000 12.735000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 5.355000 13.195000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 5.355000 25.615000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 26.365000 -0.085000 26.535000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 26.365000 5.355000 26.535000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 38.785000 -0.085000 38.955000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 38.785000 5.355000 38.955000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 39.245000 -0.085000 39.415000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 39.245000 5.355000 39.415000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 51.665000 -0.085000 51.835000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 51.665000 5.355000 51.835000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.297500 ;
-    PORT
-      LAYER li1 ;
-        RECT 25.845000 1.470000 26.135000 2.455000 ;
-        RECT 25.845000 2.985000 26.135000 3.970000 ;
-    END
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 52.170000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  20.364799 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 2.795000 2.805000 ;
@@ -864,98 +954,6 @@
         RECT 0.000000 2.480000 51.980000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  12.10240 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.865000 0.595000 3.195000 0.885000 ;
-        RECT 2.865000 4.555000 3.195000 4.845000 ;
-        RECT 2.965000 0.885000 3.195000 1.065000 ;
-        RECT 2.965000 1.065000 4.235000 1.365000 ;
-        RECT 2.965000 1.365000 3.295000 4.075000 ;
-        RECT 2.965000 4.075000 4.235000 4.375000 ;
-        RECT 2.965000 4.375000 3.195000 4.555000 ;
-        RECT 3.705000 0.595000 4.035000 1.065000 ;
-        RECT 3.705000 4.375000 4.035000 4.845000 ;
-        RECT 3.905000 1.365000 4.235000 4.075000 ;
-      LAYER mcon ;
-        RECT 3.045000 1.785000 3.215000 1.955000 ;
-        RECT 3.045000 3.485000 3.215000 3.655000 ;
-        RECT 3.985000 1.785000 4.155000 1.955000 ;
-        RECT 3.985000 3.485000 4.155000 3.655000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT  2.985000 1.755000  3.275000 1.800000 ;
-        RECT  2.985000 1.800000 48.995000 1.940000 ;
-        RECT  2.985000 1.940000  3.275000 1.985000 ;
-        RECT  2.985000 3.455000  3.275000 3.500000 ;
-        RECT  2.985000 3.500000 48.995000 3.640000 ;
-        RECT  2.985000 3.640000  3.275000 3.685000 ;
-        RECT  3.925000 1.755000  4.215000 1.800000 ;
-        RECT  3.925000 1.940000  4.215000 1.985000 ;
-        RECT  3.925000 3.455000  4.215000 3.500000 ;
-        RECT  3.925000 3.640000  4.215000 3.685000 ;
-        RECT  8.665000 1.755000  8.955000 1.800000 ;
-        RECT  8.665000 1.940000  8.955000 1.985000 ;
-        RECT  8.665000 3.455000  8.955000 3.500000 ;
-        RECT  8.665000 3.640000  8.955000 3.685000 ;
-        RECT  9.605000 1.755000  9.895000 1.800000 ;
-        RECT  9.605000 1.940000  9.895000 1.985000 ;
-        RECT  9.605000 3.455000  9.895000 3.500000 ;
-        RECT  9.605000 3.640000  9.895000 3.685000 ;
-        RECT 15.865000 1.755000 16.155000 1.800000 ;
-        RECT 15.865000 1.940000 16.155000 1.985000 ;
-        RECT 15.865000 3.455000 16.155000 3.500000 ;
-        RECT 15.865000 3.640000 16.155000 3.685000 ;
-        RECT 16.805000 1.755000 17.095000 1.800000 ;
-        RECT 16.805000 1.940000 17.095000 1.985000 ;
-        RECT 16.805000 3.455000 17.095000 3.500000 ;
-        RECT 16.805000 3.640000 17.095000 3.685000 ;
-        RECT 21.545000 1.755000 21.835000 1.800000 ;
-        RECT 21.545000 1.940000 21.835000 1.985000 ;
-        RECT 21.545000 3.455000 21.835000 3.500000 ;
-        RECT 21.545000 3.640000 21.835000 3.685000 ;
-        RECT 22.485000 1.755000 22.775000 1.800000 ;
-        RECT 22.485000 1.940000 22.775000 1.985000 ;
-        RECT 22.485000 3.455000 22.775000 3.500000 ;
-        RECT 22.485000 3.640000 22.775000 3.685000 ;
-        RECT 29.205000 1.755000 29.495000 1.800000 ;
-        RECT 29.205000 1.940000 29.495000 1.985000 ;
-        RECT 29.205000 3.455000 29.495000 3.500000 ;
-        RECT 29.205000 3.640000 29.495000 3.685000 ;
-        RECT 30.145000 1.755000 30.435000 1.800000 ;
-        RECT 30.145000 1.940000 30.435000 1.985000 ;
-        RECT 30.145000 3.455000 30.435000 3.500000 ;
-        RECT 30.145000 3.640000 30.435000 3.685000 ;
-        RECT 34.885000 1.755000 35.175000 1.800000 ;
-        RECT 34.885000 1.940000 35.175000 1.985000 ;
-        RECT 34.885000 3.455000 35.175000 3.500000 ;
-        RECT 34.885000 3.640000 35.175000 3.685000 ;
-        RECT 35.825000 1.755000 36.115000 1.800000 ;
-        RECT 35.825000 1.940000 36.115000 1.985000 ;
-        RECT 35.825000 3.455000 36.115000 3.500000 ;
-        RECT 35.825000 3.640000 36.115000 3.685000 ;
-        RECT 42.085000 1.755000 42.375000 1.800000 ;
-        RECT 42.085000 1.940000 42.375000 1.985000 ;
-        RECT 42.085000 3.455000 42.375000 3.500000 ;
-        RECT 42.085000 3.640000 42.375000 3.685000 ;
-        RECT 43.025000 1.755000 43.315000 1.800000 ;
-        RECT 43.025000 1.940000 43.315000 1.985000 ;
-        RECT 43.025000 3.455000 43.315000 3.500000 ;
-        RECT 43.025000 3.640000 43.315000 3.685000 ;
-        RECT 47.765000 1.755000 48.055000 1.800000 ;
-        RECT 47.765000 1.940000 48.055000 1.985000 ;
-        RECT 47.765000 3.455000 48.055000 3.500000 ;
-        RECT 47.765000 3.640000 48.055000 3.685000 ;
-        RECT 48.705000 1.755000 48.995000 1.800000 ;
-        RECT 48.705000 1.940000 48.995000 1.985000 ;
-        RECT 48.705000 3.455000 48.995000 3.500000 ;
-        RECT 48.705000 3.640000 48.995000 3.685000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef
index 397e411..892fe87 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.lef
@@ -100,22 +100,6 @@
         RECT 6.585000 0.945000 6.935000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -133,6 +117,22 @@
         RECT 7.445000 1.940000 7.735000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
index 5bb972d..5cca985 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
@@ -110,15 +110,6 @@
         RECT 6.585000 0.945000 6.935000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    ANTENNADIFFAREA  0.999700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -131,15 +122,6 @@
         RECT -0.190000 1.305000 8.930000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.690000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.426400 ;
     DIRECTION OUTPUT ;
@@ -157,6 +139,22 @@
         RECT 7.445000 1.940000 7.735000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef
index 5af64fe..251cc83 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.lef
@@ -92,22 +92,6 @@
         RECT 9.755000 1.025000 10.090000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.880000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 12.880000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -125,6 +109,22 @@
         RECT 11.125000 1.940000 11.415000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.880000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 12.880000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.880000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
index 43f78ad..d3f828a 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
@@ -102,11 +102,51 @@
         RECT 9.755000 1.025000 10.090000 1.295000 ;
     END
   END S[3]
-  PIN VGND
-    ANTENNADIFFAREA  0.982800 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.070000 2.910000 ;
+    END
+  END VPB
+  PIN Z
+    ANTENNADIFFAREA  1.512800 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met1 ;
+        RECT  1.465000 1.755000  1.755000 1.800000 ;
+        RECT  1.465000 1.800000 11.415000 1.940000 ;
+        RECT  1.465000 1.940000  1.755000 1.985000 ;
+        RECT  4.685000 1.755000  4.975000 1.800000 ;
+        RECT  4.685000 1.940000  4.975000 1.985000 ;
+        RECT  7.905000 1.755000  8.195000 1.800000 ;
+        RECT  7.905000 1.940000  8.195000 1.985000 ;
+        RECT 11.125000 1.755000 11.415000 1.800000 ;
+        RECT 11.125000 1.940000 11.415000 1.985000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 12.880000 0.085000 ;
         RECT  0.645000  0.085000  0.860000 0.545000 ;
@@ -150,34 +190,9 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 13.070000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  1.880000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 12.880000 2.805000 ;
@@ -226,23 +241,6 @@
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  1.512800 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT  1.465000 1.755000  1.755000 1.800000 ;
-        RECT  1.465000 1.800000 11.415000 1.940000 ;
-        RECT  1.465000 1.940000  1.755000 1.985000 ;
-        RECT  4.685000 1.755000  4.975000 1.800000 ;
-        RECT  4.685000 1.940000  4.975000 1.985000 ;
-        RECT  7.905000 1.755000  8.195000 1.800000 ;
-        RECT  7.905000 1.940000  8.195000 1.985000 ;
-        RECT 11.125000 1.755000 11.415000 1.800000 ;
-        RECT 11.125000 1.940000 11.415000 1.985000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef
index 25e4d3a..6fd3a79 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.lef
@@ -92,22 +92,6 @@
         RECT 19.405000 0.995000 20.000000 1.325000 ;
     END
   END S[3]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 25.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 25.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -133,6 +117,22 @@
         RECT 22.485000 1.940000 22.775000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 25.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 25.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 25.760000 0.085000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
index fa61570..9851764 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
@@ -102,11 +102,59 @@
         RECT 19.405000 0.995000 20.000000 1.325000 ;
     END
   END S[3]
-  PIN VGND
-    ANTENNADIFFAREA  3.317600 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
+  PIN Z
+    ANTENNADIFFAREA  3.025600 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met1 ;
+        RECT  2.985000 1.755000  3.275000 1.800000 ;
+        RECT  2.985000 1.800000 22.775000 1.940000 ;
+        RECT  2.985000 1.940000  3.275000 1.985000 ;
+        RECT  3.925000 1.755000  4.215000 1.800000 ;
+        RECT  3.925000 1.940000  4.215000 1.985000 ;
+        RECT  8.665000 1.755000  8.955000 1.800000 ;
+        RECT  8.665000 1.940000  8.955000 1.985000 ;
+        RECT  9.605000 1.755000  9.895000 1.800000 ;
+        RECT  9.605000 1.940000  9.895000 1.985000 ;
+        RECT 15.865000 1.755000 16.155000 1.800000 ;
+        RECT 15.865000 1.940000 16.155000 1.985000 ;
+        RECT 16.805000 1.755000 17.095000 1.800000 ;
+        RECT 16.805000 1.940000 17.095000 1.985000 ;
+        RECT 21.545000 1.755000 21.835000 1.800000 ;
+        RECT 21.545000 1.940000 21.835000 1.985000 ;
+        RECT 22.485000 1.755000 22.775000 1.800000 ;
+        RECT 22.485000 1.940000 22.775000 1.985000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 25.760000 0.085000 ;
         RECT  0.145000  0.085000  0.395000 0.885000 ;
@@ -192,34 +240,9 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  5.091200 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 25.760000 2.805000 ;
@@ -306,31 +329,6 @@
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  3.025600 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT  2.985000 1.755000  3.275000 1.800000 ;
-        RECT  2.985000 1.800000 22.775000 1.940000 ;
-        RECT  2.985000 1.940000  3.275000 1.985000 ;
-        RECT  3.925000 1.755000  4.215000 1.800000 ;
-        RECT  3.925000 1.940000  4.215000 1.985000 ;
-        RECT  8.665000 1.755000  8.955000 1.800000 ;
-        RECT  8.665000 1.940000  8.955000 1.985000 ;
-        RECT  9.605000 1.755000  9.895000 1.800000 ;
-        RECT  9.605000 1.940000  9.895000 1.985000 ;
-        RECT 15.865000 1.755000 16.155000 1.800000 ;
-        RECT 15.865000 1.940000 16.155000 1.985000 ;
-        RECT 16.805000 1.755000 17.095000 1.800000 ;
-        RECT 16.805000 1.940000 17.095000 1.985000 ;
-        RECT 21.545000 1.755000 21.835000 1.800000 ;
-        RECT 21.545000 1.940000 21.835000 1.985000 ;
-        RECT 22.485000 1.755000 22.775000 1.800000 ;
-        RECT 22.485000 1.940000 22.775000 1.985000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.565000 0.255000  0.895000 0.715000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef
index 2a7a8c1..c3d0600 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.lef
@@ -172,22 +172,6 @@
         RECT 14.815000 0.945000 15.215000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -213,6 +197,22 @@
         RECT 15.725000 1.940000 16.015000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 17.020000 0.085000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
index f045a3f..d2111a3 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
@@ -190,66 +190,6 @@
         RECT 14.815000 0.945000 15.215000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    ANTENNADIFFAREA  1.875900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.020000 0.085000 ;
-        RECT  0.130000  0.085000  0.390000 0.885000 ;
-        RECT  2.135000  0.085000  2.465000 0.660000 ;
-        RECT  4.210000  0.085000  4.530000 0.885000 ;
-        RECT  6.275000  0.085000  6.605000 0.660000 ;
-        RECT  8.350000  0.085000  8.670000 0.885000 ;
-        RECT 10.415000  0.085000 10.745000 0.660000 ;
-        RECT 12.490000  0.085000 12.810000 0.885000 ;
-        RECT 14.555000  0.085000 14.885000 0.660000 ;
-        RECT 16.630000  0.085000 16.890000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -278,66 +218,6 @@
         RECT -0.190000 1.305000 17.210000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.190000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 17.020000 2.805000 ;
-        RECT  0.095000 1.495000  0.425000 2.635000 ;
-        RECT  2.135000 1.465000  2.465000 2.635000 ;
-        RECT  4.175000 1.495000  4.565000 2.635000 ;
-        RECT  6.275000 1.465000  6.605000 2.635000 ;
-        RECT  8.315000 1.495000  8.705000 2.635000 ;
-        RECT 10.415000 1.465000 10.745000 2.635000 ;
-        RECT 12.455000 1.495000 12.845000 2.635000 ;
-        RECT 14.555000 1.465000 14.885000 2.635000 ;
-        RECT 16.595000 1.495000 16.925000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
-        RECT 16.705000 2.635000 16.875000 2.805000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 17.020000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  2.852800 ;
     DIRECTION OUTPUT ;
@@ -451,6 +331,124 @@
         RECT 15.725000 1.940000 16.015000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 -0.085000 17.020000 0.085000 ;
+        RECT  0.130000  0.085000  0.390000 0.885000 ;
+        RECT  2.135000  0.085000  2.465000 0.660000 ;
+        RECT  4.210000  0.085000  4.530000 0.885000 ;
+        RECT  6.275000  0.085000  6.605000 0.660000 ;
+        RECT  8.350000  0.085000  8.670000 0.885000 ;
+        RECT 10.415000  0.085000 10.745000 0.660000 ;
+        RECT 12.490000  0.085000 12.810000 0.885000 ;
+        RECT 14.555000  0.085000 14.885000 0.660000 ;
+        RECT 16.630000  0.085000 16.890000 0.885000 ;
+      LAYER mcon ;
+        RECT  0.145000 -0.085000  0.315000 0.085000 ;
+        RECT  0.605000 -0.085000  0.775000 0.085000 ;
+        RECT  1.065000 -0.085000  1.235000 0.085000 ;
+        RECT  1.525000 -0.085000  1.695000 0.085000 ;
+        RECT  1.985000 -0.085000  2.155000 0.085000 ;
+        RECT  2.445000 -0.085000  2.615000 0.085000 ;
+        RECT  2.905000 -0.085000  3.075000 0.085000 ;
+        RECT  3.365000 -0.085000  3.535000 0.085000 ;
+        RECT  3.825000 -0.085000  3.995000 0.085000 ;
+        RECT  4.285000 -0.085000  4.455000 0.085000 ;
+        RECT  4.745000 -0.085000  4.915000 0.085000 ;
+        RECT  5.205000 -0.085000  5.375000 0.085000 ;
+        RECT  5.665000 -0.085000  5.835000 0.085000 ;
+        RECT  6.125000 -0.085000  6.295000 0.085000 ;
+        RECT  6.585000 -0.085000  6.755000 0.085000 ;
+        RECT  7.045000 -0.085000  7.215000 0.085000 ;
+        RECT  7.505000 -0.085000  7.675000 0.085000 ;
+        RECT  7.965000 -0.085000  8.135000 0.085000 ;
+        RECT  8.425000 -0.085000  8.595000 0.085000 ;
+        RECT  8.885000 -0.085000  9.055000 0.085000 ;
+        RECT  9.345000 -0.085000  9.515000 0.085000 ;
+        RECT  9.805000 -0.085000  9.975000 0.085000 ;
+        RECT 10.265000 -0.085000 10.435000 0.085000 ;
+        RECT 10.725000 -0.085000 10.895000 0.085000 ;
+        RECT 11.185000 -0.085000 11.355000 0.085000 ;
+        RECT 11.645000 -0.085000 11.815000 0.085000 ;
+        RECT 12.105000 -0.085000 12.275000 0.085000 ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+        RECT 13.485000 -0.085000 13.655000 0.085000 ;
+        RECT 13.945000 -0.085000 14.115000 0.085000 ;
+        RECT 14.405000 -0.085000 14.575000 0.085000 ;
+        RECT 14.865000 -0.085000 15.035000 0.085000 ;
+        RECT 15.325000 -0.085000 15.495000 0.085000 ;
+        RECT 15.785000 -0.085000 15.955000 0.085000 ;
+        RECT 16.245000 -0.085000 16.415000 0.085000 ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT  0.000000 2.635000 17.020000 2.805000 ;
+        RECT  0.095000 1.495000  0.425000 2.635000 ;
+        RECT  2.135000 1.465000  2.465000 2.635000 ;
+        RECT  4.175000 1.495000  4.565000 2.635000 ;
+        RECT  6.275000 1.465000  6.605000 2.635000 ;
+        RECT  8.315000 1.495000  8.705000 2.635000 ;
+        RECT 10.415000 1.465000 10.745000 2.635000 ;
+        RECT 12.455000 1.495000 12.845000 2.635000 ;
+        RECT 14.555000 1.465000 14.885000 2.635000 ;
+        RECT 16.595000 1.495000 16.925000 2.635000 ;
+      LAYER mcon ;
+        RECT  0.145000 2.635000  0.315000 2.805000 ;
+        RECT  0.605000 2.635000  0.775000 2.805000 ;
+        RECT  1.065000 2.635000  1.235000 2.805000 ;
+        RECT  1.525000 2.635000  1.695000 2.805000 ;
+        RECT  1.985000 2.635000  2.155000 2.805000 ;
+        RECT  2.445000 2.635000  2.615000 2.805000 ;
+        RECT  2.905000 2.635000  3.075000 2.805000 ;
+        RECT  3.365000 2.635000  3.535000 2.805000 ;
+        RECT  3.825000 2.635000  3.995000 2.805000 ;
+        RECT  4.285000 2.635000  4.455000 2.805000 ;
+        RECT  4.745000 2.635000  4.915000 2.805000 ;
+        RECT  5.205000 2.635000  5.375000 2.805000 ;
+        RECT  5.665000 2.635000  5.835000 2.805000 ;
+        RECT  6.125000 2.635000  6.295000 2.805000 ;
+        RECT  6.585000 2.635000  6.755000 2.805000 ;
+        RECT  7.045000 2.635000  7.215000 2.805000 ;
+        RECT  7.505000 2.635000  7.675000 2.805000 ;
+        RECT  7.965000 2.635000  8.135000 2.805000 ;
+        RECT  8.425000 2.635000  8.595000 2.805000 ;
+        RECT  8.885000 2.635000  9.055000 2.805000 ;
+        RECT  9.345000 2.635000  9.515000 2.805000 ;
+        RECT  9.805000 2.635000  9.975000 2.805000 ;
+        RECT 10.265000 2.635000 10.435000 2.805000 ;
+        RECT 10.725000 2.635000 10.895000 2.805000 ;
+        RECT 11.185000 2.635000 11.355000 2.805000 ;
+        RECT 11.645000 2.635000 11.815000 2.805000 ;
+        RECT 12.105000 2.635000 12.275000 2.805000 ;
+        RECT 12.565000 2.635000 12.735000 2.805000 ;
+        RECT 13.025000 2.635000 13.195000 2.805000 ;
+        RECT 13.485000 2.635000 13.655000 2.805000 ;
+        RECT 13.945000 2.635000 14.115000 2.805000 ;
+        RECT 14.405000 2.635000 14.575000 2.805000 ;
+        RECT 14.865000 2.635000 15.035000 2.805000 ;
+        RECT 15.325000 2.635000 15.495000 2.805000 ;
+        RECT 15.785000 2.635000 15.955000 2.805000 ;
+        RECT 16.245000 2.635000 16.415000 2.805000 ;
+        RECT 16.705000 2.635000 16.875000 2.805000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 17.020000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  1.240000 1.175000  1.630000 1.465000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef
index 3d90dc0..61b3f37 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.lef
@@ -156,22 +156,6 @@
         RECT 22.635000 1.025000 22.970000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 25.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 25.760000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -197,6 +181,22 @@
         RECT 24.005000 1.940000 24.295000 1.985000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 25.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 25.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 25.760000 0.085000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
index 8c1af27..2738e32 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
@@ -174,11 +174,75 @@
         RECT 22.635000 1.025000 22.970000 1.295000 ;
     END
   END S[7]
-  PIN VGND
-    ANTENNADIFFAREA  1.965600 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
+  PIN Z
+    ANTENNADIFFAREA  3.025600 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met1 ;
+        RECT  1.465000 1.755000  1.755000 1.800000 ;
+        RECT  1.465000 1.800000 24.295000 1.940000 ;
+        RECT  1.465000 1.940000  1.755000 1.985000 ;
+        RECT  4.685000 1.755000  4.975000 1.800000 ;
+        RECT  4.685000 1.940000  4.975000 1.985000 ;
+        RECT  7.905000 1.755000  8.195000 1.800000 ;
+        RECT  7.905000 1.940000  8.195000 1.985000 ;
+        RECT 11.125000 1.755000 11.415000 1.800000 ;
+        RECT 11.125000 1.940000 11.415000 1.985000 ;
+        RECT 14.345000 1.755000 14.635000 1.800000 ;
+        RECT 14.345000 1.940000 14.635000 1.985000 ;
+        RECT 17.565000 1.755000 17.855000 1.800000 ;
+        RECT 17.565000 1.940000 17.855000 1.985000 ;
+        RECT 20.785000 1.755000 21.075000 1.800000 ;
+        RECT 20.785000 1.940000 21.075000 1.985000 ;
+        RECT 24.005000 1.755000 24.295000 1.800000 ;
+        RECT 24.005000 1.940000 24.295000 1.985000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 25.760000 0.085000 ;
         RECT  0.645000  0.085000  0.860000 0.545000 ;
@@ -256,50 +320,9 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.005000 -0.085000 19.175000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 19.465000 -0.085000 19.635000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 25.445000 -0.085000 25.615000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.950000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  3.760000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 25.760000 2.805000 ;
@@ -386,31 +409,6 @@
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  3.025600 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT  1.465000 1.755000  1.755000 1.800000 ;
-        RECT  1.465000 1.800000 24.295000 1.940000 ;
-        RECT  1.465000 1.940000  1.755000 1.985000 ;
-        RECT  4.685000 1.755000  4.975000 1.800000 ;
-        RECT  4.685000 1.940000  4.975000 1.985000 ;
-        RECT  7.905000 1.755000  8.195000 1.800000 ;
-        RECT  7.905000 1.940000  8.195000 1.985000 ;
-        RECT 11.125000 1.755000 11.415000 1.800000 ;
-        RECT 11.125000 1.940000 11.415000 1.985000 ;
-        RECT 14.345000 1.755000 14.635000 1.800000 ;
-        RECT 14.345000 1.940000 14.635000 1.985000 ;
-        RECT 17.565000 1.755000 17.855000 1.800000 ;
-        RECT 17.565000 1.940000 17.855000 1.985000 ;
-        RECT 20.785000 1.755000 21.075000 1.800000 ;
-        RECT 20.785000 1.940000 21.075000 1.985000 ;
-        RECT 24.005000 1.755000 24.295000 1.800000 ;
-        RECT 24.005000 1.940000 24.295000 1.985000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.095000 1.495000  1.285000 1.665000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef
index 7f3a597..c17f2e3 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.lef
@@ -156,23 +156,6 @@
         RECT 24.160000 4.115000 24.755000 4.445000 ;
     END
   END S[7]
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 24.840000 0.240000 ;
-        RECT 0.000000  5.200000 24.840000 5.680000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 24.840000 2.960000 ;
-    END
-  END VPWR
   PIN Z
     ANTENNADIFFAREA  1.992000 ;
     DIRECTION OUTPUT ;
@@ -215,6 +198,23 @@
         RECT 22.325000 3.640000 22.615000 3.685000 ;
     END
   END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 24.840000 0.240000 ;
+        RECT 0.000000  5.200000 24.840000 5.680000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 24.840000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 24.840000 0.085000 ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
index 3b2de72..37239ce 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
@@ -174,12 +174,103 @@
         RECT 24.160000 4.115000 24.755000 4.445000 ;
     END
   END S[7]
-  PIN VGND
-    ANTENNADIFFAREA  3.070600 ;
-    DIRECTION INOUT ;
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 -0.085000 18.715000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 5.355000 18.715000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.030000 4.135000 ;
+    END
+  END VPB
+  PIN Z
+    ANTENNADIFFAREA  6.051200 ;
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
       LAYER li1 ;
+        RECT 2.205000 1.065000 3.475000 1.365000 ;
+        RECT 2.205000 1.365000 2.535000 4.075000 ;
+        RECT 2.205000 4.075000 3.475000 4.375000 ;
+        RECT 2.405000 0.595000 2.735000 1.065000 ;
+        RECT 2.405000 4.375000 2.735000 4.845000 ;
+        RECT 3.145000 1.365000 3.475000 4.075000 ;
+        RECT 3.245000 0.595000 3.575000 0.885000 ;
+        RECT 3.245000 0.885000 3.475000 1.065000 ;
+        RECT 3.245000 4.375000 3.475000 4.555000 ;
+        RECT 3.245000 4.555000 3.575000 4.845000 ;
+      LAYER mcon ;
+        RECT 2.285000 1.785000 2.455000 1.955000 ;
+        RECT 2.285000 3.485000 2.455000 3.655000 ;
+        RECT 3.225000 1.785000 3.395000 1.955000 ;
+        RECT 3.225000 3.485000 3.395000 3.655000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT  2.225000 1.755000  2.515000 1.800000 ;
+        RECT  2.225000 1.800000 22.615000 1.940000 ;
+        RECT  2.225000 1.940000  2.515000 1.985000 ;
+        RECT  2.225000 3.455000  2.515000 3.500000 ;
+        RECT  2.225000 3.500000 22.615000 3.640000 ;
+        RECT  2.225000 3.640000  2.515000 3.685000 ;
+        RECT  3.165000 1.755000  3.455000 1.800000 ;
+        RECT  3.165000 1.940000  3.455000 1.985000 ;
+        RECT  3.165000 3.455000  3.455000 3.500000 ;
+        RECT  3.165000 3.640000  3.455000 3.685000 ;
+        RECT  8.965000 1.755000  9.255000 1.800000 ;
+        RECT  8.965000 1.940000  9.255000 1.985000 ;
+        RECT  8.965000 3.455000  9.255000 3.500000 ;
+        RECT  8.965000 3.640000  9.255000 3.685000 ;
+        RECT  9.905000 1.755000 10.195000 1.800000 ;
+        RECT  9.905000 1.940000 10.195000 1.985000 ;
+        RECT  9.905000 3.455000 10.195000 3.500000 ;
+        RECT  9.905000 3.640000 10.195000 3.685000 ;
+        RECT 14.645000 1.755000 14.935000 1.800000 ;
+        RECT 14.645000 1.940000 14.935000 1.985000 ;
+        RECT 14.645000 3.455000 14.935000 3.500000 ;
+        RECT 14.645000 3.640000 14.935000 3.685000 ;
+        RECT 15.585000 1.755000 15.875000 1.800000 ;
+        RECT 15.585000 1.940000 15.875000 1.985000 ;
+        RECT 15.585000 3.455000 15.875000 3.500000 ;
+        RECT 15.585000 3.640000 15.875000 3.685000 ;
+        RECT 21.385000 1.755000 21.675000 1.800000 ;
+        RECT 21.385000 1.940000 21.675000 1.985000 ;
+        RECT 21.385000 3.455000 21.675000 3.500000 ;
+        RECT 21.385000 3.640000 21.675000 3.685000 ;
+        RECT 22.325000 1.755000 22.615000 1.800000 ;
+        RECT 22.325000 1.940000 22.615000 1.985000 ;
+        RECT 22.325000 3.455000 22.615000 3.500000 ;
+        RECT 22.325000 3.640000 22.615000 3.685000 ;
+    END
+  END Z
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
         RECT  0.000000 -0.085000 24.840000 0.085000 ;
         RECT  0.270000  0.085000  0.560000 0.610000 ;
         RECT  1.190000  0.085000  1.480000 0.610000 ;
@@ -341,42 +432,9 @@
         RECT 0.000000 5.200000 24.840000 5.680000 ;
     END
   END VGND
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.145000 5.355000 0.315000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 18.545000 -0.085000 18.715000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 18.545000 5.355000 18.715000 5.525000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 6.125000 5.355000 6.295000 5.525000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.305000 25.030000 4.135000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  9.422400 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 16.065000 2.635000 21.195000 2.805000 ;
@@ -434,66 +492,6 @@
         RECT 0.000000 2.480000 24.840000 2.960000 ;
     END
   END VPWR
-  PIN Z
-    ANTENNADIFFAREA  6.051200 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 2.205000 1.065000 3.475000 1.365000 ;
-        RECT 2.205000 1.365000 2.535000 4.075000 ;
-        RECT 2.205000 4.075000 3.475000 4.375000 ;
-        RECT 2.405000 0.595000 2.735000 1.065000 ;
-        RECT 2.405000 4.375000 2.735000 4.845000 ;
-        RECT 3.145000 1.365000 3.475000 4.075000 ;
-        RECT 3.245000 0.595000 3.575000 0.885000 ;
-        RECT 3.245000 0.885000 3.475000 1.065000 ;
-        RECT 3.245000 4.375000 3.475000 4.555000 ;
-        RECT 3.245000 4.555000 3.575000 4.845000 ;
-      LAYER mcon ;
-        RECT 2.285000 1.785000 2.455000 1.955000 ;
-        RECT 2.285000 3.485000 2.455000 3.655000 ;
-        RECT 3.225000 1.785000 3.395000 1.955000 ;
-        RECT 3.225000 3.485000 3.395000 3.655000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT  2.225000 1.755000  2.515000 1.800000 ;
-        RECT  2.225000 1.800000 22.615000 1.940000 ;
-        RECT  2.225000 1.940000  2.515000 1.985000 ;
-        RECT  2.225000 3.455000  2.515000 3.500000 ;
-        RECT  2.225000 3.500000 22.615000 3.640000 ;
-        RECT  2.225000 3.640000  2.515000 3.685000 ;
-        RECT  3.165000 1.755000  3.455000 1.800000 ;
-        RECT  3.165000 1.940000  3.455000 1.985000 ;
-        RECT  3.165000 3.455000  3.455000 3.500000 ;
-        RECT  3.165000 3.640000  3.455000 3.685000 ;
-        RECT  8.965000 1.755000  9.255000 1.800000 ;
-        RECT  8.965000 1.940000  9.255000 1.985000 ;
-        RECT  8.965000 3.455000  9.255000 3.500000 ;
-        RECT  8.965000 3.640000  9.255000 3.685000 ;
-        RECT  9.905000 1.755000 10.195000 1.800000 ;
-        RECT  9.905000 1.940000 10.195000 1.985000 ;
-        RECT  9.905000 3.455000 10.195000 3.500000 ;
-        RECT  9.905000 3.640000 10.195000 3.685000 ;
-        RECT 14.645000 1.755000 14.935000 1.800000 ;
-        RECT 14.645000 1.940000 14.935000 1.985000 ;
-        RECT 14.645000 3.455000 14.935000 3.500000 ;
-        RECT 14.645000 3.640000 14.935000 3.685000 ;
-        RECT 15.585000 1.755000 15.875000 1.800000 ;
-        RECT 15.585000 1.940000 15.875000 1.985000 ;
-        RECT 15.585000 3.455000 15.875000 3.500000 ;
-        RECT 15.585000 3.640000 15.875000 3.685000 ;
-        RECT 21.385000 1.755000 21.675000 1.800000 ;
-        RECT 21.385000 1.940000 21.675000 1.985000 ;
-        RECT 21.385000 3.455000 21.675000 3.500000 ;
-        RECT 21.385000 3.640000 21.675000 3.685000 ;
-        RECT 22.325000 1.755000 22.615000 1.800000 ;
-        RECT 22.325000 1.940000 22.615000 1.985000 ;
-        RECT 22.325000 3.455000 22.615000 3.500000 ;
-        RECT 22.325000 3.640000 22.615000 3.685000 ;
-    END
-  END Z
   OBS
     LAYER li1 ;
       RECT  0.000000 2.635000  2.035000 2.805000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef
index 59df4d1..cc85ce1 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.lef
@@ -46,22 +46,6 @@
         RECT 0.095000 1.055000 0.430000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 0.650000 0.885000 0.820000 1.485000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 1.840000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
index 1e7599e..e96e785 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.095000 1.055000 0.430000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,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.491500 ;
     DIRECTION OUTPUT ;
@@ -89,6 +71,22 @@
         RECT 0.650000 0.885000 0.820000 1.485000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 1.840000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef
index b86f075..0bfe88c 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.lef
@@ -46,22 +46,6 @@
         RECT 0.335000 1.055000 5.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.960000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.960000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  4.858000 ;
     DIRECTION OUTPUT ;
@@ -89,6 +73,22 @@
         RECT 10.965000 1.325000 11.235000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.960000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.960000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
index 68415a4..f4d9e17 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.335000 1.055000 5.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.443000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.960000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 12.150000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.730000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.960000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  4.858000 ;
     DIRECTION OUTPUT ;
@@ -105,6 +87,22 @@
         RECT 10.965000 1.325000 11.235000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.960000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.960000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.960000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef
index 8486cd0..e592d58 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.lef
@@ -46,22 +46,6 @@
         RECT 0.395000 1.055000 7.525000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 15.640000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 15.640000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  6.499000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 14.725000 1.325000 14.995000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 15.640000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 15.640000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.640000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
index 38ea4d3..3286f03 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.395000 1.055000 7.525000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.924000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 15.640000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 15.830000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  4.890000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 15.640000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  6.499000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +91,22 @@
         RECT 14.725000 1.325000 14.995000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 15.640000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 15.640000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 15.640000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef
index a2ce486..3e968cb 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 1.075000 0.895000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.820500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 1.950000 0.905000 2.230000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
index c68e199..ec88843 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 1.075000 0.895000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.240500 ;
-    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.830000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.820500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +73,22 @@
         RECT 1.950000 0.905000 2.230000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef
index bb9565e..d877dd0 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.lef
@@ -46,22 +46,6 @@
         RECT 0.110000 1.075000 1.880000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.608500 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 3.335000 1.665000 3.715000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
index 61a396a..75cd6a9 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.110000 1.075000 1.880000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.416000 ;
-    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  1.410000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.608500 ;
     DIRECTION OUTPUT ;
@@ -93,6 +75,22 @@
         RECT 3.335000 1.665000 3.715000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef
index 37aaa2b..a06ac56 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.lef
@@ -46,22 +46,6 @@
         RECT 0.395000 1.055000 2.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.429000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 5.325000 1.325000 5.595000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
index 38a5bea..c812e55 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.395000 1.055000 2.765000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.721500 ;
-    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  1.990000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.429000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +80,22 @@
         RECT 5.325000 1.325000 5.595000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef
index b0ffaed..1c4449e 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.lef
@@ -46,22 +46,6 @@
         RECT 0.510000 1.075000 3.715000 1.295000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.184500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 7.225000 0.905000 7.475000 1.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
index 89e5e25..914cdc2 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.510000 1.075000 3.715000 1.295000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.864500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 8.470000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.690000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.184500 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 7.225000 0.905000 7.475000 1.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef
index d20c84a..d20c8fc 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.lef
@@ -46,22 +46,6 @@
         RECT 0.590000 1.075000 1.185000 1.315000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 1.820000 0.545000 2.190000 1.835000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
index 446f058..3333362 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.590000 1.075000 1.185000 1.315000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.233000 ;
-    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.575700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +72,22 @@
         RECT 1.820000 0.545000 2.190000 1.835000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef
index 6c6f513..22c6dcd 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.lef
@@ -47,22 +47,6 @@
         RECT 2.905000 1.275000 3.095000 1.655000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.825500 ;
     DIRECTION OUTPUT ;
@@ -76,6 +60,22 @@
         RECT 2.340000 1.495000 2.615000 1.835000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
index ca8c80f..d3dd84c 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
@@ -49,15 +49,6 @@
         RECT 2.905000 1.275000 3.095000 1.655000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.317200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -70,15 +61,6 @@
         RECT -0.190000 1.305000 3.410000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.062800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.825500 ;
     DIRECTION OUTPUT ;
@@ -92,6 +74,22 @@
         RECT 2.340000 1.495000 2.615000 1.835000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef
index 4f38fdc..8655993 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.lef
@@ -46,22 +46,6 @@
         RECT 3.405000 1.075000 5.390000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.576000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 4.340000 1.665000 4.720000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
index e006fb9..76697e7 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 3.405000 1.075000 5.390000 1.275000 ;
     END
   END 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  1.825000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.576000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +75,22 @@
         RECT 4.340000 1.665000 4.720000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef
index 8086f2a..7b40209 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.lef
@@ -55,22 +55,6 @@
         RECT 0.110000 0.745000 0.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.761500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 1.515000 1.665000 1.895000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
index 0d18eed..3d28d99 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.110000 0.745000 0.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 2.490000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.620000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.761500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +83,22 @@
         RECT 1.515000 1.665000 1.895000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef
index 0ff7b0e..5a4e637 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.lef
@@ -55,22 +55,6 @@
         RECT 2.785000 1.075000 4.000000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.078000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.915000 1.665000 3.295000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
index 58af2ed..e8c1cc0 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
@@ -57,15 +57,6 @@
         RECT 2.785000 1.075000 4.000000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.403000 ;
-    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  1.420000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.078000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +82,22 @@
         RECT 2.915000 1.665000 3.295000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef
index f9506d9..97c0d05 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.lef
@@ -55,22 +55,6 @@
         RECT 0.110000 1.075000 1.850000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 6.555000 0.905000 6.785000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
index 6e4bacd..5b4feb7 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.110000 1.075000 1.850000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.416000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.250000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +86,22 @@
         RECT 6.555000 0.905000 6.785000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef
index 7ef4e9c..57153a5 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.lef
@@ -55,22 +55,6 @@
         RECT 1.015000 0.995000 1.335000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.775200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.410000 0.485000 2.675000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
index 379689d..cdf664c 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.015000 0.995000 1.335000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.233000 ;
-    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.605700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.775250 ;
     DIRECTION OUTPUT ;
@@ -100,6 +82,22 @@
         RECT 2.410000 0.485000 2.675000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef
index 78429ca..f393356 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.lef
@@ -55,22 +55,6 @@
         RECT 1.065000 1.075000 1.890000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.110500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 4.250000 0.905000 4.490000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
index 59d7177..a26b2c5 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.065000 1.075000 1.890000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.429500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.465700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.110500 ;
     DIRECTION OUTPUT ;
@@ -103,6 +85,22 @@
         RECT 4.250000 0.905000 4.490000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef
index 5b08bac..d56629c 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.lef
@@ -55,22 +55,6 @@
         RECT 5.185000 1.075000 7.100000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 6.725000 1.665000 7.105000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
index a5b3159..c20a246 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
@@ -57,15 +57,6 @@
         RECT 5.185000 1.075000 7.100000 1.275000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.845000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.610000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +88,22 @@
         RECT 6.725000 1.665000 7.105000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef
index 89c3ada..f799d29 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.lef
@@ -67,22 +67,6 @@
         RECT 0.110000 0.995000 0.395000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.867500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 1.775000 0.825000 1.945000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
index ea003f4..420bb37 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
@@ -69,15 +69,6 @@
         RECT 0.110000 0.995000 0.395000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -90,15 +81,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.867500 ;
     DIRECTION OUTPUT ;
@@ -112,6 +94,22 @@
         RECT 1.775000 0.825000 1.945000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef
index 9490db3..76cada1 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.lef
@@ -64,22 +64,6 @@
         RECT 0.110000 1.075000 0.895000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 3.945000 1.665000 4.325000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
index 8c25fae..519dcaa 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.110000 1.075000 0.895000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.208000 ;
-    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  2.180000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +93,22 @@
         RECT 3.945000 1.665000 4.325000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef
index 987835c..762dbcc 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.lef
@@ -64,22 +64,6 @@
         RECT 0.105000 1.075000 1.835000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 7.675000 1.665000 8.055000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
index 205abc7..7152a7e 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.105000 1.075000 1.835000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.416000 ;
-    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.925000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.150000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -115,6 +97,22 @@
         RECT 7.675000 1.665000 8.055000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef
index 1892d6b..b17c5db 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.lef
@@ -65,22 +65,6 @@
         RECT 1.010000 0.995000 1.330000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.882500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 2.875000 0.835000 3.135000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
index c720120..26a769e 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 1.010000 0.995000 1.330000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.268750 ;
-    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  1.015700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.882500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 2.875000 0.835000 3.135000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef
index 6df572d..783c633 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.lef
@@ -64,22 +64,6 @@
         RECT 5.020000 1.075000 5.885000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 4.885000 1.665000 5.265000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
index 2f514de..6082688 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 5.020000 1.075000 5.885000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.317200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.223400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 4.885000 1.665000 5.265000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef
index 7c926d8..63759eb 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.lef
@@ -64,22 +64,6 @@
         RECT 7.665000 1.075000 9.505000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 8.605000 1.665000 8.985000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
index 44e20a6..8507ad8 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 7.665000 1.075000 9.505000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.585000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 9.850000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.360000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -115,6 +97,22 @@
         RECT 8.605000 1.665000 8.985000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef
index b7b91cb..e87c7db 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.lef
@@ -64,22 +64,6 @@
         RECT 0.995000 1.075000 1.325000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.901500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 2.410000 0.825000 2.680000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
index b7ed3c6..3aeb62a 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.995000 1.075000 1.325000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.337200 ;
-    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  1.132500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.901500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 2.410000 0.825000 2.680000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef
index 75d54e8..c80a4d4 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.lef
@@ -64,22 +64,6 @@
         RECT 5.315000 1.075000 6.295000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 5.495000 1.665000 5.875000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
index d5e1b2c..8496c46 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 5.315000 1.075000 6.295000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.342400 ;
-    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  2.021800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.368000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +93,22 @@
         RECT 5.495000 1.665000 5.875000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef
index cb61657..08818c7 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.lef
@@ -64,22 +64,6 @@
         RECT 8.395000 1.075000 10.340000 1.275000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 9.485000 1.665000 9.865000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
index 437ae02..10c873a 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 8.395000 1.075000 10.340000 1.275000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.601250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 10.770000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.425000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.736000 ;
     DIRECTION OUTPUT ;
@@ -115,6 +97,22 @@
         RECT 9.485000 1.665000 9.865000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef
index 8b58e8e..da048a9 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 1.075000 0.435000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 0.605000 0.895000 0.775000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 1.840000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
index c8a5535..712f118 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 1.075000 0.435000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.591500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 1.840000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 2.030000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.610000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 1.840000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +72,22 @@
         RECT 0.605000 0.895000 0.775000 1.495000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 1.840000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 1.840000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 1.840000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef
index 5e391cd..253f7c6 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.lef
@@ -46,22 +46,6 @@
         RECT 1.030000 1.075000 1.900000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.771000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 2.095000 0.905000 2.310000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
index 9071599..2292951 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.030000 1.075000 1.900000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.601250 ;
-    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.290000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.771000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +75,22 @@
         RECT 2.095000 0.905000 2.310000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef
index 15a257a..577611f 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.lef
@@ -46,22 +46,6 @@
         RECT 2.320000 1.075000 3.835000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.477000 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 4.095000 0.905000 4.490000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
index a7ca4eb..ee57001 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 2.320000 1.075000 3.835000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.942500 ;
-    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.580000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.477000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +77,22 @@
         RECT 4.095000 0.905000 4.490000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef
index 85817a6..15f5316 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.lef
@@ -46,22 +46,6 @@
         RECT 4.200000 1.075000 7.290000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.889000 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 7.460000 0.905000 8.025000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
index 2184894..7ab8a26 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
@@ -48,15 +48,6 @@
         RECT 4.200000 1.075000 7.290000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.774500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,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  2.889000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +83,22 @@
         RECT 7.460000 0.905000 8.025000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef
index 7e48dcd..d6df63b 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.lef
@@ -46,22 +46,6 @@
         RECT 0.515000 0.975000 0.785000 1.745000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -74,6 +58,22 @@
         RECT 2.035000 0.895000 2.215000 1.850000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
index 1c43516..c6bc2ab 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.515000 0.975000 0.785000 1.745000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.491200 ;
-    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.366600 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.445500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +72,22 @@
         RECT 2.035000 0.895000 2.215000 1.850000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef
index b327855..f93fa34 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.lef
@@ -47,22 +47,6 @@
         RECT 3.270000 1.275000 3.535000 1.965000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.738500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 1.565000 0.895000 1.815000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
index 5f94fe2..c3a2eca 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
@@ -49,15 +49,6 @@
         RECT 3.270000 1.275000 3.535000 1.965000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.685950 ;
-    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 Y
     ANTENNADIFFAREA  0.738500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +73,22 @@
         RECT 1.565000 0.895000 1.815000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef
index 16ca51c..2c30d31 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.lef
@@ -46,22 +46,6 @@
         RECT 4.925000 1.075000 5.425000 1.320000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.444500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
index 56d073f..9dd85c4 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 4.925000 1.075000 5.425000 1.320000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  1.183000 ;
-    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 Y
     ANTENNADIFFAREA  1.444500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +77,22 @@
         RECT 3.485000 1.745000 3.655000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef
index 90643e3..bd01111 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.lef
@@ -56,22 +56,6 @@
         RECT 0.090000 0.995000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.647000 ;
     DIRECTION OUTPUT ;
@@ -86,6 +70,22 @@
         RECT 1.245000 0.825000 1.415000 2.280000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
index ee4667e..b79653a 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.090000 0.995000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.630500 ;
-    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.610000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.647000 ;
     DIRECTION OUTPUT ;
@@ -102,6 +84,22 @@
         RECT 1.245000 0.825000 1.415000 2.280000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef
index a6eb4f5..c0e2ee9 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.lef
@@ -56,22 +56,6 @@
         RECT 2.445000 1.285000 2.935000 1.625000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.011500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 3.480000 0.905000 3.995000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
index 8e2d559..a5d58b8 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 2.445000 1.285000 2.935000 1.625000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.861250 ;
-    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.290000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.011500 ;
     DIRECTION OUTPUT ;
@@ -103,6 +85,22 @@
         RECT 3.480000 0.905000 3.995000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef
index 542e0ba..4b7304c 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.lef
@@ -59,22 +59,6 @@
         RECT 4.255000 1.075000 5.315000 1.275000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.828000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 6.055000 0.905000 6.345000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
index d591bb3..b74190d 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
@@ -61,15 +61,6 @@
         RECT 4.255000 1.075000 5.315000 1.275000 ;
     END
   END C
-  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  0.580000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.828000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +93,22 @@
         RECT 6.055000 0.905000 6.345000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef
index ec03b33..6294ced 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.lef
@@ -55,22 +55,6 @@
         RECT 1.985000 0.995000 2.335000 1.615000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.759000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 1.375000 0.310000 1.545000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
index e531e94..727bcfd 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.985000 0.995000 2.335000 1.615000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.462000 ;
-    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.305700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.759000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +82,22 @@
         RECT 1.375000 0.310000 1.545000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef
index f9a148c..76f9bcc 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.lef
@@ -55,22 +55,6 @@
         RECT 4.330000 1.075000 4.915000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.979000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.935000 0.255000 3.355000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
index 960d8a6..e042205 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
@@ -57,15 +57,6 @@
         RECT 4.330000 1.075000 4.915000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  1.066200 ;
-    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  0.403400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.979000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +82,22 @@
         RECT 2.935000 0.255000 3.355000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef
index d5f1d1d..58bb233 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.lef
@@ -55,22 +55,6 @@
         RECT 0.110000 1.075000 0.445000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.925500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 6.905000 0.905000 7.245000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.360000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
index ab78ee9..0a98cd2 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.110000 1.075000 0.445000 1.285000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  1.657500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 7.550000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.925500 ;
     DIRECTION OUTPUT ;
@@ -106,6 +88,22 @@
         RECT 6.905000 0.905000 7.245000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.360000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef
index 6a10fb2..9bd96c5 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.745000 0.335000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.699000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 1.595000 0.385000 1.765000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
index edf473b..3de188f 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.085000 0.745000 0.335000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.604500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.270000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.699000 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 1.595000 0.385000 1.765000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef
index a5a1ec3..4836fc8 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.lef
@@ -64,22 +64,6 @@
         RECT 3.640000 1.075000 4.275000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.252000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 4.615000 0.905000 4.950000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
index ff78e2a..981ed58 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 3.640000 1.075000 4.275000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  1.066000 ;
-    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  0.290000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.252000 ;
     DIRECTION OUTPUT ;
@@ -112,6 +94,22 @@
         RECT 4.615000 0.905000 4.950000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef
index 7a441fc..3640d91 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.lef
@@ -64,22 +64,6 @@
         RECT 6.475000 1.075000 8.045000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.374000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 8.360000 0.905000 8.630000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
index 87db99d..0b799a6 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 6.475000 1.075000 8.045000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  2.047500 ;
-    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  0.580000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.374000 ;
     DIRECTION OUTPUT ;
@@ -117,6 +99,22 @@
         RECT 8.360000 0.905000 8.630000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef
index f39e24f..43ed5fe 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.lef
@@ -64,22 +64,6 @@
         RECT 9.395000 1.075000 11.085000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.420000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 12.420000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.976000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +90,22 @@
         RECT 11.445000 1.625000 11.835000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.420000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 12.420000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
index e9f0178..3854b0e 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
@@ -66,15 +66,6 @@
         RECT 9.395000 1.075000 11.085000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  3.419000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.420000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 12.610000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 12.420000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.976000 ;
     DIRECTION OUTPUT ;
@@ -122,6 +104,22 @@
         RECT 11.445000 1.625000 11.835000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.420000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 12.420000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 12.420000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef
index 21695e0..f7f7b38 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.lef
@@ -64,22 +64,6 @@
         RECT 12.985000 1.075000 15.355000 1.285000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 16.100000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 16.100000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.968000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +95,22 @@
         RECT 15.225000 1.625000 15.475000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 16.100000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 16.100000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.100000 0.085000 ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
index 896462c..1d0a817 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
@@ -66,15 +66,6 @@
         RECT 12.985000 1.075000 15.355000 1.285000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  4.355000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 16.100000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 16.290000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.160000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 16.100000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  3.968000 ;
     DIRECTION OUTPUT ;
@@ -127,6 +109,22 @@
         RECT 15.225000 1.625000 15.475000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 16.100000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 16.100000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 16.100000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef
index e47ebb8..1b37b07 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.lef
@@ -64,22 +64,6 @@
         RECT 2.825000 0.995000 3.225000 1.615000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.913500 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 1.875000 0.310000 2.075000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
index 127b727..223c88a 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 2.825000 0.995000 3.225000 1.615000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.804600 ;
-    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.479900 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.913500 ;
     DIRECTION OUTPUT ;
@@ -108,6 +90,22 @@
         RECT 1.875000 0.310000 2.075000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef
index 69973bf..200ed8c 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.lef
@@ -65,22 +65,6 @@
         RECT 5.615000 1.285000 5.885000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.219500 ;
     DIRECTION OUTPUT ;
@@ -98,6 +82,22 @@
         RECT 4.065000 1.075000 4.490000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
index d9df8dd..efc31cd 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
@@ -67,15 +67,6 @@
         RECT 5.615000 1.285000 5.885000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.189700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.403400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.219500 ;
     DIRECTION OUTPUT ;
@@ -114,6 +96,22 @@
         RECT 4.065000 1.075000 4.490000 1.455000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef
index a5417a5..0b77ae2 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.lef
@@ -64,22 +64,6 @@
         RECT 8.855000 1.075000 9.550000 1.285000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.341500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 7.705000 1.625000 7.955000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
index 8090173..82a1a4f 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 8.855000 1.075000 9.550000 1.285000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  2.281500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 9.850000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.341500 ;
     DIRECTION OUTPUT ;
@@ -117,6 +99,22 @@
         RECT 7.705000 1.625000 7.955000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef
index 4e6d555..5b0e4ba 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.lef
@@ -64,22 +64,6 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.660000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.140000 0.310000 3.340000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
index 3559ae8..e7e70f4 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.767400 ;
-    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.523625 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.660000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +91,22 @@
         RECT 3.140000 0.310000 3.340000 0.655000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef
index 74904cc..6c86e18 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.lef
@@ -64,22 +64,6 @@
         RECT 0.425000 0.995000 0.830000 1.695000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.219500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 5.455000 0.255000 5.835000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
index 21b21d3..b23c0bd 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.425000 0.995000 0.830000 1.695000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.295950 ;
-    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  0.543625 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.219500 ;
     DIRECTION OUTPUT ;
@@ -111,6 +93,22 @@
         RECT 5.455000 0.255000 5.835000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef
index 0f2bce3..7d9fca5 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.lef
@@ -64,22 +64,6 @@
         RECT 1.005000 1.075000 1.395000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.120000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.120000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.374000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 9.135000 0.255000 9.515000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.120000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.120000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
index eaee033..3d3d0a9 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 1.005000 1.075000 1.395000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  2.223000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.120000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 10.310000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.870000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.120000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.374000 ;
     DIRECTION OUTPUT ;
@@ -115,6 +97,22 @@
         RECT 9.135000 0.255000 9.515000 0.725000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.120000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.120000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 10.120000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef
index 83a403a..ea4aa4e 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.lef
@@ -65,22 +65,6 @@
         RECT 3.640000 1.075000 4.005000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +76,22 @@
         RECT 0.085000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
index 0a7c80d..e27ae99 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 3.640000 1.075000 4.005000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.445250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.070000 ;
-    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 ;
@@ -108,6 +90,22 @@
         RECT 0.085000 1.495000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef
index 0c8b5e1..4afeed8 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.995000 0.360000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.534000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.765000 0.785000 4.035000 1.905000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
index 5b10202..646c24c 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.085000 0.995000 0.360000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.744250 ;
-    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  1.120000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.534000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +91,22 @@
         RECT 3.765000 0.785000 4.035000 1.905000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef
index fa01294..4cf2c08 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.lef
@@ -68,22 +68,6 @@
         RECT 3.255000 1.035000 4.090000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.016000 ;
     DIRECTION OUTPUT ;
@@ -100,6 +84,22 @@
         RECT 2.040000 1.700000 2.230000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
index cfa312f..c12a4d4 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
@@ -70,15 +70,6 @@
         RECT 3.255000 1.035000 4.090000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  1.069250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,15 +82,6 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.795000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.016000 ;
     DIRECTION OUTPUT ;
@@ -116,6 +98,22 @@
         RECT 2.040000 1.700000 2.230000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef
index 8205db0..809e024 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.lef
@@ -66,22 +66,6 @@
         RECT 1.915000 1.020000 2.270000 1.615000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.297000 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 2.440000 0.825000 2.675000 1.815000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
index 4c9a1bf..4183337 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
@@ -68,15 +68,6 @@
         RECT 1.915000 1.020000 2.270000 1.615000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.214500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -89,15 +80,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.620000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.297000 ;
     DIRECTION OUTPUT ;
@@ -112,6 +94,22 @@
         RECT 2.440000 0.825000 2.675000 1.815000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef
index 18baf5f..d889e90 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.lef
@@ -65,22 +65,6 @@
         RECT 0.085000 0.995000 0.375000 1.970000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.114500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 3.025000 1.710000 3.405000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
index 644f770..ebdf0d4 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
@@ -67,15 +67,6 @@
         RECT 0.085000 0.995000 0.375000 1.970000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.614250 ;
-    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.150000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.114500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 3.025000 1.710000 3.405000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef
index f83d10f..b9839ac 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.lef
@@ -70,22 +70,6 @@
         RECT 5.970000 1.075000 7.140000 1.345000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.218500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +86,22 @@
         RECT 7.980000 1.340000 8.480000 1.855000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
index 4ef454b..e63c7cc 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
@@ -72,15 +72,6 @@
         RECT 5.970000 1.075000 7.140000 1.345000 ;
     END
   END C1
-  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 ;
@@ -93,15 +84,6 @@
         RECT -0.190000 1.305000 8.930000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.480000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.218500 ;
     DIRECTION OUTPUT ;
@@ -118,6 +100,22 @@
         RECT 7.980000 1.340000 8.480000 1.855000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef
index 5b0b7fe..274d4d1 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.lef
@@ -56,22 +56,6 @@
         RECT 1.055000 1.075000 1.555000 1.305000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.085000 1.030000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
index 7caca97..e41f1e9 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.055000 1.075000 1.555000 1.305000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.383500 ;
-    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  1.255000 ;
-    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 ;
@@ -98,6 +80,22 @@
         RECT 0.085000 1.030000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef
index dd1e023..5c35559 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.lef
@@ -56,22 +56,6 @@
         RECT 1.525000 1.010000 1.955000 1.615000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.506200 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 0.530000 0.255000 0.825000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
index 5a47fab..212fe45 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.525000 1.010000 1.955000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.718250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.365000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.506250 ;
     DIRECTION OUTPUT ;
@@ -97,6 +79,22 @@
         RECT 0.530000 0.255000 0.825000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef
index f80780b..8773ccf 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.lef
@@ -57,22 +57,6 @@
         RECT 2.735000 1.075000 3.485000 1.615000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.029000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 1.975000 1.700000 2.155000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
index c04bf19..7e1bbfe 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
@@ -59,15 +59,6 @@
         RECT 2.735000 1.075000 3.485000 1.615000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.007500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -80,15 +71,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.760000 ;
-    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 ;
@@ -103,6 +85,22 @@
         RECT 1.975000 1.700000 2.155000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef
index e4aa0df..f675f9e 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.lef
@@ -56,22 +56,6 @@
         RECT 1.655000 1.295000 2.215000 1.655000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.506200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 1.645000 0.275000 2.110000 0.955000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
index 26d1f92..6c63b11 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.655000 1.295000 2.215000 1.655000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.253500 ;
-    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.651500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.752250 ;
     DIRECTION OUTPUT ;
@@ -100,6 +82,22 @@
         RECT 1.645000 0.275000 2.110000 0.955000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef
index 928bf04..1109c27 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.lef
@@ -57,22 +57,6 @@
         RECT 3.280000 0.765000 3.570000 1.400000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.814500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 2.695000 1.965000 3.110000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
index 753134d..d57c9c9 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
@@ -59,15 +59,6 @@
         RECT 3.280000 0.765000 3.570000 1.400000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.500500 ;
-    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.995000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.814500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +83,22 @@
         RECT 2.695000 1.965000 3.110000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef
index 55b0ba9..ff94db9 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.lef
@@ -58,22 +58,6 @@
         RECT 4.305000 1.015000 5.600000 1.275000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.661500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 5.920000 0.845000 6.330000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
index ca75d28..8d856fe 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
@@ -60,15 +60,6 @@
         RECT 4.305000 1.015000 5.600000 1.275000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.851500 ;
-    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.490000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.661500 ;
     DIRECTION OUTPUT ;
@@ -106,6 +88,22 @@
         RECT 5.920000 0.845000 6.330000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef
index 0b6bb28..2c770b7 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.lef
@@ -55,22 +55,6 @@
         RECT 1.030000 0.995000 1.380000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.439000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.085000 1.480000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
index b159a37..3be8a28 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
@@ -57,15 +57,6 @@
         RECT 1.030000 0.995000 1.380000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.376000 ;
-    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.925700 ;
-    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 0.085000 1.480000 0.425000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef
index 5e50f70..ef07200 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.lef
@@ -56,22 +56,6 @@
         RECT 0.605000 1.325000 0.825000 1.695000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.571700 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 0.995000 1.495000 1.455000 1.695000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
index 5e0bc1e..5240da3 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.605000 1.325000 0.825000 1.695000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.566000 ;
-    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  1.380700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.571750 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 0.995000 1.495000 1.455000 1.695000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef
index 72f2f59..80994c7 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.lef
@@ -56,22 +56,6 @@
         RECT 0.605000 1.285000 0.935000 1.705000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 2.045000 0.255000 2.375000 0.725000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
index c0b5fe7..bdbb68b 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.605000 1.285000 0.935000 1.705000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.033500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.430000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +83,22 @@
         RECT 2.045000 0.255000 2.375000 0.725000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef
index b6d8634..48a3c6c 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 1.345000 0.355000 2.445000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.521500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 1.635000 1.625000 2.155000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
index e165a97..95ffa1c 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.085000 1.345000 0.355000 2.445000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.361500 ;
-    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.660700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.521500 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 1.635000 1.625000 2.155000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef
index 78b17d1..740c578 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 0.995000 0.480000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.788000 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 2.655000 1.615000 2.900000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
index c5f0af3..5f219f3 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.085000 0.995000 0.480000 1.325000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  0.611200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.865700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.788000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 2.655000 1.615000 2.900000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef
index 965d9ed..a69c63a 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 1.075000 0.510000 1.285000 ;
     END
   END B1_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.576000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 4.515000 1.625000 4.765000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.360000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
index 329d802..4f565d7 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.085000 1.075000 0.510000 1.285000 ;
     END
   END B1_N
-  PIN VGND
-    ANTENNADIFFAREA  1.111500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 7.550000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.430000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.360000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.576000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +86,22 @@
         RECT 4.515000 1.625000 4.765000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.360000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.360000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.360000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef
index d3f9551..470ad95 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.lef
@@ -74,22 +74,6 @@
         RECT 0.085000 0.995000 0.415000 1.285000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.504500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 3.715000 0.825000 4.030000 1.875000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
index 369c48c..0ada14e 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
@@ -76,15 +76,6 @@
         RECT 0.085000 0.995000 0.415000 1.285000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.377000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -97,15 +88,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.700000 ;
-    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 ;
@@ -117,6 +99,22 @@
         RECT 3.715000 0.825000 4.030000 1.875000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef
index 999dc57..8e5b1d2 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.lef
@@ -73,22 +73,6 @@
         RECT 0.085000 0.975000 0.345000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -102,6 +86,22 @@
         RECT 4.180000 0.905000 4.490000 1.875000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
index c246876..87cec04 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
@@ -75,15 +75,6 @@
         RECT 0.085000 0.975000 0.345000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.546000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -96,15 +87,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.970000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -118,6 +100,22 @@
         RECT 4.180000 0.905000 4.490000 1.875000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef
index ca95973..334c75f 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.lef
@@ -78,22 +78,6 @@
         RECT 0.090000 1.075000 0.440000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -112,6 +96,22 @@
         RECT 7.365000 0.905000 7.710000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
index 062612c..abe2abf 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
@@ -80,15 +80,6 @@
         RECT 0.090000 1.075000 0.440000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.994500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -101,15 +92,6 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.220000 ;
-    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 ;
@@ -128,6 +110,22 @@
         RECT 7.365000 0.905000 7.710000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef
index 81ae439..cad453a 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.lef
@@ -76,22 +76,6 @@
         RECT 0.085000 0.995000 0.465000 1.325000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.974500 ;
     DIRECTION OUTPUT ;
@@ -107,6 +91,22 @@
         RECT 1.900000 2.180000 2.505000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
index da3ba42..903d680 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
@@ -78,15 +78,6 @@
         RECT 0.085000 0.995000 0.465000 1.325000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.175500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -99,15 +90,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.240000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.974500 ;
     DIRECTION OUTPUT ;
@@ -123,6 +105,22 @@
         RECT 1.900000 2.180000 2.505000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef
index 8211752..f80a944 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.lef
@@ -78,22 +78,6 @@
         RECT 0.085000 1.075000 0.435000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.078000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +93,22 @@
         RECT 4.500000 1.955000 4.750000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
index ee0fce1..de2b86e 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
@@ -80,15 +80,6 @@
         RECT 0.085000 1.075000 0.435000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.383500 ;
-    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  1.745000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.078000 ;
     DIRECTION OUTPUT ;
@@ -125,6 +107,22 @@
         RECT 4.500000 1.955000 4.750000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef
index dc96235..82501bd 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.lef
@@ -79,22 +79,6 @@
         RECT 0.090000 1.075000 1.900000 1.275000 ;
     END
   END C1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +95,22 @@
         RECT 4.345000 1.785000 8.565000 2.005000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
index fae47fb..9e181cd 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
@@ -81,15 +81,6 @@
         RECT 0.090000 1.075000 1.900000 1.275000 ;
     END
   END C1
-  PIN VGND
-    ANTENNADIFFAREA  0.767000 ;
-    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  2.645000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.156000 ;
     DIRECTION OUTPUT ;
@@ -127,6 +109,22 @@
         RECT 4.345000 1.785000 8.565000 2.005000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef
index 55e086b..38afbc4 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.lef
@@ -65,22 +65,6 @@
         RECT 1.730000 1.075000 2.155000 1.325000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 0.085000 0.365000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
index 2025be2..d0479e6 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 1.730000 1.075000 2.155000 1.325000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.383500 ;
-    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.980000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -106,6 +88,22 @@
         RECT 0.085000 0.365000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef
index 833cb0f..6ddc162 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.lef
@@ -65,22 +65,6 @@
         RECT 2.110000 1.075000 2.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -90,6 +74,22 @@
         RECT 0.605000 0.365000 0.855000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
index 2aed76a..92e332e 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
@@ -67,15 +67,6 @@
         RECT 2.110000 1.075000 2.625000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.565500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.380000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.491500 ;
     DIRECTION OUTPUT ;
@@ -106,6 +88,22 @@
         RECT 0.605000 0.365000 0.855000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef
index 4979ac1..6065df1 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.lef
@@ -69,22 +69,6 @@
         RECT 3.350000 1.075000 4.030000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -100,6 +84,22 @@
         RECT 1.630000 1.615000 1.880000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
index 32ec55e..9ec7bcb 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
@@ -71,15 +71,6 @@
         RECT 3.350000 1.075000 4.030000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.942500 ;
-    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  2.055000 ;
-    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/o22ai/sky130_fd_sc_hdll__o22ai_1.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.lef
index 469c882..d3c97cd 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.lef
@@ -67,22 +67,6 @@
         RECT 1.050000 0.995000 1.350000 1.665000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.816800 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 1.130000 2.045000 1.680000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
index fb2f74d..4cb7a36 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
@@ -69,15 +69,6 @@
         RECT 1.050000 0.995000 1.350000 1.665000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.201500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -90,15 +81,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.550000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.816750 ;
     DIRECTION OUTPUT ;
@@ -111,6 +93,22 @@
         RECT 1.130000 2.045000 1.680000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef
index b6688fe..21ae0df 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.lef
@@ -64,22 +64,6 @@
         RECT 1.325000 1.075000 2.125000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.061000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 3.065000 1.625000 3.315000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
index a5ddf68..15172d0 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 1.325000 1.075000 2.125000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.481000 ;
-    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  0.580000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.061000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +91,22 @@
         RECT 3.065000 1.625000 3.315000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef
index 526caaf..784f937 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.lef
@@ -69,22 +69,6 @@
         RECT 5.660000 1.075000 7.160000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.959500 ;
     DIRECTION OUTPUT ;
@@ -104,6 +88,22 @@
         RECT 7.905000 0.820000 8.170000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
index 702184a..bbd4ebd 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
@@ -71,15 +71,6 @@
         RECT 5.660000 1.075000 7.160000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.799500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.280000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -92,15 +83,6 @@
         RECT -0.190000 1.305000 8.470000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.490000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.280000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.959500 ;
     DIRECTION OUTPUT ;
@@ -120,6 +102,22 @@
         RECT 7.905000 0.820000 8.170000 1.785000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.280000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.280000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.280000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef
index 54c4cda..b27bcf9 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.lef
@@ -67,22 +67,6 @@
         RECT 3.335000 1.325000 3.535000 2.425000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.471500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 0.085000 1.795000 0.345000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
index 38d9f87..d27a18a 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
@@ -69,15 +69,6 @@
         RECT 3.335000 1.325000 3.535000 2.425000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.398850 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -90,15 +81,6 @@
         RECT -0.190000 1.305000 4.330000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.839800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.471500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 0.085000 1.795000 0.345000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef
index 14aa808..711fdcb 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.lef
@@ -68,22 +68,6 @@
         RECT 3.655000 1.915000 3.995000 2.425000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 0.535000 1.795000 0.840000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
index b3eaaaa..6bc305d 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
@@ -70,15 +70,6 @@
         RECT 3.655000 1.915000 3.995000 2.425000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.545950 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,15 +82,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.255800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -111,6 +93,22 @@
         RECT 0.535000 1.795000 0.840000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef
index a6eb329..295bf01 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.lef
@@ -68,22 +68,6 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 7.820000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +85,22 @@
         RECT 7.405000 0.905000 7.710000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
index 8f18a4e..a4f3eb7 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
@@ -70,15 +70,6 @@
         RECT 0.855000 1.075000 1.445000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.137500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,15 +82,6 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.510000 ;
-    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 ;
@@ -117,6 +99,22 @@
         RECT 7.405000 0.905000 7.710000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 7.820000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 7.820000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 7.820000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef
index 4d06f49..e142fdc 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.lef
@@ -66,22 +66,6 @@
         RECT 2.445000 1.275000 2.615000 2.425000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.485500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 1.950000 1.665000 2.275000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
index b7026ed..4e5eb06 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
@@ -68,15 +68,6 @@
         RECT 2.445000 1.275000 2.615000 2.425000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.386750 ;
-    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  1.275000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.485500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 1.950000 1.665000 2.275000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef
index e1390b8..de0a6d7 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.lef
@@ -68,22 +68,6 @@
         RECT 4.260000 1.075000 4.900000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.788000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +81,22 @@
         RECT 4.430000 1.955000 4.680000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
index 331d6b9..d55086b 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
@@ -70,15 +70,6 @@
         RECT 4.260000 1.075000 4.900000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.734500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,15 +82,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.960000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.788000 ;
     DIRECTION OUTPUT ;
@@ -113,6 +95,22 @@
         RECT 4.430000 1.955000 4.680000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef
index 68dae74..83f2302 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.lef
@@ -64,22 +64,6 @@
         RECT 7.065000 1.075000 8.675000 1.285000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.608500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +79,22 @@
         RECT 8.215000 1.625000 8.465000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
index 9e96437..9299b22 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 7.065000 1.075000 8.675000 1.285000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.345500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -87,15 +78,6 @@
         RECT -0.190000 1.305000 11.230000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  3.080000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.608500 ;
     DIRECTION OUTPUT ;
@@ -111,6 +93,22 @@
         RECT 8.215000 1.625000 8.465000 2.125000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef
index e76b888..26ea8e5 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.lef
@@ -65,22 +65,6 @@
         RECT 2.325000 0.995000 2.650000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.833500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 1.885000 0.825000 2.155000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT -0.015000  2.635000 2.760000 2.805000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
index a92462a..9df55e2 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
@@ -67,15 +67,6 @@
         RECT 2.325000 0.995000 2.650000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  0.377000 ;
-    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.540000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.833500 ;
     DIRECTION OUTPUT ;
@@ -107,6 +89,22 @@
         RECT 1.885000 0.825000 2.155000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT -0.015000  2.635000 2.760000 2.805000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef
index d1e883f..e009bd0 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.lef
@@ -64,22 +64,6 @@
         RECT 4.630000 0.755000 4.970000 1.325000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.136000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +77,22 @@
         RECT 4.625000 1.665000 4.965000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
index 4edf7bc..28ef459 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 4.630000 0.755000 4.970000 1.325000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.007500 ;
-    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  0.700000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.136000 ;
     DIRECTION OUTPUT ;
@@ -109,6 +91,22 @@
         RECT 4.625000 1.665000 4.965000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef
index fca3440..1a575c9 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.lef
@@ -64,22 +64,6 @@
         RECT 7.165000 1.055000 8.585000 1.275000 ;
     END
   END B1
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 8.740000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 8.740000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.851000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +78,22 @@
         RECT 8.300000 1.695000 8.625000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
index 27329ee..90bda1e 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
@@ -66,15 +66,6 @@
         RECT 7.165000 1.055000 8.585000 1.275000 ;
     END
   END B1
-  PIN VGND
-    ANTENNADIFFAREA  1.725750 ;
-    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  1.851000 ;
     DIRECTION OUTPUT ;
@@ -110,6 +92,22 @@
         RECT 8.300000 1.695000 8.625000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 8.740000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 8.740000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 8.740000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef
index b890099..8b91c68 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.lef
@@ -73,22 +73,6 @@
         RECT 0.920000 0.995000 1.305000 1.615000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.758800 ;
     DIRECTION OUTPUT ;
@@ -100,6 +84,22 @@
         RECT 0.530000 1.785000 1.530000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
index 32c078b..c09349a 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
@@ -75,15 +75,6 @@
         RECT 0.920000 0.995000 1.305000 1.615000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  0.601250 ;
-    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.758750 ;
     DIRECTION OUTPUT ;
@@ -116,6 +98,22 @@
         RECT 0.530000 1.785000 1.530000 2.465000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef
index f8ea340..45e7673 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.lef
@@ -73,22 +73,6 @@
         RECT 0.090000 1.075000 0.895000 1.325000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.061000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +87,22 @@
         RECT 3.025000 1.665000 3.405000 2.085000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
index 2198333..c24cec9 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
@@ -75,15 +75,6 @@
         RECT 0.090000 1.075000 0.895000 1.325000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.059500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -96,15 +87,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.850000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.061000 ;
     DIRECTION OUTPUT ;
@@ -119,6 +101,22 @@
         RECT 3.025000 1.665000 3.405000 2.085000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef
index 70bca28..9a2cf8c 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.lef
@@ -73,22 +73,6 @@
         RECT 0.110000 1.075000 1.835000 1.275000 ;
     END
   END B2
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -104,6 +88,22 @@
         RECT 5.750000 1.665000 6.130000 2.085000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
index cd858bb..10f5dff 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
@@ -75,15 +75,6 @@
         RECT 0.110000 1.075000 1.835000 1.275000 ;
     END
   END B2
-  PIN VGND
-    ANTENNADIFFAREA  1.413750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -96,15 +87,6 @@
         RECT -0.190000 1.305000 11.230000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.410000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  2.024500 ;
     DIRECTION OUTPUT ;
@@ -120,6 +102,22 @@
         RECT 5.750000 1.665000 6.130000 2.085000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.lef
index 66988ba..d22d61a 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 0.765000 0.440000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.300000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.300000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.551500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 1.915000 0.825000 2.215000 1.845000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
index aac7ef5..88fbe89 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 0.765000 0.440000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.330700 ;
-    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.551500 ;
     DIRECTION OUTPUT ;
@@ -89,6 +71,22 @@
         RECT 1.915000 0.825000 2.215000 1.845000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.300000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.300000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.300000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.lef
index 2eaa229..2d8c326 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.lef
@@ -46,22 +46,6 @@
         RECT 0.125000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -75,6 +59,22 @@
         RECT 1.935000 0.825000 2.415000 1.835000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
index 8c9af00..75a8644 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.125000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.533700 ;
-    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.595700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -91,6 +73,22 @@
         RECT 1.935000 0.825000 2.415000 1.835000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.lef
index f2d34cf..1c58070 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 2.825000 0.905000 3.170000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
index a8a8ca7..643d89d 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.090000 0.765000 0.345000 1.325000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.841750 ;
-    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.955000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +77,22 @@
         RECT 2.825000 0.905000 3.170000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.lef
index 8a82c85..f96a001 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.lef
@@ -46,22 +46,6 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.396500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 5.015000 0.905000 5.415000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
index 60d3264..02518df 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.722500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.420000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.396500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +77,22 @@
         RECT 5.015000 0.905000 5.415000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.lef
index 3c25661..d910b7f 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.lef
@@ -46,22 +46,6 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.862000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 5.935000 0.905000 6.335000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
index 164df76..413369e 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
@@ -48,15 +48,6 @@
         RECT 1.355000 1.075000 2.025000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.963000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.900000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -69,15 +60,6 @@
         RECT -0.190000 1.305000 7.090000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.710000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.900000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.862000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +79,22 @@
         RECT 5.935000 0.905000 6.335000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.900000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.900000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.900000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef
index 521dc1d..3584e7a 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.455500 ;
     DIRECTION OUTPUT ;
@@ -73,6 +57,22 @@
         RECT 2.705000 0.760000 3.090000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
index 74bcbd2..5717059 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.572250 ;
-    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.455500 ;
     DIRECTION OUTPUT ;
@@ -89,6 +71,22 @@
         RECT 2.705000 0.760000 3.090000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef
index f1a2f9e..77f143d 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.lef
@@ -46,22 +46,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.811500 ;
     DIRECTION OUTPUT ;
@@ -71,6 +55,22 @@
         RECT 2.790000 0.415000 3.110000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
index 4269ae5..5e61087 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  0.776400 ;
-    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.719100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.811500 ;
     DIRECTION OUTPUT ;
@@ -87,6 +69,22 @@
         RECT 2.790000 0.415000 3.110000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef
index 4b2d08c..824b4da 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.lef
@@ -46,22 +46,6 @@
         RECT 0.090000 1.075000 0.425000 1.955000 ;
     END
   END B_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -79,6 +63,22 @@
         RECT 4.105000 0.905000 4.490000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
index a3cfd58..1939f95 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
@@ -48,15 +48,6 @@
         RECT 0.090000 1.075000 0.425000 1.955000 ;
     END
   END B_N
-  PIN VGND
-    ANTENNADIFFAREA  1.112050 ;
-    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  1.068400 ;
-    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 ;
@@ -95,6 +77,22 @@
         RECT 4.105000 0.905000 4.490000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.lef
index 5d08dbe..ee008cc 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 0.995000 0.430000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.810200 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 2.445000 0.760000 2.615000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
index 09b599b..c943a58 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.085000 0.995000 0.430000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.349650 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 2.760000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 2.950000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.310700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 2.760000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.810250 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 2.445000 0.760000 2.615000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 2.760000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 2.760000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 2.760000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.lef
index c7337ce..9dcb6c7 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 0.995000 0.385000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 2.470000 0.760000 2.655000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
index 59f5ab5..10adfd3 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.085000 0.995000 0.385000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.646900 ;
-    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.825700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.530500 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 2.470000 0.760000 2.655000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.lef
index 873272b..0cc2e60 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.lef
@@ -56,22 +56,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 4.115000 0.905000 4.455000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
index b5c080f..c42fcb6 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.085000 1.075000 0.425000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  1.205750 ;
-    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.480000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +85,22 @@
         RECT 4.115000 0.905000 4.455000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef
index fb804e6..7920a96 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.lef
@@ -56,22 +56,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463700 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 3.215000 0.760000 3.535000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
index adb4414..10ec856 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 0.090000 1.075000 0.425000 1.325000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.478700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.424100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463750 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 3.215000 0.760000 3.535000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef
index f2f2bc4..2df4710 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.741200 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.985000 1.495000 1.430000 1.700000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
index ca3f206..b8453e7 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.555750 ;
-    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.616400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.741250 ;
     DIRECTION OUTPUT ;
@@ -98,6 +80,22 @@
         RECT 0.985000 1.495000 1.430000 1.700000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef
index e5273da..0dbfda1 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.lef
@@ -55,22 +55,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 2.005000 0.255000 2.240000 0.735000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
index 109bc07..bd595cf 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
@@ -57,15 +57,6 @@
         RECT 0.085000 1.075000 0.425000 1.640000 ;
     END
   END C_N
-  PIN VGND
-    ANTENNADIFFAREA  0.863500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -78,15 +69,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.885700 ;
-    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 ;
@@ -100,6 +82,22 @@
         RECT 2.005000 0.255000 2.240000 0.735000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.lef
index 0e01ebc..66242da 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.lef
@@ -64,22 +64,6 @@
         RECT 0.090000 0.755000 0.440000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.220000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.703000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 2.905000 0.760000 3.075000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
index 4aa5183..97866b3 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.090000 0.755000 0.440000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.479850 ;
-    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.310700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.220000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.703000 ;
     DIRECTION OUTPUT ;
@@ -107,6 +89,22 @@
         RECT 2.905000 0.760000 3.075000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.220000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.220000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.220000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.lef
index 986eef8..3cd740d 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.755000 0.435000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.802800 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 2.890000 0.760000 3.125000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
index 9e5763b..052a289 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.085000 0.755000 0.435000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  0.666600 ;
-    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.625700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.802750 ;
     DIRECTION OUTPUT ;
@@ -107,6 +89,22 @@
         RECT 2.890000 0.760000 3.125000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.lef
index c3a2dcd..d155024 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.lef
@@ -68,22 +68,6 @@
         RECT 0.085000 0.755000 0.370000 1.325000 ;
     END
   END D
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -99,6 +83,22 @@
         RECT 4.210000 0.905000 4.485000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
index a98c769..045bdd7 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
@@ -70,15 +70,6 @@
         RECT 0.085000 0.755000 0.370000 1.325000 ;
     END
   END D
-  PIN VGND
-    ANTENNADIFFAREA  1.075750 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,15 +82,6 @@
         RECT -0.190000 1.305000 4.790000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.970000 ;
-    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 ;
@@ -115,6 +97,22 @@
         RECT 4.210000 0.905000 4.485000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef
index 8297faa..9314ff7 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 0.755000 0.425000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463700 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 3.725000 0.760000 3.995000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
index 14db3aa..e9bb27f 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.085000 0.755000 0.425000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.618450 ;
-    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.424100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463750 ;
     DIRECTION OUTPUT ;
@@ -107,6 +89,22 @@
         RECT 3.725000 0.760000 3.995000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef
index 916c33b..4910fc8 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.lef
@@ -64,22 +64,6 @@
         RECT 0.085000 1.075000 0.425000 1.435000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.140000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.140000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 1.020000 1.495000 1.350000 1.825000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
index cf251e3..35232f7 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.085000 1.075000 0.425000 1.435000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.677100 ;
-    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.722700 ;
-    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 ;
@@ -107,6 +89,22 @@
         RECT 1.020000 1.495000 1.350000 1.825000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.140000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.140000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.140000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef
index dbbc313..d045995 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.lef
@@ -65,22 +65,6 @@
         RECT 0.105000 0.995000 0.445000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 5.175000 0.905000 5.415000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
index ad328d8..c14a46f 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
@@ -67,15 +67,6 @@
         RECT 0.105000 0.995000 0.445000 1.955000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.202300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.520000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.305000 5.710000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.073400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.520000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -112,6 +94,22 @@
         RECT 5.175000 0.905000 5.415000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.520000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.520000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.520000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef
index dd8f0a1..025542d 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.lef
@@ -64,22 +64,6 @@
         RECT 0.980000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 4.600000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463700 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 4.235000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
index e853f15..6c85348 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
@@ -66,15 +66,6 @@
         RECT 0.980000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.620550 ;
-    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.564325 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 4.600000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.463750 ;
     DIRECTION OUTPUT ;
@@ -107,6 +89,22 @@
         RECT 4.235000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 4.600000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 4.600000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 4.600000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef
index 16e0fb6..025b1f6 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.lef
@@ -64,22 +64,6 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.060000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.060000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.498000 ;
     DIRECTION OUTPUT ;
@@ -91,6 +75,22 @@
         RECT 4.260000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
index 697fcc9..0f876ed 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
@@ -66,15 +66,6 @@
         RECT 1.000000 0.995000 1.340000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  0.812100 ;
-    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  0.859325 ;
-    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 ;
@@ -107,6 +89,22 @@
         RECT 4.260000 0.760000 4.455000 1.495000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.060000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.060000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.060000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef
index cad51db..3535e60 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.lef
@@ -65,22 +65,6 @@
         RECT 0.995000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +80,22 @@
         RECT 5.625000 0.905000 5.855000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
index edc5d7c..4f82d0a 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
@@ -67,15 +67,6 @@
         RECT 0.995000 0.995000 1.335000 1.325000 ;
     END
   END D_N
-  PIN VGND
-    ANTENNADIFFAREA  1.204400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -88,15 +79,6 @@
         RECT -0.190000 1.285000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.203625 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.028500 ;
     DIRECTION OUTPUT ;
@@ -112,6 +94,22 @@
         RECT 5.625000 0.905000 5.855000 1.455000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 5.980000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 5.980000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef
index cab1f23..61b0a2f 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.lef
@@ -27,7 +27,7 @@
   CLASS CORE ;
   SYMMETRY X Y R90 ;
   SIZE  5.980000 BY  2.720000 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -37,9 +37,21 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met5 ;
+        RECT 1.250000 0.560000 4.270000 2.160000 ;
+      LAYER via4 ;
+        RECT 1.560000 0.870000 2.360000 1.670000 ;
+        RECT 3.160000 0.870000 3.960000 1.670000 ;
+    END
+  END X
   PIN VGND
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
@@ -55,7 +67,7 @@
   END VGND
   PIN VPWR
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -69,18 +81,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met5 ;
-        RECT 1.250000 0.560000 4.270000 2.160000 ;
-      LAYER via4 ;
-        RECT 1.560000 0.870000 2.360000 1.670000 ;
-        RECT 3.160000 0.870000 3.960000 1.670000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
index 021df61..bba31a8 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
@@ -29,7 +29,7 @@
   ORIGIN  0.000000  0.000000 ;
   SIZE  5.980000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -39,11 +39,30 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.339000 ;
-    DIRECTION INPUT ;
+  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
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met5 ;
+        RECT 1.250000 1.950000 4.270000 2.160000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
         RECT 0.615000  0.085000 0.895000 0.565000 ;
@@ -72,22 +91,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 INPUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -117,14 +123,6 @@
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
-  PIN X
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met5 ;
-        RECT 1.250000 1.950000 4.270000 2.160000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef
index 5492bae..21952dd 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.lef
@@ -27,7 +27,7 @@
   CLASS CORE ;
   SYMMETRY X Y R90 ;
   SIZE  5.980000 BY  2.720000 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -37,9 +37,21 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
+  PIN X
+    ANTENNADIFFAREA  1.028500 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met3 ;
+        RECT -0.715000 1.030000 0.065000 1.350000 ;
+      LAYER via3 ;
+        RECT -0.625000 1.090000 -0.425000 1.290000 ;
+        RECT -0.225000 1.090000 -0.025000 1.290000 ;
+    END
+  END X
   PIN VGND
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT 0.000000 -0.085000 5.980000 0.085000 ;
@@ -58,7 +70,7 @@
   END VGND
   PIN VPWR
     DIRECTION INPUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT 0.000000 2.635000 5.980000 2.805000 ;
@@ -75,18 +87,6 @@
         RECT 5.605000 2.645000 5.755000 2.795000 ;
     END
   END VPWR
-  PIN X
-    ANTENNADIFFAREA  1.028500 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met3 ;
-        RECT -0.715000 1.030000 0.065000 1.350000 ;
-      LAYER via3 ;
-        RECT -0.625000 1.090000 -0.425000 1.290000 ;
-        RECT -0.225000 1.090000 -0.025000 1.290000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.095000 1.445000 1.595000 1.615000 ;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
index 1d9fd56..8020fc5 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
@@ -29,7 +29,7 @@
   ORIGIN  0.000000  0.000000 ;
   SIZE  5.980000 BY  2.720000 ;
   SYMMETRY X Y R90 ;
-  SITE unit ;
+  SITE unithd ;
   PIN A
     ANTENNAGATEAREA  0.832500 ;
     DIRECTION INPUT ;
@@ -39,21 +39,6 @@
         RECT 0.140000 1.075000 1.240000 1.275000 ;
     END
   END A
-  PIN VGND
-    ANTENNADIFFAREA  1.339000 ;
-    DIRECTION INPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met4 ;
-        RECT 4.930000 -0.895000 6.110000 0.285000 ;
-    END
-    PORT
-      LAYER met5 ;
-        RECT 4.360000 -1.170000 6.675000 -0.455000 ;
-        RECT 4.360000 -0.155000 6.675000  0.560000 ;
-        RECT 4.560000 -0.455000 6.675000 -0.155000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -66,11 +51,32 @@
         RECT -0.190000 1.305000 6.170000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.720000 ;
-    DIRECTION INPUT ;
+  PIN X
+    DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
+      LAYER met5 ;
+        RECT -1.260000 0.560000 1.060000 2.160000 ;
+    END
+  END X
+  PIN VGND
+    DIRECTION INPUT ;
+    USE GROUND ;
+    PORT
+      LAYER met4 ;
+        RECT 4.930000 -0.895000 6.110000 0.285000 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT 4.360000 -1.170000 6.675000 -0.455000 ;
+        RECT 4.360000 -0.155000 6.675000  0.560000 ;
+        RECT 4.560000 -0.455000 6.675000 -0.155000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INPUT ;
+    USE POWER ;
+    PORT
       LAYER met4 ;
         RECT 4.930000 2.435000 6.110000 3.615000 ;
     END
@@ -81,14 +87,6 @@
         RECT 4.560000 2.875000 6.675000 3.175000 ;
     END
   END VPWR
-  PIN X
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met5 ;
-        RECT -1.260000 0.560000 1.060000 2.160000 ;
-    END
-  END X
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 5.980000 0.085000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef
index 88a3d5b..fb97470 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.lef
@@ -113,7 +113,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.640000 0.085000 ;
@@ -131,7 +131,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.640000 2.805000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
index a28a915..b26c7f4 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
@@ -114,10 +114,21 @@
         RECT 10.655000 0.920000 10.945000 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 15.830000 2.910000 ;
+    END
+  END VPB
   PIN VGND
-    ANTENNADIFFAREA  1.524700 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER li1 ;
         RECT  0.000000 -0.085000 15.640000 0.085000 ;
@@ -170,22 +181,9 @@
         RECT 0.000000 -0.240000 15.640000 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 15.830000 2.910000 ;
-    END
-  END VPB
   PIN VPWR
-    ANTENNADIFFAREA  2.152000 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER li1 ;
         RECT  0.000000 2.635000 15.640000 2.805000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef
index be51cab..0bd2146 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.lef
@@ -100,7 +100,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
@@ -108,7 +108,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
index 33c9489..db66816 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
@@ -100,15 +100,6 @@
         RECT 1.585000 1.335000 2.220000 1.745000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.540500 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 14.260000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -123,10 +114,17 @@
         RECT  4.455000 1.305000 14.450000 1.425000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.880750 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 14.260000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef
index c603069..6910e0f 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.lef
@@ -100,7 +100,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
@@ -108,7 +108,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
index c9a9e89..44addb7 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
@@ -100,15 +100,6 @@
         RECT 1.585000 1.335000 2.220000 1.745000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.778050 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 14.720000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -123,10 +114,17 @@
         RECT  4.455000 1.305000 14.910000 1.425000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.269200 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 14.720000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef
index a4e12cd..b3f864c 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.lef
@@ -89,7 +89,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
@@ -97,7 +97,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
index b380d99..d7fbd1a 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
@@ -89,15 +89,6 @@
         RECT 1.585000 1.335000 2.220000 1.745000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.353300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.880000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -112,10 +103,17 @@
         RECT  4.455000 1.305000 13.070000 1.425000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.639800 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.880000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef
index 401e1a6..01e2a94 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.lef
@@ -89,7 +89,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
@@ -97,7 +97,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
index 63c0b2c..21f3a62 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
@@ -89,15 +89,6 @@
         RECT 1.585000 1.335000 2.220000 1.745000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.353300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 12.880000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -112,10 +103,17 @@
         RECT  4.455000 1.305000 13.070000 1.425000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.639800 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 12.880000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef
index c8e2764..0f0747a 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.lef
@@ -89,7 +89,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
@@ -97,7 +97,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
index 97f9d11..2a55409 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
@@ -89,15 +89,6 @@
         RECT 1.585000 1.335000 2.220000 1.745000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.619800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 13.340000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -112,10 +103,17 @@
         RECT  4.455000 1.305000 13.530000 1.425000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.059800 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef
index 2321155..eee9f19 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.lef
@@ -94,7 +94,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
@@ -102,7 +102,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
index 31b7375..7585056 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
@@ -94,15 +94,6 @@
         RECT 1.585000 1.335000 2.220000 1.745000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.704300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 14.260000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -117,10 +108,17 @@
         RECT  4.455000 1.305000 14.450000 1.425000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.264800 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 14.260000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef
index 7fc2d2d..75d7ee0 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.lef
@@ -104,7 +104,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
@@ -112,7 +112,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
index 266a19e..52347d8 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
@@ -105,15 +105,6 @@
         RECT 9.675000 1.600000 9.965000 1.645000 ;
     END
   END SET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.460100 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 14.720000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -126,10 +117,17 @@
         RECT -0.190000 1.305000 14.910000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.970500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 14.720000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef
index 53ff70b..e24e624 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.lef
@@ -104,7 +104,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
@@ -112,7 +112,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.640000 2.960000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
index 3574b08..d7cd819 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
@@ -105,15 +105,6 @@
         RECT 9.675000 1.600000 9.965000 1.645000 ;
     END
   END SET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.905350 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 15.640000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -126,10 +117,17 @@
         RECT -0.190000 1.305000 15.830000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.625500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 15.640000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.640000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef
index 24c87b7..45136d6 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.lef
@@ -91,7 +91,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
@@ -99,7 +99,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
index d17d3e7..5ea18d3 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
@@ -92,15 +92,6 @@
         RECT 9.565000 1.600000 9.905000 1.645000 ;
     END
   END SET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.284800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 13.340000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -113,10 +104,17 @@
         RECT -0.190000 1.305000 13.530000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.599700 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef
index 1faab4c..b74c0ad 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.lef
@@ -93,7 +93,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
@@ -101,7 +101,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
index 5cfb0a6..74bf270 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
@@ -94,15 +94,6 @@
         RECT 9.730000 1.600000 10.070000 1.645000 ;
     END
   END SET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.503950 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 14.260000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -115,10 +106,17 @@
         RECT -0.190000 1.305000 14.450000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.071800 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 14.260000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef
index ed62192..e921ffa 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.lef
@@ -97,7 +97,7 @@
   END SET_B
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
@@ -105,7 +105,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
index e94ca6f..3916bc1 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
@@ -98,15 +98,6 @@
         RECT 9.730000 1.600000 10.070000 1.645000 ;
     END
   END SET_B
-  PIN VGND
-    ANTENNADIFFAREA  1.732450 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 15.180000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -119,10 +110,17 @@
         RECT -0.190000 1.305000 15.370000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.397400 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 15.180000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef
index faf6a35..7d24ce1 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.lef
@@ -88,7 +88,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
@@ -96,7 +96,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
index 4fe065b..8d42213 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
@@ -88,15 +88,6 @@
         RECT 3.315000 0.785000 3.535000 1.115000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.363800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.960000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -109,10 +100,17 @@
         RECT -0.190000 1.305000 12.150000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.705550 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.960000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef
index b734bea..964ed98 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.lef
@@ -86,7 +86,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
@@ -94,7 +94,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
index b84b0e0..b68c8ba 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
@@ -86,15 +86,6 @@
         RECT 3.315000 0.785000 3.535000 1.115000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.981300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 13.340000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -107,10 +98,17 @@
         RECT -0.190000 1.305000 13.530000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.675550 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef
index bcace6a..627b2d8 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.lef
@@ -79,7 +79,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
@@ -87,7 +87,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
index 284057a..2f54170 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
@@ -79,15 +79,6 @@
         RECT 3.335000 0.785000 3.505000 1.115000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.078200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -100,10 +91,17 @@
         RECT -0.190000 1.305000 10.770000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.369900 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef
index 175cb93..d634e18 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.lef
@@ -79,7 +79,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
@@ -87,7 +87,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
index 1c5bd00..3ca9400 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
@@ -79,15 +79,6 @@
         RECT 3.335000 0.785000 3.505000 1.115000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.305350 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -100,10 +91,17 @@
         RECT -0.190000 1.305000 11.230000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.711150 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef
index 50d7aa9..2422525 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.lef
@@ -83,7 +83,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
@@ -91,7 +91,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
index 9ccf4b5..5a5252c 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
@@ -83,15 +83,6 @@
         RECT 3.335000 0.785000 3.505000 1.115000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.480850 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.960000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -104,10 +95,17 @@
         RECT -0.190000 1.305000 12.150000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.981150 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.960000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef
index 047b50f..55b2d17 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.lef
@@ -70,7 +70,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
@@ -78,7 +78,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
index 2f6c51a..b94956b 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
@@ -70,15 +70,6 @@
         RECT 0.085000 0.955000 0.330000 1.665000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  0.792650 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.360000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -91,10 +82,17 @@
         RECT -0.190000 1.305000 7.550000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.382600 ;
+  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/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef
index 6d476a5..ff84256 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.lef
@@ -75,7 +75,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
@@ -83,7 +83,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
index 9b5b7a6..fd6bc0c 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
@@ -75,15 +75,6 @@
         RECT 0.085000 0.955000 0.330000 1.665000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  0.946050 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 7.820000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -96,10 +87,17 @@
         RECT -0.190000 1.305000 8.010000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.665400 ;
+  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/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef
index dce0369..0c15443 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.lef
@@ -80,7 +80,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
@@ -88,7 +88,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
index a8a7cf3..d940d2e 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
@@ -80,15 +80,6 @@
         RECT 0.085000 0.955000 0.345000 1.665000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.307800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -101,10 +92,17 @@
         RECT -0.190000 1.305000 9.390000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.223500 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    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 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef
index 2f0853b..b1b0ba3 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.lef
@@ -94,7 +94,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
@@ -102,7 +102,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
index e679662..71e74ae 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
@@ -94,15 +94,6 @@
         RECT 5.605000 1.105000 5.885000 1.615000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.448700 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 15.180000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -117,10 +108,17 @@
         RECT  7.985000 1.305000 15.370000 1.435000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.935350 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 15.180000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef
index 9845f8a..872aba2 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.lef
@@ -96,7 +96,7 @@
   END SCE
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
@@ -104,7 +104,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 16.560000 2.960000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
index 97c9e35..bba5c88 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
@@ -96,15 +96,6 @@
         RECT 5.605000 1.105000 5.885000 1.615000 ;
     END
   END SCE
-  PIN VGND
-    ANTENNADIFFAREA  1.789200 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 16.560000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -119,10 +110,17 @@
         RECT  7.985000 1.305000 16.750000 1.435000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.495350 ;
+  PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 16.560000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 16.560000 2.960000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.lef
index 6724ffe..02a6c7f 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
index bc39e99..b52a59f 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_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
     ANTENNADIFFAREA  0.089250 ;
     PORT
@@ -52,9 +44,17 @@
         RECT 0.085000 1.470000 0.375000 2.455000 ;
     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/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef
index 4b64995..7a6fc17 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.lef
@@ -30,11 +30,11 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef
index f597ef5..ad2ef78 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.lef
@@ -30,11 +30,11 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
   END VPWR
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef
index 9e0fcf4..4f39d7e 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.lef
@@ -30,7 +30,7 @@
   SITE unithd ;
   PIN VGND
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
@@ -38,7 +38,7 @@
   END VGND
   PIN VPWR
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
index 78b7d4e..3b90672 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
@@ -31,18 +31,16 @@
   SYMMETRY X Y R90 ;
   SITE unithd ;
   PIN VGND
-    ANTENNADIFFAREA  0.089250 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE GROUND ;
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
   PIN VPWR
-    ANTENNADIFFAREA  0.148750 ;
     DIRECTION INOUT ;
-    USE SIGNAL ;
+    USE POWER ;
     PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef
index a579f2e..ac88999 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.lef
@@ -49,22 +49,6 @@
         RECT 1.945000 1.245000 2.165000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.545000 ;
     DIRECTION OUTPUT ;
@@ -78,6 +62,22 @@
         RECT 3.355000 0.825000 3.595000 1.755000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
index 5b96794..7cf5ab5 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
@@ -51,15 +51,6 @@
         RECT 1.945000 1.245000 2.165000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.442000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -72,15 +63,6 @@
         RECT -0.190000 1.305000 3.870000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.480000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.545000 ;
     DIRECTION OUTPUT ;
@@ -94,6 +76,22 @@
         RECT 3.355000 0.825000 3.595000 1.755000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef
index f916dbf..6ef350b 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.lef
@@ -50,22 +50,6 @@
         RECT 3.180000 1.285000 3.350000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.953000 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 5.950000 0.475000 6.340000 1.415000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
index 87a79b0..0a5134f 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
@@ -52,15 +52,6 @@
         RECT 3.180000 1.285000 3.350000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.734500 ;
-    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  1.430000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  0.953000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +79,22 @@
         RECT 5.950000 0.475000 6.340000 1.415000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef
index 217636f..a0c29c6 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.lef
@@ -50,22 +50,6 @@
         RECT 6.100000 1.275000 6.270000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.858500 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 10.705000 0.905000 10.940000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
index 6818dd7..a0effca 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
@@ -52,15 +52,6 @@
         RECT 6.100000 1.275000 6.270000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.378000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -73,15 +64,6 @@
         RECT -0.190000 1.305000 11.230000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  2.320000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN Y
     ANTENNADIFFAREA  1.858500 ;
     DIRECTION OUTPUT ;
@@ -98,6 +80,22 @@
         RECT 10.705000 0.905000 10.940000 1.445000 ;
     END
   END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef
index aafad98..8341e76 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.lef
@@ -56,22 +56,6 @@
         RECT 1.715000 1.075000 2.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -82,6 +66,22 @@
         RECT 0.085000 1.440000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
index c16d96b..8bdec16 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.715000 1.075000 2.330000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.912400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.200000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 9.390000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.225950 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.200000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +80,22 @@
         RECT 0.085000 1.440000 0.365000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.200000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.200000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.200000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef
index 2cdb17f..7aff161 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.lef
@@ -56,22 +56,6 @@
         RECT 2.225000 1.075000 2.840000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.550500 ;
     DIRECTION OUTPUT ;
@@ -81,6 +65,22 @@
         RECT 0.545000 0.350000 0.865000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
index 300eebc..8bcb4a1 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 2.225000 1.075000 2.840000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.854300 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 9.850000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.220950 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.550500 ;
     DIRECTION OUTPUT ;
@@ -97,6 +79,22 @@
         RECT 0.545000 0.350000 0.865000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef
index cd7278f..bdbcbc5 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.lef
@@ -56,22 +56,6 @@
         RECT 3.245000 1.075000 3.860000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -87,6 +71,22 @@
         RECT 1.565000 1.440000 1.895000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
index c29b5e6..f51163f 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
@@ -58,15 +58,6 @@
         RECT 3.245000 1.075000 3.860000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  1.074800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 10.770000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.500950 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -103,6 +85,22 @@
         RECT 1.565000 1.440000 1.895000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef
index 557170f..233fb8c 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.lef
@@ -49,22 +49,6 @@
         RECT 1.720000 1.245000 1.890000 1.445000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 3.680000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -77,6 +61,22 @@
         RECT 3.225000 1.535000 3.545000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
index 8c8f2ed..96d85a4 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
@@ -51,15 +51,6 @@
         RECT 1.720000 1.245000 1.890000 1.445000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  0.728000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 3.680000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -72,15 +63,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 X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -93,6 +75,22 @@
         RECT 3.225000 1.535000 3.545000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 3.680000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 3.680000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 3.680000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef
index ec93086..0513ff2 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.lef
@@ -54,22 +54,6 @@
         RECT 3.765000 1.260000 4.055000 1.305000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.806800 ;
     DIRECTION OUTPUT ;
@@ -84,6 +68,22 @@
         RECT 5.985000 0.905000 6.350000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
index 4bc0370..559bd41 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
@@ -56,15 +56,6 @@
         RECT 3.765000 1.260000 4.055000 1.305000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.069250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 6.440000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -77,15 +68,6 @@
         RECT -0.190000 1.305000 6.630000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  0.925000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 6.440000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.806750 ;
     DIRECTION OUTPUT ;
@@ -100,6 +82,22 @@
         RECT 5.985000 0.905000 6.350000 1.415000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 6.440000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 6.440000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 6.440000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef
index 39ef0c4..a7577ec 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.lef
@@ -51,22 +51,6 @@
         RECT 3.270000 1.105000 6.340000 1.275000 ;
     END
   END B
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.318500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 10.635000 0.905000 10.955000 1.445000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
index 8d4cb26..265b8ed 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
@@ -53,15 +53,6 @@
         RECT 3.270000 1.105000 6.340000 1.275000 ;
     END
   END B
-  PIN VGND
-    ANTENNADIFFAREA  1.979250 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 11.040000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -74,15 +65,6 @@
         RECT -0.190000 1.305000 11.230000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.740000 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 11.040000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  1.759450 ;
     DIRECTION OUTPUT ;
@@ -94,6 +76,22 @@
         RECT 8.705000 0.695000 8.995000 0.780000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 11.040000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 11.040000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 11.040000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef
index 10979c4..4bd11ed 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.lef
@@ -56,22 +56,6 @@
         RECT 1.960000 0.995000 2.645000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -83,6 +67,22 @@
         RECT 0.085000 1.440000 0.610000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
index 6335e55..4c94d49 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
@@ -58,15 +58,6 @@
         RECT 1.960000 0.995000 2.645000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.970950 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 9.850000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.309400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.472000 ;
     DIRECTION OUTPUT ;
@@ -99,6 +81,22 @@
         RECT 0.085000 1.440000 0.610000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef
index 8e2f291..30ed0ff 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.lef
@@ -56,22 +56,6 @@
         RECT 2.255000 0.995000 2.940000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.517500 ;
     DIRECTION OUTPUT ;
@@ -85,6 +69,22 @@
         RECT 0.680000 0.350000 0.930000 0.660000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
index 42705aa..bf557e2 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
@@ -58,15 +58,6 @@
         RECT 2.255000 0.995000 2.940000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  0.896050 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 9.660000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 9.850000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.269400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 9.660000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.517500 ;
     DIRECTION OUTPUT ;
@@ -101,6 +83,22 @@
         RECT 0.680000 0.350000 0.930000 0.660000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 9.660000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 9.660000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT 0.000000 -0.085000 9.660000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef
index 22abebd..ded9ec8 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.lef
@@ -56,22 +56,6 @@
         RECT 3.130000 0.995000 3.815000 1.325000 ;
     END
   END C
-  PIN VGND
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -88,6 +72,22 @@
         RECT 1.685000 2.045000 1.855000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
index 1d639a9..6ac409f 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
@@ -58,15 +58,6 @@
         RECT 3.130000 0.995000 3.815000 1.325000 ;
     END
   END C
-  PIN VGND
-    ANTENNADIFFAREA  1.225400 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 10.580000 0.240000 ;
-    END
-  END VGND
   PIN VNB
     PORT
       LAYER pwell ;
@@ -79,15 +70,6 @@
         RECT -0.190000 1.305000 10.770000 2.910000 ;
     END
   END VPB
-  PIN VPWR
-    ANTENNADIFFAREA  1.490800 ;
-    DIRECTION INOUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 2.480000 10.580000 2.960000 ;
-    END
-  END VPWR
   PIN X
     ANTENNADIFFAREA  0.996000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +86,22 @@
         RECT 1.685000 2.045000 1.855000 2.465000 ;
     END
   END X
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 10.580000 0.240000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 2.480000 10.580000 2.960000 ;
+    END
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.000000 -0.085000 10.580000 0.085000 ;