diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.magic.lef
index f9f0e84..bf0bcdd 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 2.445000 1.500000 2.775000 1.800000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.magic.lef
index e80df3e..1fba2af 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 1.565000 1.350000 2.275000 1.780000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.magic.lef
index c1b0c24..0c71892 100644
--- a/cells/a2111o/sky130_fd_sc_ls__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_ls__a2111o_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.385000 1.260000 3.715000 1.780000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.magic.lef
index 74efc28..264c6d4 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.465000 1.350000 0.835000 1.780000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.722400 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.magic.lef
index 6b0e7d2..cc1c571 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.605000 1.350000 1.315000 1.780000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.027900 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.magic.lef
index 305aba1..f1b82a8 100644
--- a/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_ls__a2111oi_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.555000 1.180000 1.905000 1.550000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.708000 ;
     DIRECTION OUTPUT ;
@@ -113,6 +101,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_ls__a211o_1.magic.lef
index aca8bcf..dab169d 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 3.385000 0.255000 3.715000 0.670000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_ls__a211o_2.magic.lef
index 5717b28..fdc6537 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.405000 1.450000 3.735000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211o/sky130_fd_sc_ls__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_ls__a211o_4.magic.lef
index b55da6f..2be494d 100644
--- a/cells/a211o/sky130_fd_sc_ls__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_ls__a211o_4.magic.lef
@@ -65,18 +65,6 @@
         RECT 3.450000 1.210000 3.780000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.magic.lef
index ec7f69a..5250759 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.445000 1.180000 2.775000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.792700 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.magic.lef
index f2cbd0a..47eefbb 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.965000 1.180000 4.675000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.076000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.magic.lef
index c88e475..91015bc 100644
--- a/cells/a211oi/sky130_fd_sc_ls__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_ls__a211oi_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 6.365000 1.350000 7.555000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.685800 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.magic.lef
index fab52be..7b60731 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.515000 1.180000 2.845000 1.550000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.magic.lef
index a6e2e59..fa50cff 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.125000 1.180000 0.510000 1.550000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.magic.lef
index 36f379a..3aefc50 100644
--- a/cells/a21bo/sky130_fd_sc_ls__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_ls__a21bo_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.125000 0.505000 0.355000 0.670000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.magic.lef
index 06253f0..b28b85a 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.120000 0.255000 0.450000 1.605000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.515200 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.magic.lef
index ee1f291..65ad6a8 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.125000 1.450000 0.475000 1.780000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.750400 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.magic.lef
index 5455df3..a99fda2 100644
--- a/cells/a21boi/sky130_fd_sc_ls__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_ls__a21boi_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 6.365000 1.490000 7.555000 1.820000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.500800 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_ls__a21o_1.magic.lef
index 7d60518..4445ba6 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.585000 1.450000 1.835000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_ls__a21o_2.magic.lef
index 2c219b7..54e3492 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.565000 1.180000 1.990000 1.535000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21o/sky130_fd_sc_ls__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_ls__a21o_4.magic.lef
index 35275bc..e98749c 100644
--- a/cells/a21o/sky130_fd_sc_ls__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_ls__a21o_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.425000 1.435000 2.755000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.magic.lef
index 667c31a..ec6e9af 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.560000 1.190000 1.815000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.596600 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.magic.lef
index f586922..9567f5f 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.105000 1.435000 0.435000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.739300 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.magic.lef
index 7fc2cbd..aa4b72f 100644
--- a/cells/a21oi/sky130_fd_sc_ls__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_ls__a21oi_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 4.235000 1.350000 5.245000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.478600 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_ls__a221o_1.magic.lef
index 496429d..5581bbf 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.865000 0.255000 4.195000 0.670000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_ls__a221o_2.magic.lef
index 92053d5..c0bc7e1 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.865000 1.180000 4.195000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221o/sky130_fd_sc_ls__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_ls__a221o_4.magic.lef
index c6ebae6..4c641ed 100644
--- a/cells/a221o/sky130_fd_sc_ls__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_ls__a221o_4.magic.lef
@@ -74,18 +74,6 @@
         RECT 5.405000 1.470000 5.735000 2.150000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.magic.lef
index 70d38f6..dbc3e60 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.545000 1.350000 0.875000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.177500 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.magic.lef
index cf2dedf..85f900a 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 0.585000 1.350000 0.915000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.172200 ;
     DIRECTION OUTPUT ;
@@ -116,6 +104,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.magic.lef
index 63360b8..f0902d6 100644
--- a/cells/a221oi/sky130_fd_sc_ls__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_ls__a221oi_4.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.525000 1.350000 1.875000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.560000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.750000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.380200 ;
     DIRECTION OUTPUT ;
@@ -114,6 +102,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_1.magic.lef b/cells/a222o/sky130_fd_sc_ls__a222o_1.magic.lef
index 9703cde..ac4b4e5 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_1.magic.lef
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 1.060000 1.120000 1.390000 1.760000 ;
     END
   END C2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a222o/sky130_fd_sc_ls__a222o_2.magic.lef b/cells/a222o/sky130_fd_sc_ls__a222o_2.magic.lef
index 9498c60..23ea2ec 100644
--- a/cells/a222o/sky130_fd_sc_ls__a222o_2.magic.lef
+++ b/cells/a222o/sky130_fd_sc_ls__a222o_2.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.605000 1.260000 1.140000 1.780000 ;
     END
   END C2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.magic.lef
index cc6bf21..da81ce9 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_1.magic.lef
@@ -79,18 +79,6 @@
         RECT 0.985000 1.120000 1.315000 1.790000 ;
     END
   END C2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.232000 ;
     DIRECTION OUTPUT ;
@@ -116,6 +104,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.magic.lef b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.magic.lef
index 20d230d..842b1ac 100644
--- a/cells/a222oi/sky130_fd_sc_ls__a222oi_2.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_ls__a222oi_2.magic.lef
@@ -90,18 +90,6 @@
         RECT 1.795000 1.130000 2.125000 1.665000 ;
     END
   END C2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.693200 ;
     DIRECTION OUTPUT ;
@@ -136,6 +124,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_ls__a22o_1.magic.lef
index b364db6..6993d5f 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 0.125000 1.470000 1.215000 1.800000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_ls__a22o_2.magic.lef
index 536ad61..f777cdd 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.705000 1.350000 3.235000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22o/sky130_fd_sc_ls__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_ls__a22o_4.magic.lef
index 87516ed..b5f8b78 100644
--- a/cells/a22o/sky130_fd_sc_ls__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_ls__a22o_4.magic.lef
@@ -66,18 +66,6 @@
         RECT 4.025000 1.770000 4.195000 1.935000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.magic.lef
index f4791c5..1f0cc04 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.105000 1.180000 0.435000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.624600 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.magic.lef
index 5301412..00306f1 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 3.405000 1.430000 3.735000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.497400 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.magic.lef
index c7259df..65ffabb 100644
--- a/cells/a22oi/sky130_fd_sc_ls__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_ls__a22oi_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.605000 1.350000 1.955000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.172800 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.magic.lef
index b563816..cf31fd9 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.875000 1.450000 3.235000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.magic.lef
index 7102034..388d6c5 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.605000 1.180000 1.315000 1.550000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.magic.lef
index ea42a26..9d703f6 100644
--- a/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_ls__a2bb2o_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 5.405000 1.260000 6.115000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.magic.lef
index aad958a..e291f11 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.525000 1.540000 2.755000 2.150000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.515200 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.magic.lef
index 2fbf943..d914f67 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.405000 1.320000 3.735000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.750400 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.magic.lef
index 70600a5..c2efe86 100644
--- a/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_ls__a2bb2oi_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 4.445000 1.350000 6.115000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.500800 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_ls__a311o_1.magic.lef
index 60fe42d..cafe482 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_1.magic.lef
@@ -72,18 +72,6 @@
         RECT 3.385000 0.255000 3.715000 0.670000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_ls__a311o_2.magic.lef
index d1c1b8e..c9870b4 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.885000 1.440000 4.215000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311o/sky130_fd_sc_ls__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_ls__a311o_4.magic.lef
index d077412..1c186cf 100644
--- a/cells/a311o/sky130_fd_sc_ls__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_ls__a311o_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.495000 1.470000 0.825000 1.800000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.magic.lef
index 0a6ba95..3818ca2 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.925000 1.350000 3.255000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.792700 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.magic.lef
index 9d0d910..ae2ef70 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_2.magic.lef
@@ -73,18 +73,6 @@
         RECT 4.845000 1.350000 5.175000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.935400 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.magic.lef
index 39cfb1d..762cde6 100644
--- a/cells/a311oi/sky130_fd_sc_ls__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_ls__a311oi_4.magic.lef
@@ -72,18 +72,6 @@
         RECT 8.285000 1.180000 9.075000 1.220000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.700600 ;
     DIRECTION OUTPUT ;
@@ -114,6 +102,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_ls__a31o_1.magic.lef
index 6b3c1fe..a20e79d 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 1.565000 0.255000 2.815000 0.640000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_ls__a31o_2.magic.lef
index 5bb0697..07892b5 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.405000 1.180000 3.735000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31o/sky130_fd_sc_ls__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_ls__a31o_4.magic.lef
index 56f8816..b3aabdb 100644
--- a/cells/a31o/sky130_fd_sc_ls__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_ls__a31o_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.565000 1.470000 3.235000 1.800000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.138200 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.magic.lef
index 93ce365..3c1067c 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.045000 1.180000 2.775000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.641200 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.magic.lef
index ea490e6..7a2ee89 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 2.325000 1.180000 2.995000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.090800 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.magic.lef
index 199532d..9390815 100644
--- a/cells/a31oi/sky130_fd_sc_ls__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_ls__a31oi_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 6.365000 1.350000 8.515000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.621350 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_ls__a32o_1.magic.lef
index 334e55e..1caa9c3 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.290000 1.210000 3.715000 1.550000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_ls__a32o_2.magic.lef
index f432db2..cc8c018 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.885000 1.300000 4.215000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.550600 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32o/sky130_fd_sc_ls__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_ls__a32o_4.magic.lef
index c15cc45..af4e781 100644
--- a/cells/a32o/sky130_fd_sc_ls__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_ls__a32o_4.magic.lef
@@ -77,20 +77,6 @@
         RECT 4.085000 0.425000 4.415000 0.585000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.100000 1.780000 ;
-        RECT -0.190000 1.780000 8.350000 3.520000 ;
-        RECT  4.895000 1.660000 8.350000 1.780000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.097500 ;
     DIRECTION OUTPUT ;
@@ -117,6 +103,24 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.100000 1.780000 ;
+        RECT -0.190000 1.780000 8.350000 3.520000 ;
+        RECT  4.895000 1.660000 8.350000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.magic.lef
index 2516d2c..724eba6 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.115000 1.180000 0.445000 1.550000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.998800 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.magic.lef
index 81eb7b6..6c67c4e 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_2.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.125000 1.630000 0.355000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.192800 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.magic.lef
index 05aac4f..7c5d046 100644
--- a/cells/a32oi/sky130_fd_sc_ls__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_ls__a32oi_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.125000 1.350000 1.795000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.560000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.750000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.387000 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_ls__a41o_1.magic.lef
index 8dcc6b1..e3ce515 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 1.485000 1.450000 1.815000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.040800 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_ls__a41o_2.magic.lef
index 915d980..21c2dbb 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.525000 1.450000 2.925000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.639400 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41o/sky130_fd_sc_ls__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_ls__a41o_4.magic.lef
index 63261b3..03f9c34 100644
--- a/cells/a41o/sky130_fd_sc_ls__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_ls__a41o_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.125000 1.450000 0.550000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.magic.lef
index d4975c3..686d985 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.105000 1.300000 0.435000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.752200 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.magic.lef
index 7768fcb..dc9045f 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_2.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.125000 1.350000 1.085000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.810100 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.magic.lef
index cfa3529..3e15dc2 100644
--- a/cells/a41oi/sky130_fd_sc_ls__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_ls__a41oi_4.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.125000 1.350000 1.430000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.447600 ;
     DIRECTION OUTPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2/sky130_fd_sc_ls__and2_1.magic.lef b/cells/and2/sky130_fd_sc_ls__and2_1.magic.lef
index 1e378b0..f94e594 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_ls__and2_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 1.075000 1.180000 1.405000 1.680000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2/sky130_fd_sc_ls__and2_2.magic.lef b/cells/and2/sky130_fd_sc_ls__and2_2.magic.lef
index f9e7bd2..b74d4a7 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_ls__and2_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.605000 1.300000 1.085000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -78,6 +66,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2/sky130_fd_sc_ls__and2_4.magic.lef b/cells/and2/sky130_fd_sc_ls__and2_4.magic.lef
index da6d9a2..d25f5cf 100644
--- a/cells/and2/sky130_fd_sc_ls__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_ls__and2_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 2.255000 1.345000 2.755000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.219800 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_ls__and2b_1.magic.lef
index c0a00e8..d13d37b 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 2.045000 1.350000 2.375000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_ls__and2b_2.magic.lef
index aeafe3b..d58e91b 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 2.045000 1.180000 2.525000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and2b/sky130_fd_sc_ls__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_ls__and2b_4.magic.lef
index 3adf755..8ba4485 100644
--- a/cells/and2b/sky130_fd_sc_ls__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_ls__and2b_4.magic.lef
@@ -45,18 +45,6 @@
         RECT 2.045000 1.180000 2.585000 1.620000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.093800 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3/sky130_fd_sc_ls__and3_1.magic.lef b/cells/and3/sky130_fd_sc_ls__and3_1.magic.lef
index ffe65ca..6072215 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_ls__and3_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 1.485000 1.450000 1.815000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3/sky130_fd_sc_ls__and3_2.magic.lef b/cells/and3/sky130_fd_sc_ls__and3_2.magic.lef
index 0a13ca6..7c38f49 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_ls__and3_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.485000 1.430000 1.815000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.572800 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3/sky130_fd_sc_ls__and3_4.magic.lef b/cells/and3/sky130_fd_sc_ls__and3_4.magic.lef
index f337316..e866784 100644
--- a/cells/and3/sky130_fd_sc_ls__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_ls__and3_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.525000 1.450000 3.230000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_ls__and3b_1.magic.lef
index fab3cbd..1f55247 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.525000 1.390000 2.875000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_ls__and3b_2.magic.lef
index 0fe808c..b56f2a6 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.690000 1.350000 3.235000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and3b/sky130_fd_sc_ls__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_ls__and3b_4.magic.lef
index 5cea006..a156ef1 100644
--- a/cells/and3b/sky130_fd_sc_ls__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_ls__and3b_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 3.005000 1.350000 3.560000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.138200 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4/sky130_fd_sc_ls__and4_1.magic.lef b/cells/and4/sky130_fd_sc_ls__and4_1.magic.lef
index c52e676..b18fba3 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_ls__and4_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.045000 1.350000 2.395000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4/sky130_fd_sc_ls__and4_2.magic.lef b/cells/and4/sky130_fd_sc_ls__and4_2.magic.lef
index 4eee8ba..ea9718e 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_ls__and4_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.045000 1.180000 2.425000 1.550000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4/sky130_fd_sc_ls__and4_4.magic.lef b/cells/and4/sky130_fd_sc_ls__and4_4.magic.lef
index 43abecb..cfec7e1 100644
--- a/cells/and4/sky130_fd_sc_ls__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_ls__and4_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.930000 1.470000 3.260000 1.800000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.164600 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_ls__and4b_1.magic.lef
index 487eff4..93cccfd 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_1.magic.lef
@@ -61,20 +61,6 @@
         RECT 2.985000 1.550000 3.315000 1.880000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.370000 1.940000 ;
-        RECT -0.190000 1.940000 4.510000 3.520000 ;
-        RECT  3.220000 1.660000 4.510000 1.940000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -95,6 +81,24 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.370000 1.940000 ;
+        RECT -0.190000 1.940000 4.510000 3.520000 ;
+        RECT  3.220000 1.660000 4.510000 1.940000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_ls__and4b_2.magic.lef
index b4042c1..a24afa6 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 1.965000 1.350000 2.295000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4b/sky130_fd_sc_ls__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_ls__and4b_4.magic.lef
index cb4679d..d18fc4d 100644
--- a/cells/and4b/sky130_fd_sc_ls__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_ls__and4b_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.965000 1.470000 5.155000 1.800000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.209600 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.magic.lef
index c33c42b..457d88f 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.515000 1.190000 3.890000 1.860000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.692500 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.magic.lef
index 77f4b05..fe04e21 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.925000 1.420000 3.255000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.magic.lef
index 6523863..24d1b69 100644
--- a/cells/and4bb/sky130_fd_sc_ls__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_ls__and4bb_4.magic.lef
@@ -61,20 +61,6 @@
         RECT 6.365000 1.350000 6.875000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.720000 1.760000 ;
-        RECT -0.190000 1.760000 9.310000 3.520000 ;
-        RECT  5.970000 1.660000 9.310000 1.760000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.116000 ;
     DIRECTION OUTPUT ;
@@ -98,6 +84,24 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.720000 1.760000 ;
+        RECT -0.190000 1.760000 9.310000 3.520000 ;
+        RECT  5.970000 1.660000 9.310000 1.760000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_ls__buf_1.magic.lef b/cells/buf/sky130_fd_sc_ls__buf_1.magic.lef
index f758a6a..b69dbeb 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_ls__buf_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.450000 0.910000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_ls__buf_16.magic.lef b/cells/buf/sky130_fd_sc_ls__buf_16.magic.lef
index deaa196..760fa2d 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_ls__buf_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 7.775000 1.350000 10.435000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.560000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.750000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  4.345600 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_ls__buf_2.magic.lef b/cells/buf/sky130_fd_sc_ls__buf_2.magic.lef
index 48d7f88..ce0464f 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_ls__buf_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 1.825000 1.350000 2.275000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -65,6 +53,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_ls__buf_4.magic.lef b/cells/buf/sky130_fd_sc_ls__buf_4.magic.lef
index f75a0d1..1404bba 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_ls__buf_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 2.525000 1.350000 2.905000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -72,6 +60,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/buf/sky130_fd_sc_ls__buf_8.magic.lef b/cells/buf/sky130_fd_sc_ls__buf_8.magic.lef
index 723c20b..17507c6 100644
--- a/cells/buf/sky130_fd_sc_ls__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_ls__buf_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 1.430000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  2.249300 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.magic.lef
index 3cb4703..dd2a5da 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.300000 0.505000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.150000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  4.401600 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.magic.lef
index 11d516d..967b648 100644
--- a/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_ls__bufbuf_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 0.570000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  2.273200 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.magic.lef
index b3d5c41..a5f3a0e 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 1.430000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.000000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 12.190000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  4.390400 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.magic.lef
index 902bb09..57f7270 100644
--- a/cells/bufinv/sky130_fd_sc_ls__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_ls__bufinv_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 0.550000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.385000 ;
     DIRECTION OUTPUT ;
@@ -71,6 +59,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.magic.lef
index b9c1be8..39a80a9 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.300000 0.835000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.449400 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.magic.lef
index 8d40be7..53daadf 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 1.795000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  3.628800 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.magic.lef
index 28ef788..aa91f05 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 1.085000 1.010000 1.495000 2.150000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.453600 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.magic.lef
index 8e06a5c..a8ab937 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 2.055000 1.080000 2.455000 1.410000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.924000 ;
     DIRECTION OUTPUT ;
@@ -70,6 +58,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.magic.lef
index 448c5ba..eeea933 100644
--- a/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_ls__clkbuf_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 1.095000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.841700 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.magic.lef b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.magic.lef
index a2e21f3..2fdf8a2 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.magic.lef
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_ls__clkdlyinv3sd1_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424900 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.magic.lef b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.magic.lef
index d7d6247..c434ba1 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.magic.lef
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_ls__clkdlyinv3sd2_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424900 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.magic.lef b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.magic.lef
index 05a5e9e..bfca6a1 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.magic.lef
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_ls__clkdlyinv3sd3_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424900 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.magic.lef b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.magic.lef
index 7ecb7a5..11691d0 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.magic.lef
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_ls__clkdlyinv5sd1_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424900 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.magic.lef b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.magic.lef
index 93b0c37..9ae9931 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.magic.lef
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_ls__clkdlyinv5sd2_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424900 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.magic.lef b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.magic.lef
index e5a3cd2..1da5aef 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.magic.lef
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_ls__clkdlyinv5sd3_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.424900 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.magic.lef
index eb06233..84183fe 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_1.magic.lef
@@ -36,18 +36,6 @@
         RECT 0.425000 1.780000 0.755000 1.930000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.477350 ;
     DIRECTION OUTPUT ;
@@ -69,6 +57,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.magic.lef
index 6a2a401..310c892 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.985000 1.180000 10.935000 1.410000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.520000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.710000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  5.040000 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.magic.lef
index fd49231..44f9540 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 1.315000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.994000 ;
     DIRECTION OUTPUT ;
@@ -69,6 +57,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.magic.lef
index 650a5b5..a9166a4 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.605000 1.350000 2.755000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.432200 ;
     DIRECTION OUTPUT ;
@@ -72,6 +60,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.magic.lef
index d5af0da..cba6caf 100644
--- a/cells/clkinv/sky130_fd_sc_ls__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_ls__clkinv_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.625000 1.350000 5.715000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.242400 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/conb/sky130_fd_sc_ls__conb_1.magic.lef b/cells/conb/sky130_fd_sc_ls__conb_1.magic.lef
index 1b17ca5..c91452d 100644
--- a/cells/conb/sky130_fd_sc_ls__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_ls__conb_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 1.055000 0.995000 1.355000 2.485000 ;
     END
   END LO
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_ls__decap_4.magic.lef b/cells/decap/sky130_fd_sc_ls__decap_4.magic.lef
index 257f13a..020fa4f 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_ls__decap_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decap/sky130_fd_sc_ls__decap_8.magic.lef b/cells/decap/sky130_fd_sc_ls__decap_8.magic.lef
index 1a04a03..09d81e7 100644
--- a/cells/decap/sky130_fd_sc_ls__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_ls__decap_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.magic.lef b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.magic.lef
index 190053d..13975be 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_18.magic.lef
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_18.magic.lef
@@ -25,18 +25,6 @@
   SIZE  8.640000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.magic.lef b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.magic.lef
index cec85c0..3f24549 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_2.magic.lef
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_2.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.960000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.magic.lef b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.magic.lef
index 8e0ec2e..53494c1 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_3.magic.lef
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_3.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.440000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.magic.lef b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.magic.lef
index 6f3c52d..0a99032 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_4.magic.lef
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.magic.lef b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.magic.lef
index 2fe5ad1..d2c38cf 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_6.magic.lef
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_6.magic.lef
@@ -25,18 +25,6 @@
   SIZE  2.880000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.magic.lef b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.magic.lef
index a48192d..372a631 100644
--- a/cells/decaphe/sky130_fd_sc_ls__decaphe_8.magic.lef
+++ b/cells/decaphe/sky130_fd_sc_ls__decaphe_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.magic.lef b/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.magic.lef
index 6b17837..481cea2 100644
--- a/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.magic.lef
+++ b/cells/decaphetap/sky130_fd_sc_ls__decaphetap_2.magic.lef
@@ -30,12 +30,14 @@
     END
   END VNB
   PIN VPB
+    DIRECTION INPUT ;
     PORT
       LAYER nwell ;
         RECT -0.190000 1.660000 1.150000 3.520000 ;
     END
   END VPB
   PIN VGND
+    DIRECTION INPUT ;
     USE GROUND ;
     PORT
       LAYER met1 ;
@@ -43,6 +45,7 @@
     END
   END VGND
   PIN VPWR
+    DIRECTION INPUT ;
     USE POWER ;
     PORT
       LAYER met1 ;
@@ -63,6 +66,8 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
+    LAYER pwell ;
+      RECT 0.155000 0.320000 0.805000 1.140000 ;
   END
 END sky130_fd_sc_ls__decaphetap_2
 END LIBRARY
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.magic.lef
index 758696d..8b1cb44 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_1.magic.lef
@@ -76,18 +76,6 @@
         RECT 8.735000 2.105000 9.025000 2.150000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.630000 3.520000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.magic.lef
index ad51e3e..406a75b 100644
--- a/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_ls__dfbbn_2.magic.lef
@@ -81,18 +81,6 @@
         RECT 8.735000 2.105000 9.025000 2.150000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 14.590000 3.520000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.magic.lef
index c3098fc..6050691 100644
--- a/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_ls__dfbbp_1.magic.lef
@@ -82,18 +82,6 @@
         RECT 8.240000 1.470000 8.570000 1.740000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.150000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -112,6 +100,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.magic.lef
index 42c5dbe..1fb0168 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_1.magic.lef
@@ -70,22 +70,6 @@
         RECT 7.775000 2.105000 8.065000 2.150000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.520000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  1.440000 1.675000 ;
-        RECT -0.190000 1.675000 11.710000 3.520000 ;
-        RECT  3.100000 1.620000  7.060000 1.660000 ;
-        RECT  3.100000 1.660000 11.710000 1.675000 ;
-        RECT  5.540000 1.555000  7.060000 1.620000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -105,6 +89,26 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.440000 1.675000 ;
+        RECT -0.190000 1.675000 11.710000 3.520000 ;
+        RECT  3.100000 1.620000  7.060000 1.660000 ;
+        RECT  3.100000 1.660000 11.710000 1.675000 ;
+        RECT  5.540000 1.555000  7.060000 1.620000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.magic.lef
index 1f9671e..0f07054 100644
--- a/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_ls__dfrbp_2.magic.lef
@@ -73,22 +73,6 @@
         RECT 9.695000 1.735000 9.985000 1.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  1.140000 1.675000 ;
-        RECT -0.190000 1.675000  3.025000 2.245000 ;
-        RECT -0.190000 2.245000 14.110000 3.520000 ;
-        RECT  5.200000 1.660000 14.110000 2.245000 ;
-        RECT 10.235000 1.580000 12.385000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -107,6 +91,26 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.140000 1.675000 ;
+        RECT -0.190000 1.675000  3.025000 2.245000 ;
+        RECT -0.190000 2.245000 14.110000 3.520000 ;
+        RECT  5.200000 1.660000 14.110000 2.245000 ;
+        RECT 10.235000 1.580000 12.385000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.magic.lef
index 86b749c..2aa79ea 100644
--- a/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_ls__dfrtn_1.magic.lef
@@ -60,21 +60,6 @@
         RECT 8.255000 1.735000 8.545000 1.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  3.225000 1.675000 ;
-        RECT -0.190000 1.675000 11.230000 3.520000 ;
-        RECT  0.935000 1.555000  3.225000 1.660000 ;
-        RECT  6.920000 1.660000 11.230000 1.675000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -93,6 +78,25 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.225000 1.675000 ;
+        RECT -0.190000 1.675000 11.230000 3.520000 ;
+        RECT  0.935000 1.555000  3.225000 1.660000 ;
+        RECT  6.920000 1.660000 11.230000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.magic.lef
index 7fe5a29..017efc5 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_1.magic.lef
@@ -60,21 +60,6 @@
         RECT 7.775000 2.105000 8.065000 2.150000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  1.390000 1.675000 ;
-        RECT -0.190000 1.675000 11.230000 3.520000 ;
-        RECT  5.320000 1.555000  6.400000 1.660000 ;
-        RECT  5.320000 1.660000 11.230000 1.675000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -94,6 +79,25 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.390000 1.675000 ;
+        RECT -0.190000 1.675000 11.230000 3.520000 ;
+        RECT  5.320000 1.555000  6.400000 1.660000 ;
+        RECT  5.320000 1.660000 11.230000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.magic.lef
index a007ea8..b768cd1 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_2.magic.lef
@@ -58,21 +58,6 @@
         RECT 7.775000 2.105000 8.065000 2.150000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.520000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  1.390000 1.675000 ;
-        RECT -0.190000 1.675000 11.710000 3.520000 ;
-        RECT  3.310000 1.555000  6.930000 1.660000 ;
-        RECT  3.310000 1.660000 11.710000 1.675000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -92,6 +77,25 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.390000 1.675000 ;
+        RECT -0.190000 1.675000 11.710000 3.520000 ;
+        RECT  3.310000 1.555000  6.930000 1.660000 ;
+        RECT  3.310000 1.660000 11.710000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.magic.lef
index e7f0923..1b69238 100644
--- a/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_ls__dfrtp_4.magic.lef
@@ -67,20 +67,6 @@
         RECT 8.735000 2.105000 9.025000 2.150000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  1.225000 1.780000 ;
-        RECT -0.190000 1.780000 13.630000 3.520000 ;
-        RECT  3.150000 1.660000 13.630000 1.780000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -101,6 +87,24 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  1.225000 1.780000 ;
+        RECT -0.190000 1.780000 13.630000 3.520000 ;
+        RECT  3.150000 1.660000 13.630000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.magic.lef
index 98c67b5..c89c5d9 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_1.magic.lef
@@ -69,20 +69,6 @@
         RECT 8.255000 1.735000 8.545000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.000000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 12.190000 3.520000 ;
-        RECT  0.965000 1.610000  6.715000 1.660000 ;
-        RECT  5.675000 1.525000  6.715000 1.610000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -101,6 +87,24 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+        RECT  0.965000 1.610000  6.715000 1.660000 ;
+        RECT  5.675000 1.525000  6.715000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.magic.lef
index ca321fb..d80d93f 100644
--- a/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_ls__dfsbp_2.magic.lef
@@ -68,20 +68,6 @@
         RECT 8.255000 1.735000 8.545000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.150000 3.520000 ;
-        RECT  0.965000 1.610000  6.735000 1.660000 ;
-        RECT  5.695000 1.525000  6.735000 1.610000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -100,6 +86,24 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  0.965000 1.610000  6.735000 1.660000 ;
+        RECT  5.695000 1.525000  6.735000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.magic.lef
index 2986476..26bdbfe 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_1.magic.lef
@@ -57,20 +57,6 @@
         RECT 8.255000 2.105000 8.545000 2.150000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.230000 3.520000 ;
-        RECT  0.940000 1.570000  6.430000 1.660000 ;
-        RECT  5.390000 1.525000  6.430000 1.570000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -89,6 +75,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  0.940000 1.570000  6.430000 1.660000 ;
+        RECT  5.390000 1.525000  6.430000 1.570000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.magic.lef
index 8794252..3d3e35e 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_2.magic.lef
@@ -59,20 +59,6 @@
         RECT 8.255000 2.105000 8.545000 2.150000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.000000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 12.190000 3.520000 ;
-        RECT  0.965000 1.610000  6.775000 1.660000 ;
-        RECT  5.735000 1.525000  6.775000 1.610000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -91,6 +77,24 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+        RECT  0.965000 1.610000  6.775000 1.660000 ;
+        RECT  5.735000 1.525000  6.775000 1.610000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.magic.lef
index 903306d..d26cd37 100644
--- a/cells/dfstp/sky130_fd_sc_ls__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_ls__dfstp_4.magic.lef
@@ -63,19 +63,6 @@
         RECT 8.255000 1.735000 8.545000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.150000 3.520000 ;
-        RECT  5.505000 1.555000  6.545000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -94,6 +81,23 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  5.505000 1.555000  6.545000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.magic.lef
index d178472..cd9f5ac 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_1.magic.lef
@@ -58,18 +58,6 @@
         RECT 9.345000 1.130000 9.515000 1.820000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.magic.lef
index a0fa953..ef3dcb3 100644
--- a/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_ls__dfxbp_2.magic.lef
@@ -57,20 +57,6 @@
         RECT 10.335000 1.130000 10.505000 1.820000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  3.700000 1.940000 ;
-        RECT -0.190000 1.940000 11.230000 3.520000 ;
-        RECT  5.205000 1.660000 11.230000 1.940000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -89,6 +75,24 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.700000 1.940000 ;
+        RECT -0.190000 1.940000 11.230000 3.520000 ;
+        RECT  5.205000 1.660000 11.230000 1.940000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.magic.lef
index f53d3e4..cd1780e 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_1.magic.lef
@@ -46,18 +46,6 @@
         RECT 7.905000 1.130000 8.075000 2.030000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.magic.lef
index 3716c5c..bc6f992 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_2.magic.lef
@@ -47,18 +47,6 @@
         RECT 7.935000 1.130000 8.105000 2.030000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.magic.lef
index 25487bc..14f48ff 100644
--- a/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_ls__dfxtp_4.magic.lef
@@ -51,18 +51,6 @@
         RECT 8.865000 1.130000 9.035000 1.800000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/diode/sky130_fd_sc_ls__diode_2.magic.lef b/cells/diode/sky130_fd_sc_ls__diode_2.magic.lef
index 1c37df6..586095a 100644
--- a/cells/diode/sky130_fd_sc_ls__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_ls__diode_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.095000 0.265000 0.865000 3.065000 ;
     END
   END DIODE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -55,6 +43,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.magic.lef
index 6df0125..40a71b7 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_1.magic.lef
@@ -44,20 +44,6 @@
         RECT 6.275000 0.350000 6.605000 1.550000 ;
     END
   END GCLK
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.670000 1.785000 ;
-        RECT -0.190000 1.785000 6.910000 3.520000 ;
-        RECT  5.035000 1.660000 6.910000 1.785000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.459000 ;
     DIRECTION INPUT ;
@@ -76,6 +62,24 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.670000 1.785000 ;
+        RECT -0.190000 1.785000 6.910000 3.520000 ;
+        RECT  5.035000 1.660000 6.910000 1.785000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.magic.lef
index 3e66c39..f255ed4 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_2.magic.lef
@@ -43,21 +43,6 @@
         RECT 6.805000 0.440000 7.135000 2.980000 ;
     END
   END GCLK
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.160000 1.780000 ;
-        RECT -0.190000 1.780000 7.870000 3.520000 ;
-        RECT  4.355000 1.755000 7.870000 1.780000 ;
-        RECT  6.205000 1.660000 7.870000 1.755000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.498000 ;
     DIRECTION INPUT ;
@@ -76,6 +61,25 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.780000 ;
+        RECT -0.190000 1.780000 7.870000 3.520000 ;
+        RECT  4.355000 1.755000 7.870000 1.780000 ;
+        RECT  6.205000 1.660000 7.870000 1.755000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.magic.lef
index d36e937..64593ea 100644
--- a/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_ls__dlclkp_4.magic.lef
@@ -50,21 +50,6 @@
         RECT 7.805000 1.380000 8.015000 1.550000 ;
     END
   END GCLK
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.215000 1.705000 ;
-        RECT -0.190000 1.705000 3.205000 1.930000 ;
-        RECT -0.190000 1.930000 8.830000 3.520000 ;
-        RECT  4.475000 1.660000 8.830000 1.930000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.516000 ;
     DIRECTION INPUT ;
@@ -83,6 +68,25 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.215000 1.705000 ;
+        RECT -0.190000 1.705000 3.205000 1.930000 ;
+        RECT -0.190000 1.930000 8.830000 3.520000 ;
+        RECT  4.475000 1.660000 8.830000 1.930000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.magic.lef
index e609a7d..1567b7b 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_1.magic.lef
@@ -65,20 +65,6 @@
         RECT 5.875000 1.180000 6.180000 1.550000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-        RECT  1.535000 1.560000 7.080000 1.660000 ;
-        RECT  5.025000 1.530000 7.080000 1.560000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -97,6 +83,24 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  1.535000 1.560000 7.080000 1.660000 ;
+        RECT  5.025000 1.530000 7.080000 1.560000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.magic.lef
index 03e6d2b..3031620 100644
--- a/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_ls__dlrbn_2.magic.lef
@@ -65,19 +65,6 @@
         RECT 5.570000 1.180000 6.115000 1.550000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-        RECT  1.455000 1.560000 2.295000 1.660000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -96,6 +83,23 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+        RECT  1.455000 1.560000 2.295000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.magic.lef
index 904b9b5..3764dc6 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_1.magic.lef
@@ -66,18 +66,6 @@
         RECT 5.425000 1.180000 5.795000 1.550000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.magic.lef
index e4c3521..d4b5e23 100644
--- a/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_ls__dlrbp_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 5.435000 1.180000 5.785000 1.550000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.magic.lef
index e2074b3..a6cf34b 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_1.magic.lef
@@ -54,18 +54,6 @@
         RECT 5.885000 1.180000 6.235000 1.550000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.magic.lef
index 58c51ad..7c966f8 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_2.magic.lef
@@ -54,18 +54,6 @@
         RECT 5.885000 1.180000 6.305000 1.550000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.magic.lef
index 6c7c379..224d636 100644
--- a/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_ls__dlrtn_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 6.320000 1.120000 7.555000 1.450000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.magic.lef
index 3f4f648..1e27c92 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_1.magic.lef
@@ -54,20 +54,6 @@
         RECT 5.435000 1.350000 5.765000 1.780000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.160000 1.780000 ;
-        RECT -0.190000 1.780000 6.910000 3.520000 ;
-        RECT  2.905000 1.660000 6.910000 1.780000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -86,6 +72,24 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.780000 ;
+        RECT -0.190000 1.780000 6.910000 3.520000 ;
+        RECT  2.905000 1.660000 6.910000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.magic.lef
index bc3a929..80651a6 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 5.435000 1.180000 5.840000 1.550000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.magic.lef
index 0b2bfe5..c4ddb5f 100644
--- a/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_ls__dlrtp_4.magic.lef
@@ -58,20 +58,6 @@
         RECT 5.885000 1.120000 6.595000 1.450000 ;
     END
   END RESET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.480000 1.780000 ;
-        RECT -0.190000 1.780000 9.310000 3.520000 ;
-        RECT  2.870000 1.660000 9.310000 1.780000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -90,6 +76,24 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.480000 1.780000 ;
+        RECT -0.190000 1.780000 9.310000 3.520000 ;
+        RECT  2.870000 1.660000 9.310000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.magic.lef
index 69552f2..eaa918a 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_1.magic.lef
@@ -54,19 +54,6 @@
         RECT 7.715000 0.350000 8.050000 2.980000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-        RECT  4.625000 1.580000 5.695000 1.660000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -85,6 +72,23 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+        RECT  4.625000 1.580000 5.695000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.magic.lef
index 6daebfb..b76277e 100644
--- a/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_ls__dlxbn_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 8.325000 1.130000 8.495000 1.820000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.magic.lef
index 54f0bea..bb43fe7 100644
--- a/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_ls__dlxbp_1.magic.lef
@@ -54,18 +54,6 @@
         RECT 7.715000 0.350000 8.050000 2.980000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.magic.lef
index c0d552c..a361923 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 6.270000 0.350000 6.605000 2.980000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -73,6 +61,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.magic.lef
index 06eb418..f6aefcc 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_2.magic.lef
@@ -45,19 +45,6 @@
         RECT 6.415000 1.125000 6.585000 1.920000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-        RECT  4.670000 1.635000 5.740000 1.660000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -76,6 +63,23 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+        RECT  4.670000 1.635000 5.740000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.magic.lef
index 604361c..1f9fefc 100644
--- a/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_ls__dlxtn_4.magic.lef
@@ -50,18 +50,6 @@
         RECT 7.805000 1.150000 8.035000 1.820000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN GATE_N
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.magic.lef
index 280cd01..351a452 100644
--- a/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_ls__dlxtp_1.magic.lef
@@ -45,19 +45,6 @@
         RECT 7.425000 1.150000 7.595000 1.820000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-        RECT  4.110000 1.505000 5.865000 1.660000 ;
-    END
-  END VPB
   PIN GATE
     ANTENNAGATEAREA  0.237000 ;
     DIRECTION INPUT ;
@@ -76,6 +63,23 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+        RECT  4.110000 1.505000 5.865000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.magic.lef
index d729386..2d2ae82 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_ls__dlygate4sd1_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.509700 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.magic.lef
index d7fc80d..f095ecc 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_ls__dlygate4sd2_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.509700 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.magic.lef
index b67ed33..d2a6e74 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_ls__dlygate4sd3_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.100000 1.190000 0.730000 1.860000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.509700 ;
     DIRECTION OUTPUT ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.magic.lef
index 9ad5819..81f9a07 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_ls__dlymetal6s2s_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 1.355000 0.555000 1.765000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     ANTENNAGATEAREA  0.126000 ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.magic.lef
index cdca37e..b2576d2 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_ls__dlymetal6s4s_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 1.355000 0.555000 1.765000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     ANTENNAGATEAREA  0.126000 ;
@@ -66,6 +54,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.magic.lef
index 0c1ccc4..f45f533 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_ls__dlymetal6s6s_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 1.355000 0.555000 1.765000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.504100 ;
     DIRECTION OUTPUT ;
@@ -65,6 +53,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.magic.lef
index 094fae5..4febda3 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_1.magic.lef
@@ -47,18 +47,6 @@
         RECT 1.865000 2.590000 2.195000 3.010000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.magic.lef
index 218b143..e613f21 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 2.965000 1.180000 3.295000 1.650000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.599200 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.magic.lef
index bc7ea5c..00c44cf 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.975000 1.180000 1.285000 1.550000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  1.101200 ;
     DIRECTION OUTPUT ;
@@ -79,6 +67,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.magic.lef
index 2836759..b1e34eb 100644
--- a/cells/ebufn/sky130_fd_sc_ls__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_ls__ebufn_8.magic.lef
@@ -43,18 +43,6 @@
         RECT 8.265000 1.180000 9.475000 1.550000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.560000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.750000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  2.360500 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.magic.lef
index 19e55ff..b93b5f5 100644
--- a/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_ls__edfxbp_1.magic.lef
@@ -65,20 +65,6 @@
         RECT 14.145000 1.150000 14.315000 1.820000 ;
     END
   END Q_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 14.590000 3.520000 ;
-        RECT  4.945000 1.650000  6.045000 1.660000 ;
-        RECT 11.870000 1.645000 12.940000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -97,6 +83,24 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+        RECT  4.945000 1.650000  6.045000 1.660000 ;
+        RECT 11.870000 1.645000 12.940000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.magic.lef b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.magic.lef
index f4283b2..47eaebf 100644
--- a/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.magic.lef
+++ b/cells/edfxtp/sky130_fd_sc_ls__edfxtp_1.magic.lef
@@ -54,19 +54,6 @@
         RECT 12.075000 1.550000 12.405000 2.980000 ;
     END
   END Q
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.150000 3.520000 ;
-        RECT  3.525000 1.580000  4.590000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -85,6 +72,23 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+        RECT  3.525000 1.580000  4.590000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_ls__einvn_1.magic.lef
index 6520860..d04f409 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_1.magic.lef
@@ -44,18 +44,6 @@
         RECT 1.085000 1.760000 1.315000 1.780000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_ls__einvn_2.magic.lef
index 187f45e..42bcb8d 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.125000 1.120000 0.550000 2.130000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.546900 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_ls__einvn_4.magic.lef
index 1a93515..b233862 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.125000 1.300000 0.455000 1.780000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvn/sky130_fd_sc_ls__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_ls__einvn_8.magic.lef
index 8c37a5a..de6a179 100644
--- a/cells/einvn/sky130_fd_sc_ls__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_ls__einvn_8.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.105000 1.180000 0.435000 1.630000 ;
     END
   END TE_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  2.332400 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_ls__einvp_1.magic.lef
index ca833a0..0309600 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.445000 1.440000 1.315000 1.780000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.505900 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_ls__einvp_2.magic.lef
index ade23e0..e2de36d 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 2.480000 0.260000 2.810000 0.670000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_ls__einvp_4.magic.lef
index 5f18615..074609c 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_4.magic.lef
@@ -44,18 +44,6 @@
         RECT 5.405000 1.180000 5.650000 1.300000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  1.221900 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/einvp/sky130_fd_sc_ls__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_ls__einvp_8.magic.lef
index 317755b..dd18c09 100644
--- a/cells/einvp/sky130_fd_sc_ls__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_ls__einvp_8.magic.lef
@@ -44,18 +44,6 @@
         RECT 8.435000 1.410000 8.765000 1.550000 ;
     END
   END TE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-    END
-  END VPB
   PIN Z
     ANTENNADIFFAREA  2.328200 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_ls__fa_1.magic.lef b/cells/fa/sky130_fd_sc_ls__fa_1.magic.lef
index 9cedd6d..744022f 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_ls__fa_1.magic.lef
@@ -87,19 +87,6 @@
         RECT 0.085000 1.820000 0.355000 2.980000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-        RECT  1.500000 1.555000 7.480000 1.660000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -109,6 +96,23 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  1.500000 1.555000 7.480000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_ls__fa_2.magic.lef b/cells/fa/sky130_fd_sc_ls__fa_2.magic.lef
index 05971b6..ecea26e 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_ls__fa_2.magic.lef
@@ -94,19 +94,6 @@
         RECT 8.405000 1.150000 8.575000 1.820000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-        RECT  0.635000 1.555000 5.915000 1.660000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -116,6 +103,23 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+        RECT  0.635000 1.555000 5.915000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fa/sky130_fd_sc_ls__fa_4.magic.lef b/cells/fa/sky130_fd_sc_ls__fa_4.magic.lef
index 99bb2c8..875629c 100644
--- a/cells/fa/sky130_fd_sc_ls__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_ls__fa_4.magic.lef
@@ -98,19 +98,6 @@
         RECT 8.285000 1.170000 8.525000 1.840000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.230000 3.520000 ;
-        RECT  0.635000 1.555000  6.620000 1.660000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -120,6 +107,23 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  0.635000 1.555000  6.620000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fah/sky130_fd_sc_ls__fah_1.magic.lef b/cells/fah/sky130_fd_sc_ls__fah_1.magic.lef
index b47b5c1..e5d0a7d 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_ls__fah_1.magic.lef
@@ -76,22 +76,6 @@
         RECT 0.110000 0.540000 0.445000 2.980000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  4.165000 1.940000 ;
-        RECT -0.190000 1.940000 14.110000 3.520000 ;
-        RECT  5.525000 1.605000 12.450000 1.660000 ;
-        RECT  5.525000 1.660000 14.110000 1.940000 ;
-        RECT  9.485000 1.530000 12.450000 1.605000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -101,6 +85,26 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  4.165000 1.940000 ;
+        RECT -0.190000 1.940000 14.110000 3.520000 ;
+        RECT  5.525000 1.605000 12.450000 1.660000 ;
+        RECT  5.525000 1.660000 14.110000 1.940000 ;
+        RECT  9.485000 1.530000 12.450000 1.605000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fah/sky130_fd_sc_ls__fah_2.magic.lef b/cells/fah/sky130_fd_sc_ls__fah_2.magic.lef
index c13469c..8367dc1 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_2.magic.lef
+++ b/cells/fah/sky130_fd_sc_ls__fah_2.magic.lef
@@ -83,18 +83,6 @@
         RECT 13.705000 1.505000 13.875000 1.820000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 14.590000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fah/sky130_fd_sc_ls__fah_4.magic.lef b/cells/fah/sky130_fd_sc_ls__fah_4.magic.lef
index 235cb29..5f3704b 100644
--- a/cells/fah/sky130_fd_sc_ls__fah_4.magic.lef
+++ b/cells/fah/sky130_fd_sc_ls__fah_4.magic.lef
@@ -80,21 +80,6 @@
         RECT 14.495000 1.180000 14.745000 1.850000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 15.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  7.055000 1.715000 ;
-        RECT -0.190000 1.715000 15.550000 3.520000 ;
-        RECT  1.415000 1.630000  7.055000 1.660000 ;
-        RECT  8.400000 1.660000 15.550000 1.715000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -104,6 +89,25 @@
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  7.055000 1.715000 ;
+        RECT -0.190000 1.715000 15.550000 3.520000 ;
+        RECT  1.415000 1.630000  7.055000 1.660000 ;
+        RECT  8.400000 1.660000 15.550000 1.715000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.magic.lef
index 4a3c5e6..99809a6 100644
--- a/cells/fahcin/sky130_fd_sc_ls__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_ls__fahcin_1.magic.lef
@@ -74,18 +74,6 @@
         RECT 12.595000 0.840000 12.845000 2.980000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.magic.lef
index 2614e05..8babe4d 100644
--- a/cells/fahcon/sky130_fd_sc_ls__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_ls__fahcon_1.magic.lef
@@ -76,19 +76,6 @@
         RECT 11.265000 1.130000 11.435000 1.820000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.520000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.710000 3.520000 ;
-        RECT  1.250000 1.645000  5.035000 1.660000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -98,6 +85,23 @@
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.520000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.710000 3.520000 ;
+        RECT  1.250000 1.645000  5.035000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_ls__fill_1.magic.lef b/cells/fill/sky130_fd_sc_ls__fill_1.magic.lef
index 60001b1..5f4ccea 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_ls__fill_1.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.480000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.480000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 0.670000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_ls__fill_2.magic.lef b/cells/fill/sky130_fd_sc_ls__fill_2.magic.lef
index 526ddae..c7da202 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_ls__fill_2.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.960000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_ls__fill_4.magic.lef b/cells/fill/sky130_fd_sc_ls__fill_4.magic.lef
index 90ebde8..031fbd3 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_ls__fill_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill/sky130_fd_sc_ls__fill_8.magic.lef b/cells/fill/sky130_fd_sc_ls__fill_8.magic.lef
index 9e1039a..835037e 100644
--- a/cells/fill/sky130_fd_sc_ls__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_ls__fill_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.magic.lef b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.magic.lef
index 09084d0..fb809ab 100644
--- a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_2.magic.lef
@@ -25,18 +25,6 @@
   SIZE  0.960000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.150000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.magic.lef b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.magic.lef
index 784d021..5c5bdba 100644
--- a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_4.magic.lef
@@ -25,18 +25,6 @@
   SIZE  1.920000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.magic.lef b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.magic.lef
index fc88202..84f5578 100644
--- a/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_ls__fill_diode_8.magic.lef
@@ -25,18 +25,6 @@
   SIZE  3.840000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -46,6 +34,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_ls__ha_1.magic.lef b/cells/ha/sky130_fd_sc_ls__ha_1.magic.lef
index 009c676..6da5e1e 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_ls__ha_1.magic.lef
@@ -67,20 +67,6 @@
         RECT 0.115000 1.820000 0.445000 2.980000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.745000 1.780000 ;
-        RECT -0.190000 1.780000 4.990000 3.520000 ;
-        RECT  3.110000 1.660000 4.990000 1.780000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -90,6 +76,24 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.745000 1.780000 ;
+        RECT -0.190000 1.780000 4.990000 3.520000 ;
+        RECT  3.110000 1.660000 4.990000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_ls__ha_2.magic.lef b/cells/ha/sky130_fd_sc_ls__ha_2.magic.lef
index d99c51f..5b6e68a 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_ls__ha_2.magic.lef
@@ -68,18 +68,6 @@
         RECT 4.505000 1.050000 4.675000 1.820000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/ha/sky130_fd_sc_ls__ha_4.magic.lef b/cells/ha/sky130_fd_sc_ls__ha_4.magic.lef
index 43c6b05..502f786 100644
--- a/cells/ha/sky130_fd_sc_ls__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_ls__ha_4.magic.lef
@@ -68,19 +68,6 @@
         RECT 9.695000 2.105000 9.985000 2.150000 ;
     END
   END SUM
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-        RECT  3.545000 1.585000  4.805000 1.660000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -90,6 +77,23 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+        RECT  3.545000 1.585000  4.805000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_ls__inv_1.magic.lef b/cells/inv/sky130_fd_sc_ls__inv_1.magic.lef
index 32e009e..295e90f 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_ls__inv_1.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.300000 0.815000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_ls__inv_16.magic.lef b/cells/inv/sky130_fd_sc_ls__inv_16.magic.lef
index eedbec6..4d3760c 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_ls__inv_16.magic.lef
@@ -34,18 +34,6 @@
         RECT 1.085000 1.550000 7.070000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  4.379200 ;
     DIRECTION OUTPUT ;
@@ -64,6 +52,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_ls__inv_2.magic.lef b/cells/inv/sky130_fd_sc_ls__inv_2.magic.lef
index 8c74809..d3832c6 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_ls__inv_2.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.105000 1.300000 0.435000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -65,6 +53,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_ls__inv_4.magic.lef b/cells/inv/sky130_fd_sc_ls__inv_4.magic.lef
index 2d1c4ba..3988d09 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_ls__inv_4.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.125000 1.350000 1.800000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.116000 ;
     DIRECTION OUTPUT ;
@@ -70,6 +58,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/inv/sky130_fd_sc_ls__inv_8.magic.lef b/cells/inv/sky130_fd_sc_ls__inv_8.magic.lef
index fbab431..d3ac3be 100644
--- a/cells/inv/sky130_fd_sc_ls__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_ls__inv_8.magic.lef
@@ -34,18 +34,6 @@
         RECT 0.560000 1.350000 2.250000 1.780000 ;
     END
   END A
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.172800 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/latchupcell/sky130_fd_sc_ls__latchupcell.magic.lef b/cells/latchupcell/sky130_fd_sc_ls__latchupcell.magic.lef
index 44659c4..e506a8a 100644
--- a/cells/latchupcell/sky130_fd_sc_ls__latchupcell.magic.lef
+++ b/cells/latchupcell/sky130_fd_sc_ls__latchupcell.magic.lef
@@ -28,6 +28,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
   PIN VPWR
@@ -35,6 +37,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
     END
   END VPWR
   OBS
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_ls__maj3_1.magic.lef
index 3919c87..ec782fc 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_1.magic.lef
@@ -54,18 +54,6 @@
         RECT 2.285000 1.760000 2.755000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.538500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_ls__maj3_2.magic.lef
index 4d212b4..8c4ac94 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_2.magic.lef
@@ -54,19 +54,6 @@
         RECT 3.215000 1.630000 3.715000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-        RECT  1.875000 1.555000 3.825000 1.660000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -87,6 +74,23 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+        RECT  1.875000 1.555000 3.825000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/maj3/sky130_fd_sc_ls__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_ls__maj3_4.magic.lef
index 83e5aac..2c9adf4 100644
--- a/cells/maj3/sky130_fd_sc_ls__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_ls__maj3_4.magic.lef
@@ -60,18 +60,6 @@
         RECT 4.755000 1.470000 5.220000 1.800000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.116000 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_ls__mux2_1.magic.lef
index 749dd1c..ab6f621 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_1.magic.lef
@@ -55,18 +55,6 @@
         RECT 0.505000 1.350000 0.835000 1.780000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_ls__mux2_2.magic.lef
index 5302293..e7fede4 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_2.magic.lef
@@ -55,18 +55,6 @@
         RECT 3.125000 1.300000 3.455000 1.460000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2/sky130_fd_sc_ls__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_ls__mux2_4.magic.lef
index b0be581..523f028 100644
--- a/cells/mux2/sky130_fd_sc_ls__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_ls__mux2_4.magic.lef
@@ -58,20 +58,6 @@
         RECT 2.995000 1.765000 3.165000 2.155000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-        RECT  0.850000 1.470000 1.690000 1.575000 ;
-        RECT  0.850000 1.575000 2.930000 1.660000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.576550 ;
     DIRECTION OUTPUT ;
@@ -94,6 +80,24 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+        RECT  0.850000 1.470000 1.690000 1.575000 ;
+        RECT  0.850000 1.575000 2.930000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.magic.lef
index ee72c8d..dc2d99c 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.125000 1.180000 0.550000 1.855000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.857700 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.magic.lef
index ed24326..7d89cfe 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_2.magic.lef
@@ -54,18 +54,6 @@
         RECT 5.480000 1.350000 5.810000 1.840000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.040950 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.magic.lef
index bbfbe87..8e43f43 100644
--- a/cells/mux2i/sky130_fd_sc_ls__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_ls__mux2i_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 7.080000 1.180000 9.475000 1.540000 ;
     END
   END S
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.868700 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_ls__mux4_1.magic.lef
index f47e929..14380a8 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_1.magic.lef
@@ -79,19 +79,6 @@
         RECT 8.205000 1.350000 8.535000 1.780000 ;
     END
   END S1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-        RECT  0.680000 1.525000 4.260000 1.660000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.558100 ;
     DIRECTION OUTPUT ;
@@ -112,6 +99,23 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+        RECT  0.680000 1.525000 4.260000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_ls__mux4_2.magic.lef
index 04bc1dc..37980e0 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_2.magic.lef
@@ -90,20 +90,6 @@
         RECT 6.900000 1.450000 7.555000 1.780000 ;
     END
   END S1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.560000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  6.910000 1.760000 ;
-        RECT -0.190000 1.760000 10.750000 3.520000 ;
-        RECT  8.275000 1.660000 10.750000 1.760000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -123,6 +109,24 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  6.910000 1.760000 ;
+        RECT -0.190000 1.760000 10.750000 3.520000 ;
+        RECT  8.275000 1.660000 10.750000 1.760000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/mux4/sky130_fd_sc_ls__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_ls__mux4_4.magic.lef
index 1f5aa5e..6a34b1a 100644
--- a/cells/mux4/sky130_fd_sc_ls__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_ls__mux4_4.magic.lef
@@ -82,18 +82,6 @@
         RECT 13.540000 1.300000 13.865000 1.550000 ;
     END
   END S1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 16.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 16.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -118,6 +106,22 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_ls__nand2_1.magic.lef
index 2ec7917..683ce05 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.105000 1.180000 0.435000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.546900 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_ls__nand2_2.magic.lef
index f9d049c..ca7621f 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.605000 1.350000 1.315000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.916200 ;
     DIRECTION OUTPUT ;
@@ -78,6 +66,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_ls__nand2_4.magic.lef
index 10103dc..11f6718 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_4.magic.lef
@@ -44,18 +44,6 @@
         RECT 1.085000 1.680000 2.275000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.286100 ;
     DIRECTION OUTPUT ;
@@ -80,6 +68,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2/sky130_fd_sc_ls__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_ls__nand2_8.magic.lef
index 5f2052b..872a66e 100644
--- a/cells/nand2/sky130_fd_sc_ls__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_ls__nand2_8.magic.lef
@@ -44,18 +44,6 @@
         RECT 2.045000 1.350000 4.195000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.284800 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.magic.lef
index 21ca7fd..1b12724 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 1.015000 1.350000 1.345000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.710200 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.magic.lef
index ee1f531..e57deec 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 2.445000 1.350000 2.775000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.879200 ;
     DIRECTION OUTPUT ;
@@ -77,6 +65,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.magic.lef
index 4949fd2..b9aa7b9 100644
--- a/cells/nand2b/sky130_fd_sc_ls__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_ls__nand2b_4.magic.lef
@@ -44,18 +44,6 @@
         RECT 4.445000 1.630000 5.655000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.634300 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_ls__nand3_1.magic.lef
index 3bb3748..3915c16 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.105000 1.180000 0.835000 1.550000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.877300 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_ls__nand3_2.magic.lef
index e4388c7..7332592 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_2.magic.lef
@@ -57,18 +57,6 @@
         RECT 0.125000 1.180000 0.735000 1.550000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.220800 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3/sky130_fd_sc_ls__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_ls__nand3_4.magic.lef
index e5973fa..772e72e 100644
--- a/cells/nand3/sky130_fd_sc_ls__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_ls__nand3_4.magic.lef
@@ -54,18 +54,6 @@
         RECT 4.495000 1.630000 6.115000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.004800 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.magic.lef
index 8f7236f..93dc7fc 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.015000 1.350000 1.345000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.006800 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.magic.lef
index 6c4cbdc..1e412ca 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.085000 1.430000 1.795000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.332800 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.magic.lef
index af98d42..852defd 100644
--- a/cells/nand3b/sky130_fd_sc_ls__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_ls__nand3b_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.765000 1.350000 3.235000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.866500 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_ls__nand4_1.magic.lef
index 4290732..d7a404d 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.575000 1.180000 0.905000 1.550000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.936500 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_ls__nand4_2.magic.lef
index 4970379..da04413 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.125000 1.350000 1.090000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.633200 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4/sky130_fd_sc_ls__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_ls__nand4_4.magic.lef
index 7687e62..d0775e5 100644
--- a/cells/nand4/sky130_fd_sc_ls__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_ls__nand4_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.125000 1.350000 2.275000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.321600 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.magic.lef
index 8efb46e..9b48b1d 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.985000 1.180000 1.315000 1.550000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.012400 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.magic.lef
index 3d3ccbd..a5e184e 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 4.445000 1.350000 5.635000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.573400 ;
     DIRECTION OUTPUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.magic.lef
index 085cc1c..157bcc4 100644
--- a/cells/nand4b/sky130_fd_sc_ls__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_ls__nand4b_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 7.805000 1.300000 9.015000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.665600 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.magic.lef
index 75c4922..d6f6af5 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.485000 1.350000 3.885000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.248650 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.magic.lef
index e71ca42..a89c5f0 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 6.365000 1.680000 6.595000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.614500 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.magic.lef
index 3bce7db..1a1f11a 100644
--- a/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_ls__nand4bb_4.magic.lef
@@ -62,18 +62,6 @@
         RECT 8.265000 1.300000 9.955000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.236100 ;
     DIRECTION OUTPUT ;
@@ -113,6 +101,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_ls__nor2_1.magic.lef
index ac4e6bf..aab252c 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.985000 1.300000 1.315000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.630000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.537600 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_ls__nor2_2.magic.lef
index 1fdffd4..1c6287c 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_2.magic.lef
@@ -45,18 +45,6 @@
         RECT 0.115000 1.180000 0.445000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_ls__nor2_4.magic.lef
index 96ace80..f9d179b 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 3.005000 1.180000 4.195000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.793600 ;
     DIRECTION OUTPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2/sky130_fd_sc_ls__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_ls__nor2_8.magic.lef
index f28b5ff..678eba2 100644
--- a/cells/nor2/sky130_fd_sc_ls__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_ls__nor2_8.magic.lef
@@ -43,18 +43,6 @@
         RECT 7.225000 0.300000 7.555000 1.310000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.839300 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.magic.lef
index b393259..04bc7e2 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.110000 1.180000 0.440000 1.550000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.682700 ;
     DIRECTION OUTPUT ;
@@ -76,6 +64,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.magic.lef
index fc2faf8..d654d08 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.530000 1.470000 0.860000 1.800000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.824400 ;
     DIRECTION OUTPUT ;
@@ -78,6 +66,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.magic.lef
index a1008ce..e3d376a 100644
--- a/cells/nor2b/sky130_fd_sc_ls__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_ls__nor2b_4.magic.lef
@@ -46,18 +46,6 @@
         RECT 4.750000 1.180000 5.155000 1.825000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_ls__nor3_1.magic.lef
index 0646b3f..6c34ab0 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.485000 1.300000 1.815000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 1.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.110000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.737300 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 1.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.110000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_ls__nor3_2.magic.lef
index 50ff5c7..28821f0 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_2.magic.lef
@@ -54,18 +54,6 @@
         RECT 0.605000 1.180000 0.975000 1.550000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.861900 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3/sky130_fd_sc_ls__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_ls__nor3_4.magic.lef
index 452200c..6c7c074 100644
--- a/cells/nor3/sky130_fd_sc_ls__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_ls__nor3_4.magic.lef
@@ -60,19 +60,6 @@
         RECT 3.785000 0.340000 5.635000 0.670000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-        RECT  1.780000 1.590000 3.830000 1.660000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.674800 ;
     DIRECTION OUTPUT ;
@@ -99,6 +86,23 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+        RECT  1.780000 1.590000 3.830000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.magic.lef
index 4d4f0df..4611359 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.445000 1.180000 0.815000 1.550000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.778100 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.magic.lef
index e4edb1f..dff3691 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.425000 1.450000 0.835000 1.780000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.005700 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.magic.lef
index ba5b8d6..5b3f280 100644
--- a/cells/nor3b/sky130_fd_sc_ls__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_ls__nor3b_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 6.765000 1.180000 7.095000 1.550000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.985500 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_ls__nor4_1.magic.lef
index 6db93fb..cb2113a 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.045000 1.350000 2.445000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.744800 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_ls__nor4_2.magic.lef
index d54eb0c..d4ad631 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_2.magic.lef
@@ -67,18 +67,6 @@
         RECT 0.105000 0.330000 0.435000 0.660000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.808000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4/sky130_fd_sc_ls__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_ls__nor4_4.magic.lef
index 8349e15..9e5e0f3 100644
--- a/cells/nor4/sky130_fd_sc_ls__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_ls__nor4_4.magic.lef
@@ -62,18 +62,6 @@
         RECT 0.525000 1.350000 1.875000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.214400 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.magic.lef
index 8bc0fb9..be7a315 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.445000 1.110000 0.815000 1.440000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.879200 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.magic.lef
index 1344b3e..56390ad 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.535000 1.470000 0.865000 1.800000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.323900 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.magic.lef
index 697029e..b269df4 100644
--- a/cells/nor4b/sky130_fd_sc_ls__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_ls__nor4b_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.125000 0.920000 0.550000 1.930000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.440600 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.magic.lef
index 0944609..d13ef7d 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.965000 1.450000 4.345000 1.780000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.848400 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.magic.lef
index 1688ce4..ea208ee 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 1.495000 1.470000 1.825000 1.800000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.198100 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.magic.lef
index f5b4210..4eca19c 100644
--- a/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_ls__nor4bb_4.magic.lef
@@ -65,19 +65,6 @@
         RECT 10.125000 1.450000 10.455000 1.780000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.230000 3.520000 ;
-        RECT  2.480000 1.565000  8.675000 1.660000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.544200 ;
     DIRECTION OUTPUT ;
@@ -113,6 +100,23 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+        RECT  2.480000 1.565000  8.675000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.magic.lef
index 6e25061..077c47a 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 1.005000 1.550000 1.335000 1.880000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.533900 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.magic.lef
index 3a7ad0e..dcc8b4b 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.925000 1.350000 3.255000 1.780000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.magic.lef
index 3ffd912..83b4880 100644
--- a/cells/o2111a/sky130_fd_sc_ls__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_ls__o2111a_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.125000 1.450000 0.550000 1.780000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.142400 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.magic.lef
index 5edb71d..170da45 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.580000 1.180000 0.910000 1.550000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.162500 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.magic.lef
index f0ff23c..63d17a7 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_2.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.105000 1.180000 0.435000 1.550000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.551200 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.magic.lef
index 3e0331f..8895120 100644
--- a/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_ls__o2111ai_4.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.125000 1.350000 1.350000 1.780000 ;
     END
   END D1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  3.411800 ;
     DIRECTION OUTPUT ;
@@ -114,6 +102,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_ls__o211a_1.magic.lef
index d8a8050..80c53e8 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.635000 1.490000 4.195000 1.800000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_ls__o211a_2.magic.lef
index a8ee21c..8f4b96d 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.105000 1.180000 0.435000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211a/sky130_fd_sc_ls__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_ls__o211a_4.magic.lef
index af5ea29..5fc1b6a 100644
--- a/cells/o211a/sky130_fd_sc_ls__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_ls__o211a_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.450000 1.450000 3.780000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.magic.lef
index d63fefa..86e00f8 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_1.magic.lef
@@ -64,18 +64,6 @@
         RECT 1.975000 1.180000 2.305000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.427600 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.magic.lef
index 933c477..63b2794 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 0.125000 1.350000 0.550000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.215200 ;
     DIRECTION OUTPUT ;
@@ -98,6 +86,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.magic.lef
index 35c524c..5f96361 100644
--- a/cells/o211ai/sky130_fd_sc_ls__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_ls__o211ai_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 5.870000 1.350000 7.075000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.915200 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_ls__o21a_1.magic.lef
index a749742..a6f3cba 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.085000 1.445000 1.435000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -83,6 +71,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_ls__o21a_2.magic.lef
index c86a76b..388af7d 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.565000 1.180000 1.955000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21a/sky130_fd_sc_ls__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_ls__o21a_4.magic.lef
index 0908c65..f55057f 100644
--- a/cells/o21a/sky130_fd_sc_ls__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_ls__o21a_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.445000 1.515000 3.235000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -90,6 +78,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.magic.lef
index c1bff61..7a6d872 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 1.565000 1.350000 2.275000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.828300 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.magic.lef
index c4c416e..0b344b6 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_2.magic.lef
@@ -54,18 +54,6 @@
         RECT 2.905000 1.180000 3.235000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.961100 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.magic.lef
index 178a721..96bf3f2 100644
--- a/cells/o21ai/sky130_fd_sc_ls__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_ls__o21ai_4.magic.lef
@@ -53,18 +53,6 @@
         RECT 2.045000 1.180000 3.165000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.478400 ;
     DIRECTION OUTPUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.magic.lef
index dc2652b..54b3ee0 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 2.515000 1.180000 2.845000 1.550000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.magic.lef
index 885811e..3a97cad 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.125000 1.300000 0.455000 1.780000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.magic.lef
index d8788fa..f2ee6a1 100644
--- a/cells/o21ba/sky130_fd_sc_ls__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_ls__o21ba_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.425000 1.180000 0.835000 1.550000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.093800 ;
     DIRECTION OUTPUT ;
@@ -87,6 +75,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.magic.lef
index 3626054..705830f 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_1.magic.lef
@@ -53,18 +53,6 @@
         RECT 0.125000 1.450000 0.565000 1.780000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.magic.lef
index 0158845..49dae96 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_2.magic.lef
@@ -55,18 +55,6 @@
         RECT 0.460000 1.350000 0.835000 1.780000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.879200 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.magic.lef
index 30c5ac2..f71ced8 100644
--- a/cells/o21bai/sky130_fd_sc_ls__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_ls__o21bai_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 6.365000 1.450000 7.075000 1.780000 ;
     END
   END B1_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.855000 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_ls__o221a_1.magic.lef
index 2962e8b..65038b4 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.485000 1.120000 3.825000 1.790000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_ls__o221a_2.magic.lef
index ca8342d..07f5d21 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.105000 1.180000 0.435000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221a/sky130_fd_sc_ls__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_ls__o221a_4.magic.lef
index b12a065..3d3d57c 100644
--- a/cells/o221a/sky130_fd_sc_ls__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_ls__o221a_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.125000 1.445000 0.890000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.235700 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.magic.lef
index d41f0ef..48a5374 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_1.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.105000 1.300000 0.435000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.011700 ;
     DIRECTION OUTPUT ;
@@ -106,6 +94,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.magic.lef
index ad700b6..49dbbff 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_2.magic.lef
@@ -74,18 +74,6 @@
         RECT 0.105000 1.300000 0.435000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.232000 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.magic.lef
index b60a6ab..a781ff9 100644
--- a/cells/o221ai/sky130_fd_sc_ls__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_ls__o221ai_4.magic.lef
@@ -74,18 +74,6 @@
         RECT 0.125000 1.350000 1.405000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.514400 ;
     DIRECTION OUTPUT ;
@@ -119,6 +107,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_ls__o22a_1.magic.lef
index e097215..48ea0e2 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_1.magic.lef
@@ -62,20 +62,6 @@
         RECT 1.085000 0.585000 1.305000 0.670000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 1.160000 1.675000 ;
-        RECT -0.190000 1.675000 4.030000 3.520000 ;
-        RECT  3.195000 1.660000 4.030000 1.675000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -96,6 +82,24 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.160000 1.675000 ;
+        RECT -0.190000 1.675000 4.030000 3.520000 ;
+        RECT  3.195000 1.660000 4.030000 1.675000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_ls__o22a_2.magic.lef
index 364508f..8a33a57 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.045000 1.430000 2.500000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22a/sky130_fd_sc_ls__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_ls__o22a_4.magic.lef
index 63e9095..f87dfba 100644
--- a/cells/o22a/sky130_fd_sc_ls__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_ls__o22a_4.magic.lef
@@ -62,18 +62,6 @@
         RECT 2.525000 1.450000 3.505000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.125600 ;
     DIRECTION OUTPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.magic.lef
index fb30a5c..c169f43 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.965000 1.350000 1.315000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.895900 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.magic.lef
index 2feb5d8..a5324ae 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_2.magic.lef
@@ -63,18 +63,6 @@
         RECT 1.485000 1.350000 1.815000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.212200 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.magic.lef
index 18b91b0..c3937de 100644
--- a/cells/o22ai/sky130_fd_sc_ls__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_ls__o22ai_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 6.365000 1.680000 7.155000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.388000 ;
     DIRECTION OUTPUT ;
@@ -112,6 +100,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.magic.lef
index e5333e1..01e88cf 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_1.magic.lef
@@ -62,18 +62,6 @@
         RECT 3.005000 1.180000 3.715000 1.510000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.magic.lef
index 49a4036..aa4ed8d 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.810000 1.450000 1.285000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.magic.lef
index 5e3a7a9..a18610d 100644
--- a/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_ls__o2bb2a_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 1.470000 1.450000 2.275000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.311300 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.magic.lef
index 3f9f73c..c365ee6 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.225000 1.300000 2.755000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.546900 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.magic.lef
index c3bd807..f7fc4c3 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 4.345000 1.180000 4.675000 1.550000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.896000 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.magic.lef
index a7d912f..56a636d 100644
--- a/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_ls__o2bb2ai_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 5.885000 1.350000 7.640000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.758400 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_ls__o311a_1.magic.lef
index 2c2c4cc..cc95a82 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.105000 1.140000 0.410000 1.470000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_ls__o311a_2.magic.lef
index 19e0dd6..f5ee89e 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.105000 1.180000 0.435000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311a/sky130_fd_sc_ls__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_ls__o311a_4.magic.lef
index c11d370..05daacb 100644
--- a/cells/o311a/sky130_fd_sc_ls__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_ls__o311a_4.magic.lef
@@ -78,18 +78,6 @@
         RECT 3.485000 1.435000 3.825000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.345400 ;
     DIRECTION OUTPUT ;
@@ -118,6 +106,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.magic.lef
index 171aad9..c5b9e74 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.925000 1.180000 3.255000 1.550000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.011700 ;
     DIRECTION OUTPUT ;
@@ -104,6 +92,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.magic.lef
index dd7439f..71a5f8f 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 4.925000 1.300000 5.635000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.754600 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.magic.lef
index e12dffc..539e975 100644
--- a/cells/o311ai/sky130_fd_sc_ls__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_ls__o311ai_4.magic.lef
@@ -71,18 +71,6 @@
         RECT 0.125000 1.300000 1.240000 1.780000 ;
     END
   END C1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.230000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.271700 ;
     DIRECTION OUTPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_ls__o31a_1.magic.lef
index 8528d1d..10a3256 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.545000 1.350000 2.915000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_ls__o31a_2.magic.lef
index 518f4bd..05e117a 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 3.395000 1.300000 3.725000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.604800 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31a/sky130_fd_sc_ls__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_ls__o31a_4.magic.lef
index 8a07656..802962c 100644
--- a/cells/o31a/sky130_fd_sc_ls__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_ls__o31a_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.905000 1.470000 3.235000 2.150000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -97,6 +85,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.magic.lef
index 518e072..f8eb8bc 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 2.445000 1.300000 2.775000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.020700 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.magic.lef
index b1dbba8..1826d86 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 4.365000 1.180000 4.695000 1.350000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.297000 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.magic.lef
index 3cd4468..1446a3a 100644
--- a/cells/o31ai/sky130_fd_sc_ls__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_ls__o31ai_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 6.365000 1.350000 7.790000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.803200 ;
     DIRECTION OUTPUT ;
@@ -101,6 +89,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_ls__o32a_1.magic.lef
index 778649e..3bfd7a8 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 2.535000 1.350000 2.895000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_ls__o32a_2.magic.lef
index 6373082..10e3430 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 3.095000 1.350000 3.715000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -103,6 +91,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32a/sky130_fd_sc_ls__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_ls__o32a_4.magic.lef
index 4404122..ea1ce65 100644
--- a/cells/o32a/sky130_fd_sc_ls__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_ls__o32a_4.magic.lef
@@ -78,18 +78,6 @@
         RECT 3.925000 1.270000 4.255000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.313300 ;
     DIRECTION OUTPUT ;
@@ -118,6 +106,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.magic.lef
index a60ac58..77c74bf 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.975000 1.350000 1.315000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.992900 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.magic.lef
index 199668d..c0431d9 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_2.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.125000 1.350000 1.315000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.138200 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.magic.lef
index 6e08e51..4f37685 100644
--- a/cells/o32ai/sky130_fd_sc_ls__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_ls__o32ai_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.125000 1.430000 1.795000 1.780000 ;
     END
   END B2
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.230000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  2.287500 ;
     DIRECTION OUTPUT ;
@@ -110,6 +98,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_ls__o41a_1.magic.lef
index 280a33f..fc908d2 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_1.magic.lef
@@ -70,18 +70,6 @@
         RECT 1.085000 1.450000 1.580000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_ls__o41a_2.magic.lef
index 9452733..ef75af4 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_2.magic.lef
@@ -72,18 +72,6 @@
         RECT 2.525000 1.350000 3.235000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41a/sky130_fd_sc_ls__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_ls__o41a_4.magic.lef
index 8f1150b..ec01267 100644
--- a/cells/o41a/sky130_fd_sc_ls__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_ls__o41a_4.magic.lef
@@ -72,18 +72,6 @@
         RECT 3.280000 1.440000 4.195000 1.780000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -109,6 +97,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.magic.lef
index 2be14b5..0be5910 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_1.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.105000 1.180000 0.435000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.602900 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.magic.lef
index 0526e9a..f744c9c 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_2.magic.lef
@@ -73,18 +73,6 @@
         RECT 0.125000 1.550000 0.455000 1.630000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.430000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.879200 ;
     DIRECTION OUTPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.magic.lef
index 2feb995..db0b07b 100644
--- a/cells/o41ai/sky130_fd_sc_ls__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_ls__o41ai_4.magic.lef
@@ -70,18 +70,6 @@
         RECT 0.125000 1.180000 1.145000 1.550000 ;
     END
   END B1
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.586200 ;
     DIRECTION OUTPUT ;
@@ -108,6 +96,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2/sky130_fd_sc_ls__or2_1.magic.lef b/cells/or2/sky130_fd_sc_ls__or2_1.magic.lef
index d49b550..17958e2 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_ls__or2_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.105000 1.180000 0.775000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2/sky130_fd_sc_ls__or2_2.magic.lef b/cells/or2/sky130_fd_sc_ls__or2_2.magic.lef
index d20b405..141d960 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_ls__or2_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.105000 1.180000 0.435000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 2.590000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.565600 ;
     DIRECTION OUTPUT ;
@@ -74,6 +62,22 @@
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 2.590000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2/sky130_fd_sc_ls__or2_4.magic.lef b/cells/or2/sky130_fd_sc_ls__or2_4.magic.lef
index 6d96daf..7f2c2ff 100644
--- a/cells/or2/sky130_fd_sc_ls__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_ls__or2_4.magic.lef
@@ -45,18 +45,6 @@
         RECT 2.925000 1.450000 3.255000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.149300 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_ls__or2b_1.magic.lef
index 8fd5816..e7657a1 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_1.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.125000 1.180000 0.455000 1.550000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_ls__or2b_2.magic.lef
index ea6294d..31222a3 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_2.magic.lef
@@ -43,18 +43,6 @@
         RECT 0.125000 1.350000 0.550000 1.780000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.787700 ;
     DIRECTION OUTPUT ;
@@ -75,6 +63,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or2b/sky130_fd_sc_ls__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_ls__or2b_4.magic.lef
index 704bbcb..3adee03 100644
--- a/cells/or2b/sky130_fd_sc_ls__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_ls__or2b_4.magic.lef
@@ -43,18 +43,6 @@
         RECT 4.905000 1.120000 5.235000 1.790000 ;
     END
   END B_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.104900 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3/sky130_fd_sc_ls__or3_1.magic.lef b/cells/or3/sky130_fd_sc_ls__or3_1.magic.lef
index 8b84835..aae9692 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_ls__or3_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.125000 1.350000 0.570000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 2.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.070000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 2.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3/sky130_fd_sc_ls__or3_2.magic.lef b/cells/or3/sky130_fd_sc_ls__or3_2.magic.lef
index caf14e0..87085eb 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_ls__or3_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.435000 1.120000 0.835000 1.790000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -86,6 +74,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3/sky130_fd_sc_ls__or3_4.magic.lef b/cells/or3/sky130_fd_sc_ls__or3_4.magic.lef
index be5fe7e..2b087ec 100644
--- a/cells/or3/sky130_fd_sc_ls__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_ls__or3_4.magic.lef
@@ -55,18 +55,6 @@
         RECT 1.050000 0.270000 1.380000 0.940000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.090100 ;
     DIRECTION OUTPUT ;
@@ -91,6 +79,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_ls__or3b_1.magic.lef
index bae08df..3e7f25f 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.125000 1.110000 0.605000 1.780000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_ls__or3b_2.magic.lef
index fd991f0..bed8d53 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.105000 1.300000 0.435000 1.780000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -85,6 +73,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or3b/sky130_fd_sc_ls__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_ls__or3b_4.magic.lef
index 0e9e6ad..0f04585 100644
--- a/cells/or3b/sky130_fd_sc_ls__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_ls__or3b_4.magic.lef
@@ -56,18 +56,6 @@
         RECT 0.105000 0.255000 0.775000 0.640000 ;
     END
   END C_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.950000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.104900 ;
     DIRECTION OUTPUT ;
@@ -92,6 +80,22 @@
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4/sky130_fd_sc_ls__or4_1.magic.lef b/cells/or4/sky130_fd_sc_ls__or4_1.magic.lef
index a020108..aeac60f 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_ls__or4_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.125000 1.420000 0.650000 1.780000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4/sky130_fd_sc_ls__or4_2.magic.lef b/cells/or4/sky130_fd_sc_ls__or4_2.magic.lef
index 2f1a05b..f0a9e38 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_ls__or4_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.425000 1.180000 0.835000 1.770000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -95,6 +83,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4/sky130_fd_sc_ls__or4_4.magic.lef b/cells/or4/sky130_fd_sc_ls__or4_4.magic.lef
index 34767bf..c9a59c7 100644
--- a/cells/or4/sky130_fd_sc_ls__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_ls__or4_4.magic.lef
@@ -65,18 +65,6 @@
         RECT 6.285000 0.255000 6.615000 0.855000 ;
     END
   END D
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 6.720000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 6.910000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.326900 ;
     DIRECTION OUTPUT ;
@@ -102,6 +90,22 @@
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 6.720000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 6.910000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_ls__or4b_1.magic.lef
index a19379e..2867074 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.125000 1.450000 0.570000 1.780000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_ls__or4b_2.magic.lef
index 107e28c..4eee0f2 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_2.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.125000 1.350000 0.550000 1.780000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.510000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4b/sky130_fd_sc_ls__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_ls__or4b_4.magic.lef
index 4015aea..4c0fa6d 100644
--- a/cells/or4b/sky130_fd_sc_ls__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_ls__or4b_4.magic.lef
@@ -67,18 +67,6 @@
         RECT 4.445000 1.180000 4.815000 1.550000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.200000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.390000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.178900 ;
     DIRECTION OUTPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.200000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.390000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.magic.lef
index c35dc21..444b957 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_1.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.965000 1.050000 1.315000 1.720000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.magic.lef
index 4b3cde4..0157c03 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_2.magic.lef
@@ -62,18 +62,6 @@
         RECT 0.125000 1.350000 0.550000 1.780000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -94,6 +82,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.magic.lef
index 9f166c8..062f60c 100644
--- a/cells/or4bb/sky130_fd_sc_ls__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_ls__or4bb_4.magic.lef
@@ -61,18 +61,6 @@
         RECT 0.425000 1.350000 0.835000 1.780000 ;
     END
   END D_N
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.677500 ;
     DIRECTION OUTPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.magic.lef
index 3775ec4..b0e6ba5 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_1.magic.lef
@@ -96,19 +96,6 @@
         RECT 11.615000 2.105000 11.905000 2.150000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 16.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 16.990000 3.520000 ;
-        RECT 13.420000 1.550000 15.300000 1.660000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -127,6 +114,23 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+        RECT 13.420000 1.550000 15.300000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.magic.lef
index f67a82e..45633bb 100644
--- a/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_ls__sdfbbn_2.magic.lef
@@ -97,18 +97,6 @@
         RECT 12.095000 1.735000 12.385000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 18.240000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 18.430000 3.520000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -127,6 +115,22 @@
         RECT 0.000000 -0.245000 18.240000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 18.240000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 18.430000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.magic.lef
index 20b4de0..081ae5a 100644
--- a/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_ls__sdfbbp_1.magic.lef
@@ -103,19 +103,6 @@
         RECT 11.055000 1.860000 11.365000 2.150000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 15.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 16.030000 3.520000 ;
-        RECT 12.680000 1.560000 14.260000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -134,6 +121,23 @@
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.030000 3.520000 ;
+        RECT 12.680000 1.560000 14.260000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.magic.lef
index 0a9f9f6..99cd3c6 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_1.magic.lef
@@ -89,21 +89,6 @@
         RECT 2.395000 1.260000 2.725000 1.490000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  4.125000 1.675000 ;
-        RECT -0.190000 1.675000 14.110000 3.520000 ;
-        RECT  5.585000 1.660000 14.110000 1.675000 ;
-        RECT  8.005000 1.555000  9.515000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -123,6 +108,25 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  4.125000 1.675000 ;
+        RECT -0.190000 1.675000 14.110000 3.520000 ;
+        RECT  5.585000 1.660000 14.110000 1.675000 ;
+        RECT  8.005000 1.555000  9.515000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.magic.lef
index 965186a..5cca4a0 100644
--- a/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_ls__sdfrbp_2.magic.lef
@@ -89,22 +89,6 @@
         RECT 1.625000 1.620000 1.795000 1.820000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  3.830000 1.780000 ;
-        RECT -0.190000 1.780000 15.070000 3.520000 ;
-        RECT  5.725000 1.660000 15.070000 1.780000 ;
-        RECT  7.970000 1.555000  9.470000 1.595000 ;
-        RECT  7.970000 1.595000 12.540000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -123,6 +107,26 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.830000 1.780000 ;
+        RECT -0.190000 1.780000 15.070000 3.520000 ;
+        RECT  5.725000 1.660000 15.070000 1.780000 ;
+        RECT  7.970000 1.555000  9.470000 1.595000 ;
+        RECT  7.970000 1.595000 12.540000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.magic.lef
index 38794cd..c7e05fc 100644
--- a/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_ls__sdfrtn_1.magic.lef
@@ -78,21 +78,6 @@
         RECT 1.875000 0.955000 2.550000 1.410000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  5.995000 1.780000 ;
-        RECT -0.190000 1.780000 14.110000 3.520000 ;
-        RECT  3.750000 1.555000  5.995000 1.660000 ;
-        RECT  9.725000 1.660000 14.110000 1.780000 ;
-    END
-  END VPB
   PIN CLK_N
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -111,6 +96,25 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  5.995000 1.780000 ;
+        RECT -0.190000 1.780000 14.110000 3.520000 ;
+        RECT  3.750000 1.555000  5.995000 1.660000 ;
+        RECT  9.725000 1.660000 14.110000 1.780000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.magic.lef
index b891c51..1d56f34 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_1.magic.lef
@@ -79,21 +79,6 @@
         RECT 2.345000 1.260000 2.725000 1.490000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  4.125000 1.675000 ;
-        RECT -0.190000 1.675000 13.630000 3.520000 ;
-        RECT  5.585000 1.660000 13.630000 1.675000 ;
-        RECT  8.145000 1.555000  9.665000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -113,6 +98,25 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  4.125000 1.675000 ;
+        RECT -0.190000 1.675000 13.630000 3.520000 ;
+        RECT  5.585000 1.660000 13.630000 1.675000 ;
+        RECT  8.145000 1.555000  9.665000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.magic.lef
index 5b60c96..f510109 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_2.magic.lef
@@ -81,21 +81,6 @@
         RECT 2.375000 1.260000 2.705000 1.490000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  4.125000 1.675000 ;
-        RECT -0.190000 1.675000 14.590000 3.520000 ;
-        RECT  5.585000 1.660000 14.590000 1.675000 ;
-        RECT  8.090000 1.555000  9.780000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -116,6 +101,25 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  4.125000 1.675000 ;
+        RECT -0.190000 1.675000 14.590000 3.520000 ;
+        RECT  5.585000 1.660000 14.590000 1.675000 ;
+        RECT  8.090000 1.555000  9.780000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.magic.lef
index 7f3a2a7..02b7f2d 100644
--- a/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_ls__sdfrtp_4.magic.lef
@@ -85,21 +85,6 @@
         RECT 2.405000 1.260000 2.735000 1.490000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000  3.985000 1.780000 ;
-        RECT -0.190000 1.780000 15.070000 3.520000 ;
-        RECT  5.835000 1.660000 15.070000 1.780000 ;
-        RECT  8.125000 1.555000  9.645000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.261000 ;
     DIRECTION INPUT ;
@@ -119,6 +104,25 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000  3.985000 1.780000 ;
+        RECT -0.190000 1.780000 15.070000 3.520000 ;
+        RECT  5.835000 1.660000 15.070000 1.780000 ;
+        RECT  8.125000 1.555000  9.645000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.magic.lef
index 49e6fc1..83a84c1 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_1.magic.lef
@@ -87,19 +87,6 @@
         RECT 9.695000 1.735000 9.985000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.400000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 14.590000 3.520000 ;
-        RECT  7.405000 1.555000  8.470000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -118,6 +105,23 @@
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.400000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.590000 3.520000 ;
+        RECT  7.405000 1.555000  8.470000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.magic.lef
index 26b03e5..826ba9e 100644
--- a/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_ls__sdfsbp_2.magic.lef
@@ -88,18 +88,6 @@
         RECT 13.055000 1.735000 13.345000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 17.760000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 17.950000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -118,6 +106,22 @@
         RECT 0.000000 -0.245000 17.760000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.760000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 17.950000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.magic.lef
index ba39072..475723e 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_1.magic.lef
@@ -78,19 +78,6 @@
         RECT 10.655000 1.735000 10.945000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.920000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 14.110000 3.520000 ;
-        RECT  7.455000 1.525000  8.515000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -109,6 +96,23 @@
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.920000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 14.110000 3.520000 ;
+        RECT  7.455000 1.525000  8.515000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.magic.lef
index c996b92..0371d3e 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_2.magic.lef
@@ -81,18 +81,6 @@
         RECT 11.615000 1.365000 11.905000 1.410000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 14.880000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 15.070000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -111,6 +99,22 @@
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 14.880000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.070000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.magic.lef
index e083c0d..f1ab87e 100644
--- a/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_ls__sdfstp_4.magic.lef
@@ -86,18 +86,6 @@
         RECT 11.615000 1.735000 11.905000 1.780000 ;
     END
   END SET_B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 15.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 16.030000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -116,6 +104,22 @@
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.magic.lef
index 43e5c8a..b006816 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_1.magic.lef
@@ -75,18 +75,6 @@
         RECT 1.565000 0.810000 2.050000 0.955000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.480000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 12.670000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -105,6 +93,22 @@
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.magic.lef
index 4f69262..0461c7c 100644
--- a/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_ls__sdfxbp_2.magic.lef
@@ -77,18 +77,6 @@
         RECT 1.565000 0.810000 2.075000 0.900000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 13.440000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 13.630000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -107,6 +95,22 @@
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 13.440000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 13.630000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.magic.lef
index 97804a7..9122665 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_1.magic.lef
@@ -63,18 +63,6 @@
         RECT 1.085000 0.900000 2.250000 0.955000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 11.040000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 11.230000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 11.040000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 11.230000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.magic.lef
index cc43ed4..c4cbaa1 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_2.magic.lef
@@ -66,18 +66,6 @@
         RECT 1.875000 1.020000 2.205000 1.230000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.000000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 12.190000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -96,6 +84,22 @@
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.000000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.190000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.magic.lef
index 7640478..4533246 100644
--- a/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_ls__sdfxtp_4.magic.lef
@@ -69,18 +69,6 @@
         RECT 1.565000 0.810000 2.195000 0.955000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 12.480000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 12.670000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -99,6 +87,22 @@
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 12.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 12.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.magic.lef
index 15f7c97..7fbff09 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_1.magic.lef
@@ -54,19 +54,6 @@
         RECT 0.125000 1.290000 0.545000 1.960000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 7.680000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 7.870000 3.520000 ;
-        RECT  3.910000 1.580000 4.980000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.459000 ;
     DIRECTION INPUT ;
@@ -85,6 +72,23 @@
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 7.680000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 7.870000 3.520000 ;
+        RECT  3.910000 1.580000 4.980000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.magic.lef
index 5e41317..65b32f0 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_2.magic.lef
@@ -54,19 +54,6 @@
         RECT 0.125000 1.290000 0.550000 1.960000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-        RECT  3.840000 1.560000 5.890000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.498000 ;
     DIRECTION INPUT ;
@@ -85,6 +72,23 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+        RECT  3.840000 1.560000 5.890000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.magic.lef
index 46f4884..20b981b 100644
--- a/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_ls__sdlclkp_4.magic.lef
@@ -59,20 +59,6 @@
         RECT 0.125000 1.455000 0.550000 1.785000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-        RECT  1.385000 1.650000 5.370000 1.660000 ;
-        RECT  4.270000 1.575000 5.370000 1.650000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.516000 ;
     DIRECTION INPUT ;
@@ -91,6 +77,24 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+        RECT  1.385000 1.650000 5.370000 1.660000 ;
+        RECT  4.270000 1.575000 5.370000 1.650000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.magic.lef
index 8e1e98a..02c6059 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_1.magic.lef
@@ -82,18 +82,6 @@
         RECT 4.475000 1.450000 4.865000 1.780000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 16.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 16.510000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -112,6 +100,22 @@
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.510000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.magic.lef
index 06166e6..9ed36fc 100644
--- a/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_ls__sedfxbp_2.magic.lef
@@ -83,18 +83,6 @@
         RECT 4.475000 1.180000 4.915000 1.510000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 17.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 17.470000 3.520000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -113,6 +101,22 @@
         RECT 0.000000 -0.245000 17.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 17.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 17.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.magic.lef b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.magic.lef
index 2297704..db52149 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_1.magic.lef
@@ -70,19 +70,6 @@
         RECT 4.400000 1.180000 4.730000 1.510000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 15.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 15.550000 3.520000 ;
-        RECT  6.020000 1.600000  7.080000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -101,6 +88,23 @@
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 15.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 15.550000 3.520000 ;
+        RECT  6.020000 1.600000  7.080000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.magic.lef b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.magic.lef
index 664f416..66afd96 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_2.magic.lef
@@ -73,19 +73,6 @@
         RECT 4.465000 1.180000 4.785000 1.510000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 16.320000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 16.510000 3.520000 ;
-        RECT  6.200000 1.640000  7.305000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -104,6 +91,23 @@
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.320000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.510000 3.520000 ;
+        RECT  6.200000 1.640000  7.305000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.magic.lef b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.magic.lef
index b499376..70ecb0c 100644
--- a/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_ls__sedfxtp_4.magic.lef
@@ -76,19 +76,6 @@
         RECT 4.445000 1.180000 4.785000 1.510000 ;
     END
   END SCE
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 16.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 16.990000 3.520000 ;
-        RECT  6.115000 1.625000  7.180000 1.660000 ;
-    END
-  END VPB
   PIN CLK
     ANTENNAGATEAREA  0.279000 ;
     DIRECTION INPUT ;
@@ -107,6 +94,23 @@
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 16.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 16.990000 3.520000 ;
+        RECT  6.115000 1.625000  7.180000 1.660000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef b/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef
index 0b80235..44ac59d 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef
@@ -25,23 +25,6 @@
   SIZE  0.480000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.265000 0.390000 1.440000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.480000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.142800 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 1.890000 0.390000 3.065000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -51,6 +34,30 @@
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.090000 0.265000 0.390000 1.440000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.480000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.090000 1.890000 0.390000 3.065000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -67,8 +74,6 @@
     LAYER mcon ;
       RECT 0.155000 -0.085000 0.325000 0.085000 ;
       RECT 0.155000  3.245000 0.325000 3.415000 ;
-    LAYER nwell ;
-      RECT -0.190000 1.660000 0.670000 3.520000 ;
   END
 END sky130_fd_sc_ls__tap_1
 END LIBRARY
diff --git a/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef b/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef
index 856d05c..a934b6a 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef
@@ -25,23 +25,6 @@
   SIZE  0.960000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 0.265000 0.870000 1.440000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.546000 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 1.890000 0.870000 3.065000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -51,6 +34,30 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER li1 ;
+        RECT 0.090000 0.265000 0.870000 1.440000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.805000 1.145000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.090000 1.890000 0.870000 3.065000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -69,8 +76,6 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
-    LAYER nwell ;
-      RECT -0.190000 1.660000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_ls__tap_2
 END LIBRARY
diff --git a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef
index f35f6e2..e7205d8 100644
--- a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef
+++ b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef
@@ -25,29 +25,6 @@
   SIZE  0.960000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VNB
-    PORT
-      LAYER met1 ;
-        RECT 0.080000 0.425000 0.400000 0.685000 ;
-    END
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 0.960000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    ANTENNADIFFAREA  0.546000 ;
-    PORT
-      LAYER li1 ;
-        RECT 0.090000 2.210000 0.870000 3.065000 ;
-      LAYER mcon ;
-        RECT 0.635000 2.690000 0.805000 2.860000 ;
-    END
-    PORT
-      LAYER met1 ;
-        RECT 0.560000 2.645000 0.880000 2.905000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -57,6 +34,36 @@
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.080000 0.425000 0.400000 0.685000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.805000 1.145000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 0.960000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER li1 ;
+        RECT 0.090000 2.210000 0.870000 3.065000 ;
+      LAYER mcon ;
+        RECT 0.635000 2.690000 0.805000 2.860000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.560000 2.645000 0.880000 2.905000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.660000 1.150000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -77,8 +84,6 @@
       RECT 0.155000  3.245000 0.325000 3.415000 ;
       RECT 0.635000 -0.085000 0.805000 0.085000 ;
       RECT 0.635000  3.245000 0.805000 3.415000 ;
-    LAYER nwell ;
-      RECT -0.190000 1.660000 1.150000 3.520000 ;
   END
 END sky130_fd_sc_ls__tapmet1_2
 END LIBRARY
diff --git a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef
index 9de1534..3937306 100644
--- a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef
@@ -25,13 +25,6 @@
   SIZE  0.480000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VPB
-    ANTENNADIFFAREA  0.142800 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.080000 2.645000 0.400000 2.905000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -39,8 +32,20 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.080000 2.645000 0.400000 2.905000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef
index 3e24037..ca18ba8 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef
@@ -25,13 +25,6 @@
   SIZE  0.480000 BY  3.330000 ;
   SYMMETRY X Y ;
   SITE unit ;
-  PIN VPB
-    ANTENNADIFFAREA  0.142800 ;
-    PORT
-      LAYER met1 ;
-        RECT 0.080000 2.275000 0.400000 2.535000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -39,8 +32,20 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER met1 ;
+        RECT 0.080000 2.275000 0.400000 2.535000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef
index 4b740a1..cb92d09 100644
--- a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef
+++ b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef
@@ -25,12 +25,6 @@
   SIZE  0.480000 BY  3.330000 ;
   SYMMETRY X Y R90 ;
   SITE unit ;
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 0.670000 3.520000 ;
-    END
-  END VPB
   PIN VGND
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
@@ -38,8 +32,18 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef
index 525d6a7..330b607 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef
@@ -32,6 +32,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
+      LAYER pwell ;
+        RECT 0.155000 0.320000 0.325000 1.145000 ;
     END
   END VGND
   PIN VPWR
@@ -41,6 +43,8 @@
     PORT
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
+      LAYER nwell ;
+        RECT -0.190000 1.660000 0.670000 3.520000 ;
     END
   END VPWR
   OBS
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.magic.lef
index a15404f..aa366eb 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_1.magic.lef
@@ -47,18 +47,6 @@
         RECT 2.015000 1.680000 2.185000 1.950000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.360000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 3.550000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  0.699800 ;
     DIRECTION OUTPUT ;
@@ -81,6 +69,22 @@
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.360000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 3.550000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.magic.lef
index 7f40118..22c9602 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_2.magic.lef
@@ -53,18 +53,6 @@
         RECT 5.025000 1.180000 5.195000 2.060000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 5.280000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 5.470000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.072800 ;
     DIRECTION OUTPUT ;
@@ -93,6 +81,22 @@
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 5.280000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 5.470000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.magic.lef
index a0a9bfb..7db12ca 100644
--- a/cells/xnor2/sky130_fd_sc_ls__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_ls__xnor2_4.magic.lef
@@ -51,18 +51,6 @@
         RECT 6.365000 1.765000 6.535000 1.945000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-    END
-  END VPB
   PIN Y
     ANTENNADIFFAREA  1.474200 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.magic.lef
index 78f8474..b275db8 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 0.995000 1.350000 1.325000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.160000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.350000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.530100 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.160000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.350000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.magic.lef
index 923ada1..f794adb 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 6.845000 1.350000 7.175000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -84,6 +72,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.magic.lef
index fb5fa94..88f8ca3 100644
--- a/cells/xnor3/sky130_fd_sc_ls__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_ls__xnor3_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 6.780000 1.350000 7.110000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.080000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.270000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -88,6 +76,22 @@
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.080000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.270000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_ls__xor2_1.magic.lef
index 31f692a..4c617ff 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_1.magic.lef
@@ -45,18 +45,6 @@
         RECT 2.515000 1.695000 2.845000 1.780000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 3.840000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.030000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.697200 ;
     DIRECTION OUTPUT ;
@@ -78,6 +66,22 @@
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 3.840000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.030000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_ls__xor2_2.magic.lef
index 78630a5..2b65294 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_2.magic.lef
@@ -47,18 +47,6 @@
         RECT 3.485000 1.180000 4.145000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 4.800000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 4.990000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.754100 ;
     DIRECTION OUTPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 4.800000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 4.990000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor2/sky130_fd_sc_ls__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_ls__xor2_4.magic.lef
index d9e0db9..047b971 100644
--- a/cells/xor2/sky130_fd_sc_ls__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_ls__xor2_4.magic.lef
@@ -58,18 +58,6 @@
         RECT 5.885000 1.350000 8.165000 1.550000 ;
     END
   END B
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 8.640000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 8.830000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.504500 ;
     DIRECTION OUTPUT ;
@@ -100,6 +88,22 @@
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 8.640000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 8.830000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_ls__xor3_1.magic.lef
index 5c1d829..23d091e 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_1.magic.lef
@@ -52,18 +52,6 @@
         RECT 6.875000 1.180000 7.205000 1.685000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.120000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.310000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.541300 ;
     DIRECTION OUTPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.120000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.310000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_ls__xor3_2.magic.lef
index 661878c..6ac12f2 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_2.magic.lef
@@ -52,18 +52,6 @@
         RECT 6.875000 1.180000 7.125000 1.685000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 9.600000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 9.790000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  0.543200 ;
     DIRECTION OUTPUT ;
@@ -82,6 +70,22 @@
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 9.600000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 9.790000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;
diff --git a/cells/xor3/sky130_fd_sc_ls__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_ls__xor3_4.magic.lef
index 59d3a97..c773f16 100644
--- a/cells/xor3/sky130_fd_sc_ls__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_ls__xor3_4.magic.lef
@@ -52,18 +52,6 @@
         RECT 6.810000 1.450000 7.070000 1.780000 ;
     END
   END C
-  PIN VNB
-    PORT
-      LAYER pwell ;
-        RECT 0.000000 0.000000 10.560000 0.245000 ;
-    END
-  END VNB
-  PIN VPB
-    PORT
-      LAYER nwell ;
-        RECT -0.190000 1.660000 10.750000 3.520000 ;
-    END
-  END VPB
   PIN X
     ANTENNADIFFAREA  1.086400 ;
     DIRECTION OUTPUT ;
@@ -89,6 +77,22 @@
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
   END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER pwell ;
+        RECT 0.000000 0.000000 10.560000 0.245000 ;
+    END
+  END VNB
+  PIN VPB
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.660000 10.750000 3.520000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     SHAPE ABUTMENT ;