diff --git a/library/Oscillators.dcm b/library/Oscillators.dcm
index e63ccbc6..dd82801b 100644
--- a/library/Oscillators.dcm
+++ b/library/Oscillators.dcm
@@ -12,8 +12,32 @@ K Crystal Clock Oscillator
 F http://cdn-reichelt.de/documents/datenblatt/B400/OSZI.pdf
 $ENDCMP
 #
-$CMP IQXO/7X
-D Crystal Clock Oscillator
+$CMP DFA-S11
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP DFA-S15
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP DFA-S2
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP DFA-S3
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP IQXO-70
+D Crystal Clock Oscillator, SMD package 7.5x5.0mm²
 K Crystal Clock Oscillator
 F http://www.iqdfrequencyproducts.com/products/details/iqxo-70-11-30.pdf
 $ENDCMP
@@ -36,26 +60,32 @@ K Temperature compensated crystal oscillator
 F http://www.hcelectronics.cz/PDF/TCXO3_A.pdf
 $ENDCMP
 #
-$CMP TCXO_DFAS11
-D Temperature compensated Crystal Clock Oscillator
-K Temperature compensated Crystal Clock Oscillator
-F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$CMP TFT660
+D Crystal Clock Oscillator, DIP8-style metal package
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/OSZI.pdf
+$ENDCMP
+#
+$CMP TFT680
+D Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/OSZI.pdf
 $ENDCMP
 #
 $CMP XO32
-D XO32 Series Series HCMOS Clock Oscillator
+D HCMOS Clock Oscillator
 K Crystal Clock Oscillator
 F http://cdn-reichelt.de/documents/datenblatt/B400/XO32.pdf
 $ENDCMP
 #
 $CMP XO53
-D XO53 Series Low Power Consumption Clock Oscillator
+D Low Power Consumption Clock Oscillator
 K Crystal Clock Oscillator
 F http://cdn-reichelt.de/documents/datenblatt/B400/XO53.pdf
 $ENDCMP
 #
 $CMP XO91
-D XO91 Series Series HCMOS Clock Oscillator
+D HCMOS Clock Oscillator
 K Crystal Clock Oscillator
 F http://cdn-reichelt.de/documents/datenblatt/B400/XO91.pdf
 $ENDCMP
diff --git a/library/Oscillators.lib b/library/Oscillators.lib
index ab6fe26f..bc6cb59f 100644
--- a/library/Oscillators.lib
+++ b/library/Oscillators.lib
@@ -6,13 +6,15 @@ EESchema-LIBRARY Version 2.3
 DEF CXO_DIP14 X 0 10 Y Y 1 F N
 F0 "X" -200 250 50 H V L CNN
 F1 "CXO_DIP14" 50 -250 50 H V L CNN
-F2 "Oscillators:KXO-200" 450 -350 50 H I C CNN
+F2 "Oscillators:Oscillator_DIP-14" 450 -350 50 H I C CNN
 F3 "" -100 0 50 H V C CNN
+ALIAS TFT680
 $FPLIST
- KXO?200*
+ Oscillator*DIP*14*
 $ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
 X EN 1 -300 0 100 R 50 50 1 1 I
 X GND 7 0 -300 100 U 50 50 1 1 W
 X OUT 8 300 0 100 L 50 50 1 1 O
@@ -25,13 +27,15 @@ ENDDEF
 DEF CXO_DIP8 X 0 10 Y Y 1 F N
 F0 "X" -200 250 50 H V L CNN
 F1 "CXO_DIP8" 50 -250 50 H V L CNN
-F2 "Oscillators:OSC_DIP8" 450 -350 50 H I C CNN
+F2 "Oscillators:Oscillator_DIP-8" 450 -350 50 H I C CNN
 F3 "" -100 0 50 H V C CNN
+ALIAS TFT660
 $FPLIST
- OSC*DIP*
+ Oscillator*DIP*8*
 $ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
 X EN 1 -300 0 100 R 50 50 1 1 I
 X GND 4 0 -300 100 U 50 50 1 1 W
 X OUT 5 300 0 100 L 50 50 1 1 O
@@ -39,15 +43,99 @@ X Vcc 8 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# IQXO/7X
+# DFA-S11
 #
-DEF IQXO/7X X 0 10 Y Y 1 F N
+DEF DFA-S11 X 0 10 Y Y 1 F N
 F0 "X" -200 250 50 H V L CNN
-F1 "IQXO/7X" 50 -250 50 H V L CNN
-F2 "" -100 0 50 H V C CNN
+F1 "DFA-S11" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_Fordahl_DFAS11_package7.0x5.0mm" 1100 -350 50 H I C CNN
 F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*Fordahl*DFAS11*package7.0x5.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DFA-S15
+#
+DEF DFA-S15 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DFA-S15" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_Fordahl_DFAS15_package5.0x3.2mm" 1100 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*Fordahl*DFAS15*package5.0x3.2mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DFA-S2
+#
+DEF DFA-S2 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DFA-S2" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_Fordahl_DFAS2_package7.3x5.1mm" 1100 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*Fordahl*DFAS2*package7.3x5.1mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DFA-S3
+#
+DEF DFA-S3 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DFA-S3" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_Fordahl_DFAS3_package9.1x7.2mm" 1100 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*Fordahl*DFAS3*package9.1x7.2mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# IQXO-70
+#
+DEF IQXO-70 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "IQXO-70" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_IQD_IQXO70_package7.5x5.0mm" 675 -325 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*IQD*IQXO70*package7.5x5.0mm*
+$ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -40 -30 -30 -30 -30 30 -10 30 -10 -30 10 -30 10 30 30 30 30 -30 40 -30 N
 X E/B 1 -300 0 100 R 50 50 1 1 I
 X GND 2 0 -300 100 U 50 50 1 1 W
 X OUT 3 300 0 100 L 50 50 1 1 O
@@ -61,12 +149,13 @@ DEF Si570 IC 0 40 Y Y 1 F N
 F0 "IC" -400 400 50 H V C CNN
 F1 "Si570" 350 -400 50 H V C CNN
 F2 "Oscillators:SI570_SI571_Standard" -550 600 50 H I C CNN
-F3 "http://www.silabs.com/Support Documents/TechnicalDocs/si570.pdf" -400 700 50 H I C CNN
+F3 "" -400 700 50 H I C CNN
 $FPLIST
  SI570*SI571*
 $ENDFPLIST
 DRAW
 S -450 350 450 -350 0 1 10 f
+P 10 0 1 0 -75 -50 -50 -50 -50 50 0 50 0 -50 50 -50 50 50 100 50 100 -50 125 -50 N
 X NC 1 -600 200 150 R 50 50 1 1 N N
 X OE 2 -600 100 150 R 50 50 1 1 I
 X GND 3 0 -500 150 U 50 50 1 1 W
@@ -84,12 +173,13 @@ DEF Si571 IC 0 40 Y Y 1 F N
 F0 "IC" -400 400 50 H V C CNN
 F1 "Si571" 350 -400 50 H V C CNN
 F2 "Oscillators:SI570_SI571_Standard" -550 600 50 H I C CNN
-F3 "http://www.silabs.com/Support Documents/TechnicalDocs/si570.pdf" -400 700 50 H I C CNN
+F3 "" -400 700 50 H I C CNN
 $FPLIST
  SI570*SI571*
 $ENDFPLIST
 DRAW
 S -450 350 450 -350 0 1 10 f
+P 10 0 1 0 -75 -50 -50 -50 -50 50 0 50 0 -50 50 -50 50 50 100 50 100 -50 125 -50 N
 X Vc 1 -600 200 150 R 50 50 1 1 I
 X OE 2 -600 100 150 R 50 50 1 1 I
 X GND 3 0 -500 150 U 50 50 1 1 W
@@ -103,48 +193,37 @@ ENDDEF
 #
 # TCXO3
 #
-DEF TCXO3 X 0 40 Y Y 1 F N
-F0 "X" -450 350 50 H V C CNN
-F1 "TCXO3" 300 -250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
+DEF TCXO3 X 0 20 Y Y 1 F N
+F0 "X" 325 450 50 H V L CNN
+F1 "TCXO3" 325 350 50 H V L CNN
+F2 "" -550 250 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
 S -500 -200 400 300 0 1 10 f
+P 10 0 1 0 -100 0 -75 0 -75 100 -25 100 -25 0 25 0 25 100 75 100 75 0 100 0 N
 X FREQ 1 500 100 100 L 50 50 1 1 O
 X NC 2 500 200 100 L 50 50 1 1 N N
 X URef 3 -200 400 100 D 50 50 1 1 w
 X NC 4 -600 200 100 R 50 50 1 1 N N
-X NC 5 500 300 100 L 50 50 1 1 N N
+X NC 5 100 400 100 D 50 50 1 1 N N
 X NC 6 -600 0 100 R 50 50 1 1 N N
 X NC 7 -600 -100 100 R 50 50 1 1 N N
-X NC 8 -600 -200 100 R 50 50 1 1 N N
-X NC 9 500 -200 100 L 50 50 1 1 N N
+X NC 8 -300 -300 100 U 50 50 1 1 N N
+X NC 9 200 -300 100 U 50 50 1 1 N N
 X GND 10 -200 -300 100 U 50 50 1 1 W
+X NC 20 -400 400 100 D 50 50 1 1 N N
 X GND 11 -100 -300 100 U 50 50 1 1 W
+X NC 21 300 400 100 D 50 50 1 1 N N
 X GND 12 0 -300 100 U 50 50 1 1 W
-X NC 13 500 -100 100 L 50 50 1 1 N N
+X NC 22 500 -100 100 L 50 50 1 1 N N
+X NC 13 300 -300 100 U 50 50 1 1 N N
 X GND 23 100 -300 100 U 50 50 1 1 W
 X NC 14 500 0 100 L 50 50 1 1 N N
 X +5V 15 0 400 100 D 50 50 1 1 W
-X NC 16 500 400 100 L 50 50 1 1 N N
-X NC 17 -600 300 100 R 50 50 1 1 N N
+X NC 16 200 400 100 D 50 50 1 1 N N
+X NC 17 -100 400 100 D 50 50 1 1 N N
 X Vctrl 18 -600 100 100 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# TCXO_DFAS11
-#
-DEF TCXO_DFAS11 X 0 10 Y Y 1 F N
-F0 "X" -200 250 50 H V L CNN
-F1 "TCXO_DFAS11" 50 -250 50 H V L CNN
-F2 "" -100 0 50 H V C CNN
-F3 "" -100 0 50 H V C CNN
-DRAW
-S -200 200 200 -200 0 1 10 f
-X Vctrl 1 -300 0 100 R 50 50 1 1 I
-X GND 2 0 -300 100 U 50 50 1 1 W
-X OUT 3 300 0 100 L 50 50 1 1 O
-X V+ 4 0 300 100 D 50 50 1 1 W
+X NC 19 -300 400 100 D 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
@@ -153,10 +232,14 @@ ENDDEF
 DEF XO32 X 0 10 Y Y 1 F N
 F0 "X" -200 250 50 H V L CNN
 F1 "XO32" 50 -250 50 H V L CNN
-F2 "" 700 -350 50 H I C CNN
+F2 "Oscillators:Oscillator_EuroQuartz_XO32_package3.2x2.5mm" 700 -350 50 H I C CNN
 F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*EuroQuartz*XO32*package3.2x2.5mm*
+$ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
 X EN 1 -300 0 100 R 50 50 1 1 I
 X GND 2 0 -300 100 U 50 50 1 1 W
 X OUT 3 300 0 100 L 50 50 1 1 O
@@ -169,10 +252,14 @@ ENDDEF
 DEF XO53 X 0 10 Y Y 1 F N
 F0 "X" -200 250 50 H V L CNN
 F1 "XO53" 50 -250 50 H V L CNN
-F2 "" 700 -350 50 H I C CNN
+F2 "Oscillators:Oscillator_EuroQuartz_XO53_package5.0x3.2mm" 700 -350 50 H I C CNN
 F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*EuroQuartz*XO53*package5.0x3.2mm*
+$ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 30 -30 20 -30 20 30 0 30 0 -30 -20 -30 -20 30 -40 30 -40 -30 -50 -30 N
 X EN 1 -300 0 100 R 50 50 1 1 I
 X GND 2 0 -300 100 U 50 50 1 1 W
 X OUT 3 300 0 100 L 50 50 1 1 O
@@ -185,10 +272,14 @@ ENDDEF
 DEF XO91 X 0 10 Y Y 1 F N
 F0 "X" -200 250 50 H V L CNN
 F1 "XO91" 50 -250 50 H V L CNN
-F2 "" 700 -350 50 H I C CNN
+F2 "Oscillators:Oscillator_EuroQuartz_XO91_package7.0x5.0mm" 700 -350 50 H I C CNN
 F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*EuroQuartz*XO91*package7.0x5.0mm*
+$ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 30 -30 20 -30 20 30 0 30 0 -30 -20 -30 -20 30 -40 30 -40 -30 -50 -30 N
 X EN 1 -300 0 100 R 50 50 1 1 I
 X GND 2 0 -300 100 U 50 50 1 1 W
 X OUT 3 300 0 100 L 50 50 1 1 O