diff --git a/chrysemys/chrysemys.yaml b/chrysemys/chrysemys.yaml
index 71658f9..8aa2403 100644
--- a/chrysemys/chrysemys.yaml
+++ b/chrysemys/chrysemys.yaml
@@ -15,9 +15,20 @@ points:
     matrix:
       key:
         footprints:
-          - type: chocmini
+          chocmini:
+            type: chocmini
             nets:
-              from: "=row_net"
+              from: "=colrow"
+              to: "=row_net"
+          diode:
+            type: diode
+            params:
+              through_hole: false
+            anchor:
+              shift: [0, 4.3]
+              rotate: 180
+            nets:
+              from: "=colrow"
               to: "=column_net"
       rotate: -angle + pinky_splay + ring_splay
       columns:
@@ -100,9 +111,20 @@ points:
         shift: [-(kx/2), -(ky + 2)]
       key:
         footprints:
-          - type: chocmini
+          chocmini:
+            type: chocmini
             nets:
-              from: "=row_net"
+              from: "=colrow"
+              to: "=row_net"
+          diode:
+            type: diode
+            params:
+              through_hole: false
+            anchor:
+              shift: [0, 4.3]
+              rotate: 180
+            nets:
+              from: "=colrow"
               to: "=column_net"
       columns:
         near:
diff --git a/chrysemys/footprints/diode.js b/chrysemys/footprints/diode.js
new file mode 100644
index 0000000..5b7cf45
--- /dev/null
+++ b/chrysemys/footprints/diode.js
@@ -0,0 +1,66 @@
+module.exports = {
+    nets: {
+        from: undefined,
+        to: undefined
+    },
+    params: {
+        class: 'D',
+        through_hole: true,
+        via_in_pad: false
+    },
+    body: p => `
+  
+    (module ComboDiode (layer F.Cu) (tedit 5B24D78E)
+
+
+        ${p.at /* parametric position */}
+
+        ${'' /* footprint reference */}
+        (fp_text reference "${p.ref}" (at 0 0) (layer F.SilkS) ${p.ref_hide} (effects (font (size 1.27 1.27) (thickness 0.15))))
+        (fp_text value "" (at 0 0) (layer F.SilkS) hide (effects (font (size 1.27 1.27) (thickness 0.15))))
+        
+        ${''/* diode symbols */}
+        (fp_line (start 0.25 0) (end 0.75 0) (layer F.SilkS) (width 0.1))
+        (fp_line (start 0.25 0.4) (end -0.35 0) (layer F.SilkS) (width 0.1))
+        (fp_line (start 0.25 -0.4) (end 0.25 0.4) (layer F.SilkS) (width 0.1))
+        (fp_line (start -0.35 0) (end 0.25 -0.4) (layer F.SilkS) (width 0.1))
+        (fp_line (start -0.35 0) (end -0.35 0.55) (layer F.SilkS) (width 0.1))
+        (fp_line (start -0.35 0) (end -0.35 -0.55) (layer F.SilkS) (width 0.1))
+        (fp_line (start -0.75 0) (end -0.35 0) (layer F.SilkS) (width 0.1))
+        (fp_line (start 0.25 0) (end 0.75 0) (layer B.SilkS) (width 0.1))
+        (fp_line (start 0.25 0.4) (end -0.35 0) (layer B.SilkS) (width 0.1))
+        (fp_line (start 0.25 -0.4) (end 0.25 0.4) (layer B.SilkS) (width 0.1))
+        (fp_line (start -0.35 0) (end 0.25 -0.4) (layer B.SilkS) (width 0.1))
+        (fp_line (start -0.35 0) (end -0.35 0.55) (layer B.SilkS) (width 0.1))
+        (fp_line (start -0.35 0) (end -0.35 -0.55) (layer B.SilkS) (width 0.1))
+        (fp_line (start -0.75 0) (end -0.35 0) (layer B.SilkS) (width 0.1))
+
+        ${ p.param.via_in_pad ?
+            `
+             ${''/* Vias in SMD pads */}   
+             (pad 1 thru_hole rect (at -1.65 0 ${ p.rot }) (size 0.9 1.2) (drill 0.3) (layers *.Cu *.Mask) (zone_connect 2) ${ p.net.to.str })
+             (pad 2 thru_hole rect (at 1.65 0 ${ p.rot }) (size 0.9 1.2) (drill 0.3) (layers *.Cu *.Mask) (zone_connect 2) ${ p.net.from.str })
+            `
+        :
+            `
+             ${ ''/* SMD pads on both sides */ }
+             (pad 1 smd rect (at -1.65 0 ${ p.rot }) (size 0.9 1.2) (layers F.Cu F.Paste F.Mask) ${ p.net.to.str })
+             (pad 2 smd rect (at 1.65 0 ${ p.rot }) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask) ${ p.net.from.str })
+             (pad 1 smd rect (at -1.65 0 ${ p.rot }) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask) ${ p.net.to.str })
+             (pad 2 smd rect (at 1.65 0 ${ p.rot }) (size 0.9 1.2) (layers F.Cu F.Paste F.Mask) ${ p.net.from.str })
+            `
+        }
+        
+        ${ p.param.through_hole === false ?
+            ''
+        :
+            `
+             ${''/* THT terminals */}
+             (pad 1 thru_hole circle (at 3.81 0 ${ p.rot }) (size 1.905 1.905) (drill 0.9906) (layers *.Cu *.Mask) ${ p.net.from.str })
+             (pad 2 thru_hole rect (at -3.81 0 ${ p.rot }) (size 1.778 1.778) (drill 0.9906) (layers *.Cu *.Mask) ${ p.net.to.str })
+            `
+        }
+
+    )
+    `
+}
\ No newline at end of file