diff --git a/library/device.dcm b/library/device.dcm
index d63b1fb1..553328e1 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -15,6 +15,16 @@ D Battery
 K batt voltage-source cell
 $ENDCMP
 #
+$CMP Beeper
+D Beeper
+K Quartz Resonator Ceramic 
+$ENDCMP
+#
+$CMP Buzzer
+D Buzzer, polar
+K Quartz Resonator Ceramic 
+$ENDCMP
+#
 $CMP C
 D Unpolarized capacitor
 K cap capacitor
@@ -165,6 +175,11 @@ D EMI Filter, three pins
 K electromagnetic interference noise
 $ENDCMP
 #
+$CMP Earphone
+D earphone, polar
+K earphone speaker headphone
+$ENDCMP
+#
 $CMP FUSE
 D Fuse, generic
 K fuse
@@ -260,6 +275,31 @@ D LED, small symbol
 K led diode light-emitting-diode
 $ENDCMP
 #
+$CMP Microphone
+D Microphone
+K Microphone
+$ENDCMP
+#
+$CMP Microphone_ALT
+D Microphone, alternative symbol
+K Microphone sound
+$ENDCMP
+#
+$CMP Microphone_Condenser
+D Condenser Microspcope
+K Capacitance condenser Microphone 
+$ENDCMP
+#
+$CMP Microphone_Crystal
+D crystal microphone
+K microphone crystal 
+$ENDCMP
+#
+$CMP Microphone_Ultrasound
+D Ultrasound receiver
+K Microphone Ultrasound crystal
+$ENDCMP
+#
 $CMP OHMMETER
 D ohmmeter, measures resistance
 K ohmmeter
@@ -602,11 +642,6 @@ D Diode schottky - cms
 K diode SCHOTTKY CMS
 $ENDCMP
 #
-$CMP SPEAKER
-D Audio speaker, 2 pins, generic symbol
-K buzzer beeper sound
-$ENDCMP
-#
 $CMP SW_CODED
 D Rotary switch, 4-bit encoding
 K rotary hex
@@ -677,6 +712,21 @@ D Single Pole Single Throw (SPST) switch, small symbol
 K switch lever
 $ENDCMP
 #
+$CMP Speaker_Crystal
+D crystal speaker/transducer
+K crystal speaker ultrasonic transducer
+$ENDCMP
+#
+$CMP Speaker_Small
+D small speaker symbol
+K speaker sound
+$ENDCMP
+#
+$CMP Speaker_Ultrasound
+D ultrasonic transducer
+K crystal speaker ultrasonic transducer
+$ENDCMP
+#
 $CMP TEST
 D Testpoint, connection for test equipment
 K tp testpoint
@@ -737,16 +787,6 @@ D Voltage dependent resistor
 K vdr resistance
 $ENDCMP
 #
-$CMP VOLTMETER_AC
-D AC voltmeter
-K voltmeter AC
-$ENDCMP
-#
-$CMP VOLTMETER_DC
-D DV voltmeter
-K voltmeter
-$ENDCMP
-#
 $CMP ZENER
 D Diode zener
 K diode
diff --git a/library/device.lib b/library/device.lib
index b7202bf4..ab9fcf2d 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -60,6 +60,32 @@ X ~ 2 0 -150 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Buzzer
+#
+DEF Buzzer BZ 0 1 Y N 1 F N
+F0 "BZ" 100 150 50 H V L CNN
+F1 "Buzzer" 100 75 50 H V L CNN
+F2 "" 0 100 50 V V C CNN
+F3 "" 0 100 50 V V C CNN
+ALIAS Beeper
+$FPLIST
+ *Buzzer*
+$ENDFPLIST
+DRAW
+S -20 30 20 30 0 1 0 N
+S 0 30 0 20 0 1 0 N
+S 0 70 0 80 0 1 0 N
+S 20 70 -20 70 0 1 0 N
+S 30 40 -30 60 0 1 0 N
+S 50 -25 75 125 0 1 0 F
+S 50 0 -50 100 0 1 0 N
+P 2 0 1 0 10 150 30 150 N
+P 2 0 1 0 20 160 20 140 N
+X - 1 0 -100 100 U 50 50 1 1 P
+X + 2 0 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # C
 #
 DEF C C 0 10 N Y 1 F N
@@ -760,6 +786,21 @@ X VO 3 300 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Earphone
+#
+DEF Earphone SP 0 1 Y N 1 F N
+F0 "SP" 100 150 50 H V L CNN
+F1 "Earphone" 100 75 50 H V L CNN
+F2 "" 0 100 50 V V C CNN
+F3 "" 0 100 50 V V C CNN
+DRAW
+S 50 -25 75 125 0 1 0 F
+S 50 0 -50 100 0 1 0 N
+X - 1 0 -100 100 U 50 50 1 1 P
+X + 2 0 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # FUSE
 #
 DEF FUSE F 0 10 Y Y 1 F N
@@ -1223,6 +1264,84 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Microphone
+#
+DEF Microphone MIC 0 1 Y N 1 F N
+F0 "MIC" -150 50 50 H V R CNN
+F1 "Microphone" -150 -25 50 H V R CNN
+F2 "" 0 100 50 V V C CNN
+F3 "" 0 100 50 V V C CNN
+DRAW
+C 0 0 100 0 1 10 N
+P 2 0 1 10 -100 100 -100 -100 N
+P 2 0 1 0 10 150 30 150 N
+P 2 0 1 0 20 160 20 140 N
+X - 1 0 -200 100 U 50 50 1 1 P
+X + 2 0 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Microphone_ALT
+#
+DEF Microphone_ALT MIC 0 0 Y N 1 F N
+F0 "MIC" -100 100 50 H V R CNN
+F1 "Microphone_ALT" -100 20 50 H V R CNN
+F2 "" 0 100 50 V V C CNN
+F3 "" 0 100 50 V V C CNN
+DRAW
+A -90 50 100 -899 899 0 1 10 N -90 -50 -90 150
+P 2 0 1 10 -90 150 -90 -50 f
+P 2 0 1 0 40 120 60 120 N
+P 2 0 1 0 50 110 50 130 N
+X - 1 100 0 100 L 50 50 1 1 P
+X + 2 100 100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Microphone_Condenser
+#
+DEF Microphone_Condenser MIC 0 1 Y N 1 F N
+F0 "MIC" -130 50 50 H V R CNN
+F1 "Microphone_Condenser" -130 -25 50 H V R CNN
+F2 "" 0 100 50 V V C CNN
+F3 "" 0 100 50 V V C CNN
+DRAW
+C 0 0 100 0 1 10 N
+S 40 -10 -40 -30 0 1 0 F
+S 40 30 -40 10 0 1 0 F
+P 2 0 1 10 -100 100 -100 -100 N
+P 2 0 1 0 0 -30 0 -60 N
+P 2 0 1 0 0 30 0 60 N
+P 2 0 1 0 10 150 30 150 N
+P 2 0 1 0 20 160 20 140 N
+X - 1 0 -200 100 U 50 50 1 1 P
+X + 2 0 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Microphone_Crystal
+#
+DEF Microphone_Crystal MIC 0 1 Y N 1 F N
+F0 "MIC" -150 45 50 H V R CNN
+F1 "Microphone_Crystal" -150 -30 50 H V R CNN
+F2 "" 50 -70 50 V V L CNN
+F3 "" 0 100 50 V V C CNN
+ALIAS Microphone_Ultrasound
+DRAW
+C 0 0 100 0 1 10 N
+S -50 20 50 -20 0 1 10 N
+P 2 0 1 10 -100 100 -100 -100 N
+P 2 0 1 0 -30 -40 30 -40 N
+P 2 0 1 0 -30 40 30 40 N
+P 2 0 1 0 0 -40 0 -70 N
+P 2 0 1 0 0 40 0 70 N
+P 2 0 1 0 10 150 30 150 N
+P 2 0 1 0 20 160 20 140 N
+X - 1 0 -200 100 U 50 50 1 1 P
+X + 2 0 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # OHMMETER
 #
 DEF OHMMETER M 0 1 N N 1 F N
@@ -2818,21 +2937,6 @@ X A 3 200 50 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# SPEAKER
-#
-DEF SPEAKER SP 0 0 N Y 1 F N
-F0 "SP" -100 250 50 H V C CNN
-F1 "SPEAKER" -100 -250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 4 0 0 0 100 150 250 300 250 -300 100 -150 N
-P 5 0 0 0 -100 150 100 150 100 -150 -100 -150 -100 150 F
-X 1 1 -300 100 200 R 50 50 1 1 I
-X 2 2 -300 -100 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
 # SW_CODED
 #
 DEF SW_CODED SW 0 20 Y Y 1 F N
@@ -3104,6 +3208,57 @@ X 2 2 200 0 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# Speaker
+#
+DEF Speaker SP 0 0 N Y 1 F N
+F0 "SP" -100 250 50 H V C CNN
+F1 "Speaker" -100 -250 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 0 0 100 150 250 300 250 -300 100 -150 N
+P 5 0 0 0 -100 150 100 150 100 -150 -100 -150 -100 150 F
+X 1 1 -300 100 200 R 50 50 1 1 I
+X 2 2 -300 -100 200 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Speaker_Crystal
+#
+DEF Speaker_Crystal SP 0 0 N Y 1 F N
+F0 "SP" 25 225 50 H V R CNN
+F1 "Speaker_Crystal" 25 150 50 H V R CNN
+F2 "" -35 -50 50 H V C CNN
+F3 "" -35 -50 50 H V C CNN
+ALIAS Speaker_Ultrasound
+DRAW
+S -100 50 45 -150 0 0 10 N
+S -80 -25 25 -75 0 0 10 N
+P 2 0 0 0 -65 -90 15 -90 N
+P 2 0 0 0 -65 -10 15 -10 N
+P 2 0 0 0 -25 -90 -25 -120 N
+P 2 0 0 0 -25 -10 -25 20 N
+P 4 0 0 10 45 50 145 150 145 -250 45 -150 N
+X 1 1 -200 0 100 R 50 50 1 1 I
+X 2 2 -200 -100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Speaker_Small
+#
+DEF Speaker_Small SP 0 0 N Y 1 F N
+F0 "SP" 50 225 50 H V R CNN
+F1 "Speaker_Small" 50 150 50 H V R CNN
+F2 "" 0 -200 50 H V C CNN
+F3 "" -10 -50 50 H V C CNN
+DRAW
+S -100 50 40 -150 0 0 10 N
+P 4 0 0 10 40 50 140 150 140 -250 40 -150 N
+X 1 1 -200 0 100 R 50 50 1 1 I
+X 2 2 -200 -100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # TEST
 #
 DEF TEST P 0 40 N N 1 F N
@@ -3438,11 +3593,11 @@ X ~ 2 0 -250 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# VOLTMETER_AC
+# Voltmeter_AC
 #
-DEF VOLTMETER_AC M 0 1 N N 1 F N
+DEF Voltmeter_AC M 0 1 N N 1 F N
 F0 "M" -130 40 50 H V R CNN
-F1 "VOLTMETER_AC" -130 -30 50 H V R CNN
+F1 "Voltmeter_AC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V V C CNN
 F3 "" 0 100 50 V V C CNN
 DRAW
@@ -3458,11 +3613,11 @@ X ~ 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# VOLTMETER_DC
+# Voltmeter_DC
 #
-DEF VOLTMETER_DC M 0 1 N N 1 F N
+DEF Voltmeter_DC M 0 1 N N 1 F N
 F0 "M" -130 40 50 H V R CNN
-F1 "VOLTMETER_DC" -130 -30 50 H V R CNN
+F1 "Voltmeter_DC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V V C CNN
 F3 "" 0 100 50 V V C CNN
 DRAW