diff --git a/cells/fill/sky130_fd_sc_hs__fill_1.lef b/cells/fill/sky130_fd_sc_hs__fill_1.lef
index ca7ba4e..48c6111 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_1.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__fill_1
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
index 238b692..26fdf76 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
@@ -22,7 +22,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__fill_1
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_2.lef b/cells/fill/sky130_fd_sc_hs__fill_2.lef
index 2cc9654..ebdc40c 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_2.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_2.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__fill_2
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
index f3b0ab1..925211f 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
@@ -22,7 +22,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__fill_2
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_4.lef b/cells/fill/sky130_fd_sc_hs__fill_4.lef
index bda68b2..fd36e81 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_4.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_4.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__fill_4
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  1.920000 BY  3.330000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
index d266c14..cf84432 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
@@ -22,7 +22,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__fill_4
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_4 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  1.920000 BY  3.330000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_8.lef b/cells/fill/sky130_fd_sc_hs__fill_8.lef
index 88aa2d7..499c134 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_8.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_8.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__fill_8
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  3.840000 BY  3.330000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
index 057fbdb..8602d2a 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
@@ -22,7 +22,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__fill_8
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_8 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  3.840000 BY  3.330000 ;
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.lef
index 1fbb113..c534395 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__fill_diode_2
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
index 78fe8d9..e421f19 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
@@ -22,7 +22,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__fill_diode_2
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_diode_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.lef
index 5659987..29a3430 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__fill_diode_4
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  1.920000 BY  3.330000 ;
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
index 1d3b7a2..9900902 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
@@ -22,7 +22,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__fill_diode_4
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_diode_4 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  1.920000 BY  3.330000 ;
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.lef
index 6aca0bb..aca7bde 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__fill_diode_8
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  3.840000 BY  3.330000 ;
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
index a3dab93..51e9642 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
@@ -22,7 +22,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__fill_diode_8
-  CLASS CORE ;
+  CLASS CORE SPACER ;
   FOREIGN sky130_fd_sc_hs__fill_diode_8 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  3.840000 BY  3.330000 ;