Index: simulation/raw/10_bjt_amp_tr.rs
===================================================================
--- simulation/raw/10_bjt_amp_tr.rs	(revision 7898)
+++ simulation/raw/10_bjt_amp_tr.rs	(revision 7899)
@@ -22,6 +22,34 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=mpbUxZA3TcX63n9yc2EAAAA9;
+				li:objects {
+					ha:group.1 {
+						uuid=mpbUxZA3TcX63n9yc2EAAAA+; loclib_name=bc817;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: based on Vishay's datasheet: https://archive.org/details/bc817_spice_vishay
+*
+.model BC817 npn (
++ IS=2.43485e-13 VAF=10 BF=270 IKF=1.12487 NE=1.84302 ISE=7.17747e-12
++ IKR=0.149889 ISC=2.42047e-12 NC=3.94859 NR=1.04566 BR=2.51332 RC=0.407107
++ CJC=5.516e-11 FC=0.8 MJC=0.529364 VJC=0.4 CJE=5.10473e-11 MJE=0.412728
++ VJE=0.561234 TF=7.1424e-10 ITF=0.175457 VTF=1.86025 XTF=1.09929 RB=6.50128
++ IRB=0.1 RBM=0.1 RE=0.0814215 TR=1e-07
++ )
+
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {
Index: simulation/raw/12_bjt_amp_ac.rs
===================================================================
--- simulation/raw/12_bjt_amp_ac.rs	(revision 7898)
+++ simulation/raw/12_bjt_amp_ac.rs	(revision 7899)
@@ -22,6 +22,34 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=ocyrXFXWgSsRrvvVMDcAAAA9;
+				li:objects {
+					ha:group.1 {
+						uuid=ocyrXFXWgSsRrvvVMDcAAAA+; loclib_name=bc817;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: based on Vishay's datasheet: https://archive.org/details/bc817_spice_vishay
+*
+.model BC817 npn (
++ IS=2.43485e-13 VAF=10 BF=270 IKF=1.12487 NE=1.84302 ISE=7.17747e-12
++ IKR=0.149889 ISC=2.42047e-12 NC=3.94859 NR=1.04566 BR=2.51332 RC=0.407107
++ CJC=5.516e-11 FC=0.8 MJC=0.529364 VJC=0.4 CJE=5.10473e-11 MJE=0.412728
++ VJE=0.561234 TF=7.1424e-10 ITF=0.175457 VTF=1.86025 XTF=1.09929 RB=6.50128
++ IRB=0.1 RBM=0.1 RE=0.0814215 TR=1e-07
++ )
+
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {
@@ -939,13 +967,13 @@
 					-sym-source=sch-rnd default symbol lib
 					devmap=bc817_sot23
 					name=Q1
-					role=symbol
-					spice/model=bc817
 					li:portmap {
 						{C->spice/pinnum=1}
 						{B->spice/pinnum=2}
 						{E->spice/pinnum=3}
 					}
+					role=symbol
+					spice/model=bc817
 				}
 			}
 			ha:connection.74 {
Index: simulation/raw/16_opamp_dc.rs
===================================================================
--- simulation/raw/16_opamp_dc.rs	(revision 7898)
+++ simulation/raw/16_opamp_dc.rs	(revision 7899)
@@ -29,6 +29,85 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=y4qxH+ae2qngQHst1jcAAAA1;
+				li:objects {
+					ha:group.1 {
+						uuid=y4qxH+ae2qngQHst1jcAAAA2; loclib_name=lm358;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* lm358 - low power opamp model (single slot)
+*
+* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: from ST's datasheet: https://archive.org/details/st-ts321
+* (st321 is reasonably close to lm358 for simple simulation cases; see
+* warnings on page 7)
+*
+*
+** CONNECTIONS:
+* 1 inverting input
+* 2 non-inverting INPUT
+* 3 output
+* 4 positive power supply
+* 5 negative power supply
+.SUBCKT LM358 1 2 3 4 5
+
+.MODEL MDTH D IS=1E-8 KF=3.104131E-15 CJO=10F
+
+* INPUT STAGE
+CIP 2 5 1.000000E-12
+CIN 1 5 1.000000E-12
+EIP 10 5 2 5 1
+EIN 16 5 1 5 1
+RIP 10 11 2.600000E+01
+RIN 15 16 2.600000E+01
+RIS 11 15 2.003862E+02
+DIP 11 12 MDTH 400E-12
+DIN 15 14 MDTH 400E-12
+VOFP 12 13 DC 0
+VOFN 13 14 DC 0
+IPOL 13 5 1.000000E-05
+CPS 11 15 3.783376E-09
+DINN 17 13 MDTH 400E-12
+VIN 17 5 0.000000e+00
+DINR 15 18 MDTH 400E-12
+VIP 4 18 2.000000E+00
+FCP 4 5 VOFP 3.400000E+01
+FCN 5 4 VOFN 3.400000E+01
+FIBP 2 5 VOFN 2.000000E-03
+FIBN 5 1 VOFP 2.000000E-03
+
+* AMPLIFYING STAGE
+FIP 5 19 VOFP 3.600000E+02
+FIN 5 19 VOFN 3.600000E+02
+RG1 19 5 3.652997E+06
+RG2 19 4 3.652997E+06
+CC 19 5 6.000000E-09
+DOPM 19 22 MDTH 400E-12
+DONM 21 19 MDTH 400E-12
+HOPM 22 28 VOUT 7.500000E+03
+VIPM 28 4 1.500000E+02
+HONM 21 27 VOUT 7.500000E+03
+VINM 5 27 1.500000E+02
+EOUT 26 23 19 5 1
+VOUT 23 5 0
+ROUT 26 3 20
+COUT 3 5 1.000000E-12
+DOP 19 25 MDTH 400E-12
+VOP 4 25 2.242230E+00
+DON 24 19 MDTH 400E-12
+VON 24 5 7.922301E-01
+.ENDS
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {
Index: simulation/raw/18_opamp_ac.rs
===================================================================
--- simulation/raw/18_opamp_ac.rs	(revision 7898)
+++ simulation/raw/18_opamp_ac.rs	(revision 7899)
@@ -29,6 +29,85 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=mWD+aTBiBXTjVEOQC6IAAABQ;
+				li:objects {
+					ha:group.1 {
+						uuid=mWD+aTBiBXTjVEOQC6IAAABR; loclib_name=lm358;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* lm358 - low power opamp model (single slot)
+*
+* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: from ST's datasheet: https://archive.org/details/st-ts321
+* (st321 is reasonably close to lm358 for simple simulation cases; see
+* warnings on page 7)
+*
+*
+** CONNECTIONS:
+* 1 inverting input
+* 2 non-inverting INPUT
+* 3 output
+* 4 positive power supply
+* 5 negative power supply
+.SUBCKT LM358 1 2 3 4 5
+
+.MODEL MDTH D IS=1E-8 KF=3.104131E-15 CJO=10F
+
+* INPUT STAGE
+CIP 2 5 1.000000E-12
+CIN 1 5 1.000000E-12
+EIP 10 5 2 5 1
+EIN 16 5 1 5 1
+RIP 10 11 2.600000E+01
+RIN 15 16 2.600000E+01
+RIS 11 15 2.003862E+02
+DIP 11 12 MDTH 400E-12
+DIN 15 14 MDTH 400E-12
+VOFP 12 13 DC 0
+VOFN 13 14 DC 0
+IPOL 13 5 1.000000E-05
+CPS 11 15 3.783376E-09
+DINN 17 13 MDTH 400E-12
+VIN 17 5 0.000000e+00
+DINR 15 18 MDTH 400E-12
+VIP 4 18 2.000000E+00
+FCP 4 5 VOFP 3.400000E+01
+FCN 5 4 VOFN 3.400000E+01
+FIBP 2 5 VOFN 2.000000E-03
+FIBN 5 1 VOFP 2.000000E-03
+
+* AMPLIFYING STAGE
+FIP 5 19 VOFP 3.600000E+02
+FIN 5 19 VOFN 3.600000E+02
+RG1 19 5 3.652997E+06
+RG2 19 4 3.652997E+06
+CC 19 5 6.000000E-09
+DOPM 19 22 MDTH 400E-12
+DONM 21 19 MDTH 400E-12
+HOPM 22 28 VOUT 7.500000E+03
+VIPM 28 4 1.500000E+02
+HONM 21 27 VOUT 7.500000E+03
+VINM 5 27 1.500000E+02
+EOUT 26 23 19 5 1
+VOUT 23 5 0
+ROUT 26 3 20
+COUT 3 5 1.000000E-12
+DOP 19 25 MDTH 400E-12
+VOP 4 25 2.242230E+00
+DON 24 19 MDTH 400E-12
+VON 24 5 7.922301E-01
+.ENDS
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {
Index: simulation/raw/gnucap/10_bjt_amp_tr.rs
===================================================================
--- simulation/raw/gnucap/10_bjt_amp_tr.rs	(revision 7898)
+++ simulation/raw/gnucap/10_bjt_amp_tr.rs	(revision 7899)
@@ -22,6 +22,34 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=DWHOYByNBsqCfIkWh9EAAAA9;
+				li:objects {
+					ha:group.1 {
+						uuid=DWHOYByNBsqCfIkWh9EAAAA+; loclib_name=bc817;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: based on Vishay's datasheet: https://archive.org/details/bc817_spice_vishay
+*
+.model BC817 npn (
++ IS=2.43485e-13 VAF=10 BF=270 IKF=1.12487 NE=1.84302 ISE=7.17747e-12
++ IKR=0.149889 ISC=2.42047e-12 NC=3.94859 NR=1.04566 BR=2.51332 RC=0.407107
++ CJC=5.516e-11 FC=0.8 MJC=0.529364 VJC=0.4 CJE=5.10473e-11 MJE=0.412728
++ VJE=0.561234 TF=7.1424e-10 ITF=0.175457 VTF=1.86025 XTF=1.09929 RB=6.50128
++ IRB=0.1 RBM=0.1 RE=0.0814215 TR=1e-07
++ )
+
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {
Index: simulation/raw/gnucap/12_bjt_amp_ac.rs
===================================================================
--- simulation/raw/gnucap/12_bjt_amp_ac.rs	(revision 7898)
+++ simulation/raw/gnucap/12_bjt_amp_ac.rs	(revision 7899)
@@ -22,6 +22,34 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=z0b4zSqeNVj4ZxfDauMAAAA9;
+				li:objects {
+					ha:group.1 {
+						uuid=z0b4zSqeNVj4ZxfDauMAAAA+; loclib_name=bc817;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: based on Vishay's datasheet: https://archive.org/details/bc817_spice_vishay
+*
+.model BC817 npn (
++ IS=2.43485e-13 VAF=10 BF=270 IKF=1.12487 NE=1.84302 ISE=7.17747e-12
++ IKR=0.149889 ISC=2.42047e-12 NC=3.94859 NR=1.04566 BR=2.51332 RC=0.407107
++ CJC=5.516e-11 FC=0.8 MJC=0.529364 VJC=0.4 CJE=5.10473e-11 MJE=0.412728
++ VJE=0.561234 TF=7.1424e-10 ITF=0.175457 VTF=1.86025 XTF=1.09929 RB=6.50128
++ IRB=0.1 RBM=0.1 RE=0.0814215 TR=1e-07
++ )
+
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {
@@ -936,13 +964,13 @@
 					-sym-source=sch-rnd default symbol lib
 					devmap=bc817_sot23
 					name=Q1
-					role=symbol
-					spice/model=bc817
 					li:portmap {
 						{C->spice/pinnum=1}
 						{B->spice/pinnum=2}
 						{E->spice/pinnum=3}
 					}
+					role=symbol
+					spice/model=bc817
 				}
 			}
 			ha:connection.74 {
Index: simulation/raw/gnucap/16_opamp_dc.rs
===================================================================
--- simulation/raw/gnucap/16_opamp_dc.rs	(revision 7898)
+++ simulation/raw/gnucap/16_opamp_dc.rs	(revision 7899)
@@ -29,6 +29,85 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=q2/sAR5PfxztjLc/eYgAAAA1;
+				li:objects {
+					ha:group.1 {
+						uuid=q2/sAR5PfxztjLc/eYgAAAA2; loclib_name=lm358;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* lm358 - low power opamp model (single slot)
+*
+* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: from ST's datasheet: https://archive.org/details/st-ts321
+* (st321 is reasonably close to lm358 for simple simulation cases; see
+* warnings on page 7)
+*
+*
+** CONNECTIONS:
+* 1 inverting input
+* 2 non-inverting INPUT
+* 3 output
+* 4 positive power supply
+* 5 negative power supply
+.SUBCKT LM358 1 2 3 4 5
+
+.MODEL MDTH D IS=1E-8 KF=3.104131E-15 CJO=10F
+
+* INPUT STAGE
+CIP 2 5 1.000000E-12
+CIN 1 5 1.000000E-12
+EIP 10 5 2 5 1
+EIN 16 5 1 5 1
+RIP 10 11 2.600000E+01
+RIN 15 16 2.600000E+01
+RIS 11 15 2.003862E+02
+DIP 11 12 MDTH 400E-12
+DIN 15 14 MDTH 400E-12
+VOFP 12 13 DC 0
+VOFN 13 14 DC 0
+IPOL 13 5 1.000000E-05
+CPS 11 15 3.783376E-09
+DINN 17 13 MDTH 400E-12
+VIN 17 5 0.000000e+00
+DINR 15 18 MDTH 400E-12
+VIP 4 18 2.000000E+00
+FCP 4 5 VOFP 3.400000E+01
+FCN 5 4 VOFN 3.400000E+01
+FIBP 2 5 VOFN 2.000000E-03
+FIBN 5 1 VOFP 2.000000E-03
+
+* AMPLIFYING STAGE
+FIP 5 19 VOFP 3.600000E+02
+FIN 5 19 VOFN 3.600000E+02
+RG1 19 5 3.652997E+06
+RG2 19 4 3.652997E+06
+CC 19 5 6.000000E-09
+DOPM 19 22 MDTH 400E-12
+DONM 21 19 MDTH 400E-12
+HOPM 22 28 VOUT 7.500000E+03
+VIPM 28 4 1.500000E+02
+HONM 21 27 VOUT 7.500000E+03
+VINM 5 27 1.500000E+02
+EOUT 26 23 19 5 1
+VOUT 23 5 0
+ROUT 26 3 20
+COUT 3 5 1.000000E-12
+DOP 19 25 MDTH 400E-12
+VOP 4 25 2.242230E+00
+DON 24 19 MDTH 400E-12
+VON 24 5 7.922301E-01
+.ENDS
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {
Index: simulation/raw/gnucap/18_opamp_ac.rs
===================================================================
--- simulation/raw/gnucap/18_opamp_ac.rs	(revision 7898)
+++ simulation/raw/gnucap/18_opamp_ac.rs	(revision 7899)
@@ -29,6 +29,85 @@
 					ha:purpose = { value=devmap; prio=0; }
 				}
 			}
+			ha:group.2 {
+				uuid=1ufQxkEY+kLwRSZVvqoAAABQ;
+				li:objects {
+					ha:group.1 {
+						uuid=1ufQxkEY+kLwRSZVvqoAAABR; loclib_name=lm358;
+						li:objects {
+						}
+						ha:attrib {
+							spice/model_card={* lm358 - low power opamp model (single slot)
+*
+* (C) 2023 Tibor 'Igor2' Palinkas
+* License: CC0 (no rights reserved): https://creativecommons.org/publicdomain/zero/1.0/
+* Source: from ST's datasheet: https://archive.org/details/st-ts321
+* (st321 is reasonably close to lm358 for simple simulation cases; see
+* warnings on page 7)
+*
+*
+** CONNECTIONS:
+* 1 inverting input
+* 2 non-inverting INPUT
+* 3 output
+* 4 positive power supply
+* 5 negative power supply
+.SUBCKT LM358 1 2 3 4 5
+
+.MODEL MDTH D IS=1E-8 KF=3.104131E-15 CJO=10F
+
+* INPUT STAGE
+CIP 2 5 1.000000E-12
+CIN 1 5 1.000000E-12
+EIP 10 5 2 5 1
+EIN 16 5 1 5 1
+RIP 10 11 2.600000E+01
+RIN 15 16 2.600000E+01
+RIS 11 15 2.003862E+02
+DIP 11 12 MDTH 400E-12
+DIN 15 14 MDTH 400E-12
+VOFP 12 13 DC 0
+VOFN 13 14 DC 0
+IPOL 13 5 1.000000E-05
+CPS 11 15 3.783376E-09
+DINN 17 13 MDTH 400E-12
+VIN 17 5 0.000000e+00
+DINR 15 18 MDTH 400E-12
+VIP 4 18 2.000000E+00
+FCP 4 5 VOFP 3.400000E+01
+FCN 5 4 VOFN 3.400000E+01
+FIBP 2 5 VOFN 2.000000E-03
+FIBN 5 1 VOFP 2.000000E-03
+
+* AMPLIFYING STAGE
+FIP 5 19 VOFP 3.600000E+02
+FIN 5 19 VOFN 3.600000E+02
+RG1 19 5 3.652997E+06
+RG2 19 4 3.652997E+06
+CC 19 5 6.000000E-09
+DOPM 19 22 MDTH 400E-12
+DONM 21 19 MDTH 400E-12
+HOPM 22 28 VOUT 7.500000E+03
+VIPM 28 4 1.500000E+02
+HONM 21 27 VOUT 7.500000E+03
+VINM 5 27 1.500000E+02
+EOUT 26 23 19 5 1
+VOUT 23 5 0
+ROUT 26 3 20
+COUT 3 5 1.000000E-12
+DOP 19 25 MDTH 400E-12
+VOP 4 25 2.242230E+00
+DON 24 19 MDTH 400E-12
+VON 24 5 7.922301E-01
+.ENDS
+}
+						}
+					}
+				}
+				ha:attrib {
+					ha:purpose = { value=spicelib; prio=0; }
+				}
+			}
 		}
 	}
 	ha:obj_direct.2 {