diff --git a/ergogen/config.yaml b/ergogen/config.yaml
index 8f0a2ab..d8d79d8 100644
--- a/ergogen/config.yaml
+++ b/ergogen/config.yaml
@@ -601,7 +601,7 @@ pcbs:
           to: "{{row_net}}"
 
       rotary_encoder:
-        what: rotary_modified
+        what: rotary_encoder_ec12
         where: is_rotary_encoder
         params:
           from: "diode_{{name}}"
diff --git a/ergogen/footprints/button_6x6.js b/ergogen/footprints/button_6x6.js
deleted file mode 100644
index 034877d..0000000
--- a/ergogen/footprints/button_6x6.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Tactile button 6x6mm
-// Source: https://kicad.github.io/footprints/Button_Switch_SMD
-module.exports = {
-    params: {
-        designator: 'B',
-        side: 'F',
-        from: undefined,
-        to: undefined
-    },
-    body: p => `
-    (module SW_Push_1P1T_NO_6x6mm_H9.5mm (layer F.Cu) (tedit 5CA1CA7F)
-        (descr "tactile push button, 6x6mm e.g. PTS645xx series, height=9.5mm")
-        (tags "tact sw push 6mm smd")
-        (attr smd)
-
-        ${p.at /* parametric position */}
-
-        ${'' /* footprint reference */}
-        (fp_text reference "${p.ref}" (at 0 -4.05) (layer F.SilkS) ${p.ref_hide} (effects (font (size 1 1) (thickness 0.15))))
-        (fp_text value "" (at 0 4.15) (layer F.SilkS) hide (effects (font (size 1 1) (thickness 0.15))))
-
-        ${'' /* outline */}
-        (fp_line (start -3    -3   ) (end -3     3   ) (layer ${p.side}.Fab)   (width 0.1))
-        (fp_line (start -3     3   ) (end  3     3   ) (layer ${p.side}.Fab)   (width 0.1))
-        (fp_line (start  3     3   ) (end  3    -3   ) (layer ${p.side}.Fab)   (width 0.1))
-        (fp_line (start  3    -3   ) (end -3    -3   ) (layer ${p.side}.Fab)   (width 0.1))
-        (fp_line (start  5     3.25) (end  5    -3.25) (layer ${p.side}.CrtYd) (width 0.05))
-        (fp_line (start -5    -3.25) (end -5     3.25) (layer ${p.side}.CrtYd) (width 0.05))
-        (fp_line (start -5     3.25) (end  5     3.25) (layer ${p.side}.CrtYd) (width 0.05))
-        (fp_line (start -5    -3.25) (end  5    -3.25) (layer ${p.side}.CrtYd) (width 0.05))
-        (fp_line (start  3.23 -3.23) (end  3.23 -3.2 ) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_line (start  3.23  3.23) (end  3.23  3.2 ) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_line (start -3.23  3.23) (end -3.23  3.2 ) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_line (start -3.23 -3.2 ) (end -3.23 -3.23) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_line (start  3.23 -1.3 ) (end  3.23  1.3 ) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_line (start -3.23 -3.23) (end  3.23 -3.23) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_line (start -3.23 -1.3 ) (end -3.23  1.3 ) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_line (start -3.23  3.23) (end  3.23  3.23) (layer ${p.side}.SilkS) (width 0.12))
-        (fp_circle (center 0 0)      (end 1.75 -0.05)  (layer ${p.side}.Fab)   (width 0.1))
-
-        ${'' /* pins */}
-        (pad 1 smd rect (at -3.975 -2.25 ${p.r}) (size 1.55 1.3) (layers ${p.side}.Cu ${p.side}.Paste ${p.side}.Mask) ${p.from})
-        (pad 1 smd rect (at  3.975 -2.25 ${p.r}) (size 1.55 1.3) (layers ${p.side}.Cu ${p.side}.Paste ${p.side}.Mask) ${p.from})
-        (pad 2 smd rect (at -3.975  2.25 ${p.r}) (size 1.55 1.3) (layers ${p.side}.Cu ${p.side}.Paste ${p.side}.Mask) ${p.to})
-        (pad 2 smd rect (at  3.975  2.25 ${p.r}) (size 1.55 1.3) (layers ${p.side}.Cu ${p.side}.Paste ${p.side}.Mask) ${p.to})
-    )
-    `
-}
diff --git a/ergogen/footprints/cap_0805.js b/ergogen/footprints/cap_0805.js
index 96f071b..9f9a8ef 100644
--- a/ergogen/footprints/cap_0805.js
+++ b/ergogen/footprints/cap_0805.js
@@ -2,8 +2,9 @@ module.exports = {
     params: {
         designator: 'C',
         side: 'F',
+        value: '100nF',
         from: undefined,
-        to: undefined
+        to: undefined,
     },
     body: p => `
         (module C_0805_2012Metric (layer ${p.side}.Cu) (tedit 5F68FEEE)
@@ -12,7 +13,7 @@ module.exports = {
 
             ${'' /* footprint reference */}
             (fp_text reference "${p.ref}" (at 0 0) (layer ${p.side}.SilkS) ${p.ref_hide} (effects (font (size 1.27 1.27) (thickness 0.15))))
-            (fp_text value "" (at 0 0) (layer ${p.side}.SilkS) hide (effects (font (size 1.27 1.27) (thickness 0.15))))
+            (fp_text value "${p.value}" (at 0 0) (layer ${p.side}.SilkS) hide (effects (font (size 1.27 1.27) (thickness 0.15))))
 
             ${''/* capacitor symbols */}
             (fp_line (start -1 0.625) (end -1 -0.625) (layer ${p.side}.Fab) (width 0.1))
diff --git a/ergogen/footprints/diode_smd.js b/ergogen/footprints/diode_smd.js
index 2e1071b..81c9198 100644
--- a/ergogen/footprints/diode_smd.js
+++ b/ergogen/footprints/diode_smd.js
@@ -2,17 +2,18 @@ module.exports = {
     params: {
         designator: 'D',
         side: 'F',
+        value: '1N4148',
         from: undefined,
-        to: undefined
+        to: undefined,
     },
     body: p => `
-        (module SmdDiode (layer ${p.side}.Cu) (tedit 65D012FE)
+        (module SmdDiode_SOD-123 (layer ${p.side}.Cu) (tedit 6705952B)
             ${p.at /* parametric position */}
             (attr smd)
 
             ${'' /* footprint reference */}
             (fp_text reference "${p.ref}" (at 0 0) (layer ${p.side}.SilkS) ${p.ref_hide} (effects (font (size 1.27 1.27) (thickness 0.15))))
-            (fp_text value "" (at 0 0) (layer ${p.side}.SilkS) hide (effects (font (size 1.27 1.27) (thickness 0.15))))
+            (fp_text value "${p.value}" (at 0 0) (layer ${p.side}.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 ${p.side}.SilkS) (width 0.1))
diff --git a/ergogen/footprints/rotary_modified.js b/ergogen/footprints/rotary_encoder_ec12.js
similarity index 98%
rename from ergogen/footprints/rotary_modified.js
rename to ergogen/footprints/rotary_encoder_ec12.js
index c3ba26c..3239c71 100644
--- a/ergogen/footprints/rotary_modified.js
+++ b/ergogen/footprints/rotary_encoder_ec12.js
@@ -23,8 +23,7 @@ module.exports = {
         radius: 10,
     },
     body: p => `
-        (module rotary_encoder (layer F.Cu) (tedit 603326DE)
-
+        (module RotaryEncoder_EC12 (layer F.Cu) (tedit 6705957B)
             ${p.at /* parametric position */}
 
             ${'' /* footprint reference */}