`.lef` file improvements.

 * Fixing missing VNB / VPB pins in `.lef` files.
 * Removing `UNITS` section.

Updating sky130_fd_sc_hdll 0.1.0.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
index 88a291a..11e5560 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.755000 ;
     DIRECTION INOUT ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
index 2ef3f3d..1fef04b 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.940000 ;
     DIRECTION INOUT ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
index fa5013f..e77f9ee 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -84,6 +81,18 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.550000 ;
     DIRECTION INOUT ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
index 7e7a2ea..3912baa 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.305000 ;
     DIRECTION INOUT ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
index baee937..eaec856 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -80,6 +77,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
index 2e5ed11..8369e41 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -85,6 +82,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
index e5c2db6..3a0b5f8 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.683400 ;
     DIRECTION INOUT ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
index 0398520..660ad9e 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.937200 ;
     DIRECTION INOUT ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
index e2ee3cc..ca0b222 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
index e7d2b48..bfdcf8c 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.535500 ;
     DIRECTION INOUT ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
index 275a52d..45a49cc 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -72,6 +69,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.705500 ;
     DIRECTION INOUT ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
index 4774506..350e166 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -72,6 +69,18 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.465000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
index eaf9d6c..e9553e5 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
index e023770..2748463 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.935000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
index bb78231..f67b0c3 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
index 679e5b0..ff40b9f 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
index 72cad0e..32eb4aa 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
index b1b0fb3..428ddcb 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.315000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
index 196c009..7d441d1 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -71,6 +68,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.590000 ;
     DIRECTION INOUT ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
index 93d128b..78796f6 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -72,6 +69,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.210000 ;
     DIRECTION INOUT ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
index 2428b38..7bc3262 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -89,6 +86,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
index 60d42f3..81d43df 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -92,6 +89,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
index 846e0e0..e98c85b 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -93,6 +90,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
index cb085ae..7b505d3 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -96,6 +93,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.350000 ;
     DIRECTION INOUT ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
index c32eba0..ca00a64 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -80,6 +77,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.600000 ;
     DIRECTION INOUT ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
index 959077b..350a41d 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -80,6 +77,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
index d7709fa..67109be 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -83,6 +80,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
index 7338a0e..cc047d7 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -80,6 +77,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
index d3d6161..9c9997c 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -96,6 +93,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
index e8b7ba3..f3dc7aa 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
index 39c5d94..b33a3f3 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -95,6 +92,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.467400 ;
     DIRECTION INOUT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
index fe82287..d10a192 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -97,6 +94,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.125000 -0.085000 0.295000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.849000 ;
     DIRECTION INOUT ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
index 913eb12..a772bb5 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -84,6 +81,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
index cb4a51e..6a9c948 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -95,6 +92,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.570000 ;
     DIRECTION INOUT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
index 81b1d8f..431a5bc 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -80,6 +77,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.325000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
index 9394bd1..306b7a2 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -81,6 +78,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
index e0cb003..ce97491 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.705000 ;
     DIRECTION INOUT ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
index b243623..7196fde 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.910000 ;
     DIRECTION INOUT ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
index 97b2e7e..47fb98c 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -84,6 +81,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
index 66abf2c..6996b46 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.595000 ;
     DIRECTION INOUT ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
index ddd9565..0e1e564 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.470000 ;
     DIRECTION INOUT ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
index a8a49ad..b7bb292 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
index ef06f71..1d759db 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -89,6 +86,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.975000 ;
     DIRECTION INOUT ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
index d6e7a93..10f68bb 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -88,6 +85,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.010000 ;
     DIRECTION INOUT ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
index ccdb967..d649fff 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -88,6 +85,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.700000 ;
     DIRECTION INOUT ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
index b0b4ed2..654c789 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -87,6 +84,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
index 1a11274..9934dab 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -88,6 +85,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.195000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.080000 ;
     DIRECTION INOUT ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
index 3b40916..69ef3da 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -123,6 +120,18 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.690000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.195000 ;
     DIRECTION INOUT ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
index a737779..659d345 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.445650 ;
     DIRECTION INOUT ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
index 7a46a93..1720d99 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.819100 ;
     DIRECTION INOUT ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
index c5ce038..c33ead0 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.245000 ;
     DIRECTION INOUT ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
index 252f107..1b28be1 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -64,6 +61,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
index 3443dd5..d086e55 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -64,6 +61,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.010000 ;
     DIRECTION INOUT ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
index 7cf70cb..bb135e4 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.642200 ;
     DIRECTION INOUT ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
index 17cb12c..3a95734 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.924800 ;
     DIRECTION INOUT ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
index 64709de..476a2a7 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.275700 ;
     DIRECTION INOUT ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
index 3879ab0..2e8dbbf 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.454800 ;
     DIRECTION INOUT ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
index e237fe5..825c24d 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -84,6 +81,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.832500 ;
     DIRECTION INOUT ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
index cd45752..385b9f5 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.435000 ;
     DIRECTION INOUT ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
index 9b0dc3f..a6bbf44 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.591300 ;
     DIRECTION INOUT ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
index 3b69ba7..1ddea58 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.940900 ;
     DIRECTION INOUT ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
index c632d54..682d0a9 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.390700 ;
     DIRECTION INOUT ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
index 9ae0dff..45726f4 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.560100 ;
     DIRECTION INOUT ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
index f8b8025..41f5ee5 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.994300 ;
     DIRECTION INOUT ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
index c91cf93..00ee00e 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.510000 ;
     DIRECTION INOUT ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
index ad0605b..4527482 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.711500 ;
     DIRECTION INOUT ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
index 0bf1bed..831d6ce 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.856300 ;
     DIRECTION INOUT ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
index 41771ad..8f02245 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.615700 ;
     DIRECTION INOUT ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
index b7a7365..7871b48 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.677900 ;
     DIRECTION INOUT ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
index c838ca3..117aa5c 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.299000 ;
     DIRECTION INOUT ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
index 650ace2..3a226d6 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.981400 ;
     DIRECTION INOUT ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
index 7f7fdbc..09707be 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.085000 0.325000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.244900 ;
     DIRECTION INOUT ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
index ff9db27..7b30821 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -83,6 +80,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.620000 -0.085000 0.790000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
index 72becf6..4165bf0 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.690000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.440000 ;
     DIRECTION INOUT ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
index 75b3c04..54dffee 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -63,6 +60,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.709400 ;
     DIRECTION INOUT ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
index 0d392ef..68c5a7b 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -66,6 +63,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
index 1309f09..d12b2aa 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -71,6 +68,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
index a0cdc68..d28b2df 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -75,6 +72,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INOUT ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
index f50ff15..fcd77a7 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  4.020000 ;
     DIRECTION INOUT ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
index 34ac198..f8a298d 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.044400 ;
     DIRECTION INOUT ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
index ae136be..3de14d1 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.750000 ;
     DIRECTION INOUT ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
index 7c7de8a..47c654e 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
index fc00dbc..fa3e892 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,12 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.529300 ;
     DIRECTION INOUT ;
@@ -93,6 +96,8 @@
       RECT 1.065000  2.635000 1.235000 2.805000 ;
       RECT 1.525000 -0.085000 1.695000 0.085000 ;
       RECT 1.525000  2.635000 1.695000 2.805000 ;
+    LAYER pwell ;
+      RECT 1.165000 -0.085000 1.335000 0.085000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
index ff51629..5ac5bbd 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
index bce6147..3b13052 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.245000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
index 8355c4c..e962f0d 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.615000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
index 9f71516..8e0bb1b 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.960000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
index f2fabc1..f98968c 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
index c7d3c0c..ec164e6 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.750000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
index 8ccdd08..877418c 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.470400 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
index bd22455..e4f458a 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.860000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
index 0e031c6..c99440e 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -55,6 +52,18 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.895000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
index 4254d62..e93643a 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.575000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
index aaf4047..e758998 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.270000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
index 87369a6..a9ca538 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.095000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
index 7cb4f3c..5c13234 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.650000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
index 6a5ded5..b7b8b3a 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.790000 ;
     DIRECTION INOUT ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
index 5621b10..6c1589b 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -76,6 +73,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.640000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.805800 ;
     DIRECTION INOUT ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
index fe417ff..1fdda11 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -76,6 +73,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.880000 -0.085000 1.100000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.066400 ;
     DIRECTION INOUT ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
index 76229ea..5998e4d 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -76,6 +73,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 1.800000 -0.085000 2.020000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.358800 ;
     DIRECTION INOUT ;
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
index 31954b2..8286dca 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -57,6 +54,18 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
index d04731d..d27a9d7 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -43,6 +40,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  2.601500 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
index 3857968..b902698 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -43,6 +40,18 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  0.324500 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
index 6397da1..40ed3ef 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -43,6 +40,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  0.577500 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
index b315e74..e82dafa 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -43,6 +40,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  1.083500 ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
index dd7662f..4a40cdd 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -43,6 +40,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.452400 ;
     ANTENNAGATEAREA  1.589500 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
index 0c03bb3..5767883 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -83,6 +80,18 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.314500 ;
     DIRECTION INOUT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
index 6d5d184..f6dad56 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -87,6 +84,18 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.584500 ;
     DIRECTION INOUT ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
index b65413d..d004118 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -89,6 +86,18 @@
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.690000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.881700 ;
     DIRECTION INOUT ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
index 303a79c..fb5a2fc 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -117,6 +114,18 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.388300 ;
     DIRECTION INOUT ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
index 71f26ba..edd260a 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -121,6 +118,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.678900 ;
     DIRECTION INOUT ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
index 52471bd..f2738d7 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -129,6 +126,18 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.968300 ;
     DIRECTION INOUT ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
index ee4dcd2..98d44c4 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -35,6 +32,7 @@
   SITE unithd ;
   PIN DIODE
     ANTENNADIFFAREA  0.434700 ;
+    ANTENNAGATEAREA  0.434700 ;
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
@@ -42,6 +40,18 @@
         RECT 0.085000 0.255000 0.835000 2.465000 ;
     END
   END DIODE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
index e74a96e..bad0693 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -35,6 +32,7 @@
   SITE unithd ;
   PIN DIODE
     ANTENNADIFFAREA  1.055700 ;
+    ANTENNAGATEAREA  1.055700 ;
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
@@ -42,6 +40,18 @@
         RECT 0.085000 0.255000 1.755000 2.465000 ;
     END
   END DIODE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
index 47b98f5..500ed29 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -35,6 +32,7 @@
   SITE unithd ;
   PIN DIODE
     ANTENNADIFFAREA  2.203200 ;
+    ANTENNAGATEAREA  2.203200 ;
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
@@ -42,6 +40,20 @@
         RECT 0.085000 0.255000 2.675000 2.465000 ;
     END
   END DIODE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.070000 ;
+        RECT -0.190000 2.070000 2.950000 2.910000 ;
+        RECT  2.110000 1.305000 2.950000 2.070000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
index dd1cf9b..9e0a91e 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -35,6 +32,7 @@
   SITE unithd ;
   PIN DIODE
     ANTENNADIFFAREA  3.546400 ;
+    ANTENNAGATEAREA  3.546400 ;
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
@@ -42,6 +40,20 @@
         RECT 0.085000 0.255000 3.595000 2.465000 ;
     END
   END DIODE
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.070000 ;
+        RECT -0.190000 2.070000 3.870000 2.910000 ;
+        RECT  3.030000 1.305000 3.870000 2.070000 ;
+    END
+  END VPB
   PIN VGND
     USE GROUND ;
     PORT
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
index b39d97b..9b5afcc 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
index 155bdb8..5948846 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -83,6 +80,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
index 5c085a9..0bdbfed 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -88,6 +85,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
index cd97c53..ec0a532 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.131000 ;
     DIRECTION INOUT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
index c5880ec..5a34032 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -83,6 +80,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.411000 ;
     DIRECTION INOUT ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
index a0b8491..d710b8f 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -88,6 +85,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.691000 ;
     DIRECTION INOUT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
index 62658bc..04a7dc4 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.784600 ;
     DIRECTION INOUT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
index 5fdfb7f..6a8d75c 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.044600 ;
     DIRECTION INOUT ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
index 2bc4da8..44dc6a2 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -75,6 +72,18 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.349600 ;
     DIRECTION INOUT ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
index 17ffaae..9d1b935 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
index 9ed194d..7cad248 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
index 4f1b9cd..2ede95d 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.449100 ;
     DIRECTION INOUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
index 86c5743..e19b63e 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.465600 ;
     DIRECTION INOUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
index a4c34d8..01c58e2 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.525400 ;
     DIRECTION INOUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
index 910ab6a..5b4ee2a 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.940200 ;
     DIRECTION INOUT ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
index 1558932..f9ab309 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -62,6 +59,18 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.958400 ;
     DIRECTION INOUT ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
index 3232ac5..263427f 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.314400 ;
     DIRECTION INOUT ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
index 51dde07..bea1a18 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.552600 ;
     DIRECTION INOUT ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
index 3725016..d6c1a9c 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.866300 ;
     DIRECTION INOUT ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
index 118f598..23610f3 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.411500 ;
     DIRECTION INOUT ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
index d84f701..39fe8f5 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.845700 ;
     DIRECTION INOUT ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
index 0cae937..f7d7ee4 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.445400 ;
     DIRECTION INOUT ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
index 09aeea6..dae946e 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.815200 ;
     DIRECTION INOUT ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
index 9f47221..d96c80d 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.360400 ;
     DIRECTION INOUT ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
index b44c044..c84257b 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -41,6 +38,18 @@
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.055000 0.260000 0.055000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 0.650000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
index 868f37b..3c09c4a 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -41,6 +38,18 @@
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.155000 -0.050000 0.315000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.110000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
index 3eda9ee..3f77c1b 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -41,6 +38,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.175000 -0.060000 0.285000 0.060000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
index fe2865c..1d8bd82 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -41,6 +38,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.120000 0.350000 0.050000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     DIRECTION INOUT ;
     USE SIGNAL ;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
index 94fbe66..64d33a1 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.469100 ;
     DIRECTION INOUT ;
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
index b615cb1..6ed5e26 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.623300 ;
     DIRECTION INOUT ;
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
index 8cb1514..58a46f0 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
index 4067a3b..94b26fc 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
index f972647..3294568 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 1.570000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
index 7dc9bab..f3fc1e6 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.000000 ;
     DIRECTION INOUT ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
index 2663a42..6547350 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.570000 ;
     DIRECTION INOUT ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
index 5c3d863..fd4635e 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
index 85b27d1..0a93286 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.075000 ;
     DIRECTION INOUT ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
index 462689f..00d38fc 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.130000 ;
     DIRECTION INOUT ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
index 8ab0e08..c3aa002 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -51,6 +48,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
index 3c95189..3de3e96 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.328800 ;
     DIRECTION INOUT ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
index 8b17231..d69ae46 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 18.590000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.270000 ;
     DIRECTION INOUT ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
index bb052cb..3e75921 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
index bfcf8c8..e079d84 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
index 7d9947c..ae94da4 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
index 21dfb5f..f9dfeda 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -75,6 +72,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.420000 -0.085000 0.640000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.492600 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
index 24df9c2..50989ce 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 16.750000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.690000 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
index 0606354..2b1a7ff 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 18.590000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  4.270000 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
index 4f22b6f..3ad64a8 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.776400 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
index c0b7468..d75938d 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.195000 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
index 1d381ef..b51f2c2 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.160000 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
index 62a910c..2360c53 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.820000 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
index a50d7fb..90bc3e2 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
index 21a3375..bae74a2 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -72,6 +69,18 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.475000 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef b/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
index b6e97dd..1ef0601 100644
--- a/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
+++ b/cells/muxb/sky130_fd_sc_hdll__muxb.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hdll__muxb
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_hdll__muxb ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
index bd56858..1bd5143 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -468,6 +465,54 @@
         RECT 0.000000 5.200000 17.020000 5.680000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 5.355000 16.875000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 5.355000 4.455000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 -0.085000 8.595000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 5.355000 8.595000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 17.210000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  6.380000 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
index eecc745..5d224b8 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -480,6 +477,78 @@
         RECT 0.000000 5.200000 25.760000 5.680000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 5.355000 19.175000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 5.355000 19.635000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 5.355000 6.755000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  7.520000 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
index 3ec1ec9..5873c65 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -651,7 +648,6 @@
     END
   END VGND
   PIN VNB
-    ANTENNADIFFAREA  0.089250 ;
     PORT
       LAYER li1 ;
         RECT 25.845000 0.265000 26.135000 0.810000 ;
@@ -660,6 +656,70 @@
       LAYER li1 ;
         RECT 25.845000 4.630000 26.135000 5.175000 ;
     END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 5.355000 12.735000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 5.355000 13.195000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 -0.085000 26.535000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 26.365000 5.355000 26.535000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 -0.085000 38.955000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 38.785000 5.355000 38.955000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 -0.085000 39.415000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 39.245000 5.355000 39.415000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 -0.085000 51.835000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 51.665000 5.355000 51.835000 5.525000 ;
+    END
   END VNB
   PIN VPB
     ANTENNADIFFAREA  0.297500 ;
@@ -668,6 +728,10 @@
         RECT 25.845000 1.470000 26.135000 2.455000 ;
         RECT 25.845000 2.985000 26.135000 3.970000 ;
     END
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 52.170000 4.135000 ;
+    END
   END VPB
   PIN VPWR
     ANTENNADIFFAREA  20.364799 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
index 72cdad5..5bb972d 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -122,6 +119,18 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.690000 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
index 76a911b..43f78ad 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -153,6 +150,30 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.070000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.880000 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
index 5e7e63f..fa61570 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -195,6 +192,30 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  5.091200 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
index f985d00..f045a3f 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -253,6 +250,34 @@
         RECT 0.000000 -0.240000 17.020000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 8.425000 -0.085000 8.595000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 17.210000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.190000 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
index c87dff6..8c1af27 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -259,6 +256,46 @@
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 13.025000 -0.085000 13.195000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.005000 -0.085000 19.175000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 19.465000 -0.085000 19.635000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.585000 -0.085000 6.755000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.760000 ;
     DIRECTION INOUT ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
index bbd56ed..3b2de72 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -344,6 +341,38 @@
         RECT 0.000000 5.200000 24.840000 5.680000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 5.355000 0.315000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 -0.085000 18.715000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 18.545000 5.355000 18.715000 5.525000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 -0.085000 6.295000 0.085000 ;
+    END
+    PORT
+      LAYER pwell ;
+        RECT 6.125000 5.355000 6.295000 5.525000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 25.030000 4.135000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  9.422400 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
index 52716e6..1e7599e 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
index 2715d8b..68415a4 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.730000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
index a225956..38ea4d3 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.830000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  4.890000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
index 4ca2c21..c68e199 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.830000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
index 535ffdb..61a396a 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
index c5918d5..38a5bea 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.990000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
index 3e67286..89e5e25 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.690000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
index 159dc94..446f058 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.575700 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
index b4ff8b9..ca8c80f 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.062800 ;
     DIRECTION INOUT ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
index defa75f..e006fb9 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.825000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
index 5134abd..0d18eed 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
index 23f451b..58af2ed 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
index fd4f39e..6e4bacd 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.250000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
index fe8de43..379689d 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.605700 ;
     DIRECTION INOUT ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
index cfd2344..59d7177 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.465700 ;
     DIRECTION INOUT ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
index d2514ff..a5b3159 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.610000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
index 1bac32e..ea003f4 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -81,6 +78,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
index 38a19e0..8c25fae 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.180000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
index 756e9d1..205abc7 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.925000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.150000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
index c9c7f0d..c720120 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.015700 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
index a647bce..2f514de 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.223400 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
index 7e6f8ef..44e20a6 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.360000 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
index 86ca705..b7ed3c6 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.132500 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
index 73e992e..d5e1b2c 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.021800 ;
     DIRECTION INOUT ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
index 4162e2f..437ae02 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.425000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
index 4c09868..c8a5535 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.030000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
index d77f985..9071599 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
index c8725fa..a7ca4eb 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
index f730a66..2184894 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
index 285ebdb..1c43516 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.366600 ;
     DIRECTION INOUT ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
index a233274..5f94fe2 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -61,6 +58,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
index ddacedf..56d073f 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
index 9f7f882..ee4667e 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.610000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
index b5898af..8e2d559 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
index fe28f26..d591bb3 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -73,6 +70,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
index ef0afc7..e531e94 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
index 6747a8c..960d8a6 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
index 38143e8..ab78ee9 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
index 19f04bd..edf473b 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.270000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
index 4af7337..ff78e2a 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.290000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
index 6b1a1a1..87db99d 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
index f28bf4c..e9f0178 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.610000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
index 7aa1aad..896462c 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 16.100000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 16.290000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
index db1fb44..127b727 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.479900 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
index e598fae..d9df8dd 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.403400 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
index f229114..8090173 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
index a8cf66e..3559ae8 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.523625 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
index e4535ce..21b21d3 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.543625 ;
     DIRECTION INOUT ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
index d06febd..eaee033 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.310000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.870000 ;
     DIRECTION INOUT ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
index d4008e9..0a7c80d 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.070000 ;
     DIRECTION INOUT ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
index 77c0a4f..5b10202 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.120000 ;
     DIRECTION INOUT ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
index 9ab39b9..cfa312f 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.795000 ;
     DIRECTION INOUT ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
index e38fb20..4c9a1bf 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -80,6 +77,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.620000 ;
     DIRECTION INOUT ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
index cd09cd0..644f770 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.150000 ;
     DIRECTION INOUT ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
index 1ebd00f..4ef454b 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -84,6 +81,18 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.480000 ;
     DIRECTION INOUT ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
index 65fb7dc..7caca97 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.255000 ;
     DIRECTION INOUT ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
index 44bf617..5a47fab 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.365000 ;
     DIRECTION INOUT ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
index a00142f..c04bf19 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -71,6 +68,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.760000 ;
     DIRECTION INOUT ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
index 6d8bccb..26d1f92 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.651500 ;
     DIRECTION INOUT ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
index 3be6577..753134d 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -71,6 +68,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.995000 ;
     DIRECTION INOUT ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
index a4f14b2..ca75d28 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -72,6 +69,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
index df39e68..b159a37 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.925700 ;
     DIRECTION INOUT ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
index fceaae8..5e0bc1e 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.380700 ;
     DIRECTION INOUT ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
index 4f2d91b..c0b5fe7 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
index 649e6de..e165a97 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.660700 ;
     DIRECTION INOUT ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
index 5915992..c5f0af3 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.865700 ;
     DIRECTION INOUT ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
index e828da0..329d802 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
index af49304..369c48c 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -88,6 +85,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
index ebbd3b5..c246876 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -87,6 +84,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.120000 -0.085000 0.290000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
index 6b9359e..062612c 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -92,6 +89,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.220000 ;
     DIRECTION INOUT ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
index 702bcff..da3ba42 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -90,6 +87,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.240000 ;
     DIRECTION INOUT ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
index c92b681..ee0fce1 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -92,6 +89,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.745000 ;
     DIRECTION INOUT ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
index ff7a57b..fae47fb 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -93,6 +90,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.645000 ;
     DIRECTION INOUT ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
index fe7bae4..2025be2 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.980000 ;
     DIRECTION INOUT ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
index fbc43e0..2aed76a 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.130000 -0.085000 0.300000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.380000 ;
     DIRECTION INOUT ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
index 8f9eae9..32ec55e 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -83,6 +80,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.055000 ;
     DIRECTION INOUT ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
index d0f3487..fb2f74d 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -81,6 +78,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.550000 ;
     DIRECTION INOUT ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
index 50cc99f..a5ddf68 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.580000 ;
     DIRECTION INOUT ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
index cf8fa1b..702184a 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -83,6 +80,18 @@
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.470000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.490000 ;
     DIRECTION INOUT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
index 94df9cc..38d9f87 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -81,6 +78,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.839800 ;
     DIRECTION INOUT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
index a67664f..b3eaaaa 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.255800 ;
     DIRECTION INOUT ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
index f80b2d5..8f18a4e 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.510000 ;
     DIRECTION INOUT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
index c7bd474..b7026ed 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -80,6 +77,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.275000 ;
     DIRECTION INOUT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
index 1b8d720..331d6b9 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.960000 ;
     DIRECTION INOUT ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
index b31bfdd..9e96437 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.135000 -0.085000 0.305000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  3.080000 ;
     DIRECTION INOUT ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
index f9cdf7b..a92462a 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.540000 ;
     DIRECTION INOUT ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
index 486c433..4edf7bc 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.700000 ;
     DIRECTION INOUT ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
index b5a8fe0..27329ee 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.930000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.160000 ;
     DIRECTION INOUT ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
index c4b9519..32c078b 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -87,6 +84,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
index 17e9333..2198333 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -87,6 +84,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.850000 ;
     DIRECTION INOUT ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
index fb7e2f0..cd858bb 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -87,6 +84,18 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.410000 ;
     DIRECTION INOUT ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
index f073f66..aac7ef5 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.490000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.305700 ;
     DIRECTION INOUT ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
index df18dbf..8c9af00 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.595700 ;
     DIRECTION INOUT ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
index 88a7b7e..a8a8ca7 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.955000 ;
     DIRECTION INOUT ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
index 677a215..60d3264 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.420000 ;
     DIRECTION INOUT ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
index cb6032c..164df76 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.090000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.710000 ;
     DIRECTION INOUT ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
index ce96201..74bcbd2 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
index afdcd42..4269ae5 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.719100 ;
     DIRECTION INOUT ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
index 3e564b2..a3cfd58 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -60,6 +57,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.068400 ;
     DIRECTION INOUT ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
index 42ddc9b..09b599b 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 2.950000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
index 244bafd..59f5ab5 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.825700 ;
     DIRECTION INOUT ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
index 5fdefd1..b5c080f 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
index 5a37b27..adb4414 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
index a143e18..ca3f206 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.616400 ;
     DIRECTION INOUT ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
index b6f94be..109bc07 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -69,6 +66,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.885700 ;
     DIRECTION INOUT ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
index 5d6e59d..4aa5183 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.410000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.310700 ;
     DIRECTION INOUT ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
index acc09ed..9e5763b 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.625700 ;
     DIRECTION INOUT ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
index 75ee3eb..a98c769 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.140000 -0.085000 0.310000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.970000 ;
     DIRECTION INOUT ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
index 814176a..14db3aa 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.424100 ;
     DIRECTION INOUT ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
index 4892dd9..cf251e3 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.330000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.722700 ;
     DIRECTION INOUT ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
index cd40e58..ad328d8 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.710000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.073400 ;
     DIRECTION INOUT ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
index 12622c1..e853f15 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 4.790000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.564325 ;
     DIRECTION INOUT ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
index d734cdc..697fcc9 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -78,6 +75,18 @@
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 5.250000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.859325 ;
     DIRECTION INOUT ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
index 572144c..edc5d7c 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -79,6 +76,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.285000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.203625 ;
     DIRECTION INOUT ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
index 6401b85..021df61 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -75,6 +72,18 @@
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
index f85034e..1d9fd56 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -57,6 +54,18 @@
         RECT 4.560000 -0.455000 6.675000 -0.155000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.170000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.720000 ;
     DIRECTION INPUT ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
index 772c941..a28a915 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -173,6 +170,18 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.830000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.152000 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
index 4cfce07..33c9489 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -112,6 +109,20 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.450000 2.910000 ;
+        RECT  4.455000 1.305000 14.450000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.880750 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
index 548f51f..c9a9e89 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -112,6 +109,20 @@
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.910000 2.910000 ;
+        RECT  4.455000 1.305000 14.910000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.269200 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
index 010833b..b380d99 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -101,6 +98,20 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.455000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
index 6935ba0..63c0b2c 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -101,6 +98,20 @@
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.070000 2.910000 ;
+        RECT  4.455000 1.305000 13.070000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.639800 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
index 538169f..97f9d11 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -101,6 +98,20 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 13.530000 2.910000 ;
+        RECT  4.455000 1.305000 13.530000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.059800 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
index bc0db41..31b7375 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -106,6 +103,20 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.215000 -0.010000 0.235000 0.015000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  2.120000 1.425000 ;
+        RECT -0.190000 1.425000 14.450000 2.910000 ;
+        RECT  4.455000 1.305000 14.450000 1.425000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.264800 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
index a39acf0..266a19e 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -117,6 +114,18 @@
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.910000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.970500 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
index 6dd2eb9..3574b08 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -117,6 +114,18 @@
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.830000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.625500 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
index c2f8db2..d17d3e7 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -104,6 +101,18 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.599700 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
index c131104..5cfb0a6 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -106,6 +103,18 @@
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 14.450000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.071800 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
index 2dd184b..e94ca6f 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -110,6 +107,18 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 15.370000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.397400 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
index 69bebc8..4fe065b 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -100,6 +97,18 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.705550 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
index 3b83203..b84b0e0 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -98,6 +95,18 @@
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 13.530000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.675550 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
index c047d4a..284057a 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -91,6 +88,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.369900 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
index 2dd03b0..1c5bd00 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -91,6 +88,18 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.711150 ;
     DIRECTION INOUT ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
index 599aaeb..9ccf4b5 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -95,6 +92,18 @@
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 12.150000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.981150 ;
     DIRECTION INOUT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
index 0c22ca0..2f6c51a 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -82,6 +79,18 @@
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 7.550000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.382600 ;
     DIRECTION INOUT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
index 7be824a..9b5b7a6 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -87,6 +84,18 @@
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 8.010000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.665400 ;
     DIRECTION INOUT ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
index 1d8b8a0..a8a7cf3 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -92,6 +89,18 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.223500 ;
     DIRECTION INOUT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
index 402789e..e679662 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -106,6 +103,20 @@
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  5.285000 1.435000 ;
+        RECT -0.190000 1.435000 15.370000 2.910000 ;
+        RECT  7.985000 1.305000 15.370000 1.435000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.935350 ;
     DIRECTION INOUT ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
index 907c7e7..97c9e35 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -108,6 +105,20 @@
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000  5.285000 1.435000 ;
+        RECT -0.190000 1.435000 16.750000 2.910000 ;
+        RECT  7.985000 1.305000 16.750000 1.435000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.495350 ;
     DIRECTION INOUT ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
index a600324..594a713 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 MACRO sky130_fd_sc_hdll__tap
   CLASS BLOCK ;
   FOREIGN sky130_fd_sc_hdll__tap ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
index bc3eda0..bc39e99 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
index 53ac58c..973d7ff 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
index c08ad7c..46f43b2 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
index e9d2727..78b7d4e 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
index 40d2f32..5b96794 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -63,6 +60,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.480000 ;
     DIRECTION INOUT ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
index e54f5c6..87a79b0 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -64,6 +61,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.430000 ;
     DIRECTION INOUT ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
index 456e364..6818dd7 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -64,6 +61,18 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  2.320000 ;
     DIRECTION INOUT ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
index 084bfe5..c16d96b 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.390000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.225950 ;
     DIRECTION INOUT ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
index 27b0c36..300eebc 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.150000 -0.085000 0.320000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.220950 ;
     DIRECTION INOUT ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
index 1ce107e..c29b5e6 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.500950 ;
     DIRECTION INOUT ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
index 9d482d5..8c8f2ed 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -63,6 +60,18 @@
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 3.870000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.560000 ;
     DIRECTION INOUT ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
index ee4168d..4bc0370 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -68,6 +65,18 @@
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 6.630000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  0.925000 ;
     DIRECTION INOUT ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
index 470dafd..8d4cb26 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -65,6 +62,18 @@
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 11.230000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.740000 ;
     DIRECTION INOUT ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
index ecc06a7..6335e55 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.309400 ;
     DIRECTION INOUT ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
index df6642b..42705aa 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.145000 -0.085000 0.315000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 9.850000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.269400 ;
     DIRECTION INOUT ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
index 8fb6dba..1d639a9 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
@@ -18,9 +18,6 @@
   NOWIREEXTENSIONATPIN ON ;
   DIVIDERCHAR "/" ;
   BUSBITCHARS "[]" ;
-UNITS
-  DATABASE MICRONS 200 ;
-END UNITS
 PROPERTYDEFINITIONS
   MACRO maskLayoutSubType STRING ;
   MACRO prCellType STRING ;
@@ -70,6 +67,18 @@
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
   END VGND
+  PIN VNB
+    PORT
+      LAYER pwell ;
+        RECT 0.235000 -0.085000 0.405000 0.085000 ;
+    END
+  END VNB
+  PIN VPB
+    PORT
+      LAYER nwell ;
+        RECT -0.190000 1.305000 10.770000 2.910000 ;
+    END
+  END VPB
   PIN VPWR
     ANTENNADIFFAREA  1.490800 ;
     DIRECTION INOUT ;