diff --git a/library/device.dcm b/library/device.dcm
index ec7a1cb5..29ac0c7e 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -117,6 +117,11 @@ D Diode bridge
 K rectifier acdc
 $ENDCMP
 #
+$CMP D_Photo
+D photodiode
+K opto photodiode
+$ENDCMP
+#
 $CMP D_Radiation
 D semiconductor radiation detector
 K radiation detector diode
@@ -811,6 +816,11 @@ D Phototransistor NPN, 3-pin with base pin (E=1, B=2, C=3)
 K npn phototransistor
 $ENDCMP
 #
+$CMP Q_Photo_NPN_EC
+D Phototransistor NPN, 2-pin (C=1, E=2)
+K NPN phototransistor
+$ENDCMP
+#
 $CMP R
 D Resistor
 K r res resistor
diff --git a/library/device.lib b/library/device.lib
index 27ffce8c..58df8918 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -123,20 +123,20 @@ ENDDEF
 # Buzzer
 #
 DEF Buzzer BZ 0 1 Y N 1 F N
-F0 "BZ" 125 50 50 H V L CNN
-F1 "Buzzer" 125 -25 50 H V L CNN
+F0 "BZ" 150 50 50 H V L CNN
+F1 "Buzzer" 150 -50 50 H V L CNN
 F2 "" -25 100 50 V V C CNN
 F3 "" -25 100 50 V V C CNN
 $FPLIST
  *Buzzer*
 $ENDFPLIST
 DRAW
-A 0 12 112 -899 899 0 1 0 N 0 -100 0 125
+A 0 0 125 -899 899 0 1 0 N 0 -125 0 125
 P 2 0 1 0 -65 75 -45 75 N
 P 2 0 1 0 -55 85 -55 65 N
-P 2 0 1 0 0 125 0 -100 N
+P 2 0 1 0 0 125 0 -125 N
 X - 1 -100 100 100 R 50 50 1 1 P
-X + 2 -100 -75 100 R 50 50 1 1 P
+X + 2 -100 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -5661,9 +5661,9 @@ P 2 0 1 12 75 -50 75 50 N
 P 2 0 1 0 75 0 200 0 N
 P 2 0 1 0 120 0 120 -120 N
 P 4 0 1 0 120 -160 120 -200 -120 -200 -120 -160 N
-X 1 1 -300 0 100 R 40 40 1 1 P
-X 2 2 0 -300 100 U 40 40 1 1 P
-X 3 3 300 0 100 L 40 40 1 1 P
+X 1 1 -300 0 100 R 50 50 1 1 P
+X 2 2 0 -300 100 U 50 50 1 1 P
+X 3 3 300 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -5690,9 +5690,9 @@ P 2 0 1 12 50 -50 50 50 N
 P 2 0 1 0 50 0 75 0 N
 P 2 0 1 0 95 0 95 -70 N
 P 4 0 1 0 95 -110 95 -150 -95 -150 -95 -105 N
-X 1 1 -150 0 100 R 40 40 1 1 P
-X 2 2 0 -200 50 U 40 40 1 1 P
-X 3 3 150 0 100 L 40 40 1 1 P
+X 1 1 -150 0 100 R 50 50 1 1 P
+X 2 2 0 -200 50 U 50 50 1 1 P
+X 3 3 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -7106,10 +7106,10 @@ ENDDEF
 # SW_Rotary12
 #
 DEF SW_Rotary12 SW 0 40 Y N 1 F N
-F0 "SW" 0 700 60 H V C CNN
-F1 "SW_Rotary12" 0 -700 60 H V C CNN
-F2 "" -200 700 60 H I C CNN
-F3 "" -200 700 60 H I C CNN
+F0 "SW" 0 700 50 H V C CNN
+F1 "SW_Rotary12" 0 -700 50 H V C CNN
+F2 "" -200 700 50 H I C CNN
+F3 "" -200 700 50 H I C CNN
 DRAW
 A -275 -13 218 -767 1032 0 0 0 N -225 -225 -325 200
 C -400 -350 25 0 0 0 N
@@ -7159,10 +7159,10 @@ ENDDEF
 # SW_Rotary2x6
 #
 DEF SW_Rotary2x6 SW 0 40 Y N 1 F N
-F0 "SW" 0 700 60 H V C CNN
-F1 "SW_Rotary2x6" 0 -700 60 H V C CNN
-F2 "" -100 600 60 H I C CNN
-F3 "" -100 600 60 H I C CNN
+F0 "SW" 0 700 50 H V C CNN
+F1 "SW_Rotary2x6" 0 -700 50 H V C CNN
+F2 "" -100 600 50 H I C CNN
+F3 "" -100 600 50 H I C CNN
 DRAW
 C -175 -400 25 0 0 0 N
 C -175 300 25 0 0 0 N
@@ -7219,10 +7219,10 @@ ENDDEF
 # SW_Rotary3x4
 #
 DEF SW_Rotary3x4 SW 0 40 Y N 1 F N
-F0 "SW" 0 800 60 H V C CNN
-F1 "SW_Rotary3x4" 0 -700 60 H V C CNN
-F2 "" -100 800 60 H I C CNN
-F3 "" -100 800 60 H I C CNN
+F0 "SW" 0 800 50 H V C CNN
+F1 "SW_Rotary3x4" 0 -700 50 H V C CNN
+F2 "" -100 800 50 H I C CNN
+F3 "" -100 800 50 H I C CNN
 DRAW
 C -175 -500 25 0 0 0 N
 C -175 0 25 0 0 0 N
@@ -7285,10 +7285,10 @@ ENDDEF
 # SW_Rotary4x3
 #
 DEF SW_Rotary4x3 SW 0 40 Y N 1 F N
-F0 "SW" 0 800 60 H V C CNN
-F1 "SW_Rotary4x3" 0 -800 60 H V C CNN
-F2 "" -100 900 60 H I C CNN
-F3 "" -100 900 60 H I C CNN
+F0 "SW" 0 800 50 H V C CNN
+F1 "SW_Rotary4x3" 0 -800 50 H V C CNN
+F2 "" -100 900 50 H I C CNN
+F3 "" -100 900 50 H I C CNN
 DRAW
 C -175 -600 25 0 0 0 N
 C -175 -200 25 0 0 0 N