diff --git a/sky130/xcircuit/sky130_fd_pr.lps b/sky130/xcircuit/sky130_fd_pr.lps
index 7881478..501168b 100644
--- a/sky130/xcircuit/sky130_fd_pr.lps
+++ b/sky130/xcircuit/sky130_fd_pr.lps
@@ -1,21 +1,17 @@
 %! PostScript set of library objects for XCircuit
-%  Version: 3.9
+%  Version: 3.10
 %  Library name is: sky130_fd_pr
 %  Author:  <tim@stravinsky>
 %
 
 % Depend sky130_fd_pr::NPNModel generic::arrowhead
-% Depend ngspice::Vsource analog::source
-% Depend ngspice::ACsource analog::source generic::sinusoid
-% Depend ngspice::Vpwl analog::source
-% Depend ngspice::Switch generic::circle generic::arrowhead
-% Depend ngspice::Vpulse analog::source
 
 % XCircuitLib library objects
-/sky130_fd_pr::pMOS {
-<</@subs (avdd) /p_yps2 48 /p_xps2 16 /p_yps1 -8 /p_xps1 16 /p_yps 16 /p_xps 16 /p_rot 
-0 /@fingers (1) /@class (M) /@width (1u) /@length (0.18u) /@model (pfet) /@index 
-(?) /p_jst 28 >> begingate
+/sky130_fd_pr::pMOS3term {
+<</@mult 1 /@model (pfet_01v8) 
+(lindex {pfet_01v8 pfet_01v8_lvt pfet_01v8_hvt pfet_g5v0d10v5} 0) pop /@subs 
+(avdd) /p_yps2 48 /p_xps2 16 /p_yps1 0 /p_xps1 16 /p_yps 16 /p_xps 16 /p_rot 0 /@fingers 
+(1) /@class (X) /@width (1) /@length (0.18) /@index (?) /p_jst 28 >> begingate
 1 1.000 -44 -28 -44 28 2 polygon
 1 1.000 -60 0 -64 0 2 polygon
 1 1.000 0 -64 0 -28 -32 -28 -32 28 0 28 0 64 6 polygon
@@ -25,13 +21,15 @@
 (D) {/Times-Roman cf} 2 13 0.000 1.000 0 -64 pinlabel
 (G) {/Times-Roman cf} 2 7 0.000 1.000 -64 0 pinlabel
 0.180 0.545 0.341 scb
-mark @fingers ( M=) @length ( L=) @width ( W=) @model ( ) @subs ( %pD %pG %pS ) 
-@index @class (spice:) {/Times-Roman cf} ctmk 4 0.000 1.000 -196 -139 infolabel
+mark @fingers ( NF=) @mult ( M=) @length ( L=) @width ( W=) @model 
+( sky130_fd_pr__) @subs ( %pD %pG %pS ) @index @class (spice:) 
+{/Times-Roman cf} ctmk 4 360.000 1.000 -196 -139 infolabel
 mark ( %x %y) @width ( ) @length (sim:p %pG %pD %pS ) {/Times-Roman cf} ctmk 4 
 0.000 1.000 -196 -187 infolabel
 0.647 0.165 0.165 scb
-mark @fingers {hS} (=) {hS} (M) {CR} @length (=) {Tf} (L) {hS} {CR} @width (=) 
-{Ts} (W) {/Times-Roman cf} ctmk p_jst p_rot 0.700 p_xps1 p_yps1 label
+mark @fingers (NF=) {CR} @mult {hS} (=) {hS} (X) {CR} @length (=) {Tf} (L) {hS} 
+{CR} @width (=) {Ts} (W) {/Times-Roman cf} ctmk p_jst p_rot 0.700 p_xps1 p_yps1 
+label
 0.000 0.000 1.000 scb
 mark @index @class {/Times-Roman cf} ctmk 16 p_rot 0.700 p_xps2 p_yps2 label
 sce
@@ -39,46 +37,17 @@
 endgate
 } def
 
-1.000 90.000 <</p_yps -32 /p_xps1 32 /p_yps1 -40 /p_rot 270 /p_xps2 -32 >> /sky130_fd_pr::pMOS libinst
-<</@model (hvpfet) /@length (0.36u) /@subs (dvdd3) >> /sky130_fd_pr::pMOS libinst
-1.000 90.000 <</p_yps -32 /p_xps1 32 /p_yps1 -40 /p_rot 270 /p_xps2 -32 /@model (hvpfet) 
-/@length (0.36u) /@subs (dvdd3) >> /sky130_fd_pr::pMOS libinst
+1.000 90.000 <</@model (pfet_01v8) /p_xps 32 /p_yps -32 /p_xps1 48 /p_yps1 -40 /p_rot 270 
+/p_xps2 -32 >> /sky130_fd_pr::pMOS3term libinst
+<</@model (pfet_01v8) /@length (0.50) /@subs (dvdd3) >> /sky130_fd_pr::pMOS3term libinst
+1.000 90.000 <</@model (pfet_01v8) /p_xps 32 /p_yps -32 /p_xps1 48 /p_yps1 -40 /p_rot 270 
+/p_xps2 -32 /@length (0.50) /@subs (dvdd3) >> /sky130_fd_pr::pMOS3term libinst
 
-/sky130_fd_pr::pMOS1finger {
-<</p_yps2 -16 /p_xps2 16 /p_yps1 8 /p_xps1 16 /p_yps 40 /p_xps 16 /p_rot 0 /@subs 
-(avdd) /@class (M) /@width (1u) /@length (0.18u) /@model (pfet) /@index 
-(?) /p_jst 28 >> begingate
-1 1.000 -44 -28 -44 28 2 polygon
-1 1.000 -60 0 -64 0 2 polygon
-1 1.000 0 -64 0 -28 -32 -28 -32 28 0 28 0 64 6 polygon
-1 1.000 -52 0 8 0.000 360.000 xcarc
-1.000 0.000 0.000 scb
-(S) {/Times-Roman cf} 2 9 0.000 1.000 0 64 pinlabel
-(D) {/Times-Roman cf} 2 13 0.000 1.000 0 -64 pinlabel
-(G) {/Times-Roman cf} 2 7 0.000 1.000 -64 0 pinlabel
-0.180 0.545 0.341 scb
-mark @length ( L=) @width ( W=) @model ( ) @subs ( %pD %pG %pS ) @index @class 
-(spice:) {/Times-Roman cf} ctmk 4 0.000 1.000 -196 -139 infolabel
-mark ( %x %y) @width ( ) @length (sim:p %pG %pD %pS ) {/Times-Roman cf} ctmk 4 
-0.000 1.000 -196 -187 infolabel
-0.647 0.165 0.165 scb
-mark @length (=) {Tf} (L) {hS} {CR} @width (=) {Ts} (W) {/Times-Roman cf} ctmk 
-p_jst p_rot 0.700 p_xps2 p_yps2 label
-0.000 0.000 1.000 scb
-mark @index @class {/Times-Roman cf} ctmk 16 p_rot 0.700 p_xps p_yps label
-sce
-mark @model {/Times-RomanISO cf} ctmk 16 p_rot 0.700 p_xps1 p_yps1 label
-endgate
-} def
-
-1.000 90.000 <</p_yps2 -32 /p_yps1 -24 /p_xps2 32 /p_rot 270 /p_xps -16 >> /sky130_fd_pr::pMOS1finger libinst
-<</@model (hvpfet) /@length (0.36u) /@subs (dvdd3) >> /sky130_fd_pr::pMOS1finger libinst
-1.000 90.000 <</p_yps2 -32 /p_yps1 -24 /p_xps2 32 /p_rot 270 /p_xps -16 /@model (hvpfet) 
-/@length (0.36u) /@subs (dvdd3) >> /sky130_fd_pr::pMOS1finger libinst
-
-/sky130_fd_pr::nMOS {
+/sky130_fd_pr::nMOS3term {
 <</@subs (agnd) /p_yps2 -16 /p_xps2 16 /p_yps1 8 /p_xps1 16 /p_yps 40 /p_xps 16 /p_rot 
-0 /@fingers (1) /@class (M) /@width (1u) /@length (0.18u) /@model (nfet) /@index 
+0 /@fingers (1) /@class (X) /@width (1) /@length (0.18) /@mult 1 /@model 
+(nfet_01v8) 
+(lindex {nfet_01v8 nfet_01v8_lvt nfet_01v8_hvt nfet_g5v0d10v5} 0) pop /@index 
 (?) /p_jst 28 >> begingate
 1 1.000 0 -64 0 -28 -32 -28 -32 28 0 28 0 64 6 polygon
 1 1.000 -44 -28 -44 28 2 polygon
@@ -88,12 +57,13 @@
 (S) {/Times-Roman cf} 2 13 0.000 1.000 0 -64 pinlabel
 (D) {/Times-Roman cf} 2 9 0.000 1.000 0 64 pinlabel
 0.180 0.545 0.341 scb
-mark @fingers ( m=) @length ( l=) @width ( w=) @model ( ) @subs ( %pD %pG %pS ) 
-@index @class (spice:) {/Times-Roman cf} ctmk 4 0.000 1.000 -244 -139 infolabel
+mark @fingers ( m=) @length ( l=) @width ( w=) @model ( sky130_fd_pr__) @subs 
+( %pD %pG %pS ) @index @class (spice:) {/Times-Roman cf} ctmk 4 0.000 1.000 
+-244 -139 infolabel
 mark ( %x %y) @width ( ) @length (sim:n %pG %pD %pS ) {/Times-Roman cf} ctmk 4 
 0.000 1.000 -244 -187 infolabel
 0.647 0.165 0.165 scb
-mark @fingers (=) {Tf} {Tf} (M) {CR} @length (=) {Tf} (L) {hS} {CR} @width (=) 
+mark @fingers (=) {Tf} {Tf} (X) {CR} @length (=) {Tf} (L) {hS} {CR} @width (=) 
 {Ts} (W) {/Times-Roman cf} ctmk p_jst p_rot 0.700 p_xps2 p_yps2 label
 0.000 0.000 1.000 scb
 mark @index @class {/Times-Roman cf} ctmk 20 p_rot 0.700 p_xps p_yps label
@@ -102,43 +72,6 @@
 endgate
 } def
 
-1.000 90.000 <</p_yps1 -24 /p_xps2 32 /p_yps2 -32 /p_rot 270 /p_xps -32 >> /sky130_fd_pr::nMOS libinst
-<</p_jst 28 /p_xps2 16 /p_yps2 -16 /@model (hvnfet) /@length (0.36u) /@subs 
-(dgnd) >> /sky130_fd_pr::nMOS libinst
-1.000 90.000 <</p_yps2 -32 /p_yps1 -24 /p_xps2 32 /p_rot 270 /p_xps -32 /@model (hvnfet) 
-/@length (0.36u) /@subs (dgnd) >> /sky130_fd_pr::nMOS libinst
-
-/sky130_fd_pr::nMOS1finger {
-<</@subs (agnd) /p_yps2 -16 /p_xps2 16 /p_yps1 8 /p_xps1 16 /p_yps 40 /p_xps 16 /p_rot 
-0 /@class (M) /@width (1u) /@length (0.18u) /@model (nfet) /@index (?) /p_jst 
-28 >> begingate
-1 1.000 0 -64 0 -28 -32 -28 -32 28 0 28 0 64 6 polygon
-1 1.000 -44 -28 -44 28 2 polygon
-1 1.000 -44 0 -64 0 2 polygon
-1.000 0.000 0.000 scb
-(G) {/Times-Roman cf} 2 7 0.000 1.000 -64 0 pinlabel
-(S) {/Times-Roman cf} 2 13 0.000 1.000 0 -64 pinlabel
-(D) {/Times-Roman cf} 2 9 0.000 1.000 0 64 pinlabel
-0.180 0.545 0.341 scb
-mark @length ( l=) @width ( w=) @model ( ) @subs ( %pD %pG %pS ) @index @class 
-(spice:) {/Times-Roman cf} ctmk 4 360.000 1.000 -244 -139 infolabel
-mark ( %x %y) @width ( ) @length (sim:n %pG %pD %pS ) {/Times-Roman cf} ctmk 4 
-0.000 1.000 -244 -187 infolabel
-0.647 0.165 0.165 scb
-mark @length (=) {Tf} (L) {hS} {CR} @width (=) {Ts} (W) {/Times-Roman cf} ctmk 
-p_jst p_rot 0.700 p_xps2 p_yps2 label
-0.000 0.000 1.000 scb
-mark @index @class {/Times-Roman cf} ctmk 20 p_rot 0.700 p_xps p_yps label
-sce
-mark @model {/Times-RomanISO cf} ctmk 20 p_rot 0.700 p_xps1 p_yps1 label
-endgate
-} def
-
-1.000 90.000 <</p_yps2 -32 /p_yps1 -24 /p_xps2 32 /p_rot 270 /p_xps -32 >> /sky130_fd_pr::nMOS1finger libinst
-<</@model (hvnfet) /@length (0.36u) /@subs (dgnd) >> /sky130_fd_pr::nMOS1finger libinst
-1.000 90.000 <</p_yps2 -32 /p_yps1 -24 /p_xps2 32 /p_rot 270 /p_xps -32 /@model (hvnfet) 
-/@length (0.36u) /@subs (dgnd) >> /sky130_fd_pr::nMOS1finger libinst
-
 /generic::arrowhead {
 % nonetwork
 begingate
@@ -153,8 +86,10 @@
 
 /sky130_fd_pr::NPNModel {
 <</@subs (agnd) /p_yps2 56 /p_xps2 16 /p_yps1 0 /p_xps1 16 /p_yps 24 /p_xps 16 /p_rot 
-0 /@length (10.16u) /@width (0.2u) /@m (1) /@model (bipolar) /@index (?) /@class 
-(Q) >> begingate
+0 /@length (10.16) /@width (0.2) /@m (1) /@model 
+(rf_npn_05v5_W1p00L1p00) 
+(lindex {rf_npn_05v5_W1p00L1p00 rf_npn_05v5_W1p00L2p00} 0) pop /@index (?) /@class 
+(X) >> begingate
 1 1.000 -48 0 -64 0 2 polygon
 1 1.000 -48 48 -48 -48 2 polygon
 1 1.000 0 48 -48 22 2 polygon
@@ -167,26 +102,29 @@
 (B) {/Times-Roman cf} 2 7 0.000 1.000 -64 0 pinlabel
 (E) {/Times-Roman cf} 2 13 0.000 1.000 0 -64 pinlabel
 0.180 0.545 0.341 scb
-mark @m ( M=) @length ( L=) @width ( W=) @model ( ) @subs ( %pC %pB %pE ) 
-@index @class (spice:) {/Times-Roman cf} ctmk 4 0.000 1.000 -244 -139 infolabel
+mark @m ( M=) @length ( L=) @width ( W=) @model ( sky130_fd_pr__) @subs 
+( %pC %pB %pE ) @index @class (spice:) {/Times-Roman cf} ctmk 4 0.000 1.000 
+-244 -139 infolabel
 (sim:b %pB %pE %pC) {/Times-Roman cf} 2 4 0.000 1.000 -244 -187 infolabel
 0.000 0.000 1.000 scb
 mark @index @class {/Times-Roman cf} ctmk 16 p_rot 0.700 p_xps2 p_yps2 label
 sce
 mark @model {/Times-RomanISO cf} ctmk 16 p_rot 0.700 p_xps p_yps label
 0.647 0.165 0.165 scb
-mark @m {Tf} (=) {Tf} (M) {CR} @length {Tf} (=) {Tf} (L) {CR} @width {Ts} {hS} 
+mark @m {Tf} (=) {Tf} (X) {CR} @length {Tf} (=) {Tf} (L) {CR} @width {Ts} {hS} 
 (=) {Ts} {hS} (W) {/Times-Roman cf} ctmk 28 p_rot 0.700 p_xps1 p_yps1 label
 endgate
 } def
 
-1.000 90.000 <</p_yps -40 /p_xps2 -32 /p_xps 32 /p_xps1 48 /p_yps1 -32 /p_rot 270 >> /sky130_fd_pr::NPNModel libinst
+1.000 90.000 <</@model (rf_npn_05v5_W1p00L1p00) /p_yps -40 /p_xps2 -32 /p_xps 32 /p_xps1 48 
+/p_yps1 -32 /p_rot 270 >> /sky130_fd_pr::NPNModel libinst
 
-/sky130_fd_pr::ResModel {
-<</@substype (sub) (lindex {sub well} 0) pop /@subs (avdd) /@width (1u) /@length 
-(1u) /p_yps2 -48 /p_xps2 32 /@model (resistor) /p_yps1 0 /p_xps1 32 /p_yps 
-32 /p_xps 32 /p_rot 0 /@class (R) /@value (1.0) /@units (k) /@index (?) /p_jst 
-20 >> begingate
+/sky130_fd_pr::HighResModel {
+<</@substype (sub) (lindex {sub well} 0) pop /@subs (avdd) /@width (1) /@length 
+(1) /p_yps2 -48 /p_xps2 32 /@model (res_high_po_0p35) 
+(lindex {res_high_po_0p35 res_high_po_0p69 res_high_po_1p41 res_high_po_2p85 res_high_po_5p73} 0) pop /p_yps1 
+0 /p_xps1 32 /p_yps 32 /p_xps 32 /p_rot 0 /@class (X) /@value (1.0) /@units 
+(k) /@index (?) /p_jst 20 >> begingate
 1 1.000 0 64 0 36 2 polygon
 1 1.000 0 -64 0 -36 2 polygon
 1 1.000 0 -36 14 -30 -14 -18 14 -6 -14 6 14 18 -14 30 0 36 8 polygon
@@ -195,30 +133,24 @@
 (2) {/Times-Roman cf} 2 13 0.000 1.000 0 -64 pinlabel
 0.180 0.545 0.341 scb
 mark @subs (=) @substype ( ) @width ( W=) @length ( L=) @units @value ( R=) 
-@model ( %p1 %p2 ) @index @class (spice:) {/Times-Roman cf} ctmk 4 0.000 1.000 
--208 -160 infolabel
+@model ( %p1 %p2 sky130_fd_pr__) @index @class (spice:) {/Times-Roman cf} ctmk 
+4 0.000 1.000 -208 -160 infolabel
 (sim:r %p1 %p2) {/Times-Roman cf} 2 4 0.000 1.000 -208 -208 infolabel
 0.647 0.165 0.165 scb
 mark (W) {/Symbol cf} @units {hS} @value {/Times-Roman cf} ctmk p_jst p_rot 
 0.700 p_xps1 p_yps1 label
-0.180 0.545 0.341 scb
-mark @index @class (pcb:) {/Times-Roman cf} ctmk 20 0.000 1.000 -208 -256 
-infolabel
 0.000 0.000 1.000 scb
 mark @index @class {/Times-Roman cf} ctmk 20 p_rot 0.700 p_xps p_yps label
-0.647 0.165 0.165 scb
+sce
 mark @model {/Times-RomanISO cf} ctmk 16 p_rot 0.700 p_xps2 p_yps2 label
 endgate
 } def
 
-1.000 90.000 <</@substype (sub) /p_xps -32 /p_yps1 -32 /p_yps -16 /p_xps2 80 /p_yps2 -32 
-/p_rot 270 >> /sky130_fd_pr::ResModel libinst
-
 /sky130_fd_pr::MiMCap {
 <</@substype (sub) (lindex {sub well} 0) pop /@subs (agnd) /@fingers (1) /@length 
-(1u) /@width (1u) /p_yps2 -8 /p_xps2 48 /p_yps1 24 /p_xps1 48 /p_yps 
-56 /p_xps 48 /p_rot 0 /@class (C) /@value (1.0) /@units (p) /@index (?) /p_jst 
-20 >> begingate
+(1) /@width (1) /p_yps2 -8 /p_xps2 48 /p_yps1 24 /p_xps1 48 /p_yps 56 /p_xps 
+48 /p_rot 0 /@class (X) /@value (1.0) /@units (p) /@index (?) /p_jst 20 >> 
+begingate
 1 1.000 0 -64 0 -6 2 polygon
 1 1.000 0 64 0 6 2 polygon
 1 1.000 -32 6 32 6 2 polygon
@@ -233,12 +165,10 @@
 0.647 0.165 0.165 scb
 mark (F) @units {hS} @value {/Times-Roman cf} ctmk p_jst p_rot 0.700 p_xps1 
 p_yps1 label
-0.180 0.545 0.341 scb
-mark @index (pcb:C) {/Times-Roman cf} ctmk 20 0.000 1.000 -208 -256 infolabel
 0.000 0.000 1.000 scb
 mark @index @class {/Times-Roman cf} ctmk 20 p_rot 0.700 p_xps p_yps label
 0.647 0.165 0.165 scb
-mark @fingers {Tf} (=) {Tf} (M) {CR} @length {Tf} (=) {Tf} (L) {CR} @width {Ts} 
+mark @fingers {Tf} (=) {Tf} (X) {CR} @length {Tf} (=) {Tf} (L) {CR} @width {Ts} 
 {hS} (=) {Ts} {hS} (W) {/Times-RomanISO cf} ctmk 28 p_rot 0.700 p_xps2 p_yps2 
 label
 sce
@@ -250,7 +180,7 @@
 /p_rot 270 >> /sky130_fd_pr::MiMCap libinst
 
 /sky130_fd_pr::IndModel {
-<</@size (175u) /@width (2.5u) /@sep (2.5u) /@turns (6.5) /@substype (sub) 
+<</@size (175) /@width (2.5) /@sep (2.5) /@turns (6.5) /@substype (sub) 
 (lindex {sub well} 0) pop /@subs (agnd) /p_yps2 -48 /p_xps2 32 /@model 
 (inductor) /p_yps1 -16 /p_xps1 32 /p_yps 16 /p_xps 32 /@value (10) /@units (n) /@index 
 (?) /p_jst 20 /p_rot 0 >> begingate
@@ -274,8 +204,6 @@
 0.647 0.165 0.165 scb
 mark (H) @units {hS} @value {/Times-Roman cf} ctmk p_jst p_rot 0.700 p_xps1 
 p_yps1 label
-0.180 0.545 0.341 scb
-mark @index (pcb:L) {/Times-Roman cf} ctmk 20 0.000 1.000 -208 -256 infolabel
 0.000 0.000 1.000 scb
 mark @index (L) {/Times-Roman cf} ctmk 20 p_rot 0.700 p_xps p_yps label
 0.647 0.165 0.165 scb
diff --git a/sky130/xcircuit/sky130_fd_sc_hd.lps b/sky130/xcircuit/sky130_fd_sc_hd.lps
index 939039f..d6909e8 100644
--- a/sky130/xcircuit/sky130_fd_sc_hd.lps
+++ b/sky130/xcircuit/sky130_fd_sc_hd.lps
@@ -1,352 +1,331 @@
 %! PostScript set of library objects for XCircuit
-%  Version: 3.6
-%  Library name is: sky130_fd_sc_hd.lps
-%  Author: R. Timothy Edwards <tim.edwards@multigig.com>
+%  Version: 3.10
+%  Library name is: sky130_fd_sc_hd
+%  Author:  <tim@stravinsky>
 %
 
+
 % XCircuitLib library objects
 /sky130_fd_sc_hd::inv {
-<</gnd (dgnd) /vdd (dvdd) /@index (?) /voltage () /strength (1) >> begingate
-0 1.00 -32 -40 -32 40 40 0 3 polygon
-1 1.00 48 0 8 0.00 360.00 xcarc
-1 1.00 -32 0 -48 0 2 polygon
-1 1.00 56 0 64 0 2 polygon
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) /@strength (1) >> begingate
+0 1.000 -32 -40 -32 40 40 0 3 polygon
+1 1.000 48 0 8 0.000 360.000 xcarc
+1 1.000 -32 0 -48 0 2 polygon
+1 1.000 56 0 64 0 2 polygon
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -48 0 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -48 0 pinlabel
 0.180 0.545 0.341 scb
-mark voltage strength ( %pA %pY invX) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -32 -136 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -32 -96 infolabel
+mark @strength ( %pA %pY invX) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -32 -136 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -32 -96 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.60 -8 0 label
-mark strength {qS} (\327) {/Times-RomanISO cf} ctmk 16 0 0.60 0 24 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.600 -8 0 label
+mark @strength {qS} (\327) {/Times-RomanISO cf} ctmk 16 0.000 0.600 0 24 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.70 8 -24 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.700 8 -24 label
 endgate
 } def
 
-<</strength (2) >> /sky130_fd_sc_hd::inv libinst
-<</strength (4) >> /sky130_fd_sc_hd::inv libinst
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::inv libinst
-<</voltage (_3V) /strength (2) /vdd (dvdd3) >> /sky130_fd_sc_hd::inv libinst
-<</voltage (_3V) /strength (4) /vdd (dvdd3) >> /sky130_fd_sc_hd::inv libinst
+<</@strength (2) >> /sky130_fd_sc_hd::inv libinst
+<</@strength (4) >> /sky130_fd_sc_hd::inv libinst
 
 /sky130_fd_sc_hd::buf {
-<</gnd (dgnd) /vdd (dvdd) /@index (?) /voltage () /strength (2) >> begingate
-0 1.00 -32 -40 -32 40 40 0 3 polygon
-1 1.00 -32 0 -48 0 2 polygon
-1 1.00 40 0 64 0 2 polygon
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) /@strength (2) >> begingate
+0 1.000 -32 -40 -32 40 40 0 3 polygon
+1 1.000 -32 0 -48 0 2 polygon
+1 1.000 40 0 64 0 2 polygon
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -48 0 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -48 0 pinlabel
 0.180 0.545 0.341 scb
-mark voltage strength ( %pA %pY bufX) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -32 -112 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -32 -80 infolabel
+mark @strength ( %pA %pY bufX) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -32 -112 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -32 -80 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-RomanISO cf} ctmk 21 0 0.50 -8 0 label
-mark strength {qS} (\327) {/Times-RomanISO cf} ctmk 16 0 0.50 8 24 label
+mark {/Times-RomanISO cf} ctmk 21 0.000 0.500 -8 0 label
+mark @strength {qS} (\327) {/Times-RomanISO cf} ctmk 16 0.000 0.500 8 24 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 16 0 0.60 24 -32 label
+mark @index (U) {/Times-RomanISO cf} ctmk 16 0.000 0.600 24 -32 label
 endgate
 } def
 
-<</strength (4) >> /sky130_fd_sc_hd::buf libinst
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::buf libinst
-<</voltage (_3V) /strength (4) /vdd (dvdd3) >> /sky130_fd_sc_hd::buf libinst
+<</@strength (4) >> /sky130_fd_sc_hd::buf libinst
 
 /sky130_fd_sc_hd::nand2 {
-<</gnd (dgnd) /vdd (dvdd) /voltage () /@index (?) >> begingate
-1 1.00 0 -48 -64 -48 -64 48 0 48 4 polygon
-1 1.00 56 0 8 0.00 360.00 xcarc
-1 1.00 0 0 48 -90.00 90.00 xcarc
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) >> begingate
+1 1.000 0 -48 -64 -48 -64 48 0 48 4 polygon
+1 1.000 56 0 8 0.000 360.000 xcarc
+1 1.000 0 0 48 -90.000 90.000 xcarc
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -64 32 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -64 -32 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -64 32 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -64 -32 pinlabel
 sce
-1 1.00 -64 -48 -64 48 2 polygon
+1 1.000 -64 -48 -64 48 2 polygon
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pY nand2X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -64 -128 infolabel
+mark ( %pA %pB %pY nand2X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -64 -128 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 16 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.70 -40 -8 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.700 -40 -8 label
 0.180 0.545 0.341 scb
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -64 -96 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -64 -96 infolabel
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::nand2 libinst
-
 /sky130_fd_sc_hd::nand3 {
-<</gnd (dgnd) /vdd (dvdd) /@index (?) /voltage () >> begingate
-1 1.00 0 -48 -64 -48 -64 48 0 48 4 polygon
-1 1.00 56 0 8 0.00 360.00 xcarc
-1 1.00 0 0 48 -90.00 90.00 xcarc
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) >> begingate
+1 1.000 0 -48 -64 -48 -64 48 0 48 4 polygon
+1 1.000 56 0 8 0.000 360.000 xcarc
+1 1.000 0 0 48 -90.000 90.000 xcarc
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -64 32 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -64 0 pinlabel
-(C) {/Times-Roman cf} 2 7 0 1.00 -64 -32 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -64 32 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -64 0 pinlabel
+(C) {/Times-Roman cf} 2 7 0.000 1.000 -64 -32 pinlabel
 sce
-1 1.00 -64 -64 -64 64 2 polygon
+1 1.000 -64 -64 -64 64 2 polygon
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pC %pY nand3X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -64 -128 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -64 -96 infolabel
+mark ( %pA %pB %pC %pY nand3X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -64 -128 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -64 -96 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 16 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.70 -40 -8 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.700 -40 -8 label
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::nand3 libinst
-
 /sky130_fd_sc_hd::nand4 {
-<</gnd (dgnd) /vdd (dvdd) /voltage () /@index (?) >> begingate
-1 1.00 0 -64 -64 -64 -64 64 0 64 4 polygon
-1 1.00 56 0 8 0.00 360.00 xcarc
-1 1.00 0 0 48 64 -90.00 90.00 ellipse
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) >> begingate
+1 1.000 0 -64 -64 -64 -64 64 0 64 4 polygon
+1 1.000 56 0 8 0.000 360.000 xcarc
+1 1.000 0 0 48 64 -90.000 90.000 ellipse
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -64 48 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -64 16 pinlabel
-(C) {/Times-Roman cf} 2 7 0 1.00 -64 -16 pinlabel
-(D) {/Times-Roman cf} 2 7 0 1.00 -64 -48 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -64 48 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -64 16 pinlabel
+(C) {/Times-Roman cf} 2 7 0.000 1.000 -64 -16 pinlabel
+(D) {/Times-Roman cf} 2 7 0.000 1.000 -64 -48 pinlabel
 sce
-1 1.00 -64 -80 -64 80 2 polygon
+1 1.000 -64 -80 -64 80 2 polygon
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pC %pD %pY nand4X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -64 -144 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -64 -112 infolabel
+mark ( %pA %pB %pC %pD %pY nand4X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -64 -144 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -64 -112 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 16 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.70 -40 -8 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.700 -40 -8 label
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::nand4 libinst
-
 /sky130_fd_sc_hd::nor2 {
-<</gnd (dgnd) /vdd (dvdd) /@index (?) /voltage () >> begingate
-1 1.00 56 0 8 0.00 360.00 xcarc
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) >> begingate
+1 1.000 56 0 8 0.000 360.000 xcarc
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -64 32 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -64 -32 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -64 32 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -64 -32 pinlabel
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pY nor2X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -64 -128 infolabel
+mark ( %pA %pB %pY nor2X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -64 -128 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 16 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.70 -40 -8 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.700 -40 -8 label
 sce
-1 1.00 -35 48 96 270.00 330.00 xcarc
-1 1.00 -64 -48 -35 -48 2 polygon
-1 1.00 -128 0 80 -37.00 37.00 xcarc
-1 1.00 -35 -48 96 30.00 90.00 xcarc
-1 1.00 -64 48 -35 48 2 polygon
-1 1.00 -64 32 -56 32 2 polygon
-1 1.00 -64 -32 -56 -32 2 polygon
+1 1.000 -35 48 96 270.000 330.000 xcarc
+1 1.000 -64 -48 -35 -48 2 polygon
+1 1.000 -128 0 80 -37.000 37.000 xcarc
+1 1.000 -35 -48 96 30.000 90.000 xcarc
+1 1.000 -64 48 -35 48 2 polygon
+1 1.000 -64 32 -56 32 2 polygon
+1 1.000 -64 -32 -56 -32 2 polygon
 0.180 0.545 0.341 scb
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -64 -96 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -64 -96 infolabel
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::nor2 libinst
-
 /sky130_fd_sc_hd::nor3 {
-<</voltage () /@index (?) /vdd (dvdd) /gnd (dgnd) >> begingate
-1 1.00 56 0 8 0.00 360.00 xcarc
+<</@index (?) /@vdd (dvdd) /@gnd (dgnd) >> begingate
+1 1.000 56 0 8 0.000 360.000 xcarc
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -64 32 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -64 0 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -64 32 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -64 0 pinlabel
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pC %pY nor3X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -64 -128 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -64 -96 infolabel
+mark ( %pA %pB %pC %pY nor3X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -64 -128 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -64 -96 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 16 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.70 -40 -8 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.700 -40 -8 label
 sce
-1 1.00 -35 48 96 270.00 330.00 xcarc
-1 1.00 -64 -48 -35 -48 2 polygon
-1 1.00 -128 0 80 -36.87 36.87 xcarc
-1 1.00 -35 -48 96 30.00 90.00 xcarc
-1 1.00 -64 48 -35 48 2 polygon
-1 1.00 -64 32 -56 32 2 polygon
-1 1.00 -64 -32 -56 -32 2 polygon
-1 1.00 -48 0 -64 0 2 polygon
+1 1.000 -35 48 96 270.000 330.000 xcarc
+1 1.000 -64 -48 -35 -48 2 polygon
+1 1.000 -128 0 80 -36.870 36.870 xcarc
+1 1.000 -35 -48 96 30.000 90.000 xcarc
+1 1.000 -64 48 -35 48 2 polygon
+1 1.000 -64 32 -56 32 2 polygon
+1 1.000 -64 -32 -56 -32 2 polygon
+1 1.000 -48 0 -64 0 2 polygon
 1.000 0.000 0.000 scb
-(C) {/Times-Roman cf} 2 7 0 1.00 -64 -32 pinlabel
+(C) {/Times-Roman cf} 2 7 0.000 1.000 -64 -32 pinlabel
 sce
-1 1.00 -64 48 -64 64 2 polygon
-1 1.00 -64 -48 -64 -64 2 polygon
+1 1.000 -64 48 -64 64 2 polygon
+1 1.000 -64 -48 -64 -64 2 polygon
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::nor3 libinst
-
 /sky130_fd_sc_hd::nor4 {
-<</gnd (dgnd) /vdd (dvdd) /@index (?) /voltage () >> begingate
-1 1.00 56 0 8 0.00 360.00 xcarc
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) >> begingate
+1 1.000 56 0 8 0.000 360.000 xcarc
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -64 48 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -64 16 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -64 48 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -64 16 pinlabel
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pC %pD %pY nor4X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -64 -128 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -64 -96 infolabel
+mark ( %pA %pB %pC %pD %pY nor4X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -64 -128 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -64 -96 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 16 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 21 0 0.70 -8 -16 label
+mark @index (U) {/Times-RomanISO cf} ctmk 21 0.000 0.700 -8 -16 label
 sce
-1 1.00 -64 48 -58 48 2 polygon
-1 1.00 -64 -16 -48 -16 2 polygon
-1 1.00 -48 16 -64 16 2 polygon
+1 1.000 -64 48 -58 48 2 polygon
+1 1.000 -64 -16 -48 -16 2 polygon
+1 1.000 -48 16 -64 16 2 polygon
 1.000 0.000 0.000 scb
-(C) {/Times-Roman cf} 2 7 0 1.00 -64 -16 pinlabel
+(C) {/Times-Roman cf} 2 7 0.000 1.000 -64 -16 pinlabel
 sce
-1 1.00 32 32 0 56 -40 56 48 0 spline
-1 1.00 32 -32 0 -56 -40 -56 48 0 spline
-1 1.00 -40 32 -40 -24 -64 -56 -64 56 spline
-1 1.00 -64 56 -40 56 2 polygon
-1 1.00 -64 -56 -40 -56 2 polygon
+1 1.000 32 32 0 56 -40 56 48 0 spline
+1 1.000 32 -32 0 -56 -40 -56 48 0 spline
+1 1.000 -40 32 -40 -24 -64 -56 -64 56 spline
+1 1.000 -64 56 -40 56 2 polygon
+1 1.000 -64 -56 -40 -56 2 polygon
 1.000 0.000 0.000 scb
-(D) {/Times-Roman cf} 2 7 0 1.00 -64 -48 pinlabel
+(D) {/Times-Roman cf} 2 7 0.000 1.000 -64 -48 pinlabel
 sce
-1 1.00 -64 -48 -60 -48 2 polygon
+1 1.000 -64 -48 -60 -48 2 polygon
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::nor4 libinst
-
 /sky130_fd_sc_hd::or2 {
-<</voltage () /@index (?) /vdd (dvdd) /gnd (dgnd) >> begingate
+<</@index (?) /@vdd (dvdd) /@gnd (dgnd) >> begingate
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -64 32 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -64 -32 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -64 32 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -64 -32 pinlabel
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pY or2X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -64 -128 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -64 -96 infolabel
+mark ( %pA %pB %pY or2X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -64 -128 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -64 -96 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 16 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.70 -40 -8 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.700 -40 -8 label
 sce
-1 1.00 -35 48 96 270.00 330.00 xcarc
-1 1.00 -64 -48 -35 -48 2 polygon
-1 1.00 -128 0 80 -37.00 37.00 xcarc
-1 1.00 -35 -48 96 30.00 90.00 xcarc
-1 1.00 -64 48 -35 48 2 polygon
-1 1.00 -64 32 -56 32 2 polygon
-1 1.00 -64 -32 -56 -32 2 polygon
-1 1.00 48 0 64 0 2 polygon
+1 1.000 -35 48 96 270.000 330.000 xcarc
+1 1.000 -64 -48 -35 -48 2 polygon
+1 1.000 -128 0 80 -37.000 37.000 xcarc
+1 1.000 -35 -48 96 30.000 90.000 xcarc
+1 1.000 -64 48 -35 48 2 polygon
+1 1.000 -64 32 -56 32 2 polygon
+1 1.000 -64 -32 -56 -32 2 polygon
+1 1.000 48 0 64 0 2 polygon
 endgate
 } def
 
 /sky130_fd_sc_hd::ebufn {
-<</strength (2) /voltage () /@index (?) /vdd (dvdd) /gnd (dgnd) >> begingate
-0 1.00 -32 -40 -32 40 40 0 3 polygon
-1 1.00 -32 0 -48 0 2 polygon
-1 1.00 40 0 64 0 2 polygon
+<</@strength (2) /@index (?) /@vdd (dvdd) /@gnd (dgnd) >> begingate
+0 1.000 -32 -40 -32 40 40 0 3 polygon
+1 1.000 -32 0 -48 0 2 polygon
+1 1.000 40 0 64 0 2 polygon
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 0 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -48 0 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 0 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -48 0 pinlabel
 0.180 0.545 0.341 scb
-mark voltage strength ( %pA %pY %pEn ebufnX) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -176 -112 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -176 -80 infolabel
+mark @strength ( %pA %pY %pEn ebufnX) @gnd ( ) @vdd ( ) @index 
+(spice:X) {/Times-Roman cf} ctmk 16 360.000 0.700 -176 -112 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -176 -80 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-RomanISO cf} ctmk 21 0 0.50 -8 0 label
-mark strength {qS} (\327) {/Times-RomanISO cf} ctmk 16 0 0.50 8 24 label
+mark {/Times-RomanISO cf} ctmk 21 0.000 0.500 -8 0 label
+mark @strength {qS} (\327) {/Times-RomanISO cf} ctmk 16 0.000 0.500 8 24 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 16 0 0.60 24 -32 label
+mark @index (U) {/Times-RomanISO cf} ctmk 16 0.000 0.600 24 -32 label
 sce
-1 1.00 0 24 0 48 2 polygon
+1 1.000 0 24 0 48 2 polygon
 1.000 0.000 0.000 scb
-(En) {/Times-Roman cf} 2 17 0 1.00 0 48 pinlabel
+(En) {/Times-Roman cf} 2 17 0.000 1.000 0 48 pinlabel
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::ebufn libinst
-
 /sky130_fd_sc_hd::mux2 {
-<</gnd (dgnd) /vdd (dvdd) /@index (?) /voltage () >> begingate
-1 1.00 -16 16 -32 16 2 polygon
-1 1.00 48 -16 64 -16 2 polygon
+<</@gnd (dgnd) /@vdd (dvdd) /@index (?) >> begingate
+1 1.000 -16 16 -32 16 2 polygon
+1 1.000 48 -16 64 -16 2 polygon
 1.000 0.000 0.000 scb
-(Y) {/Times-Roman cf} 2 4 0 1.00 64 -16 pinlabel
-(A) {/Times-Roman cf} 2 7 0 1.00 -32 16 pinlabel
+(Y) {/Times-Roman cf} 2 4 0.000 1.000 64 -16 pinlabel
+(A) {/Times-Roman cf} 2 7 0.000 1.000 -32 16 pinlabel
 0.180 0.545 0.341 scb
-mark voltage ( %pA %pB %pY %pS mux2X1) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -128 -176 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -128 -144 infolabel
+mark ( %pA %pB %pY %pS mux2X1) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -128 -176 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -128 -144 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-RomanISO cf} ctmk 21 0 0.50 16 -16 label
+mark {/Times-RomanISO cf} ctmk 21 0.000 0.500 16 -16 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 28 0 0.60 24 -80 label
+mark @index (U) {/Times-RomanISO cf} ctmk 28 0.000 0.600 24 -80 label
 sce
-1 1.00 16 32 16 64 2 polygon
+1 1.000 16 32 16 64 2 polygon
 1.000 0.000 0.000 scb
-(S) {/Times-Roman cf} 2 17 0 1.00 16 64 pinlabel
-(B) {/Times-Roman cf} 2 7 0 1.00 -32 -48 pinlabel
+(S) {/Times-Roman cf} 2 17 0.000 1.000 16 64 pinlabel
+(B) {/Times-Roman cf} 2 7 0.000 1.000 -32 -48 pinlabel
 sce
-1 1.00 -32 -48 -16 -48 2 polygon
-1 1.00 -16 48 48 16 48 -48 -16 -80 -16 48 5 polygon
+1 1.000 -32 -48 -16 -48 2 polygon
+1 1.000 -16 48 48 16 48 -48 -16 -80 -16 48 5 polygon
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::mux2 libinst
-
 /sky130_fd_sc_hd::dlrbn {
-<</@index (?) /voltage () /vdd (dvdd) /gnd (dgnd) >> begingate
+<</@index (?) /@vdd (dvdd) /@gnd (dgnd) >> begingate
 1.000 0.000 0.000 scb
-(Q) {/Times-Roman cf} 2 4 0 1.00 32 32 pinlabel
-(D) {/Times-Roman cf} 2 7 0 1.00 -64 32 pinlabel
-(CLK) {/Times-Roman cf} 2 13 0 1.00 -16 -48 pinlabel
+(Q) {/Times-Roman cf} 2 4 0.000 1.000 32 32 pinlabel
+(D) {/Times-Roman cf} 2 7 0.000 1.000 -64 32 pinlabel
+(CLK) {/Times-Roman cf} 2 13 0.000 1.000 -16 -48 pinlabel
 0.180 0.545 0.341 scb
-mark voltage ( %pCLK %pD %pQ dlrbn) gnd ( ) vdd ( ) @index (spice:X) 
-{/Times-Roman cf} ctmk 16 360 0.70 -192 -160 infolabel
-mark (.cir) voltage (spice@1:%F$XCIRCUIT_LIB_DIR/standard_cells) {/Times-Roman cf} 
-ctmk 16 0 0.70 -192 -128 infolabel
+mark ( %pCLK %pD %pQ dlrbn) @gnd ( ) @vdd ( ) @index (spice:X) 
+{/Times-Roman cf} ctmk 16 360.000 0.700 -192 -160 infolabel
+mark (.cir) (spice@1:%FSTAGING_PATH/TECHNAME/libs.ref/sky130_fd_sc_hd/spice/sky130_fd_sc_hd.spice) 
+{/Times-Roman cf} ctmk 16 0.000 0.700 -192 -128 infolabel
 0.647 0.165 0.165 scb
-mark voltage {/Times-Roman cf} ctmk 21 0 0.70 -16 64 label
+mark {/Times-Roman cf} ctmk 21 0.000 0.700 -16 64 label
 0.000 0.000 1.000 scb
-mark @index (U) {/Times-RomanISO cf} ctmk 17 0 0.70 -16 128 label
+mark @index (U) {/Times-RomanISO cf} ctmk 17 0.000 0.700 -16 128 label
 sce
-0 1.00 -64 -48 -64 112 32 112 32 -48 4 polygon
-1 1.00 -32 -48 -16 -32 0 -48 3 polygon
-(D) {/Times-Roman cf} 2 21 0 0.70 -48 32 label
-(Q) {/Times-Roman cf} 2 21 0 0.70 16 32 label
+0 1.000 -64 -48 -64 112 32 112 32 -48 4 polygon
+1 1.000 -32 -48 -16 -32 0 -48 3 polygon
+(D) {/Times-Roman cf} 2 21 0.000 0.700 -48 32 label
+(Q) {/Times-Roman cf} 2 21 0.000 0.700 16 32 label
 0.000 0.000 1.000 scb
-(dlrbn) {/Times-Roman cf} 2 29 0 0.70 -16 96 label
+(dlrbn) {/Times-Roman cf} 2 29 0.000 0.700 -16 96 label
 endgate
 } def
 
-<</voltage (_3V) /vdd (dvdd3) >> /sky130_fd_sc_hd::dlrbn libinst
 
 % EndLib