diff --git a/library/opto.lib b/library/opto.lib
index 95efd96a..73a97069 100644
--- a/library/opto.lib
+++ b/library/opto.lib
@@ -74,9 +74,9 @@ ENDDEF
 # A1050
 #
 DEF A1050 R 0 0 N Y 1 F N
-F0 "R" -100 125 50 H V R CNN
-F1 "A1050" -100 50 50 H V R TNN
-F2 "Opto-Devices:Resistor_LDR_D6.4_RM3.4" 100 -50 50 V I C CNN
+F0 "R" -200 0 50 V V C CNN
+F1 "A1050" 75 0 50 V V C TNN
+F2 "Opto-Devices:Resistor_LDR_D6.4_RM3.4" 175 0 50 V I C CNN
 F3 "" 0 -50 50 H V C CNN
 ALIAS A1060
 $FPLIST
@@ -98,9 +98,9 @@ ENDDEF
 # A9050
 #
 DEF A9050 R 0 0 N Y 1 F N
-F0 "R" -100 125 50 H V R CNN
-F1 "A9050" -100 50 50 H V R TNN
-F2 "Opto-Devices:Resistor_LDR_5x4.1_RM3" 100 -50 60 V I C CNN
+F0 "R" -200 0 50 V V C CNN
+F1 "A9050" 75 0 50 V V C TNN
+F2 "Opto-Devices:Resistor_LDR_5x4.1_RM3" 175 0 60 V I C CNN
 F3 "" 0 -50 50 H V C CNN
 ALIAS A9060 A9013
 $FPLIST
@@ -356,6 +356,9 @@ F1 "BP104-SMD" -40 -110 50 H V C CNN
 F2 "Opto-Devices:PhotoDiode_SMD-DIL2_4.5x4" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
 ALIAS BPW34-SMD SFH2430 SFH2440
+$FPLIST
+ PhotoDiode*SMD*DIL2*4.5x4*
+$ENDFPLIST
 DRAW
 P 2 0 1 6 -100 50 -100 -50 N
 P 2 0 1 0 -80 70 -60 70 N
@@ -372,7 +375,7 @@ ENDDEF
 DEF BPW21 D 0 40 N N 1 F N
 F0 "D" 20 70 50 H V L CNN
 F1 "BPW21" -40 -110 50 H V C CNN
-F2 "Opto-Devices:PhotoDiode_TO-5_2Pin_AC" 0 175 50 H I C CNN
+F2 "TO_SOT_Packages_THT:TO-5_Window_2Pin" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
 ALIAS BPX61
 $FPLIST
@@ -397,6 +400,9 @@ F1 "BPW34" -40 -110 50 H V C CNN
 F2 "Opto-Devices:PhotoDiode_DIL2_4.3x4.65_RM5.08" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
 ALIAS BP104
+$FPLIST
+ PhotoDiode*SMD*DIL2*4.3x4.65*RM5.08*
+$ENDFPLIST
 DRAW
 P 2 0 1 6 -100 50 -100 -50 N
 P 2 0 1 0 -80 70 -60 70 N
@@ -416,6 +422,9 @@ F1 "BPW40" 200 -50 50 H V L CNN
 F2 "LEDs:LED-5MM" 480 -140 50 H I C CNN
 F3 "" 0 0 50 H V C CNN
 ALIAS BP103B BP103BF SFH300
+$FPLIST
+ LED*5mm*
+$ENDFPLIST
 DRAW
 C 50 0 111 0 1 10 N
 P 2 0 1 0 -75 50 -100 50 N
@@ -438,6 +447,9 @@ F0 "D" 20 70 50 H V L CNN
 F1 "BPW82" -40 -110 50 H V C CNN
 F2 "Opto-Devices:PhotoDiode_BPW82" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
+$FPLIST
+ PhotoDiode*BPW82*
+$ENDFPLIST
 DRAW
 P 2 0 1 6 -100 50 -100 -50 N
 P 2 0 1 0 -80 70 -60 70 N
@@ -454,7 +466,7 @@ ENDDEF
 DEF BPX65 D 0 40 N N 1 F N
 F0 "D" 20 70 50 H V L CNN
 F1 "BPX65" -40 -110 50 H V C CNN
-F2 "Opto-Devices:PhotoDiode_TO-18_2Pin_AC" 0 175 50 H I C CNN
+F2 "TO_SOT_Packages_THT:TO-18_Lens_2Pin" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
 $FPLIST
  TO?18*Lens*
@@ -1232,9 +1244,9 @@ ENDDEF
 # LDR03
 #
 DEF LDR03 R 0 0 N Y 1 F N
-F0 "R" -100 125 50 H V R CNN
-F1 "LDR03" -100 50 50 H V R TNN
-F2 "Opto-Devices:Resistor_LDR_10x8.5_RM7.6" 100 -50 50 V I C CNN
+F0 "R" -200 0 50 V V C CNN
+F1 "LDR03" 75 0 50 V V C TNN
+F2 "Opto-Devices:Resistor_LDR_10x8.5_RM7.6" 175 0 50 V I C CNN
 F3 "" 0 -50 50 H V C CNN
 $FPLIST
  Resistor*LDR*10x8.5*RM7.6*
@@ -1255,9 +1267,9 @@ ENDDEF
 # LDR07
 #
 DEF LDR07 R 0 0 N Y 1 F N
-F0 "R" -100 125 50 H V R CNN
-F1 "LDR07" -100 50 50 H V R TNN
-F2 "Opto-Devices:Resistor_LDR_5.1x4.3_RM3.4" 100 -50 50 V I C CNN
+F0 "R" -200 0 50 V V C CNN
+F1 "LDR07" 75 0 50 V V C TNN
+F2 "Opto-Devices:Resistor_LDR_5.1x4.3_RM3.4" 175 0 50 V I C CNN
 F3 "" 0 -50 50 H V C CNN
 $FPLIST
  Resistor*LDR*5.1x4.3*RM3.4*
@@ -1739,9 +1751,9 @@ ENDDEF
 # M9960
 #
 DEF M9960 R 0 0 N Y 1 F N
-F0 "R" -100 125 50 H V R CNN
-F1 "M9960" -100 50 50 H V R TNN
-F2 "Opto-Devices:Resistor_LDR_Vertical_5.2x5.2_RM3.5" 100 -50 50 V I C CNN
+F0 "R" -200 0 50 V V C CNN
+F1 "M9960" 75 0 50 V V C TNN
+F2 "Opto-Devices:Resistor_LDR_Vertical_5.2x5.2_RM3.5" 175 0 50 V I C CNN
 F3 "" 0 -50 50 H V C CNN
 $FPLIST
  Resistor*LDR*5.2x5.2*RM3.5*
@@ -2382,6 +2394,7 @@ P 3 0 1 0 -10 60 50 120 50 100 N
 P 3 0 1 0 40 50 -60 0 40 -50 F
 P 5 0 1 0 -60 60 0 120 0 100 0 120 -20 120 N
 X A 1 200 0 100 L 50 50 1 1 P
+X NC 2 -300 100 100 R 50 50 1 1 N N
 X C 3 -300 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
@@ -2389,31 +2402,47 @@ ENDDEF
 # PLT5_488
 #
 DEF PLT5_488 LD 0 40 Y N 1 F N
-F0 "LD" -50 175 50 H V C CNN
-F1 "PLT5_488" -50 -100 50 H V C CNN
-F2 "Opto-Devices:LaserDiode_TO56-3" 0 -175 50 H I C CNN
+F0 "LD" 0 275 50 H V C CNN
+F1 "PLT5_488" 0 -225 50 H V C CNN
+F2 "Opto-Devices:LaserDiode_TO56-3" 0 -300 50 H I C CNN
 F3 "" 30 -200 50 H V C CNN
 $FPLIST
- TO?56*Window*
+ LaserDiode*TO56*
 $ENDFPLIST
 DRAW
-P 2 0 1 0 -160 50 -100 110 N
-P 2 0 1 0 -160 70 -100 90 N
-P 2 0 1 0 -160 90 -100 70 N
-P 2 0 1 0 -160 110 -100 50 N
-P 2 0 1 0 -140 110 -120 50 N
-P 2 0 1 0 -130 80 -130 40 N
-P 2 0 1 0 -130 80 -130 120 N
-P 2 0 1 0 -120 110 -140 50 N
-P 2 0 1 0 -70 80 -170 80 N
-P 2 0 1 6 -60 50 -60 -50 N
-P 2 0 1 0 50 120 30 120 N
-P 2 0 1 0 100 0 -200 0 N
-P 3 0 1 0 -10 60 50 120 50 100 N
-P 3 0 1 0 40 50 -60 0 40 -50 F
-P 5 0 1 0 -60 60 0 120 0 100 0 120 -20 120 N
-X A 1 200 0 100 L 50 50 1 1 P
-X C 3 -300 0 100 R 50 50 1 1 P
+A -20 -63 7 -899 899 0 1 0 N -20 -70 -20 -55
+A 0 -70 15 -899 899 0 1 0 N 0 -85 0 -55
+A 0 65 15 -899 899 0 1 0 N 0 50 0 80
+C -60 0 10 0 1 0 F
+S 170 240 -90 -170 0 1 10 f
+P 2 0 1 0 -100 0 -60 0 N
+P 2 0 1 0 -60 150 0 210 N
+P 2 0 1 0 -60 170 0 190 N
+P 2 0 1 0 -60 190 0 170 N
+P 2 0 1 0 -60 210 0 150 N
+P 2 0 1 0 -40 210 -20 150 N
+P 2 0 1 0 -30 180 -30 140 N
+P 2 0 1 0 -30 180 -30 220 N
+P 2 0 1 0 -25 -55 -25 -85 N
+P 2 0 1 0 -20 210 -40 150 N
+P 2 0 1 0 0 -55 0 -85 N
+P 2 0 1 0 0 80 0 50 N
+P 2 0 1 0 30 180 -70 180 N
+P 2 0 1 6 40 -50 40 -150 N
+P 2 0 1 0 40 -30 60 -30 N
+P 2 0 1 6 40 150 40 50 N
+P 2 0 1 0 150 220 130 220 N
+P 3 0 1 0 -25 80 -25 50 -10 50 N
+P 3 0 1 0 90 160 150 220 150 200 N
+P 3 0 1 0 100 30 40 -30 40 -10 N
+P 3 0 1 0 140 -50 40 -100 140 -150 F
+P 3 0 1 0 140 150 40 100 140 50 F
+P 4 0 1 0 200 100 -60 100 -60 -100 200 -100 N
+P 5 0 1 0 40 160 100 220 100 200 100 220 80 220 N
+P 5 0 1 0 150 30 90 -30 90 -10 90 -30 110 -30 N
+X ~ 1 300 100 100 L 50 50 1 1 P
+X ~ 2 -200 0 100 R 50 50 1 1 P
+X ~ 3 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -2568,7 +2597,7 @@ ENDDEF
 DEF SFH216 D 0 40 N N 1 F N
 F0 "D" 20 70 50 H V L CNN
 F1 "SFH216" -40 -110 50 H V C CNN
-F2 "Opto-Devices:PhotoDiode_TO-18_2Pin_AC" 0 175 50 H I C CNN
+F2 "TO_SOT_Packages_THT:TO-18_Window_2Pin" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
 $FPLIST
  TO?18*Window*
@@ -2701,7 +2730,7 @@ ENDDEF
 DEF SFH460 D 0 40 N N 1 F N
 F0 "D" 20 70 50 H V L CNN
 F1 "SFH460" -40 -110 50 H V C CNN
-F2 "Opto-Devices:PhotoDiode_TO-18_2Pin_AC" 0 175 50 H I C CNN
+F2 "TO_SOT_Packages_THT:TO-18_Window_2Pin" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
 $FPLIST
  TO?18*Window*
@@ -2722,7 +2751,7 @@ ENDDEF
 DEF SFH482 D 0 40 N N 1 F N
 F0 "D" 20 70 50 H V L CNN
 F1 "SFH482" -40 -110 50 H V C CNN
-F2 "Opto-Devices:PhotoDiode_TO-18_2Pin_CA" 0 175 50 H I C CNN
+F2 "TO_SOT_Packages_THT:TO-18_Window_2Pin" 0 175 50 H I C CNN
 F3 "" -50 0 50 H V C CNN
 ALIAS SFH480
 $FPLIST
@@ -2747,7 +2776,7 @@ F1 "SPL_PL90" -50 -100 50 H V C CNN
 F2 "LEDs:LED-5MM" -60 -180 50 H I C CNN
 F3 "" 30 -200 50 H V C CNN
 $FPLIST
- *LaserDiode*
+ LED*5mm*
 $ENDFPLIST
 DRAW
 P 2 0 1 0 -160 50 -100 110 N
@@ -4128,9 +4157,9 @@ ENDDEF
 # VT93xx
 #
 DEF VT93xx R 0 0 N Y 1 F N
-F0 "R" -100 125 50 H V R CNN
-F1 "VT93xx" -100 50 50 H V R TNN
-F2 "Opto-Devices:Resistor_LDR_4.9x4.2_RM2.54" 100 -50 50 V I C CNN
+F0 "R" -200 0 50 V V C CNN
+F1 "VT93xx" 75 0 50 V V C TNN
+F2 "Opto-Devices:Resistor_LDR_4.9x4.2_RM2.54" 175 0 50 V I C CNN
 F3 "" 0 -50 50 H V C CNN
 $FPLIST
  Resistor*LDR*4.9x4.2*RM2.54*