diff --git a/fab.dcm b/fab.dcm
index 9d58f3e3f4ab192cab795867f8209040ac348fd1..ffcd37b56407fd0b4553957e999cfe76f2c21a9a 100644
--- a/fab.dcm
+++ b/fab.dcm
@@ -10,6 +10,16 @@ D Polarized capacitor
 K cap capacitor
 $ENDCMP
 #
+$CMP D_Schottky
+D Schottky diode
+K diode schottky
+$ENDCMP
+#
+$CMP D_Zener
+D Zener diode
+K diode zener
+$ENDCMP
+#
 $CMP FT230XS
 D Full Speed USB to Basic UART, SSOP-16
 K FTDI USB UART interface converter
diff --git a/fab.lib b/fab.lib
index dfc9e53a2a6bfda77fc5a3755c1620251ae10724..6c2fe3f60b4374b44be631c338f42b272506125e 100644
--- a/fab.lib
+++ b/fab.lib
@@ -754,24 +754,47 @@ X 2 P$2 100 0 0 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# DIODESOD123
+# D_Schottky
 #
-DEF DIODESOD123 D 0 40 N N 1 L N
-F0 "D" 100 19 45 H V L BNN
-F1 "DIODESOD123" 100 -91 45 H V L BNN
-F2 "fab:fab-SOD123" 30 150 20 H I C CNN
+DEF D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky" 0 -100 50 H V C CNN
+F2 "fab:fab-SOD123" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- *SOD123*
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
 $ENDFPLIST
 DRAW
-P 2 1 0 0 -50 -50 50 0 N
-P 2 1 0 0 -50 50 -50 -50 N
-P 2 1 0 0 50 0 -50 50 N
-P 2 1 0 0 50 0 50 -50 N
-P 2 1 0 0 50 50 50 0 N
-X A ANODE -100 0 100 R 40 40 1 1 P
-X C CATHODE 100 0 100 L 40 40 1 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Zener
+#
+DEF D_Zener D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Zener" 0 -100 50 H V C CNN
+F2 "fab:fab-SOD123" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 8 -50 -50 -50 50 -30 50 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -2855,48 +2878,4 @@ X VI 3 -300 0 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ZENER_DIODEDO41Z10
-#
-DEF ZENER_DIODEDO41Z10 D 0 40 N N 1 L N
-F0 "D" -70 75 45 H V L BNN
-F1 "ZENER_DIODEDO41Z10" -70 -135 45 H V L BNN
-F2 "fab:fab-DO41Z10" 30 150 20 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- *DO41Z10*
-$ENDFPLIST
-DRAW
-P 2 1 0 0 -50 -50 50 0 N
-P 2 1 0 0 -50 50 -50 -50 N
-P 2 1 0 0 50 -50 25 -50 N
-P 2 1 0 0 50 0 -50 50 N
-P 2 1 0 0 50 0 50 -50 N
-P 2 1 0 0 50 50 50 0 N
-X ANODE A -100 0 100 R 40 40 1 1 P
-X CATHODE C 100 0 100 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# ZENER_DIODESOD123
-#
-DEF ZENER_DIODESOD123 D 0 40 N N 1 L N
-F0 "D" -70 75 45 H V L BNN
-F1 "ZENER_DIODESOD123" -70 -135 45 H V L BNN
-F2 "fab:fab-SOD123" 30 150 20 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- *SOD123*
-$ENDFPLIST
-DRAW
-P 2 1 0 0 -50 -50 50 0 N
-P 2 1 0 0 -50 50 -50 -50 N
-P 2 1 0 0 50 -50 25 -50 N
-P 2 1 0 0 50 0 -50 50 N
-P 2 1 0 0 50 0 50 -50 N
-P 2 1 0 0 50 50 50 0 N
-X ANODE ANODE -100 0 100 R 40 40 1 1 P
-X CATHODE CATHODE 100 0 100 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
 #End Library