diff --git a/TripwireHook.lib b/TripwireHook.lib
index 38c4168224ba299f25b92d79db7eee4a842368f6..f1a8f0e3c4891969097562abeb15155451482052 100644
--- a/TripwireHook.lib
+++ b/TripwireHook.lib
@@ -695,4 +695,26 @@ X DIN 4 -300 0 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# D_TVS_UNI
+#
+DEF D_TVS_UNI D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_TVS_UNI" 0 -100 50 H V C CNN
+F2 "" 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 4 0 1 10 -30 50 -50 50 -50 -50 -70 -50 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+X A1 1 -150 0 100 R 50 50 1 1 P
+X A2 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/TripwireHook.pretty/WS2812D-F8.kicad_mod b/TripwireHook.pretty/WS2812D-F8.kicad_mod
index 4d6921e17e552b7016f1d58c94f38bce20c44276..0d512fc1cfc69918c2c44e16a8e59e2f47c4abcf 100644
--- a/TripwireHook.pretty/WS2812D-F8.kicad_mod
+++ b/TripwireHook.pretty/WS2812D-F8.kicad_mod
@@ -1,12 +1,13 @@
-(module WS2812D-F8 (layer F.Cu) (tedit 5FE56CE9)
+(module WS2812D-F8 (layer F.Cu) (tedit 60567D99)
+  (descr "WS2812D-F8 Smart 8mm RGB LED. Pin numbering comes from WS2812B!")
   (fp_text reference REF** (at 0 1.9) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value WS2812D-F8 (at 0 -5.6) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_circle (center 0 0) (end 4 0) (layer F.SilkS) (width 0.12))
   (fp_line (start 4 -2.2) (end 4 2.2) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 0 0) (end 4 0) (layer F.SilkS) (width 0.12))
   (fp_arc (start 0 0) (end 3.999999 -2.199999) (angle -302.3784125) (layer F.SilkS) (width 0.12))
   (pad 4 thru_hole oval (at -1.9 0) (size 1.1 1.9) (drill 0.7) (layers *.Cu *.Mask))
   (pad 1 thru_hole oval (at 1.9 0) (size 1.1 1.9) (drill 0.7) (layers *.Cu *.Mask))
diff --git a/TripwireHook.pretty/WS2812_B_D-F8_combo.kicad_mod b/TripwireHook.pretty/WS2812_B_D-F8_combo.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..4f6cb6ba4cf1567317b6b769718bb77821caae22
--- /dev/null
+++ b/TripwireHook.pretty/WS2812_B_D-F8_combo.kicad_mod
@@ -0,0 +1,36 @@
+(module WS2812_B_D-F8_combo (layer F.Cu) (tedit 60568CC9)
+  (descr "WS2812{B,D-F8} combined into one footprint. Pin numbering comes from WS2812B")
+  (fp_text reference REF** (at 5 0 90) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value WS2812D-F8 (at 0 -5.6) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 4 -2.2) (end 4 2.2) (layer F.SilkS) (width 0.12))
+  (fp_circle (center 0 0) (end 4 0) (layer F.SilkS) (width 0.12))
+  (fp_line (start -2.75 -3.6) (end -2.75 3.6) (layer F.SilkS) (width 0.12))
+  (fp_line (start 2.7 -3.65) (end 2.7 3.6) (layer F.SilkS) (width 0.12))
+  (fp_poly (pts (xy 0.85 -1.6) (xy 2.35 -1.6) (xy 2.35 -1.45) (xy 0.85 -1.45)) (layer F.SilkS) (width 0.1))
+  (fp_poly (pts (xy 0.85 -3.45) (xy 1 -3.45) (xy 1 -1.45) (xy 0.85 -1.45)) (layer F.SilkS) (width 0.1))
+  (fp_poly (pts (xy 2.2 -3.45) (xy 2.35 -3.45) (xy 2.35 -1.6) (xy 2.2 -1.6)) (layer F.SilkS) (width 0.1))
+  (fp_poly (pts (xy 0.85 -3.45) (xy 2.35 -3.45) (xy 2.35 -3.3) (xy 0.85 -3.3)) (layer F.SilkS) (width 0.1))
+  (fp_line (start 4 -2.2) (end 4 2.2) (layer F.CrtYd) (width 0.12))
+  (fp_arc (start 0 0) (end 3.999999 -2.199999) (angle -302.3784125) (layer F.SilkS) (width 0.12))
+  (fp_arc (start 0 0) (end 3.999999 -2.199999) (angle -302.4) (layer F.CrtYd) (width 0.12))
+  (fp_text user 3 (at 0.25 -2.4) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.2)))
+  )
+  (pad 4 thru_hole oval (at -1.9 0) (size 1.1 1.9) (drill 0.7) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 1.9 0) (size 1.1 1.9) (drill 0.7) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at -0.625 0) (size 1.1 1.9) (drill 0.7) (layers *.Cu *.Mask))
+  (pad 1 thru_hole oval (at 0.625 0) (size 1.1 1.9) (drill 0.7) (layers *.Cu *.Mask))
+  (pad 4 smd rect (at -1.6 -2.45 90) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -1.6 2.45 90) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 1.6 -2.45 90) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 1.6 2.45 90) (size 1.5 1) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/LED_THT.3dshapes/LED_D8.0mm.step
+    (offset (xyz 1.25 0 -3))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 180))
+  )
+)