diff --git a/cells/conb/sky130_fd_sc_ls__conb_1.lef.new b/cells/conb/sky130_fd_sc_ls__conb_1.lef.new
deleted file mode 100644
index 00b5257..0000000
--- a/cells/conb/sky130_fd_sc_ls__conb_1.lef.new
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2020 The SkyWater PDK Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-VERSION 5.5 ;
-NAMESCASESENSITIVE ON ;
-BUSBITCHARS "[]" ;
-DIVIDERCHAR "/" ;
-MACRO sky130_fd_sc_ls__conb_1
-  CLASS CORE TIELOW ;
-  CLASS CORE TIEHIGH ;
-  SOURCE USER ;
-  ORIGIN  0.000000  0.000000 ;
-  SIZE  1.440000 BY  3.330000 ;
-  SYMMETRY X Y ;
-  SITE unit ;
-  PIN HI
-    ANTENNAPARTIALMETALSIDEAREA  0.182000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.085000 0.255000 0.615000 0.845000 ;
-        RECT 0.085000 0.845000 0.395000 2.335000 ;
-    END
-  END HI
-  PIN LO
-    ANTENNAPARTIALMETALSIDEAREA  0.182000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.825000 2.485000 1.355000 3.075000 ;
-        RECT 1.055000 0.995000 1.355000 2.485000 ;
-    END
-  END LO
-  PIN VGND
-    DIRECTION INOUT ;
-    SHAPE ABUTMENT ;
-    USE GROUND ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 -0.245000 1.440000 0.245000 ;
-    END
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    SHAPE ABUTMENT ;
-    USE POWER ;
-    PORT
-      LAYER met1 ;
-        RECT 0.000000 3.085000 1.440000 3.575000 ;
-    END
-  END VPWR
-  OBS
-    LAYER li1 ;
-      RECT 0.000000 -0.085000 1.440000 0.085000 ;
-      RECT 0.000000  3.245000 1.440000 3.415000 ;
-      RECT 0.285000  2.505000 0.615000 3.245000 ;
-      RECT 0.825000  0.085000 1.155000 0.825000 ;
-    LAYER mcon ;
-      RECT 0.155000 -0.085000 0.325000 0.085000 ;
-      RECT 0.155000  3.245000 0.325000 3.415000 ;
-      RECT 0.635000 -0.085000 0.805000 0.085000 ;
-      RECT 0.635000  3.245000 0.805000 3.415000 ;
-      RECT 1.115000 -0.085000 1.285000 0.085000 ;
-      RECT 1.115000  3.245000 1.285000 3.415000 ;
-  END
-END sky130_fd_sc_ls__conb_1
-END LIBRARY
diff --git a/cells/tap/sky130_fd_sc_ls__tap_1.lef b/cells/tap/sky130_fd_sc_ls__tap_1.lef
index 44a05c8..80f84a6 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_1.lef
+++ b/cells/tap/sky130_fd_sc_ls__tap_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_ls__tap_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef b/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef
index 507cd11..c827c4e 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_ls__tap_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_ls__tap_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ls__tap_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tap/sky130_fd_sc_ls__tap_2.lef b/cells/tap/sky130_fd_sc_ls__tap_2.lef
index 7fbcd3b..0a5c984 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_2.lef
+++ b/cells/tap/sky130_fd_sc_ls__tap_2.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_ls__tap_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef b/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef
index 6999044..ff99fed 100644
--- a/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_ls__tap_2.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_ls__tap_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ls__tap_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.lef b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.lef
index 7d6ce72..a07f239 100644
--- a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.lef
+++ b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_ls__tapmet1_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef
index e930254..b87982b 100644
--- a/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef
+++ b/cells/tapmet1/sky130_fd_sc_ls__tapmet1_2.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_ls__tapmet1_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ls__tapmet1_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.lef b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.lef
index 5effbfe..fb02c9a 100644
--- a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.lef
+++ b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_ls__tapvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef
index f8006f0..8cb30d7 100644
--- a/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_ls__tapvgnd_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_ls__tapvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ls__tapvgnd_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.lef b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.lef
index cee73fb..35245a6 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_ls__tapvgnd2_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef
index 0bc9067..a4efb3c 100644
--- a/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_ls__tapvgnd2_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_ls__tapvgnd2_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ls__tapvgnd2_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.lef b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.lef
index c09ba78..e0f5c3d 100644
--- a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.lef
+++ b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_ls__tapvgndnovpb_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef
index a37b798..895b81d 100644
--- a/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef
+++ b/cells/tapvgndnovpb/sky130_fd_sc_ls__tapvgndnovpb_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_ls__tapvgndnovpb_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ls__tapvgndnovpb_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.lef b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.lef
index f2370b6..645916f 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_ls__tapvpwrvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef
index 6d77547..6213ae4 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_ls__tapvpwrvgnd_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_ls__tapvpwrvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_ls__tapvpwrvgnd_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;