diff --git a/build.info b/build.info
index ab042f8..dc648ff 100644
--- a/build.info
+++ b/build.info
@@ -6,6 +6,6 @@
      Open-PDKs: v1.0.313-0-g8acddaf
          Magic: v8.3.311-0-g085131b
 
-Build results @ https://source.cloud.google.com/results/invocations/009a7d3c-0183-4481-a840-00cf5f327e0c
-Build artifacts @ https://console.cloud.google.com/storage/browser/open_pdks/skywater-pdk/artifacts/prod/foss-fpga-tools/skywater-pdk/open_pdks/continuous/10555/20220614-201113
+Build results @ https://source.cloud.google.com/results/invocations/7036abec-9625-41b0-978b-7c2df0595852
+Build artifacts @ https://console.cloud.google.com/storage/browser/open_pdks/skywater-pdk/artifacts/prod/foss-fpga-tools/skywater-pdk/open_pdks/continuous/10556/20220614-211108
 
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_npn_11v0_W1p00L1p00.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_npn_11v0_W1p00L1p00.spice
deleted file mode 120000
index 8b7f29f..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_npn_11v0_W1p00L1p00.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_npn_11v0_W1p00L1p00.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_npn_11v0_W1p00L1p00.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_npn_11v0_W1p00L1p00.spice
new file mode 100644
index 0000000..b6b8e5e
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_npn_11v0_W1p00L1p00.spice
@@ -0,0 +1,6 @@
+* NGSPICE file created from sky130_fd_pr__rf_npn_11v0_W1p00L1p00.ext - technology: sky130B
+
+.subckt sky130_fd_pr__rf_npn_11v0_W1p00L1p00 E B C
+X0 C B a_512_512# VSUBS sky130_fd_pr__npn_11v0 area=8.01025e+13p
+.ends
+
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.spice
deleted file mode 120000
index 7062bbc..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.spice
new file mode 100644
index 0000000..0b54121
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.spice
@@ -0,0 +1,6 @@
+* NGSPICE file created from sky130_fd_pr__rf_pnp_05v5_W0p68L0p68.ext - technology: sky130B
+
+.subckt sky130_fd_pr__rf_pnp_05v5_W0p68L0p68 Base Collector Emitter
+X0 Collector Base Emitter sky130_fd_pr__pnp_05v5 area=0p
+.ends
+
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.spice
deleted file mode 120000
index 19b1c68..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.spice
new file mode 100644
index 0000000..05bf9d4
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_pr/spice/sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.spice
@@ -0,0 +1,6 @@
+* NGSPICE file created from sky130_fd_pr__rf_pnp_05v5_W3p40L3p40.ext - technology: sky130B
+
+.subckt sky130_fd_pr__rf_pnp_05v5_W3p40L3p40 Emitter Collector Base
+X0 Collector Base Emitter sky130_fd_pr__pnp_05v5 area=0p
+.ends
+
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__decap_12.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__decap_12.spice
deleted file mode 120000
index c01ccc2..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__decap_12.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__decap_12.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__decap_12.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__decap_12.spice
new file mode 100644
index 0000000..391b2e4
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__decap_12.spice
@@ -0,0 +1,7 @@
+* NGSPICE file created from sky130_ef_sc_hd__decap_12.ext - technology: sky130B
+
+.subckt sky130_ef_sc_hd__decap_12 VGND VPWR VNB VPB
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt ad=4.524e+11p pd=4.52e+06u as=0p ps=0u w=870000u l=4.73e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 ad=2.86e+11p pd=3.24e+06u as=0p ps=0u w=550000u l=4.73e+06u
+.ends
+
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fakediode_2.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fakediode_2.spice
deleted file mode 120000
index cb2a43d..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fakediode_2.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fakediode_2.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fakediode_2.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fakediode_2.spice
new file mode 100644
index 0000000..76a4795
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fakediode_2.spice
@@ -0,0 +1,6 @@
+* NGSPICE file created from sky130_ef_sc_hd__fakediode_2.ext - technology: sky130B
+
+.subckt sky130_ef_sc_hd__fakediode_2 DIODE VGND VPWR VPB VNB
+D0 VNB a_31_39# sky130_fd_pr__diode_pw2nd_05v5 pj=2.64e+06u area=4.347e+11p
+.ends
+
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_12.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_12.spice
deleted file mode 120000
index cc8dbee..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_12.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_12.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_12.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_12.spice
new file mode 100644
index 0000000..e14e767
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_12.spice
@@ -0,0 +1,7 @@
+* NGSPICE file created from sky130_ef_sc_hd__fill_12.ext - technology: sky130B
+
+.subckt sky130_ef_sc_hd__fill_12 VPWR VGND VNB VPB
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt ad=4.524e+11p pd=4.52e+06u as=0p ps=0u w=870000u l=1.97e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 ad=2.86e+11p pd=3.24e+06u as=0p ps=0u w=550000u l=1.97e+06u
+.ends
+
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_4.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_4.spice
deleted file mode 120000
index 8e29ab7..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_4.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_4.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_4.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_4.spice
new file mode 100644
index 0000000..9b781be
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_4.spice
@@ -0,0 +1,5 @@
+* NGSPICE file created from sky130_ef_sc_hd__fill_4.ext - technology: sky130B
+
+.subckt sky130_ef_sc_hd__fill_4 VGND VPWR VPB VNB
+.ends
+
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_8.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_8.spice
deleted file mode 120000
index 2276582..0000000
--- a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_8.spice
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/pdk/sky130A/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_8.spice
\ No newline at end of file
diff --git a/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_8.spice b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_8.spice
new file mode 100644
index 0000000..ff4d945
--- /dev/null
+++ b/usr/local/share/pdk/sky130B/libs.ref/sky130_fd_sc_hd/spice/sky130_ef_sc_hd__fill_8.spice
@@ -0,0 +1,5 @@
+* NGSPICE file created from sky130_ef_sc_hd__fill_8.ext - technology: sky130B
+
+.subckt sky130_ef_sc_hd__fill_8 VGND VPWR VPB VNB
+.ends
+