diff --git a/xschem_library/devices/capa-2.sym b/xschem_library/devices/capa-2.sym
index 6ec439d8..4a059733 100644
--- a/xschem_library/devices/capa-2.sym
+++ b/xschem_library/devices/capa-2.sym
@@ -22,6 +22,9 @@ v {xschem version=3.4.5 file_version=1.2
 G {}
 K {type=polarized_capacitor
 format="@name @pinlist @value m=@m"
+spectre_format="@name ( @pinlist ) capacitor c=@value $mfactor=@m"
+spectre_device_model="load \\"capacitor.osdi\\"
+model capacitor capacitor"
 tedax_format="footprint @name @footprint 
 value @name @value
 device @name @device
diff --git a/xschem_library/devices/capa.sym b/xschem_library/devices/capa.sym
index 51d9efa6..74124b43 100644
--- a/xschem_library/devices/capa.sym
+++ b/xschem_library/devices/capa.sym
@@ -22,6 +22,9 @@ v {xschem version=3.4.5 file_version=1.2
 G {}
 K {type=capacitor
 format="@name @pinlist @value m=@m"
+spectre_format="@name ( @pinlist ) capacitor c=@value $mfactor=@m"
+spectre_device_model="load \\"capacitor.osdi\\"
+model capacitor capacitor"
 tedax_format="footprint @name @footprint 
 value @name @value
 device @name @device
diff --git a/xschem_library/devices/cccs.sym b/xschem_library/devices/cccs.sym
index b9396139..326b5bdf 100644
--- a/xschem_library/devices/cccs.sym
+++ b/xschem_library/devices/cccs.sym
@@ -22,6 +22,8 @@ v {xschem version=3.4.6RC file_version=1.2
 G {}
 K {type=vcvs
 format="@name @pinlist @vnam @value"
+spectre_format="@name ( @pinlist ) cccs ctlinst=@vnam gain=@value"
+spectre_device_model="model cccs cccs"
 template="name=F1 vnam=v1 value=1"}
 V {}
 S {}
diff --git a/xschem_library/devices/ccvs.sym b/xschem_library/devices/ccvs.sym
index 99f521c9..61357ef2 100644
--- a/xschem_library/devices/ccvs.sym
+++ b/xschem_library/devices/ccvs.sym
@@ -22,6 +22,8 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=vcvs
 format="@name @pinlist @vnam @value"
+spectre_format="@name ( @pinlist ) ccvs ctlinst=@vnam gain=@value"
+spectre_device_model="model ccvs ccvs"
 template="name=H1 vnam=v1 value=1"}
 V {}
 S {}
diff --git a/xschem_library/devices/code.sym b/xschem_library/devices/code.sym
index 3e3523dc..c5921d23 100644
--- a/xschem_library/devices/code.sym
+++ b/xschem_library/devices/code.sym
@@ -23,6 +23,9 @@ G {type=netlist_commands
 template="name=s1 only_toplevel=false value=blabla"
 format="
 @value
+"
+spectre_format="
+@value
 "}
 V {}
 S {}
diff --git a/xschem_library/devices/code_shown.sym b/xschem_library/devices/code_shown.sym
index acb0b3bf..cb70fa8f 100644
--- a/xschem_library/devices/code_shown.sym
+++ b/xschem_library/devices/code_shown.sym
@@ -24,6 +24,9 @@ K {type=netlist_commands
 template="name=s1 only_toplevel=false value=blabla"
 format="
 @value
+"
+spectre_format="
+@value
 "}
 V {}
 S {}
diff --git a/xschem_library/devices/diode.sym b/xschem_library/devices/diode.sym
index eabffcb5..c86ab8b1 100644
--- a/xschem_library/devices/diode.sym
+++ b/xschem_library/devices/diode.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=diode
 format="@name @pinlist @model area=@area"
+spectre_format="@name ( @pinlist ) @model area=@area"
 function1="U H 0 m"
 function0="L U 1 m"
 tedax_format="footprint @name @footprint
diff --git a/xschem_library/devices/ind.sym b/xschem_library/devices/ind.sym
index 913da636..3f8909b7 100644
--- a/xschem_library/devices/ind.sym
+++ b/xschem_library/devices/ind.sym
@@ -22,6 +22,9 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=inductor
 format="@name @pinlist @value m=@m"
+spectre_format="@name ( @pinlist ) inductor l=@value $mfactor=@m"
+spectre_device_model="load \\"inductor.osdi\\"
+model inductor inductor"
 tedax_format="footprint @name @footprint 
 value @name @value
 device @name @device
diff --git a/xschem_library/devices/k.sym b/xschem_library/devices/k.sym
index e4d47809..37b3f1ab 100644
--- a/xschem_library/devices/k.sym
+++ b/xschem_library/devices/k.sym
@@ -21,6 +21,8 @@ v {xschem version=3.4.4 file_version=1.2
 }
 G {type=coupler
 format="@name @L1 @L2 @K"
+spectre_format="@name ( ) mutual ind1=@L1 ind2=@L2 k=@K"
+spectre_device_model="model mutual mutual"
 template="name=K1 K=0.9 L1=L1 L2=L2"}
 V {}
 S {}
diff --git a/xschem_library/devices/netlist.sym b/xschem_library/devices/netlist.sym
index 52ce8b9f..56050627 100644
--- a/xschem_library/devices/netlist.sym
+++ b/xschem_library/devices/netlist.sym
@@ -23,6 +23,9 @@ G {type=netlist_commands
 template="name=s1 value=blabla"
 format="
 @value
+"
+spectre_format="
+@value
 "}
 V {}
 S {}
diff --git a/xschem_library/devices/netlist_at_end.sym b/xschem_library/devices/netlist_at_end.sym
index 2344601b..ad447aeb 100644
--- a/xschem_library/devices/netlist_at_end.sym
+++ b/xschem_library/devices/netlist_at_end.sym
@@ -24,6 +24,9 @@ place=end
 template="name=s1 value=blabla"
 format="
 @value
+"
+spectre_format="
+@value
 "}
 V {}
 S {}
diff --git a/xschem_library/devices/netlist_not_shown.sym b/xschem_library/devices/netlist_not_shown.sym
index 78e74e2d..5c22a3e2 100644
--- a/xschem_library/devices/netlist_not_shown.sym
+++ b/xschem_library/devices/netlist_not_shown.sym
@@ -23,6 +23,9 @@ G {type=netlist_commands
 template="name=s1 only_toplevel=false value=blabla"
 format="
 @value
+"
+spectre_format="
+@value
 "}
 V {}
 S {}
diff --git a/xschem_library/devices/netlist_not_shown_at_end.sym b/xschem_library/devices/netlist_not_shown_at_end.sym
index 0096e6bd..0f5ae728 100644
--- a/xschem_library/devices/netlist_not_shown_at_end.sym
+++ b/xschem_library/devices/netlist_not_shown_at_end.sym
@@ -26,6 +26,9 @@ verilog_ignore=true
 template="name=s1 value=blabla"
 format="
 @value
+"
+spectre_format="
+@value
 "}
 V {}
 S {}
diff --git a/xschem_library/devices/njfet.sym b/xschem_library/devices/njfet.sym
index 07156add..9716f37d 100644
--- a/xschem_library/devices/njfet.sym
+++ b/xschem_library/devices/njfet.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=njfet
 format="@spiceprefix@name @pinlist @model area=@area @extra m=@m"
+spectre_format="@spiceprefix@name ( @pinlist ) @model area=@area @extra $mfactor=@m"
 template="name=J1 model=njfet area=1 m=1"
 }
 V {}
diff --git a/xschem_library/devices/nmos-sub.sym b/xschem_library/devices/nmos-sub.sym
index 129a8a42..1e9d1a2f 100644
--- a/xschem_library/devices/nmos-sub.sym
+++ b/xschem_library/devices/nmos-sub.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=nmos
 format="@name @pinlist @substrate @model w=@w l=@l m=@m"
+spectre_format="@name ( @pinlist @substrate ) @model w=@w l=@l $mfactor=@m"
 template="name=M1 model=nmos substrate=VSS w=5u l=0.18u m=1"}
 V {}
 S {}
diff --git a/xschem_library/devices/nmos.sym b/xschem_library/devices/nmos.sym
index 144a16b3..f1c0fb0e 100644
--- a/xschem_library/devices/nmos.sym
+++ b/xschem_library/devices/nmos.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=nmos
 format="@spiceprefix@name @pinlist @model @extra m=@m"
+spectre_format="@spiceprefix@name ( @pinlist ) @model @extra $mfactor=@m"
 
 tedax_format="footprint @name @footprint
 value @name @value
diff --git a/xschem_library/devices/nmos3.sym b/xschem_library/devices/nmos3.sym
index 948cb085..e0b78e6a 100644
--- a/xschem_library/devices/nmos3.sym
+++ b/xschem_library/devices/nmos3.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=nmos
 format="@name @pinlist @model m=@m"
+spectre_format="@name ( @pinlist ) @model m=@m"
 template="name=X1 model=irf540 m=1"}
 V {}
 S {}
diff --git a/xschem_library/devices/nmos4.sym b/xschem_library/devices/nmos4.sym
index 47d8f0be..23de3346 100644
--- a/xschem_library/devices/nmos4.sym
+++ b/xschem_library/devices/nmos4.sym
@@ -25,8 +25,7 @@ format="@spiceprefix@name @pinlist @model w=@w l=@l @extra m=@m"
 template="name=M1 model=nmos w=5u l=0.18u del=0 m=1"
 verilog_format="nmos #@del @name ( @@d , @@s , @@g );"
 spectre_format="@name ( @pinlist ) @model w=@w l=@l @extra $mfactor=@m"
-
-spectre_device_model="load \\"nmos.osdi\\""}
+}
 V {}
 S {}
 F {}
diff --git a/xschem_library/devices/nmos4_depl.sym b/xschem_library/devices/nmos4_depl.sym
index dc41a876..5604b097 100644
--- a/xschem_library/devices/nmos4_depl.sym
+++ b/xschem_library/devices/nmos4_depl.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=nmos
 format="@spiceprefix@name @pinlist @model w=@w l=@l @extra m=@m"
+spectre_format="@spiceprefix@name ( @pinlist ) @model w=@w l=@l @extra $mfactor=@m"
 template="name=M1 model=nmos_depl w=5u l=0.18u del=0 m=1"
 verilog_format="rnmos #@del @name ( @@s , @@d , @@d );"}
 V {}
diff --git a/xschem_library/devices/npn.sym b/xschem_library/devices/npn.sym
index 08003c0f..915fdcc0 100644
--- a/xschem_library/devices/npn.sym
+++ b/xschem_library/devices/npn.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=npn
 format="@name @pinlist  @model area=@area m=@m"
+spectre_format="@name ( @pinlist )  @model area=@area $mfactor=@m"
 
 tedax_format="footprint @name @footprint
 value @name @value
diff --git a/xschem_library/devices/param.sym b/xschem_library/devices/param.sym
index 8966d48b..99c5e65a 100644
--- a/xschem_library/devices/param.sym
+++ b/xschem_library/devices/param.sym
@@ -21,7 +21,8 @@ v {xschem version=3.4.4 file_version=1.2
 }
 G {type=spice_parameters
 template="name=s1 value=\\"w=10u\\""
-format=".param @value"}
+format=".param @value"
+spectre_format="parameters @value"}
 V {}
 S {}
 E {}
diff --git a/xschem_library/devices/pjfet.sym b/xschem_library/devices/pjfet.sym
index e1a46bce..f30115a6 100644
--- a/xschem_library/devices/pjfet.sym
+++ b/xschem_library/devices/pjfet.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=pjfet
 format="@spiceprefix@name @pinlist @model area=@area @extra m=@m"
+spectre_format="@spiceprefix@name ( @pinlist ) @model area=@area @extra $mfactor=@m"
 template="name=J1 model=pjfet area=1 m=1"
 }
 V {}
diff --git a/xschem_library/devices/pmos-sub.sym b/xschem_library/devices/pmos-sub.sym
index 516dde29..a2e7e10e 100644
--- a/xschem_library/devices/pmos-sub.sym
+++ b/xschem_library/devices/pmos-sub.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=pmos
 format="@name @pinlist @substrate @model w=@w l=@l m=@m"
+spectre_format="@name ( @pinlist @substrate ) @model w=@w l=@l $mfactor=@m"
 template="name=M1 model=pmos substrate=VCC w=5u l=0.18u m=1"}
 V {}
 S {}
diff --git a/xschem_library/devices/pmos.sym b/xschem_library/devices/pmos.sym
index 1294855c..4b5692b9 100644
--- a/xschem_library/devices/pmos.sym
+++ b/xschem_library/devices/pmos.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=pmos
 format="@spiceprefix@name @pinlist @model @extra m=@m"
+spectre_format="@spiceprefix@name ( @pinlist ) @model @extra $mfactor=@m"
 verilog_format="@symname #@del @name ( @@d , @@s , @@g );"
 
 tedax_format="footprint @name @footprint
diff --git a/xschem_library/devices/pmos3.sym b/xschem_library/devices/pmos3.sym
index 8a8ea808..4c5ce25d 100644
--- a/xschem_library/devices/pmos3.sym
+++ b/xschem_library/devices/pmos3.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.7RC file_version=1.2
 G {}
 K {type=pmos
 format="@name @pinlist @model m=@m"
+spectre_format="@name ( @pinlist ) @model m=@m"
 template="name=X1 model=irf5305 m=1"}
 V {}
 S {}
diff --git a/xschem_library/devices/pmos4.sym b/xschem_library/devices/pmos4.sym
index c899b2cf..b02e25a8 100644
--- a/xschem_library/devices/pmos4.sym
+++ b/xschem_library/devices/pmos4.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=pmos
 format="@spiceprefix@name @pinlist @model w=@w l=@l @extra m=@m"
+spectre_format="@spiceprefix@name ( @pinlist ) @model w=@w l=@l @extra $mfactor=@m"
 template="name=M1 model=pmos w=5u l=0.18u del=0 m=1"
 verilog_format="pmos #@del @name ( @@d , @@s , @@g );"}
 V {}
diff --git a/xschem_library/devices/pmoshv4.sym b/xschem_library/devices/pmoshv4.sym
index c9ee55d3..2b67f664 100644
--- a/xschem_library/devices/pmoshv4.sym
+++ b/xschem_library/devices/pmoshv4.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=pmos
 format="@name @pinlist @model w=@w l=@l number=@m"
+spectre_format="@name ( @pinlist ) @model w=@w l=@l number=@m"
 template="name=X1 model=tepbsim3 m=1 w=5u l=0.7u"}
 V {}
 S {}
diff --git a/xschem_library/devices/pmosnat.sym b/xschem_library/devices/pmosnat.sym
index 699aee7d..80ab30b6 100644
--- a/xschem_library/devices/pmosnat.sym
+++ b/xschem_library/devices/pmosnat.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=pmos
 format="@name @pinlist vdd @model number=@m w=@w l=@l"
+spectre_format="@name ( @pinlist vdd ) @model number=@m w=@w l=@l"
 template="name=X1 model=npbsim3 m=1 w=5u l=2u"}
 V {}
 S {}
diff --git a/xschem_library/devices/pnp.sym b/xschem_library/devices/pnp.sym
index e7925fb2..788a30ef 100644
--- a/xschem_library/devices/pnp.sym
+++ b/xschem_library/devices/pnp.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.6 file_version=1.2
 G {}
 K {type=pnp
 format="@spiceprefix@name @pinlist @model area=@area m=@m"
+spectre_format="@name ( @pinlist )  @model area=@area $mfactor=@m"
 
 tedax_format="footprint @name @footprint
 value @name @value
diff --git a/xschem_library/devices/res.sym b/xschem_library/devices/res.sym
index 36333b27..b2498820 100644
--- a/xschem_library/devices/res.sym
+++ b/xschem_library/devices/res.sym
@@ -26,7 +26,7 @@ function0="1"
 function1="0"
 
 format="@name @pinlist @value m=@m"
-spectre_format="@name ( @pinlist ) resistor r=@value"
+spectre_format="@name ( @pinlist ) resistor r=@value $mfactor=@m"
 verilog_format="tran @name (@@P\\\\, @@M\\\\);"
 
 tedax_format="footprint @name @footprint
diff --git a/xschem_library/devices/rnmos4.sym b/xschem_library/devices/rnmos4.sym
index 0a416d9c..71d7346e 100644
--- a/xschem_library/devices/rnmos4.sym
+++ b/xschem_library/devices/rnmos4.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=nmos
 format="@spiceprefix@name @pinlist @model w=@w l=@l @extra m=@m"
+spectre_format="@spiceprefix@name ( @pinlist ) @model w=@w l=@l @extra $mfactor=@m"
 template="name=M1 model=nmos w=5u l=0.18u del=0 m=1"
 verilog_format="rnmos #@del @name ( @@s , @@d , @@g );"}
 V {}
diff --git a/xschem_library/devices/sqwsource.sym b/xschem_library/devices/sqwsource.sym
index d88e3cfd..a84e9db2 100644
--- a/xschem_library/devices/sqwsource.sym
+++ b/xschem_library/devices/sqwsource.sym
@@ -28,7 +28,9 @@ pulse 0 @vhi \\\\
 '0.01/@freq ' \\\\
 '0.49/@freq ' \\\\
 '1/@freq '"
+spectre_format="@name ( @pinlist ) vsource type=\\\"pulse\\\" val0=0 val1=@vhi delay=0.495/@freq rise=0.01/@freq fall=0.01/@freq width=0.49/@freq period=1/@freq"
 template="name=V1 vhi=3 freq=1e6"
+spectre_device_model="model vsource vsource"
 }
 V {}
 S {}
diff --git a/xschem_library/devices/vccs.sym b/xschem_library/devices/vccs.sym
index caae27f9..ad1af064 100644
--- a/xschem_library/devices/vccs.sym
+++ b/xschem_library/devices/vccs.sym
@@ -22,6 +22,8 @@ v {xschem version=3.4.6RC file_version=1.2
 G {}
 K {type=vccs
 format="@name @pinlist @value"
+spectre_format="@name ( @pinlist ) vccs gain=@value"
+spectre_device_model="model vccs vccs"
 template="name=G1 value=1e-6"}
 V {}
 S {}
diff --git a/xschem_library/devices/vcvs.sym b/xschem_library/devices/vcvs.sym
index 6c0ad697..5be8c288 100644
--- a/xschem_library/devices/vcvs.sym
+++ b/xschem_library/devices/vcvs.sym
@@ -22,6 +22,8 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=vcvs
 format="@name @pinlist @value"
+spectre_format="@name ( @pinlist ) vcvs gain=@value"
+spectre_device_model="model vcvs vcvs"
 template="name=E1 value=3"}
 V {}
 S {}
diff --git a/xschem_library/devices/zener.sym b/xschem_library/devices/zener.sym
index de47c8a2..c87ea235 100644
--- a/xschem_library/devices/zener.sym
+++ b/xschem_library/devices/zener.sym
@@ -22,6 +22,7 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=diode
 format="@spiceprefix@name @pinlist @model"
+spectre_format="@spiceprefix@name ( @pinlist ) @model"
 
 tedax_format="footprint @name @footprint
 value @name @value