diff --git a/sky130/librelane/sky130_fd_sc_hd/no_synth.cells b/sky130/librelane/sky130_fd_sc_hd/no_synth.cells
index 84f9ee2..024165e 100644
--- a/sky130/librelane/sky130_fd_sc_hd/no_synth.cells
+++ b/sky130/librelane/sky130_fd_sc_hd/no_synth.cells
@@ -1,106 +1,7 @@
-sky130_fd_sc_hd__clkbuf_1
-sky130_fd_sc_hd__clkbuf_16
-sky130_fd_sc_hd__clkbuf_2
-sky130_fd_sc_hd__clkbuf_4
-sky130_fd_sc_hd__clkbuf_8
-sky130_fd_sc_hd__clkdlybuf4s15_1
-sky130_fd_sc_hd__clkdlybuf4s15_2
-sky130_fd_sc_hd__clkdlybuf4s18_1
-sky130_fd_sc_hd__clkdlybuf4s18_2
-sky130_fd_sc_hd__clkdlybuf4s25_1
-sky130_fd_sc_hd__clkdlybuf4s25_2
-sky130_fd_sc_hd__clkdlybuf4s50_1
-sky130_fd_sc_hd__clkdlybuf4s50_2
-sky130_fd_sc_hd__clkinv_1
-sky130_fd_sc_hd__clkinv_16
-sky130_fd_sc_hd__clkinv_2
-sky130_fd_sc_hd__clkinv_4
-sky130_fd_sc_hd__clkinv_8
-sky130_fd_sc_hd__clkinvlp_2
-sky130_fd_sc_hd__clkinvlp_4
-sky130_fd_sc_hd__decap_12
-sky130_fd_sc_hd__decap_3
-sky130_fd_sc_hd__decap_4
-sky130_fd_sc_hd__decap_6
-sky130_fd_sc_hd__decap_8
-sky130_fd_sc_hd__diode_2
-sky130_fd_sc_hd__dlclkp_1
-sky130_fd_sc_hd__dlclkp_2
-sky130_fd_sc_hd__dlclkp_4
-sky130_fd_sc_hd__dlrbn_1
-sky130_fd_sc_hd__dlrbn_2
-sky130_fd_sc_hd__dlrbp_1
-sky130_fd_sc_hd__dlrbp_2
-sky130_fd_sc_hd__dlrtn_1
-sky130_fd_sc_hd__dlrtn_2
-sky130_fd_sc_hd__dlrtn_4
-sky130_fd_sc_hd__dlrtp_1
-sky130_fd_sc_hd__dlrtp_2
-sky130_fd_sc_hd__dlrtp_4
-sky130_fd_sc_hd__dlxbn_1
-sky130_fd_sc_hd__dlxbn_2
-sky130_fd_sc_hd__dlxbp_1
-sky130_fd_sc_hd__dlygate4sd1_1
-sky130_fd_sc_hd__dlygate4sd2_1
-sky130_fd_sc_hd__dlygate4sd3_1
-sky130_fd_sc_hd__dlymetal6s2s_1
-sky130_fd_sc_hd__dlymetal6s4s_1
-sky130_fd_sc_hd__dlymetal6s6s_1
-sky130_fd_sc_hd__edfxbp_1
-sky130_fd_sc_hd__edfxtp_1
-sky130_fd_sc_hd__einvn_0
-sky130_fd_sc_hd__einvn_1
-sky130_fd_sc_hd__einvn_2
-sky130_fd_sc_hd__einvn_4
-sky130_fd_sc_hd__einvn_8
-sky130_fd_sc_hd__einvp_1
-sky130_fd_sc_hd__einvp_2
-sky130_fd_sc_hd__einvp_4
-sky130_fd_sc_hd__einvp_8
-sky130_fd_sc_hd__fah_1
-sky130_fd_sc_hd__fahcin_1
-sky130_fd_sc_hd__fahcon_1
-sky130_fd_sc_hd__ha_1
-sky130_fd_sc_hd__ha_2
-sky130_fd_sc_hd__ha_4
-sky130_fd_sc_hd__macro_sparecell
-sky130_fd_sc_hd__maj3_1
-sky130_fd_sc_hd__maj3_2
-sky130_fd_sc_hd__maj3_4
-sky130_fd_sc_hd__mux2i_1
-sky130_fd_sc_hd__mux2i_2
-sky130_fd_sc_hd__mux2i_4
-sky130_fd_sc_hd__sdfbbn_1
-sky130_fd_sc_hd__sdfbbn_2
-sky130_fd_sc_hd__sdfbbp_1
-sky130_fd_sc_hd__sdfrbp_1
-sky130_fd_sc_hd__sdfrbp_2
-sky130_fd_sc_hd__sdfrtn_1
-sky130_fd_sc_hd__sdfrtp_1
-sky130_fd_sc_hd__sdfrtp_2
-sky130_fd_sc_hd__sdfrtp_4
-sky130_fd_sc_hd__sdfsbp_1
-sky130_fd_sc_hd__sdfsbp_2
-sky130_fd_sc_hd__sdfstp_1
-sky130_fd_sc_hd__sdfstp_2
-sky130_fd_sc_hd__sdfstp_4
-sky130_fd_sc_hd__sdfxbp_1
-sky130_fd_sc_hd__sdfxbp_2
-sky130_fd_sc_hd__sdfxtp_1
-sky130_fd_sc_hd__sdfxtp_2
-sky130_fd_sc_hd__sdfxtp_4
-sky130_fd_sc_hd__sdlclkp_1
-sky130_fd_sc_hd__sdlclkp_2
-sky130_fd_sc_hd__sdlclkp_4
-sky130_fd_sc_hd__sedfxbp_1
-sky130_fd_sc_hd__sedfxbp_2
-sky130_fd_sc_hd__sedfxtp_1
-sky130_fd_sc_hd__sedfxtp_2
-sky130_fd_sc_hd__sedfxtp_4
+sky130_fd_sc_hd__a2111o_1
 sky130_fd_sc_hd__a2111oi_1
 sky130_fd_sc_hd__a211o_1
 sky130_fd_sc_hd__a211oi_1
-sky130_fd_sc_hd__a2111o_1
 sky130_fd_sc_hd__a21bo_1
 sky130_fd_sc_hd__a21boi_1
 sky130_fd_sc_hd__a21o_1
@@ -127,6 +28,31 @@
 sky130_fd_sc_hd__and4_1
 sky130_fd_sc_hd__and4b_1
 sky130_fd_sc_hd__and4bb_1
+sky130_fd_sc_hd__clkbuf_1
+sky130_fd_sc_hd__clkbuf_16
+sky130_fd_sc_hd__clkbuf_2
+sky130_fd_sc_hd__clkbuf_4
+sky130_fd_sc_hd__clkbuf_8
+sky130_fd_sc_hd__clkdlybuf4s15_1
+sky130_fd_sc_hd__clkdlybuf4s15_2
+sky130_fd_sc_hd__clkdlybuf4s18_1
+sky130_fd_sc_hd__clkdlybuf4s18_2
+sky130_fd_sc_hd__clkdlybuf4s25_1
+sky130_fd_sc_hd__clkdlybuf4s25_2
+sky130_fd_sc_hd__clkdlybuf4s50_1
+sky130_fd_sc_hd__clkdlybuf4s50_2
+sky130_fd_sc_hd__clkinv_1
+sky130_fd_sc_hd__clkinv_16
+sky130_fd_sc_hd__clkinv_2
+sky130_fd_sc_hd__clkinv_4
+sky130_fd_sc_hd__clkinv_8
+sky130_fd_sc_hd__clkinvlp_2
+sky130_fd_sc_hd__clkinvlp_4
+sky130_fd_sc_hd__decap_12
+sky130_fd_sc_hd__decap_3
+sky130_fd_sc_hd__decap_4
+sky130_fd_sc_hd__decap_6
+sky130_fd_sc_hd__decap_8
 sky130_fd_sc_hd__dfbbn_1
 sky130_fd_sc_hd__dfbbp_1
 sky130_fd_sc_hd__dfrbp_1
@@ -136,8 +62,55 @@
 sky130_fd_sc_hd__dfstp_1
 sky130_fd_sc_hd__dfxbp_1
 sky130_fd_sc_hd__dfxtp_1
+sky130_fd_sc_hd__diode_2
+sky130_fd_sc_hd__dlclkp_1
+sky130_fd_sc_hd__dlclkp_2
+sky130_fd_sc_hd__dlclkp_4
+sky130_fd_sc_hd__dlrbn_1
+sky130_fd_sc_hd__dlrbn_2
+sky130_fd_sc_hd__dlrbp_1
+sky130_fd_sc_hd__dlrbp_2
+sky130_fd_sc_hd__dlrtn_1
+sky130_fd_sc_hd__dlrtn_2
+sky130_fd_sc_hd__dlrtn_4
+sky130_fd_sc_hd__dlrtp_1
+sky130_fd_sc_hd__dlrtp_2
+sky130_fd_sc_hd__dlrtp_4
+sky130_fd_sc_hd__dlxbn_1
+sky130_fd_sc_hd__dlxbn_2
+sky130_fd_sc_hd__dlxbp_1
+sky130_fd_sc_hd__dlygate4sd1_1
+sky130_fd_sc_hd__dlygate4sd2_1
+sky130_fd_sc_hd__dlygate4sd3_1
+sky130_fd_sc_hd__dlymetal6s2s_1
+sky130_fd_sc_hd__dlymetal6s4s_1
+sky130_fd_sc_hd__dlymetal6s6s_1
 sky130_fd_sc_hd__ebufn_1
+sky130_fd_sc_hd__edfxbp_1
+sky130_fd_sc_hd__edfxtp_1
+sky130_fd_sc_hd__einvn_0
+sky130_fd_sc_hd__einvn_1
+sky130_fd_sc_hd__einvn_2
+sky130_fd_sc_hd__einvn_4
+sky130_fd_sc_hd__einvn_8
+sky130_fd_sc_hd__einvp_1
+sky130_fd_sc_hd__einvp_2
+sky130_fd_sc_hd__einvp_4
+sky130_fd_sc_hd__einvp_8
+sky130_fd_sc_hd__fah_1
+sky130_fd_sc_hd__fahcin_1
+sky130_fd_sc_hd__fahcon_1
+sky130_fd_sc_hd__ha_1
+sky130_fd_sc_hd__ha_2
+sky130_fd_sc_hd__ha_4
 sky130_fd_sc_hd__inv_1
+sky130_fd_sc_hd__macro_sparecell
+sky130_fd_sc_hd__maj3_1
+sky130_fd_sc_hd__maj3_2
+sky130_fd_sc_hd__maj3_4
+sky130_fd_sc_hd__mux2i_1
+sky130_fd_sc_hd__mux2i_2
+sky130_fd_sc_hd__mux2i_4
 sky130_fd_sc_hd__nand2_1
 sky130_fd_sc_hd__nand2b_1
 sky130_fd_sc_hd__nand3_1
@@ -181,5 +154,32 @@
 sky130_fd_sc_hd__or4_1
 sky130_fd_sc_hd__or4b_1
 sky130_fd_sc_hd__or4bb_1
+sky130_fd_sc_hd__sdfbbn_1
+sky130_fd_sc_hd__sdfbbn_2
+sky130_fd_sc_hd__sdfbbp_1
+sky130_fd_sc_hd__sdfrbp_1
+sky130_fd_sc_hd__sdfrbp_2
+sky130_fd_sc_hd__sdfrtn_1
+sky130_fd_sc_hd__sdfrtp_1
+sky130_fd_sc_hd__sdfrtp_2
+sky130_fd_sc_hd__sdfrtp_4
+sky130_fd_sc_hd__sdfsbp_1
+sky130_fd_sc_hd__sdfsbp_2
+sky130_fd_sc_hd__sdfstp_1
+sky130_fd_sc_hd__sdfstp_2
+sky130_fd_sc_hd__sdfstp_4
+sky130_fd_sc_hd__sdfxbp_1
+sky130_fd_sc_hd__sdfxbp_2
+sky130_fd_sc_hd__sdfxtp_1
+sky130_fd_sc_hd__sdfxtp_2
+sky130_fd_sc_hd__sdfxtp_4
+sky130_fd_sc_hd__sdlclkp_1
+sky130_fd_sc_hd__sdlclkp_2
+sky130_fd_sc_hd__sdlclkp_4
+sky130_fd_sc_hd__sedfxbp_1
+sky130_fd_sc_hd__sedfxbp_2
+sky130_fd_sc_hd__sedfxtp_1
+sky130_fd_sc_hd__sedfxtp_2
+sky130_fd_sc_hd__sedfxtp_4
 sky130_fd_sc_hd__xnor2_1
 sky130_fd_sc_hd__xor2_1
diff --git a/sky130/librelane/sky130_fd_sc_hdll/no_synth.cells b/sky130/librelane/sky130_fd_sc_hdll/no_synth.cells
index ca63a36..a4d3a65 100644
--- a/sky130/librelane/sky130_fd_sc_hdll/no_synth.cells
+++ b/sky130/librelane/sky130_fd_sc_hdll/no_synth.cells
@@ -1,3 +1,33 @@
+sky130_fd_sc_hdll__a2111o_1
+sky130_fd_sc_hdll__a2111oi_1
+sky130_fd_sc_hdll__a211o_1
+sky130_fd_sc_hdll__a211oi_1
+sky130_fd_sc_hdll__a21bo_1
+sky130_fd_sc_hdll__a21boi_1
+sky130_fd_sc_hdll__a21o_1
+sky130_fd_sc_hdll__a21oi_1
+sky130_fd_sc_hdll__a221o_1
+sky130_fd_sc_hdll__a221oi_1
+sky130_fd_sc_hdll__a222oi_1
+sky130_fd_sc_hdll__a22o_1
+sky130_fd_sc_hdll__a22oi_1
+sky130_fd_sc_hdll__a2bb2o_1
+sky130_fd_sc_hdll__a2bb2oi_1
+sky130_fd_sc_hdll__a311o_1
+sky130_fd_sc_hdll__a311oi_1
+sky130_fd_sc_hdll__a31o_1
+sky130_fd_sc_hdll__a31oi_1
+sky130_fd_sc_hdll__a32o_1
+sky130_fd_sc_hdll__a32oi_1
+sky130_fd_sc_hdll__a41o_1
+sky130_fd_sc_hdll__a41oi_1
+sky130_fd_sc_hdll__and2_1
+sky130_fd_sc_hdll__and2b_1
+sky130_fd_sc_hdll__and3_1
+sky130_fd_sc_hdll__and3b_1
+sky130_fd_sc_hdll__and4_1
+sky130_fd_sc_hdll__and4b_1
+sky130_fd_sc_hdll__and4bb_1
 sky130_fd_sc_hdll__clkbuf_1
 sky130_fd_sc_hdll__clkbuf_12
 sky130_fd_sc_hdll__clkbuf_16
@@ -26,6 +56,15 @@
 sky130_fd_sc_hdll__decap_4
 sky130_fd_sc_hdll__decap_6
 sky130_fd_sc_hdll__decap_8
+sky130_fd_sc_hdll__dfbbn_1
+sky130_fd_sc_hdll__dfbbp_1
+sky130_fd_sc_hdll__dfrbp_1
+sky130_fd_sc_hdll__dfrtn_1
+sky130_fd_sc_hdll__dfrtp_1
+sky130_fd_sc_hdll__dfsbp_1
+sky130_fd_sc_hdll__dfstp_1
+sky130_fd_sc_hdll__dfxbp_1
+sky130_fd_sc_hdll__dfxtp_1
 sky130_fd_sc_hdll__diode_2
 sky130_fd_sc_hdll__dlclkp_1
 sky130_fd_sc_hdll__dlclkp_2
@@ -49,6 +88,7 @@
 sky130_fd_sc_hdll__dlymetal6s2s_1
 sky130_fd_sc_hdll__dlymetal6s4s_1
 sky130_fd_sc_hdll__dlymetal6s6s_1
+sky130_fd_sc_hdll__ebufn_1
 sky130_fd_sc_hdll__edfxbp_1
 sky130_fd_sc_hdll__edfxtp_1
 sky130_fd_sc_hdll__einvn_0
@@ -66,6 +106,7 @@
 sky130_fd_sc_hdll__ha_1
 sky130_fd_sc_hdll__ha_2
 sky130_fd_sc_hdll__ha_4
+sky130_fd_sc_hdll__inv_1
 sky130_fd_sc_hdll__macro_sparecell
 sky130_fd_sc_hdll__maj3_1
 sky130_fd_sc_hdll__maj3_2
@@ -73,74 +114,6 @@
 sky130_fd_sc_hdll__mux2i_1
 sky130_fd_sc_hdll__mux2i_2
 sky130_fd_sc_hdll__mux2i_4
-sky130_fd_sc_hdll__sdfbbn_1
-sky130_fd_sc_hdll__sdfbbn_2
-sky130_fd_sc_hdll__sdfbbp_1
-sky130_fd_sc_hdll__sdfrbp_1
-sky130_fd_sc_hdll__sdfrbp_2
-sky130_fd_sc_hdll__sdfrtn_1
-sky130_fd_sc_hdll__sdfrtp_1
-sky130_fd_sc_hdll__sdfrtp_2
-sky130_fd_sc_hdll__sdfrtp_4
-sky130_fd_sc_hdll__sdfsbp_1
-sky130_fd_sc_hdll__sdfsbp_2
-sky130_fd_sc_hdll__sdfstp_1
-sky130_fd_sc_hdll__sdfstp_2
-sky130_fd_sc_hdll__sdfstp_4
-sky130_fd_sc_hdll__sdfxbp_1
-sky130_fd_sc_hdll__sdfxbp_2
-sky130_fd_sc_hdll__sdfxtp_1
-sky130_fd_sc_hdll__sdfxtp_2
-sky130_fd_sc_hdll__sdfxtp_4
-sky130_fd_sc_hdll__sdlclkp_1
-sky130_fd_sc_hdll__sdlclkp_2
-sky130_fd_sc_hdll__sdlclkp_4
-sky130_fd_sc_hdll__sedfxbp_1
-sky130_fd_sc_hdll__sedfxbp_2
-sky130_fd_sc_hdll__sedfxtp_1
-sky130_fd_sc_hdll__sedfxtp_2
-sky130_fd_sc_hdll__sedfxtp_4
-sky130_fd_sc_hdll__a2111oi_1
-sky130_fd_sc_hdll__a211o_1
-sky130_fd_sc_hdll__a211oi_1
-sky130_fd_sc_hdll__a2111o_1
-sky130_fd_sc_hdll__a21bo_1
-sky130_fd_sc_hdll__a21boi_1
-sky130_fd_sc_hdll__a21o_1
-sky130_fd_sc_hdll__a21oi_1
-sky130_fd_sc_hdll__a221o_1
-sky130_fd_sc_hdll__a221oi_1
-sky130_fd_sc_hdll__a222oi_1
-sky130_fd_sc_hdll__a22o_1
-sky130_fd_sc_hdll__a22oi_1
-sky130_fd_sc_hdll__a2bb2o_1
-sky130_fd_sc_hdll__a2bb2oi_1
-sky130_fd_sc_hdll__a311o_1
-sky130_fd_sc_hdll__a311oi_1
-sky130_fd_sc_hdll__a31o_1
-sky130_fd_sc_hdll__a31oi_1
-sky130_fd_sc_hdll__a32o_1
-sky130_fd_sc_hdll__a32oi_1
-sky130_fd_sc_hdll__a41o_1
-sky130_fd_sc_hdll__a41oi_1
-sky130_fd_sc_hdll__and2_1
-sky130_fd_sc_hdll__and2b_1
-sky130_fd_sc_hdll__and3_1
-sky130_fd_sc_hdll__and3b_1
-sky130_fd_sc_hdll__and4_1
-sky130_fd_sc_hdll__and4b_1
-sky130_fd_sc_hdll__and4bb_1
-sky130_fd_sc_hdll__dfbbn_1
-sky130_fd_sc_hdll__dfbbp_1
-sky130_fd_sc_hdll__dfrbp_1
-sky130_fd_sc_hdll__dfrtn_1
-sky130_fd_sc_hdll__dfrtp_1
-sky130_fd_sc_hdll__dfsbp_1
-sky130_fd_sc_hdll__dfstp_1
-sky130_fd_sc_hdll__dfxbp_1
-sky130_fd_sc_hdll__dfxtp_1
-sky130_fd_sc_hdll__ebufn_1
-sky130_fd_sc_hdll__inv_1
 sky130_fd_sc_hdll__nand2_1
 sky130_fd_sc_hdll__nand2b_1
 sky130_fd_sc_hdll__nand3_1
@@ -184,5 +157,32 @@
 sky130_fd_sc_hdll__or4_1
 sky130_fd_sc_hdll__or4b_1
 sky130_fd_sc_hdll__or4bb_1
+sky130_fd_sc_hdll__sdfbbn_1
+sky130_fd_sc_hdll__sdfbbn_2
+sky130_fd_sc_hdll__sdfbbp_1
+sky130_fd_sc_hdll__sdfrbp_1
+sky130_fd_sc_hdll__sdfrbp_2
+sky130_fd_sc_hdll__sdfrtn_1
+sky130_fd_sc_hdll__sdfrtp_1
+sky130_fd_sc_hdll__sdfrtp_2
+sky130_fd_sc_hdll__sdfrtp_4
+sky130_fd_sc_hdll__sdfsbp_1
+sky130_fd_sc_hdll__sdfsbp_2
+sky130_fd_sc_hdll__sdfstp_1
+sky130_fd_sc_hdll__sdfstp_2
+sky130_fd_sc_hdll__sdfstp_4
+sky130_fd_sc_hdll__sdfxbp_1
+sky130_fd_sc_hdll__sdfxbp_2
+sky130_fd_sc_hdll__sdfxtp_1
+sky130_fd_sc_hdll__sdfxtp_2
+sky130_fd_sc_hdll__sdfxtp_4
+sky130_fd_sc_hdll__sdlclkp_1
+sky130_fd_sc_hdll__sdlclkp_2
+sky130_fd_sc_hdll__sdlclkp_4
+sky130_fd_sc_hdll__sedfxbp_1
+sky130_fd_sc_hdll__sedfxbp_2
+sky130_fd_sc_hdll__sedfxtp_1
+sky130_fd_sc_hdll__sedfxtp_2
+sky130_fd_sc_hdll__sedfxtp_4
 sky130_fd_sc_hdll__xnor2_1
 sky130_fd_sc_hdll__xor2_1
diff --git a/sky130/librelane/sky130_fd_sc_hs/no_synth.cells b/sky130/librelane/sky130_fd_sc_hs/no_synth.cells
index 5a2fa92..8a9bcf8 100644
--- a/sky130/librelane/sky130_fd_sc_hs/no_synth.cells
+++ b/sky130/librelane/sky130_fd_sc_hs/no_synth.cells
@@ -1,3 +1,33 @@
+sky130_fd_sc_hs__a2111o_1
+sky130_fd_sc_hs__a2111oi_1
+sky130_fd_sc_hs__a211o_1
+sky130_fd_sc_hs__a211oi_1
+sky130_fd_sc_hs__a21bo_1
+sky130_fd_sc_hs__a21boi_1
+sky130_fd_sc_hs__a21o_1
+sky130_fd_sc_hs__a21oi_1
+sky130_fd_sc_hs__a221o_1
+sky130_fd_sc_hs__a221oi_1
+sky130_fd_sc_hs__a222oi_1
+sky130_fd_sc_hs__a22o_1
+sky130_fd_sc_hs__a22oi_1
+sky130_fd_sc_hs__a2bb2o_1
+sky130_fd_sc_hs__a2bb2oi_1
+sky130_fd_sc_hs__a311o_1
+sky130_fd_sc_hs__a311oi_1
+sky130_fd_sc_hs__a31o_1
+sky130_fd_sc_hs__a31oi_1
+sky130_fd_sc_hs__a32o_1
+sky130_fd_sc_hs__a32oi_1
+sky130_fd_sc_hs__a41o_1
+sky130_fd_sc_hs__a41oi_1
+sky130_fd_sc_hs__and2_1
+sky130_fd_sc_hs__and2b_1
+sky130_fd_sc_hs__and3_1
+sky130_fd_sc_hs__and3b_1
+sky130_fd_sc_hs__and4_1
+sky130_fd_sc_hs__and4b_1
+sky130_fd_sc_hs__and4bb_1
 sky130_fd_sc_hs__clkbuf_1
 sky130_fd_sc_hs__clkbuf_16
 sky130_fd_sc_hs__clkbuf_2
@@ -26,6 +56,15 @@
 sky130_fd_sc_hs__decap_4
 sky130_fd_sc_hs__decap_6
 sky130_fd_sc_hs__decap_8
+sky130_fd_sc_hs__dfbbn_1
+sky130_fd_sc_hs__dfbbp_1
+sky130_fd_sc_hs__dfrbp_1
+sky130_fd_sc_hs__dfrtn_1
+sky130_fd_sc_hs__dfrtp_1
+sky130_fd_sc_hs__dfsbp_1
+sky130_fd_sc_hs__dfstp_1
+sky130_fd_sc_hs__dfxbp_1
+sky130_fd_sc_hs__dfxtp_1
 sky130_fd_sc_hs__diode_2
 sky130_fd_sc_hs__dlclkp_1
 sky130_fd_sc_hs__dlclkp_2
@@ -49,6 +88,7 @@
 sky130_fd_sc_hs__dlymetal6s2s_1
 sky130_fd_sc_hs__dlymetal6s4s_1
 sky130_fd_sc_hs__dlymetal6s6s_1
+sky130_fd_sc_hs__ebufn_1
 sky130_fd_sc_hs__edfxbp_1
 sky130_fd_sc_hs__edfxtp_1
 sky130_fd_sc_hs__einvn_0
@@ -66,6 +106,7 @@
 sky130_fd_sc_hs__ha_1
 sky130_fd_sc_hs__ha_2
 sky130_fd_sc_hs__ha_4
+sky130_fd_sc_hs__inv_1
 sky130_fd_sc_hs__macro_sparecell
 sky130_fd_sc_hs__maj3_1
 sky130_fd_sc_hs__maj3_2
@@ -73,74 +114,6 @@
 sky130_fd_sc_hs__mux2i_1
 sky130_fd_sc_hs__mux2i_2
 sky130_fd_sc_hs__mux2i_4
-sky130_fd_sc_hs__sdfbbn_1
-sky130_fd_sc_hs__sdfbbn_2
-sky130_fd_sc_hs__sdfbbp_1
-sky130_fd_sc_hs__sdfrbp_1
-sky130_fd_sc_hs__sdfrbp_2
-sky130_fd_sc_hs__sdfrtn_1
-sky130_fd_sc_hs__sdfrtp_1
-sky130_fd_sc_hs__sdfrtp_2
-sky130_fd_sc_hs__sdfrtp_4
-sky130_fd_sc_hs__sdfsbp_1
-sky130_fd_sc_hs__sdfsbp_2
-sky130_fd_sc_hs__sdfstp_1
-sky130_fd_sc_hs__sdfstp_2
-sky130_fd_sc_hs__sdfstp_4
-sky130_fd_sc_hs__sdfxbp_1
-sky130_fd_sc_hs__sdfxbp_2
-sky130_fd_sc_hs__sdfxtp_1
-sky130_fd_sc_hs__sdfxtp_2
-sky130_fd_sc_hs__sdfxtp_4
-sky130_fd_sc_hs__sdlclkp_1
-sky130_fd_sc_hs__sdlclkp_2
-sky130_fd_sc_hs__sdlclkp_4
-sky130_fd_sc_hs__sedfxbp_1
-sky130_fd_sc_hs__sedfxbp_2
-sky130_fd_sc_hs__sedfxtp_1
-sky130_fd_sc_hs__sedfxtp_2
-sky130_fd_sc_hs__sedfxtp_4
-sky130_fd_sc_hs__a2111oi_1
-sky130_fd_sc_hs__a211o_1
-sky130_fd_sc_hs__a211oi_1
-sky130_fd_sc_hs__a2111o_1
-sky130_fd_sc_hs__a21bo_1
-sky130_fd_sc_hs__a21boi_1
-sky130_fd_sc_hs__a21o_1
-sky130_fd_sc_hs__a21oi_1
-sky130_fd_sc_hs__a221o_1
-sky130_fd_sc_hs__a221oi_1
-sky130_fd_sc_hs__a222oi_1
-sky130_fd_sc_hs__a22o_1
-sky130_fd_sc_hs__a22oi_1
-sky130_fd_sc_hs__a2bb2o_1
-sky130_fd_sc_hs__a2bb2oi_1
-sky130_fd_sc_hs__a311o_1
-sky130_fd_sc_hs__a311oi_1
-sky130_fd_sc_hs__a31o_1
-sky130_fd_sc_hs__a31oi_1
-sky130_fd_sc_hs__a32o_1
-sky130_fd_sc_hs__a32oi_1
-sky130_fd_sc_hs__a41o_1
-sky130_fd_sc_hs__a41oi_1
-sky130_fd_sc_hs__and2_1
-sky130_fd_sc_hs__and2b_1
-sky130_fd_sc_hs__and3_1
-sky130_fd_sc_hs__and3b_1
-sky130_fd_sc_hs__and4_1
-sky130_fd_sc_hs__and4b_1
-sky130_fd_sc_hs__and4bb_1
-sky130_fd_sc_hs__dfbbn_1
-sky130_fd_sc_hs__dfbbp_1
-sky130_fd_sc_hs__dfrbp_1
-sky130_fd_sc_hs__dfrtn_1
-sky130_fd_sc_hs__dfrtp_1
-sky130_fd_sc_hs__dfsbp_1
-sky130_fd_sc_hs__dfstp_1
-sky130_fd_sc_hs__dfxbp_1
-sky130_fd_sc_hs__dfxtp_1
-sky130_fd_sc_hs__ebufn_1
-sky130_fd_sc_hs__inv_1
 sky130_fd_sc_hs__nand2_1
 sky130_fd_sc_hs__nand2b_1
 sky130_fd_sc_hs__nand3_1
@@ -184,5 +157,32 @@
 sky130_fd_sc_hs__or4_1
 sky130_fd_sc_hs__or4b_1
 sky130_fd_sc_hs__or4bb_1
+sky130_fd_sc_hs__sdfbbn_1
+sky130_fd_sc_hs__sdfbbn_2
+sky130_fd_sc_hs__sdfbbp_1
+sky130_fd_sc_hs__sdfrbp_1
+sky130_fd_sc_hs__sdfrbp_2
+sky130_fd_sc_hs__sdfrtn_1
+sky130_fd_sc_hs__sdfrtp_1
+sky130_fd_sc_hs__sdfrtp_2
+sky130_fd_sc_hs__sdfrtp_4
+sky130_fd_sc_hs__sdfsbp_1
+sky130_fd_sc_hs__sdfsbp_2
+sky130_fd_sc_hs__sdfstp_1
+sky130_fd_sc_hs__sdfstp_2
+sky130_fd_sc_hs__sdfstp_4
+sky130_fd_sc_hs__sdfxbp_1
+sky130_fd_sc_hs__sdfxbp_2
+sky130_fd_sc_hs__sdfxtp_1
+sky130_fd_sc_hs__sdfxtp_2
+sky130_fd_sc_hs__sdfxtp_4
+sky130_fd_sc_hs__sdlclkp_1
+sky130_fd_sc_hs__sdlclkp_2
+sky130_fd_sc_hs__sdlclkp_4
+sky130_fd_sc_hs__sedfxbp_1
+sky130_fd_sc_hs__sedfxbp_2
+sky130_fd_sc_hs__sedfxtp_1
+sky130_fd_sc_hs__sedfxtp_2
+sky130_fd_sc_hs__sedfxtp_4
 sky130_fd_sc_hs__xnor2_1
 sky130_fd_sc_hs__xor2_1
diff --git a/sky130/librelane/sky130_fd_sc_ls/no_synth.cells b/sky130/librelane/sky130_fd_sc_ls/no_synth.cells
index c5802c1..7184632 100644
--- a/sky130/librelane/sky130_fd_sc_ls/no_synth.cells
+++ b/sky130/librelane/sky130_fd_sc_ls/no_synth.cells
@@ -1,3 +1,33 @@
+sky130_fd_sc_ls__a2111o_1
+sky130_fd_sc_ls__a2111oi_1
+sky130_fd_sc_ls__a211o_1
+sky130_fd_sc_ls__a211oi_1
+sky130_fd_sc_ls__a21bo_1
+sky130_fd_sc_ls__a21boi_1
+sky130_fd_sc_ls__a21o_1
+sky130_fd_sc_ls__a21oi_1
+sky130_fd_sc_ls__a221o_1
+sky130_fd_sc_ls__a221oi_1
+sky130_fd_sc_ls__a222oi_1
+sky130_fd_sc_ls__a22o_1
+sky130_fd_sc_ls__a22oi_1
+sky130_fd_sc_ls__a2bb2o_1
+sky130_fd_sc_ls__a2bb2oi_1
+sky130_fd_sc_ls__a311o_1
+sky130_fd_sc_ls__a311oi_1
+sky130_fd_sc_ls__a31o_1
+sky130_fd_sc_ls__a31oi_1
+sky130_fd_sc_ls__a32o_1
+sky130_fd_sc_ls__a32oi_1
+sky130_fd_sc_ls__a41o_1
+sky130_fd_sc_ls__a41oi_1
+sky130_fd_sc_ls__and2_1
+sky130_fd_sc_ls__and2b_1
+sky130_fd_sc_ls__and3_1
+sky130_fd_sc_ls__and3b_1
+sky130_fd_sc_ls__and4_1
+sky130_fd_sc_ls__and4b_1
+sky130_fd_sc_ls__and4bb_1
 sky130_fd_sc_ls__clkbuf_1
 sky130_fd_sc_ls__clkbuf_12
 sky130_fd_sc_ls__clkbuf_16
@@ -29,6 +59,15 @@
 sky130_fd_sc_ls__decap_4
 sky130_fd_sc_ls__decap_6
 sky130_fd_sc_ls__decap_8
+sky130_fd_sc_ls__dfbbn_1
+sky130_fd_sc_ls__dfbbp_1
+sky130_fd_sc_ls__dfrbp_1
+sky130_fd_sc_ls__dfrtn_1
+sky130_fd_sc_ls__dfrtp_1
+sky130_fd_sc_ls__dfsbp_1
+sky130_fd_sc_ls__dfstp_1
+sky130_fd_sc_ls__dfxbp_1
+sky130_fd_sc_ls__dfxtp_1
 sky130_fd_sc_ls__diode_2
 sky130_fd_sc_ls__dlclkp_1
 sky130_fd_sc_ls__dlclkp_2
@@ -52,6 +91,7 @@
 sky130_fd_sc_ls__dlymetal6s2s_1
 sky130_fd_sc_ls__dlymetal6s4s_1
 sky130_fd_sc_ls__dlymetal6s6s_1
+sky130_fd_sc_ls__ebufn_1
 sky130_fd_sc_ls__edfxbp_1
 sky130_fd_sc_ls__edfxtp_1
 sky130_fd_sc_ls__einvn_0
@@ -69,6 +109,7 @@
 sky130_fd_sc_ls__ha_1
 sky130_fd_sc_ls__ha_2
 sky130_fd_sc_ls__ha_4
+sky130_fd_sc_ls__inv_1
 sky130_fd_sc_ls__macro_sparecell
 sky130_fd_sc_ls__maj3_1
 sky130_fd_sc_ls__maj3_2
@@ -76,74 +117,6 @@
 sky130_fd_sc_ls__mux2i_1
 sky130_fd_sc_ls__mux2i_2
 sky130_fd_sc_ls__mux2i_4
-sky130_fd_sc_ls__sdfbbn_1
-sky130_fd_sc_ls__sdfbbn_2
-sky130_fd_sc_ls__sdfbbp_1
-sky130_fd_sc_ls__sdfrbp_1
-sky130_fd_sc_ls__sdfrbp_2
-sky130_fd_sc_ls__sdfrtn_1
-sky130_fd_sc_ls__sdfrtp_1
-sky130_fd_sc_ls__sdfrtp_2
-sky130_fd_sc_ls__sdfrtp_4
-sky130_fd_sc_ls__sdfsbp_1
-sky130_fd_sc_ls__sdfsbp_2
-sky130_fd_sc_ls__sdfstp_1
-sky130_fd_sc_ls__sdfstp_2
-sky130_fd_sc_ls__sdfstp_4
-sky130_fd_sc_ls__sdfxbp_1
-sky130_fd_sc_ls__sdfxbp_2
-sky130_fd_sc_ls__sdfxtp_1
-sky130_fd_sc_ls__sdfxtp_2
-sky130_fd_sc_ls__sdfxtp_4
-sky130_fd_sc_ls__sdlclkp_1
-sky130_fd_sc_ls__sdlclkp_2
-sky130_fd_sc_ls__sdlclkp_4
-sky130_fd_sc_ls__sedfxbp_1
-sky130_fd_sc_ls__sedfxbp_2
-sky130_fd_sc_ls__sedfxtp_1
-sky130_fd_sc_ls__sedfxtp_2
-sky130_fd_sc_ls__sedfxtp_4
-sky130_fd_sc_ls__a2111oi_1
-sky130_fd_sc_ls__a211o_1
-sky130_fd_sc_ls__a211oi_1
-sky130_fd_sc_ls__a2111o_1
-sky130_fd_sc_ls__a21bo_1
-sky130_fd_sc_ls__a21boi_1
-sky130_fd_sc_ls__a21o_1
-sky130_fd_sc_ls__a21oi_1
-sky130_fd_sc_ls__a221o_1
-sky130_fd_sc_ls__a221oi_1
-sky130_fd_sc_ls__a222oi_1
-sky130_fd_sc_ls__a22o_1
-sky130_fd_sc_ls__a22oi_1
-sky130_fd_sc_ls__a2bb2o_1
-sky130_fd_sc_ls__a2bb2oi_1
-sky130_fd_sc_ls__a311o_1
-sky130_fd_sc_ls__a311oi_1
-sky130_fd_sc_ls__a31o_1
-sky130_fd_sc_ls__a31oi_1
-sky130_fd_sc_ls__a32o_1
-sky130_fd_sc_ls__a32oi_1
-sky130_fd_sc_ls__a41o_1
-sky130_fd_sc_ls__a41oi_1
-sky130_fd_sc_ls__and2_1
-sky130_fd_sc_ls__and2b_1
-sky130_fd_sc_ls__and3_1
-sky130_fd_sc_ls__and3b_1
-sky130_fd_sc_ls__and4_1
-sky130_fd_sc_ls__and4b_1
-sky130_fd_sc_ls__and4bb_1
-sky130_fd_sc_ls__dfbbn_1
-sky130_fd_sc_ls__dfbbp_1
-sky130_fd_sc_ls__dfrbp_1
-sky130_fd_sc_ls__dfrtn_1
-sky130_fd_sc_ls__dfrtp_1
-sky130_fd_sc_ls__dfsbp_1
-sky130_fd_sc_ls__dfstp_1
-sky130_fd_sc_ls__dfxbp_1
-sky130_fd_sc_ls__dfxtp_1
-sky130_fd_sc_ls__ebufn_1
-sky130_fd_sc_ls__inv_1
 sky130_fd_sc_ls__nand2_1
 sky130_fd_sc_ls__nand2b_1
 sky130_fd_sc_ls__nand3_1
@@ -187,5 +160,32 @@
 sky130_fd_sc_ls__or4_1
 sky130_fd_sc_ls__or4b_1
 sky130_fd_sc_ls__or4bb_1
+sky130_fd_sc_ls__sdfbbn_1
+sky130_fd_sc_ls__sdfbbn_2
+sky130_fd_sc_ls__sdfbbp_1
+sky130_fd_sc_ls__sdfrbp_1
+sky130_fd_sc_ls__sdfrbp_2
+sky130_fd_sc_ls__sdfrtn_1
+sky130_fd_sc_ls__sdfrtp_1
+sky130_fd_sc_ls__sdfrtp_2
+sky130_fd_sc_ls__sdfrtp_4
+sky130_fd_sc_ls__sdfsbp_1
+sky130_fd_sc_ls__sdfsbp_2
+sky130_fd_sc_ls__sdfstp_1
+sky130_fd_sc_ls__sdfstp_2
+sky130_fd_sc_ls__sdfstp_4
+sky130_fd_sc_ls__sdfxbp_1
+sky130_fd_sc_ls__sdfxbp_2
+sky130_fd_sc_ls__sdfxtp_1
+sky130_fd_sc_ls__sdfxtp_2
+sky130_fd_sc_ls__sdfxtp_4
+sky130_fd_sc_ls__sdlclkp_1
+sky130_fd_sc_ls__sdlclkp_2
+sky130_fd_sc_ls__sdlclkp_4
+sky130_fd_sc_ls__sedfxbp_1
+sky130_fd_sc_ls__sedfxbp_2
+sky130_fd_sc_ls__sedfxtp_1
+sky130_fd_sc_ls__sedfxtp_2
+sky130_fd_sc_ls__sedfxtp_4
 sky130_fd_sc_ls__xnor2_1
 sky130_fd_sc_ls__xor2_1
diff --git a/sky130/librelane/sky130_fd_sc_ms/no_synth.cells b/sky130/librelane/sky130_fd_sc_ms/no_synth.cells
index 4ee39c5..e2c5029 100644
--- a/sky130/librelane/sky130_fd_sc_ms/no_synth.cells
+++ b/sky130/librelane/sky130_fd_sc_ms/no_synth.cells
@@ -1,3 +1,33 @@
+sky130_fd_sc_ms__a2111o_1
+sky130_fd_sc_ms__a2111oi_1
+sky130_fd_sc_ms__a211o_1
+sky130_fd_sc_ms__a211oi_1
+sky130_fd_sc_ms__a21bo_1
+sky130_fd_sc_ms__a21boi_1
+sky130_fd_sc_ms__a21o_1
+sky130_fd_sc_ms__a21oi_1
+sky130_fd_sc_ms__a221o_1
+sky130_fd_sc_ms__a221oi_1
+sky130_fd_sc_ms__a222oi_1
+sky130_fd_sc_ms__a22o_1
+sky130_fd_sc_ms__a22oi_1
+sky130_fd_sc_ms__a2bb2o_1
+sky130_fd_sc_ms__a2bb2oi_1
+sky130_fd_sc_ms__a311o_1
+sky130_fd_sc_ms__a311oi_1
+sky130_fd_sc_ms__a31o_1
+sky130_fd_sc_ms__a31oi_1
+sky130_fd_sc_ms__a32o_1
+sky130_fd_sc_ms__a32oi_1
+sky130_fd_sc_ms__a41o_1
+sky130_fd_sc_ms__a41oi_1
+sky130_fd_sc_ms__and2_1
+sky130_fd_sc_ms__and2b_1
+sky130_fd_sc_ms__and3_1
+sky130_fd_sc_ms__and3b_1
+sky130_fd_sc_ms__and4_1
+sky130_fd_sc_ms__and4b_1
+sky130_fd_sc_ms__and4bb_1
 sky130_fd_sc_ms__clkbuf_1
 sky130_fd_sc_ms__clkbuf_16
 sky130_fd_sc_ms__clkbuf_2
@@ -26,6 +56,15 @@
 sky130_fd_sc_ms__decap_4
 sky130_fd_sc_ms__decap_6
 sky130_fd_sc_ms__decap_8
+sky130_fd_sc_ms__dfbbn_1
+sky130_fd_sc_ms__dfbbp_1
+sky130_fd_sc_ms__dfrbp_1
+sky130_fd_sc_ms__dfrtn_1
+sky130_fd_sc_ms__dfrtp_1
+sky130_fd_sc_ms__dfsbp_1
+sky130_fd_sc_ms__dfstp_1
+sky130_fd_sc_ms__dfxbp_1
+sky130_fd_sc_ms__dfxtp_1
 sky130_fd_sc_ms__diode_2
 sky130_fd_sc_ms__dlclkp_1
 sky130_fd_sc_ms__dlclkp_2
@@ -49,6 +88,7 @@
 sky130_fd_sc_ms__dlymetal6s2s_1
 sky130_fd_sc_ms__dlymetal6s4s_1
 sky130_fd_sc_ms__dlymetal6s6s_1
+sky130_fd_sc_ms__ebufn_1
 sky130_fd_sc_ms__edfxbp_1
 sky130_fd_sc_ms__edfxtp_1
 sky130_fd_sc_ms__einvn_0
@@ -66,6 +106,7 @@
 sky130_fd_sc_ms__ha_1
 sky130_fd_sc_ms__ha_2
 sky130_fd_sc_ms__ha_4
+sky130_fd_sc_ms__inv_1
 sky130_fd_sc_ms__macro_sparecell
 sky130_fd_sc_ms__maj3_1
 sky130_fd_sc_ms__maj3_2
@@ -73,74 +114,6 @@
 sky130_fd_sc_ms__mux2i_1
 sky130_fd_sc_ms__mux2i_2
 sky130_fd_sc_ms__mux2i_4
-sky130_fd_sc_ms__sdfbbn_1
-sky130_fd_sc_ms__sdfbbn_2
-sky130_fd_sc_ms__sdfbbp_1
-sky130_fd_sc_ms__sdfrbp_1
-sky130_fd_sc_ms__sdfrbp_2
-sky130_fd_sc_ms__sdfrtn_1
-sky130_fd_sc_ms__sdfrtp_1
-sky130_fd_sc_ms__sdfrtp_2
-sky130_fd_sc_ms__sdfrtp_4
-sky130_fd_sc_ms__sdfsbp_1
-sky130_fd_sc_ms__sdfsbp_2
-sky130_fd_sc_ms__sdfstp_1
-sky130_fd_sc_ms__sdfstp_2
-sky130_fd_sc_ms__sdfstp_4
-sky130_fd_sc_ms__sdfxbp_1
-sky130_fd_sc_ms__sdfxbp_2
-sky130_fd_sc_ms__sdfxtp_1
-sky130_fd_sc_ms__sdfxtp_2
-sky130_fd_sc_ms__sdfxtp_4
-sky130_fd_sc_ms__sdlclkp_1
-sky130_fd_sc_ms__sdlclkp_2
-sky130_fd_sc_ms__sdlclkp_4
-sky130_fd_sc_ms__sedfxbp_1
-sky130_fd_sc_ms__sedfxbp_2
-sky130_fd_sc_ms__sedfxtp_1
-sky130_fd_sc_ms__sedfxtp_2
-sky130_fd_sc_ms__sedfxtp_4
-sky130_fd_sc_ms__a2111oi_1
-sky130_fd_sc_ms__a211o_1
-sky130_fd_sc_ms__a211oi_1
-sky130_fd_sc_ms__a2111o_1
-sky130_fd_sc_ms__a21bo_1
-sky130_fd_sc_ms__a21boi_1
-sky130_fd_sc_ms__a21o_1
-sky130_fd_sc_ms__a21oi_1
-sky130_fd_sc_ms__a221o_1
-sky130_fd_sc_ms__a221oi_1
-sky130_fd_sc_ms__a222oi_1
-sky130_fd_sc_ms__a22o_1
-sky130_fd_sc_ms__a22oi_1
-sky130_fd_sc_ms__a2bb2o_1
-sky130_fd_sc_ms__a2bb2oi_1
-sky130_fd_sc_ms__a311o_1
-sky130_fd_sc_ms__a311oi_1
-sky130_fd_sc_ms__a31o_1
-sky130_fd_sc_ms__a31oi_1
-sky130_fd_sc_ms__a32o_1
-sky130_fd_sc_ms__a32oi_1
-sky130_fd_sc_ms__a41o_1
-sky130_fd_sc_ms__a41oi_1
-sky130_fd_sc_ms__and2_1
-sky130_fd_sc_ms__and2b_1
-sky130_fd_sc_ms__and3_1
-sky130_fd_sc_ms__and3b_1
-sky130_fd_sc_ms__and4_1
-sky130_fd_sc_ms__and4b_1
-sky130_fd_sc_ms__and4bb_1
-sky130_fd_sc_ms__dfbbn_1
-sky130_fd_sc_ms__dfbbp_1
-sky130_fd_sc_ms__dfrbp_1
-sky130_fd_sc_ms__dfrtn_1
-sky130_fd_sc_ms__dfrtp_1
-sky130_fd_sc_ms__dfsbp_1
-sky130_fd_sc_ms__dfstp_1
-sky130_fd_sc_ms__dfxbp_1
-sky130_fd_sc_ms__dfxtp_1
-sky130_fd_sc_ms__ebufn_1
-sky130_fd_sc_ms__inv_1
 sky130_fd_sc_ms__nand2_1
 sky130_fd_sc_ms__nand2b_1
 sky130_fd_sc_ms__nand3_1
@@ -184,5 +157,32 @@
 sky130_fd_sc_ms__or4_1
 sky130_fd_sc_ms__or4b_1
 sky130_fd_sc_ms__or4bb_1
+sky130_fd_sc_ms__sdfbbn_1
+sky130_fd_sc_ms__sdfbbn_2
+sky130_fd_sc_ms__sdfbbp_1
+sky130_fd_sc_ms__sdfrbp_1
+sky130_fd_sc_ms__sdfrbp_2
+sky130_fd_sc_ms__sdfrtn_1
+sky130_fd_sc_ms__sdfrtp_1
+sky130_fd_sc_ms__sdfrtp_2
+sky130_fd_sc_ms__sdfrtp_4
+sky130_fd_sc_ms__sdfsbp_1
+sky130_fd_sc_ms__sdfsbp_2
+sky130_fd_sc_ms__sdfstp_1
+sky130_fd_sc_ms__sdfstp_2
+sky130_fd_sc_ms__sdfstp_4
+sky130_fd_sc_ms__sdfxbp_1
+sky130_fd_sc_ms__sdfxbp_2
+sky130_fd_sc_ms__sdfxtp_1
+sky130_fd_sc_ms__sdfxtp_2
+sky130_fd_sc_ms__sdfxtp_4
+sky130_fd_sc_ms__sdlclkp_1
+sky130_fd_sc_ms__sdlclkp_2
+sky130_fd_sc_ms__sdlclkp_4
+sky130_fd_sc_ms__sedfxbp_1
+sky130_fd_sc_ms__sedfxbp_2
+sky130_fd_sc_ms__sedfxtp_1
+sky130_fd_sc_ms__sedfxtp_2
+sky130_fd_sc_ms__sedfxtp_4
 sky130_fd_sc_ms__xnor2_1
 sky130_fd_sc_ms__xor2_1