diff --git a/library/device.dcm b/library/device.dcm
index 6949a12d..9db72f96 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -1193,7 +1193,51 @@ D Phototransistor NPN, 2-pin (C=1, E=2)
 K NPN phototransistor
 $ENDCMP
 #
-
+$CMP Q_TRIAC_AAG
+D triode for alternating current (TRIAC)
+K triode for alternating current TRIAC
+$ENDCMP
+#
+$CMP Q_TRIAC_AGA
+D triode for alternating current (TRIAC)
+K triode for alternating current TRIAC
+$ENDCMP
+#
+$CMP Q_TRIAC_GAA
+D triode for alternating current (TRIAC)
+K triode for alternating current TRIAC
+$ENDCMP
+#
+$CMP Q_Thyristor_AGK
+D silicon controlled rectifier (Thyristor)
+K Thyristor silicon controlled rectifier
+$ENDCMP
+#
+$CMP Q_Thyristor_AKG
+D silicon controlled rectifier (Thyristor)
+K Thyristor silicon controlled rectifier
+$ENDCMP
+#
+$CMP Q_Thyristor_GAK
+D silicon controlled rectifier (Thyristor)
+K Thyristor silicon controlled rectifier
+$ENDCMP
+#
+$CMP Q_Thyristor_GKA
+D silicon controlled rectifier (Thyristor)
+K Thyristor silicon controlled rectifier
+$ENDCMP
+#
+$CMP Q_Thyristor_KAG
+D silicon controlled rectifier (Thyristor)
+K Thyristor silicon controlled rectifier
+$ENDCMP
+#
+$CMP Q_Thyristor_KGA
+D silicon controlled rectifier (Thyristor)
+K Thyristor silicon controlled rectifier
+$ENDCMP
+#
 $CMP R
 D Resistor
 K r res resistor
@@ -1779,16 +1823,6 @@ D Testpoint, connection for test equipment
 K tp testpoint
 $ENDCMP
 #
-$CMP THYRISTOR
-D Solid-state thyristor, silicon-controlled rectifier, with gate pin
-K scr diode switch
-$ENDCMP
-#
-$CMP TRIAC
-D triode for alternating current (TRIAC) / bidirectional triode thyristor / bilateral triode thyristor
-K triode thyristor TRIAC
-$ENDCMP
-#
 $CMP Thermistor
 D Thermistor, temperature-dependent resistor
 K r res thermistor
diff --git a/library/device.lib b/library/device.lib
index bbc8cb87..1aba53f1 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -5539,6 +5539,171 @@ X C 2 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Q_TRIAC_AAG
+#
+DEF Q_TRIAC_AAG D 0 0 Y N 1 F N
+F0 "D" 125 25 50 H V L CNN
+F1 "Q_TRIAC_AAG" 125 -50 50 H V L CNN
+F2 "" 75 25 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -100 -50 100 -50 N
+P 2 0 1 0 -100 50 100 50 N
+P 2 0 1 0 -50 -100 -25 -50 N
+P 3 0 1 0 -100 50 -50 -50 0 50 F
+P 3 0 1 0 0 -50 50 50 100 -50 F
+X A1 1 0 150 100 D 50 50 1 1 P
+X A2 2 0 -150 100 U 50 50 1 1 P
+X G 3 -150 -100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_TRIAC_AGA
+#
+DEF Q_TRIAC_AGA D 0 0 Y N 1 F N
+F0 "D" 125 25 50 H V L CNN
+F1 "Q_TRIAC_AGA" 125 -50 50 H V L CNN
+F2 "" 75 25 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -100 -50 100 -50 N
+P 2 0 1 0 -100 50 100 50 N
+P 2 0 1 0 -50 -100 -25 -50 N
+P 3 0 1 0 -100 50 -50 -50 0 50 F
+P 3 0 1 0 0 -50 50 50 100 -50 F
+X A1 1 0 150 100 D 50 50 1 1 P
+X G 2 -150 -100 100 R 50 50 1 1 I
+X A2 3 0 -150 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_TRIAC_GAA
+#
+DEF Q_TRIAC_GAA D 0 0 Y N 1 F N
+F0 "D" 125 25 50 H V L CNN
+F1 "Q_TRIAC_GAA" 125 -50 50 H V L CNN
+F2 "" 75 25 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -100 -50 100 -50 N
+P 2 0 1 0 -100 50 100 50 N
+P 2 0 1 0 -50 -100 -25 -50 N
+P 3 0 1 0 -100 50 -50 -50 0 50 F
+P 3 0 1 0 0 -50 50 50 100 -50 F
+X G 1 -150 -100 100 R 50 50 1 1 I
+X A1 2 0 150 100 D 50 50 1 1 P
+X A2 3 0 -150 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_Thyristor_AGK
+#
+DEF Q_Thyristor_AGK D 0 0 Y N 1 F N
+F0 "D" 75 25 50 H V L CNN
+F1 "Q_Thyristor_AGK" 75 -50 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -50 -100 -25 -50 N
+P 2 0 1 0 -50 -50 50 -50 N
+P 2 0 1 0 0 -100 0 100 N
+P 3 0 1 0 -50 50 0 -50 50 50 F
+X A 1 0 150 100 D 50 50 1 1 P
+X G 2 -150 -100 100 R 50 50 1 1 I
+X K 3 0 -150 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_Thyristor_AKG
+#
+DEF Q_Thyristor_AKG D 0 0 Y N 1 F N
+F0 "D" 75 25 50 H V L CNN
+F1 "Q_Thyristor_AKG" 75 -50 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -50 -100 -25 -50 N
+P 2 0 1 0 -50 -50 50 -50 N
+P 2 0 1 0 0 -100 0 100 N
+P 3 0 1 0 -50 50 0 -50 50 50 F
+X A 1 0 150 100 D 50 50 1 1 P
+X K 2 0 -150 100 U 50 50 1 1 P
+X G 3 -150 -100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_Thyristor_GAK
+#
+DEF Q_Thyristor_GAK D 0 0 Y N 1 F N
+F0 "D" 75 25 50 H V L CNN
+F1 "Q_Thyristor_GAK" 75 -50 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -50 -100 -25 -50 N
+P 2 0 1 0 -50 -50 50 -50 N
+P 2 0 1 0 0 -100 0 100 N
+P 3 0 1 0 -50 50 0 -50 50 50 F
+X G 1 -150 -100 100 R 50 50 1 1 I
+X A 2 0 150 100 D 50 50 1 1 P
+X K 3 0 -150 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_Thyristor_GKA
+#
+DEF Q_Thyristor_GKA D 0 0 Y N 1 F N
+F0 "D" 75 25 50 H V L CNN
+F1 "Q_Thyristor_GKA" 75 -50 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -50 -100 -25 -50 N
+P 2 0 1 0 -50 -50 50 -50 N
+P 2 0 1 0 0 -100 0 100 N
+P 3 0 1 0 -50 50 0 -50 50 50 F
+X G 1 -150 -100 100 R 50 50 1 1 I
+X K 2 0 -150 100 U 50 50 1 1 P
+X A 3 0 150 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_Thyristor_KAG
+#
+DEF Q_Thyristor_KAG D 0 0 Y N 1 F N
+F0 "D" 75 25 50 H V L CNN
+F1 "Q_Thyristor_KAG" 75 -50 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -50 -100 -25 -50 N
+P 2 0 1 0 -50 -50 50 -50 N
+P 2 0 1 0 0 -100 0 100 N
+P 3 0 1 0 -50 50 0 -50 50 50 F
+X K 1 0 -150 100 U 50 50 1 1 P
+X A 2 0 150 100 D 50 50 1 1 P
+X G 3 -150 -100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_Thyristor_KGA
+#
+DEF Q_Thyristor_KGA D 0 0 Y N 1 F N
+F0 "D" 75 25 50 H V L CNN
+F1 "Q_Thyristor_KGA" 75 -50 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+DRAW
+P 2 0 1 0 -50 -100 -25 -50 N
+P 2 0 1 0 -50 -50 50 -50 N
+P 2 0 1 0 0 -100 0 100 N
+P 3 0 1 0 -50 50 0 -50 50 50 F
+X K 1 0 -150 100 U 50 50 1 1 P
+X G 2 -150 -100 100 R 50 50 1 1 I
+X A 3 0 150 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # R
 #
 DEF R R 0 0 N Y 1 F N
@@ -9408,42 +9573,6 @@ X ~ 1 0 0 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# THYRISTOR
-#
-DEF THYRISTOR D 0 40 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "THYRISTOR" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -50 50 -50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
-P 4 0 1 0 -50 0 -100 50 -100 50 -100 50 N
-X K 1 -200 0 150 R 50 50 1 1 P
-X A 2 200 0 150 L 50 50 1 1 P
-X G 3 -100 200 150 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TRIAC
-#
-DEF TRIAC U 0 10 Y Y 1 F N
-F0 "U" -250 350 50 H V C CNN
-F1 "TRIAC" -300 -250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -300 -50 0 -50 N
-P 2 0 1 0 -150 -50 -300 -200 N
-P 2 0 1 0 0 200 300 200 N
-P 3 0 1 0 -300 200 -150 -50 0 200 F
-P 3 0 1 0 150 200 0 -50 300 -50 F
-X ~ 1 0 -250 200 U 50 50 1 1 P
-X ~ 2 0 400 200 D 50 50 1 1 P
-X ~ 3 -500 -200 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
 # Thermistor
 #
 DEF Thermistor TH 0 0 N Y 1 F N