diff --git a/footprints/ElsassKabel.pretty/DIODE_1N4148_HOLE_SOD-123.kicad_mod b/footprints/ElsassKabel.pretty/DIODE_1N4148_HOLE_SOD-123.kicad_mod
index 8ea7a3a..8c80acb 100644
--- a/footprints/ElsassKabel.pretty/DIODE_1N4148_HOLE_SOD-123.kicad_mod
+++ b/footprints/ElsassKabel.pretty/DIODE_1N4148_HOLE_SOD-123.kicad_mod
@@ -1,17 +1,19 @@
 (footprint "DIODE_1N4148_HOLE_SOD-123" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 6290BCCE)
+  (tedit 634C0850)
   (descr "Diode 1N4148 SOD-123")
-  (attr smd)
-  (fp_text reference "REF**" (at -0.008 -2.54 unlocked) (layer "F.SilkS") hide
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 1858e105-edcf-4cbf-a673-68a02909113c)
   )
-  (fp_text value "DIODE_1N4148_HOLE_SOD-123" (at -0.008 3.81 unlocked) (layer "F.Fab") hide
+  (fp_text value "DIODE_1N4148_HOLE_SOD-123" (at -0.008 2.54 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp a0ef29a0-7175-4f23-9b90-80ef32a72c44)
   )
-  (fp_text user "${REFERENCE}" (at -0.008 2.54 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 15486712-c3e3-4f41-8b3b-296a7733efce)
   )
@@ -23,12 +25,9 @@
   (fp_line (start -0.492 -0.5) (end 0.408 0) (layer "F.SilkS") (width 0.15) (tstamp c31c86ac-c10d-4628-8e83-85e5d17c433a))
   (fp_line (start 2.692 -0.75) (end -2.708 -0.75) (layer "F.SilkS") (width 0.15) (tstamp daf7c805-3c4a-4d53-bfa5-c5910798156f))
   (fp_line (start 0.508 0.5) (end 0.508 -0.5) (layer "F.SilkS") (width 0.15) (tstamp df5e1dcc-021f-4b97-8901-5f0c9b1f91f8))
-  (pad "1" smd rect (at -1.783 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 05e6396f-7b26-4364-8d25-40a6a217841d))
-  (pad "1" thru_hole circle (at -4 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 07f7b79b-8b8c-4762-bf37-e2c07e7ab000))
-  (pad "2" smd rect (at 1.767 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp a092a142-0fc5-4521-a7c8-e8d2dcad2aeb))
-  (pad "2" thru_hole rect (at 4 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp c941acbb-9f2d-4293-bc81-b525a71e9129))
+  (fp_rect (start -5.08 -1.27) (end 5.08 1.27) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 4116bfc2-eab3-4c29-a983-44eacd9f10f5))
+  (pad "1" smd rect (at -1.783 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 05e6396f-7b26-4364-8d25-40a6a217841d))
+  (pad "1" thru_hole circle (at -4 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 07f7b79b-8b8c-4762-bf37-e2c07e7ab000))
+  (pad "2" smd rect (at 1.767 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a092a142-0fc5-4521-a7c8-e8d2dcad2aeb))
+  (pad "2" thru_hole rect (at 4 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp c941acbb-9f2d-4293-bc81-b525a71e9129))
 )
diff --git a/footprints/ElsassKabel.pretty/DIODE_1N4148_HOLE_SOD-123_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/DIODE_1N4148_HOLE_SOD-123_2_SIDES.kicad_mod
deleted file mode 100644
index aac296f..0000000
--- a/footprints/ElsassKabel.pretty/DIODE_1N4148_HOLE_SOD-123_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,46 +0,0 @@
-(footprint "DIODE_1N4148_HOLE_SOD-123_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6290BCDA)
-  (descr "Diode 1N4148 SOD-123 (2 sides)")
-  (attr smd)
-  (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1858e105-edcf-4cbf-a673-68a02909113c)
-  )
-  (fp_text value "DIODE_1N4148_HOLE_SOD-123_2_SIDES" (at 0 3.81 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a0ef29a0-7175-4f23-9b90-80ef32a72c44)
-  )
-  (fp_text user "${REFERENCE}" (at 0 2.54 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 15486712-c3e3-4f41-8b3b-296a7733efce)
-  )
-  (fp_line (start 0.5064 -0.5) (end 0.5064 0.5) (layer "B.SilkS") (width 0.15) (tstamp 21aff110-7dd2-4d56-9867-0d7ca102d629))
-  (fp_line (start -2.7096 0.75) (end -2.7096 -0.75) (layer "B.SilkS") (width 0.15) (tstamp 6a21aa23-fdcf-4c03-b2a5-b9ec843e0d35))
-  (fp_line (start -0.4936 0.5) (end 0.4064 0) (layer "B.SilkS") (width 0.15) (tstamp 6cdfaa8b-26f6-4324-b88f-c0e6dd23296c))
-  (fp_line (start 0.4064 0) (end -0.4936 -0.5) (layer "B.SilkS") (width 0.15) (tstamp 920cbd06-0778-4bb7-9b1a-62b52b244d82))
-  (fp_line (start -0.4936 -0.5) (end -0.4936 0.5) (layer "B.SilkS") (width 0.15) (tstamp 95d195ec-3888-4802-b014-384c184ed333))
-  (fp_line (start -2.7096 -0.75) (end 2.6904 -0.75) (layer "B.SilkS") (width 0.15) (tstamp d0ad95c3-e370-4d69-aacc-f7a2956e0e88))
-  (fp_line (start 2.6904 0.75) (end 2.6904 -0.75) (layer "B.SilkS") (width 0.15) (tstamp e8bc358b-84f3-4578-b929-dd358c52b3e8))
-  (fp_line (start 2.6904 0.75) (end -2.7096 0.75) (layer "B.SilkS") (width 0.15) (tstamp f311efca-0f73-48f1-96f2-20a8a7ec9f76))
-  (fp_line (start 0.408 0) (end -0.492 0.5) (layer "F.SilkS") (width 0.15) (tstamp 01059cff-2151-4925-abad-5f7d6f8a6345))
-  (fp_line (start -2.708 -0.75) (end -2.708 0.75) (layer "F.SilkS") (width 0.15) (tstamp 1daa6c5b-8fe6-4836-bf4c-2df54206462c))
-  (fp_line (start -0.492 0.5) (end -0.492 -0.5) (layer "F.SilkS") (width 0.15) (tstamp 44eca545-9d58-4969-ab34-f459e5ac1133))
-  (fp_line (start 2.692 -0.75) (end 2.692 0.75) (layer "F.SilkS") (width 0.15) (tstamp 5419332b-8e6c-41bc-b5aa-c5264ab644b2))
-  (fp_line (start -2.708 0.75) (end 2.692 0.75) (layer "F.SilkS") (width 0.15) (tstamp aa645f84-fd4e-4e81-b0c2-d3ffe6816e6d))
-  (fp_line (start -0.492 -0.5) (end 0.408 0) (layer "F.SilkS") (width 0.15) (tstamp c31c86ac-c10d-4628-8e83-85e5d17c433a))
-  (fp_line (start 2.692 -0.75) (end -2.708 -0.75) (layer "F.SilkS") (width 0.15) (tstamp daf7c805-3c4a-4d53-bfa5-c5910798156f))
-  (fp_line (start 0.508 0.5) (end 0.508 -0.5) (layer "F.SilkS") (width 0.15) (tstamp df5e1dcc-021f-4b97-8901-5f0c9b1f91f8))
-  (pad "1" smd rect (at -1.783 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 05e6396f-7b26-4364-8d25-40a6a217841d))
-  (pad "1" smd rect (at -1.7846 0 180) (size 1.4 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 2848edd0-2aa2-4882-8511-43bd8f4c89a2))
-  (pad "1" thru_hole circle (at -4 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp ef2917df-d1bc-48f5-a482-b6dea9f4b4c6))
-  (pad "2" smd rect (at 1.767 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp a092a142-0fc5-4521-a7c8-e8d2dcad2aeb))
-  (pad "2" thru_hole rect (at 4 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp d075c97f-b46e-4e34-a554-8a086191642e))
-  (pad "2" smd rect (at 1.7654 0 180) (size 1.4 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp d22b5095-2344-41dd-a55f-a09981184080))
-)
diff --git a/footprints/ElsassKabel.pretty/DIODE_1N4148_SOD-123.kicad_mod b/footprints/ElsassKabel.pretty/DIODE_1N4148_SOD-123.kicad_mod
index 86030ad..c386d00 100644
--- a/footprints/ElsassKabel.pretty/DIODE_1N4148_SOD-123.kicad_mod
+++ b/footprints/ElsassKabel.pretty/DIODE_1N4148_SOD-123.kicad_mod
@@ -1,17 +1,19 @@
 (footprint "DIODE_1N4148_SOD-123" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 626CF1FE)
+  (tedit 634C0BFB)
   (descr "Diode 1N4148 SOD-123")
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr smd)
-  (fp_text reference "REF**" (at -0.008 -2.54 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at -0.008 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 1858e105-edcf-4cbf-a673-68a02909113c)
   )
-  (fp_text value "DIODE_1N4148_SOD-123" (at -0.008 3.81 unlocked) (layer "F.Fab") hide
+  (fp_text value "DIODE_1N4148_SOD-123" (at -0.008 2.54 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp a0ef29a0-7175-4f23-9b90-80ef32a72c44)
   )
-  (fp_text user "${REFERENCE}" (at -0.008 2.54 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 15486712-c3e3-4f41-8b3b-296a7733efce)
   )
@@ -23,8 +25,7 @@
   (fp_line (start -0.492 -0.5) (end 0.408 0) (layer "F.SilkS") (width 0.15) (tstamp c31c86ac-c10d-4628-8e83-85e5d17c433a))
   (fp_line (start 2.692 -0.75) (end -2.708 -0.75) (layer "F.SilkS") (width 0.15) (tstamp daf7c805-3c4a-4d53-bfa5-c5910798156f))
   (fp_line (start 0.508 0.5) (end 0.508 -0.5) (layer "F.SilkS") (width 0.15) (tstamp df5e1dcc-021f-4b97-8901-5f0c9b1f91f8))
-  (pad "1" smd rect (at -1.783 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 05e6396f-7b26-4364-8d25-40a6a217841d))
-  (pad "2" smd rect (at 1.767 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp a092a142-0fc5-4521-a7c8-e8d2dcad2aeb))
+  (fp_rect (start -3.048 -1.016) (end 3.048 1.016) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 46411048-26da-4369-ba01-0ac72fcae2e6))
+  (pad "1" smd rect (at -1.783 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 05e6396f-7b26-4364-8d25-40a6a217841d))
+  (pad "2" smd rect (at 1.767 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a092a142-0fc5-4521-a7c8-e8d2dcad2aeb))
 )
diff --git a/footprints/ElsassKabel.pretty/DIODE_1N4148_SOD-123_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/DIODE_1N4148_SOD-123_2_SIDES.kicad_mod
deleted file mode 100644
index 48a7242..0000000
--- a/footprints/ElsassKabel.pretty/DIODE_1N4148_SOD-123_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,42 +0,0 @@
-(footprint "DIODE_1N4148_SOD-123_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 626CF21C)
-  (descr "Diode 1N4148 SOD-123 (2 sides)")
-  (attr smd)
-  (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 1858e105-edcf-4cbf-a673-68a02909113c)
-  )
-  (fp_text value "DIODE_1N4148_SOD-123_2_SIDES" (at 0 3.81 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp a0ef29a0-7175-4f23-9b90-80ef32a72c44)
-  )
-  (fp_text user "${REFERENCE}" (at 0 2.54 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 15486712-c3e3-4f41-8b3b-296a7733efce)
-  )
-  (fp_line (start 0.5064 -0.5) (end 0.5064 0.5) (layer "B.SilkS") (width 0.15) (tstamp 21aff110-7dd2-4d56-9867-0d7ca102d629))
-  (fp_line (start -2.7096 0.75) (end -2.7096 -0.75) (layer "B.SilkS") (width 0.15) (tstamp 6a21aa23-fdcf-4c03-b2a5-b9ec843e0d35))
-  (fp_line (start -0.4936 0.5) (end 0.4064 0) (layer "B.SilkS") (width 0.15) (tstamp 6cdfaa8b-26f6-4324-b88f-c0e6dd23296c))
-  (fp_line (start 0.4064 0) (end -0.4936 -0.5) (layer "B.SilkS") (width 0.15) (tstamp 920cbd06-0778-4bb7-9b1a-62b52b244d82))
-  (fp_line (start -0.4936 -0.5) (end -0.4936 0.5) (layer "B.SilkS") (width 0.15) (tstamp 95d195ec-3888-4802-b014-384c184ed333))
-  (fp_line (start -2.7096 -0.75) (end 2.6904 -0.75) (layer "B.SilkS") (width 0.15) (tstamp d0ad95c3-e370-4d69-aacc-f7a2956e0e88))
-  (fp_line (start 2.6904 0.75) (end 2.6904 -0.75) (layer "B.SilkS") (width 0.15) (tstamp e8bc358b-84f3-4578-b929-dd358c52b3e8))
-  (fp_line (start 2.6904 0.75) (end -2.7096 0.75) (layer "B.SilkS") (width 0.15) (tstamp f311efca-0f73-48f1-96f2-20a8a7ec9f76))
-  (fp_line (start 0.408 0) (end -0.492 0.5) (layer "F.SilkS") (width 0.15) (tstamp 01059cff-2151-4925-abad-5f7d6f8a6345))
-  (fp_line (start -2.708 -0.75) (end -2.708 0.75) (layer "F.SilkS") (width 0.15) (tstamp 1daa6c5b-8fe6-4836-bf4c-2df54206462c))
-  (fp_line (start -0.492 0.5) (end -0.492 -0.5) (layer "F.SilkS") (width 0.15) (tstamp 44eca545-9d58-4969-ab34-f459e5ac1133))
-  (fp_line (start 2.692 -0.75) (end 2.692 0.75) (layer "F.SilkS") (width 0.15) (tstamp 5419332b-8e6c-41bc-b5aa-c5264ab644b2))
-  (fp_line (start -2.708 0.75) (end 2.692 0.75) (layer "F.SilkS") (width 0.15) (tstamp aa645f84-fd4e-4e81-b0c2-d3ffe6816e6d))
-  (fp_line (start -0.492 -0.5) (end 0.408 0) (layer "F.SilkS") (width 0.15) (tstamp c31c86ac-c10d-4628-8e83-85e5d17c433a))
-  (fp_line (start 2.692 -0.75) (end -2.708 -0.75) (layer "F.SilkS") (width 0.15) (tstamp daf7c805-3c4a-4d53-bfa5-c5910798156f))
-  (fp_line (start 0.508 0.5) (end 0.508 -0.5) (layer "F.SilkS") (width 0.15) (tstamp df5e1dcc-021f-4b97-8901-5f0c9b1f91f8))
-  (pad "1" smd rect (at -1.783 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 05e6396f-7b26-4364-8d25-40a6a217841d))
-  (pad "1" smd rect (at -1.7846 0 180) (size 1.4 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 2848edd0-2aa2-4882-8511-43bd8f4c89a2))
-  (pad "2" smd rect (at 1.767 0) (size 1.4 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp a092a142-0fc5-4521-a7c8-e8d2dcad2aeb))
-  (pad "2" smd rect (at 1.7654 0 180) (size 1.4 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp d22b5095-2344-41dd-a55f-a09981184080))
-)
diff --git a/footprints/ElsassKabel.pretty/JUMPER_CLOSE.kicad_mod b/footprints/ElsassKabel.pretty/JUMPER_CLOSE.kicad_mod
deleted file mode 100644
index c4754c0..0000000
--- a/footprints/ElsassKabel.pretty/JUMPER_CLOSE.kicad_mod
+++ /dev/null
@@ -1,28 +0,0 @@
-(footprint "JUMPER_CLOSE" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 626CF616)
-  (descr "Jumper close")
-  (attr smd exclude_from_pos_files exclude_from_bom)
-  (fp_text reference "REF**" (at 0 -1.905) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cb62c661-4cb1-450d-ae7f-b40d3141b097)
-  )
-  (fp_text value "JUMPER_CLOSE" (at 0 1.9) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ed51e603-1292-4ecf-9325-0e6a88453939)
-  )
-  (fp_poly (pts
-      (xy -0.25 -0.3)
-      (xy 0.25 -0.3)
-      (xy 0.25 0.3)
-      (xy -0.25 0.3)
-    ) (layer "F.Cu") (width 0) (fill solid) (tstamp eada75f4-b178-4135-92ce-f63c34819bb3))
-  (fp_line (start -1.4 -1) (end 1.4 -1) (layer "F.SilkS") (width 0.15) (tstamp 8b37493a-497f-496a-abe7-5114d22fabe3))
-  (fp_line (start 1.4 1) (end -1.4 1) (layer "F.SilkS") (width 0.15) (tstamp 9641e2d7-d6ef-435f-94f3-3354e3093021))
-  (fp_line (start -1.4 1) (end -1.4 -1) (layer "F.SilkS") (width 0.15) (tstamp 97bb38ee-0cd9-4e14-b83b-b283fbc6d07b))
-  (fp_line (start 1.4 -1) (end 1.4 1) (layer "F.SilkS") (width 0.15) (tstamp cbd7ea47-20e6-4f9d-8cb8-e8b83b980719))
-  (pad "1" smd rect (at -0.65 0) (size 1 1.5) (layers "F.Cu" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 7c46f02a-1719-4449-bdeb-ce6be3af8adf))
-  (pad "2" smd rect (at 0.65 0) (size 1 1.5) (layers "F.Cu" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp c43e32f1-42d7-4e8c-91bd-cbb14777c064))
-)
diff --git a/footprints/ElsassKabel.pretty/JUMPER_OPEN.kicad_mod b/footprints/ElsassKabel.pretty/JUMPER_OPEN.kicad_mod
deleted file mode 100644
index e2e8d06..0000000
--- a/footprints/ElsassKabel.pretty/JUMPER_OPEN.kicad_mod
+++ /dev/null
@@ -1,22 +0,0 @@
-(footprint "JUMPER_OPEN" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 626CF62B)
-  (descr "Jumper open")
-  (attr smd exclude_from_pos_files exclude_from_bom)
-  (fp_text reference "REF**" (at 0 -1.905) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp cb62c661-4cb1-450d-ae7f-b40d3141b097)
-  )
-  (fp_text value "JUMPER_OPEN" (at 0 1.9) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ed51e603-1292-4ecf-9325-0e6a88453939)
-  )
-  (fp_line (start -1.4 -1) (end 1.4 -1) (layer "F.SilkS") (width 0.15) (tstamp 8b37493a-497f-496a-abe7-5114d22fabe3))
-  (fp_line (start 1.4 1) (end -1.4 1) (layer "F.SilkS") (width 0.15) (tstamp 9641e2d7-d6ef-435f-94f3-3354e3093021))
-  (fp_line (start -1.4 1) (end -1.4 -1) (layer "F.SilkS") (width 0.15) (tstamp 97bb38ee-0cd9-4e14-b83b-b283fbc6d07b))
-  (fp_line (start 1.4 -1) (end 1.4 1) (layer "F.SilkS") (width 0.15) (tstamp cbd7ea47-20e6-4f9d-8cb8-e8b83b980719))
-  (pad "1" smd rect (at -0.65 0) (size 1 1.5) (layers "F.Cu" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 7c46f02a-1719-4449-bdeb-ce6be3af8adf))
-  (pad "2" smd rect (at 0.65 0) (size 1 1.5) (layers "F.Cu" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp c43e32f1-42d7-4e8c-91bd-cbb14777c064))
-)
diff --git a/footprints/ElsassKabel.pretty/LED_STRIP.kicad_mod b/footprints/ElsassKabel.pretty/LED_STRIP.kicad_mod
deleted file mode 100644
index a21bcec..0000000
--- a/footprints/ElsassKabel.pretty/LED_STRIP.kicad_mod
+++ /dev/null
@@ -1,49 +0,0 @@
-(footprint "LED_STRIP" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 629BB2D9)
-  (descr "LED strip connector")
-  (solder_mask_margin 0.1)
-  (attr smd)
-  (fp_text reference "REF**" (at 0 -5 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 606cc23c-679a-4fa3-b3b1-c023026298b1)
-  )
-  (fp_text value "LED_STRIP" (at 0 5.75 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8cc78138-26c2-4be3-a4bd-4ad124dd5c3d)
-  )
-  (fp_text user "GND" (at 2.54 2.54 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    (tstamp 396b75b5-8301-434d-a10a-ad2aa7eccc47)
-  )
-  (fp_text user "VCC" (at 2.54 -2.54 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    (tstamp 9e0599fe-97ee-4f13-a349-762a8f42c861)
-  )
-  (fp_text user "LED" (at 2.54 0 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    (tstamp b1074f14-d9b1-488c-9ce1-52a2bed8b998)
-  )
-  (fp_text user "VCC" (at 2.54 2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 21930fd1-46a2-4b3e-9765-d207f0464a07)
-  )
-  (fp_text user "GND" (at 2.54 -2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2efaba24-aee5-4bea-ae84-dbce9fb4b72e)
-  )
-  (fp_text user "LED" (at 2.54 0 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 80308ea8-7152-4634-99bf-492db3c9f37a)
-  )
-  (fp_text user "${REFERENCE}" (at 0 7.25 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 959ed360-eb0a-4a79-8f34-5faaf7fec5ad)
-  )
-  (pad "1" smd roundrect (at 0 2.54) (size 1.524 1.524) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.05) (tstamp 188ae16b-4163-436c-8af9-1112c99f2627))
-  (pad "1" smd roundrect (at 0 -2.54) (size 1.524 1.524) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) (tstamp aa9c9fa8-922d-4661-b6ba-f949438fcd13))
-  (pad "2" smd roundrect (at 0 0) (size 1.524 1.524) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) (tstamp 0a742bb2-0657-47bc-9dea-e70308e1113a))
-  (pad "2" smd roundrect (at 0 0) (size 1.524 1.524) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.05) (tstamp 2a6753e8-f9e7-4c11-a472-dc9c7e1759c8))
-  (pad "3" smd roundrect (at 0 2.54) (size 1.524 1.524) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) (tstamp 3154fe1e-b45f-4d3b-8bab-828e398110b6))
-  (pad "3" smd roundrect (at 0 -2.54) (size 1.524 1.524) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.05) (tstamp b82916c0-2ec4-4e30-9450-9594adc24759))
-)
diff --git a/footprints/ElsassKabel.pretty/MJ-4PP-9.kicad_mod b/footprints/ElsassKabel.pretty/MJ-4PP-9.kicad_mod
deleted file mode 100644
index d449f18..0000000
--- a/footprints/ElsassKabel.pretty/MJ-4PP-9.kicad_mod
+++ /dev/null
@@ -1,29 +0,0 @@
-(footprint "MJ-4PP-9" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 627173D1)
-  (descr "TRRS connector")
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 -1 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 45e98497-3de7-4c05-afa5-63d1cc2c969c)
-  )
-  (fp_text value "MJ-4PP-9" (at 0 8 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f8aa346d-c918-486c-8a5c-a637b8932b4e)
-  )
-  (fp_text user "${REFERENCE}" (at 0 10 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b5bc0cf4-9df0-4bb5-bd24-1e716d0e567b)
-  )
-  (fp_rect (start -3 -6) (end 3 6) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 236ed0e2-ff56-42e3-aeeb-91a99fca6264))
-  (pad "" np_thru_hole circle (at 0 2.6) (size 1 1) (drill 1) (layers F&B.Cu *.Mask) (tstamp 2bbdb967-ab92-4569-86e9-d9b822f7e406))
-  (pad "" np_thru_hole circle (at 0 -4.4) (size 1 1) (drill 1) (layers F&B.Cu *.Mask) (tstamp dbdf2d02-16f4-455d-9ecf-e9ca499a5cb6))
-  (pad "1" thru_hole oval (at -2.25 5.5) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4a0207bc-8dcb-4b6f-8d2c-137181114c7e))
-  (pad "2" thru_hole oval (at 2.25 4.4) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 30cde442-c5a9-4ea9-a731-e546dbb28f1f))
-  (pad "3" thru_hole oval (at 2.25 0.3) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 50fe5a3d-c210-469c-bb71-512d5cea5518))
-  (pad "4" thru_hole oval (at 2.25 -2.8) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp ff206ac6-2a32-4ca3-9a3d-c27826adfcdf))
-)
diff --git a/footprints/ElsassKabel.pretty/MJ-4PP-9_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/MJ-4PP-9_2_SIDES.kicad_mod
deleted file mode 100644
index 23c85e5..0000000
--- a/footprints/ElsassKabel.pretty/MJ-4PP-9_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(footprint "MJ-4PP-9_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 627173FC)
-  (descr "TRRS connector (2 sides)")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 -1 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 45e98497-3de7-4c05-afa5-63d1cc2c969c)
-  )
-  (fp_text value "MJ-4PP-9_2_SIDES" (at 0 8 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f8aa346d-c918-486c-8a5c-a637b8932b4e)
-  )
-  (fp_text user "${REFERENCE}" (at 0 10 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b5bc0cf4-9df0-4bb5-bd24-1e716d0e567b)
-  )
-  (fp_rect (start 2 -6) (end -4 6) (layer "B.SilkS") (width 0.15) (fill none) (tstamp 1258e808-54e6-48cf-a7b0-8fb92a54260a))
-  (fp_rect (start -2 -6) (end 4 6) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 236ed0e2-ff56-42e3-aeeb-91a99fca6264))
-  (pad "" np_thru_hole circle (at 1 2.6) (size 1 1) (drill 1) (layers F&B.Cu *.Mask) (tstamp 2bbdb967-ab92-4569-86e9-d9b822f7e406))
-  (pad "" np_thru_hole circle (at -1 -4.4) (size 1 1) (drill 1) (layers F&B.Cu *.Mask) (tstamp 2c75b0fd-8d39-4134-8230-331aada634fa))
-  (pad "" np_thru_hole circle (at -1 2.6) (size 1 1) (drill 1) (layers F&B.Cu *.Mask) (tstamp 8c6d2a68-1e86-4cd8-86da-9252a6831921))
-  (pad "" np_thru_hole circle (at 1 -4.4) (size 1 1) (drill 1) (layers F&B.Cu *.Mask) (tstamp dbdf2d02-16f4-455d-9ecf-e9ca499a5cb6))
-  (pad "1" thru_hole oval (at 1.25 5.5) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp 0ae91059-c3cb-42ca-b237-3365d95bbdf4))
-  (pad "1" thru_hole oval (at -1.25 5.5) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp 4a0207bc-8dcb-4b6f-8d2c-137181114c7e))
-  (pad "2" thru_hole oval (at -3.25 4.4) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp 0e8b54b8-a5f4-4bb5-915f-c2ac7f05bd90))
-  (pad "2" thru_hole oval (at 3.25 4.4) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp 30cde442-c5a9-4ea9-a731-e546dbb28f1f))
-  (pad "3" thru_hole oval (at -3.25 0.3) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp 413ed2ad-bd97-4c0d-9d65-9fd24c3213ef))
-  (pad "3" thru_hole oval (at 3.25 0.3) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp 50fe5a3d-c210-469c-bb71-512d5cea5518))
-  (pad "4" thru_hole oval (at -3.25 -2.8) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp fb81bcb2-26d4-495a-a97a-504a52f05b3f))
-  (pad "4" thru_hole oval (at 3.25 -2.8) (size 1.7 2.2) (drill oval 1 1.5) (layers *.Cu *.Mask) (tstamp ff206ac6-2a32-4ca3-9a3d-c27826adfcdf))
-)
diff --git a/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M2_PAD.kicad_mod b/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M2_PAD.kicad_mod
index 05cc244..365a574 100644
--- a/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M2_PAD.kicad_mod
+++ b/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M2_PAD.kicad_mod
@@ -1,20 +1,21 @@
 (footprint "MOUNTING_HOLE_M2_PAD" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 62702A0A)
+  (tedit 634C093B)
   (descr "Mounting hole for M2 screw with pads (top, bot)")
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 -3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 -3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 5fbbaf43-ba7f-44ca-83cd-b97297f0da6a)
   )
-  (fp_text value "MOUNTING_HOLE_M2_PAD" (at 0 5.08 unlocked) (layer "F.Fab") hide
+  (fp_text value "MOUNTING_HOLE_M2_PAD" (at 0 3.81 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d8d8e5cd-908c-4cc6-9c66-65441b9b9042)
   )
-  (fp_text user "${REFERENCE}" (at 0 7.62 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ccf3d06b-f435-4793-b285-ca3c1bd459fa)
   )
-  (pad "1" thru_hole circle (at 0 0) (size 4 4) (drill 2.1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
+  (pad "1" thru_hole circle (at 0 0) (size 4 4) (drill 2.1) (layers *.Cu *.Mask) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
 )
diff --git a/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M3_PAD.kicad_mod b/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M3_PAD.kicad_mod
index 248612a..d18c89b 100644
--- a/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M3_PAD.kicad_mod
+++ b/footprints/ElsassKabel.pretty/MOUNTING_HOLE_M3_PAD.kicad_mod
@@ -1,20 +1,21 @@
 (footprint "MOUNTING_HOLE_M3_PAD" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 62702A13)
+  (tedit 634C0977)
   (descr "Mounting hole for M3 screw with pads (top, bot)")
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 -3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 -5.08 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 5fbbaf43-ba7f-44ca-83cd-b97297f0da6a)
   )
-  (fp_text value "MOUNTING_HOLE_M3_PAD" (at 0 5.08 unlocked) (layer "F.Fab") hide
+  (fp_text value "MOUNTING_HOLE_M3_PAD" (at 0 5.08 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d8d8e5cd-908c-4cc6-9c66-65441b9b9042)
   )
-  (fp_text user "${REFERENCE}" (at 0 7.62 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ccf3d06b-f435-4793-b285-ca3c1bd459fa)
   )
-  (pad "1" thru_hole circle (at 0 0) (size 6 6) (drill 3.1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
+  (pad "1" thru_hole circle (at 0 0) (size 6 6) (drill 3.1) (layers *.Cu *.Mask) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
 )
diff --git a/footprints/ElsassKabel.pretty/OLED_128x32.kicad_mod b/footprints/ElsassKabel.pretty/OLED_128x32.kicad_mod
deleted file mode 100644
index e5b4eba..0000000
--- a/footprints/ElsassKabel.pretty/OLED_128x32.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(footprint "OLED_128x32" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 626CF786)
-  (descr "OLED Screen 128x32")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 -5.08 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 755f94aa-38f0-4a64-a7c7-6c71cb18cddf)
-  )
-  (fp_text value "OLED" (at 0 2.54 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4970ec6e-3725-4619-b57d-dc2c2cb86ed0)
-  )
-  (fp_text user "OLED" (at 0 -2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5199ad7b-ab84-4971-9df3-53270a0a37ba)
-  )
-  (fp_text user "${REFERENCE}" (at 0 3.81 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f8b47531-6c06-4e54-9fc9-cd9d0f3dd69f)
-  )
-  (fp_rect (start -5.08 -1.27) (end 5.08 1.27) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 9c8ec18d-fd4c-410f-bd9f-c35303bfbf97))
-  (fp_rect (start -6 -36.73) (end 6 1.27) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 21a4e5f9-158c-4a1e-a6d3-12c826291e62))
-  (pad "1" thru_hole circle (at -3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 88e4f832-79d6-4c54-9ce3-4328dcb9d5b5))
-  (pad "2" thru_hole circle (at -1.27 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp bc408f2c-2338-4a2e-9d30-e90fd4d4f487))
-  (pad "3" thru_hole circle (at 1.27 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f5a54919-b960-48fc-8517-e9e32dce0bf0))
-  (pad "4" thru_hole circle (at 3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp ee4527a8-96f7-423b-b0eb-5c3b1bed75f9))
-)
diff --git a/footprints/ElsassKabel.pretty/OLED_128x32_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/OLED_128x32_2_SIDES.kicad_mod
deleted file mode 100644
index e2dc8f3..0000000
--- a/footprints/ElsassKabel.pretty/OLED_128x32_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,37 +0,0 @@
-(footprint "OLED_128x32_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 626CF7BC)
-  (descr "OLED Screen 128x32 (2 sides)")
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 -5.08 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 755f94aa-38f0-4a64-a7c7-6c71cb18cddf)
-  )
-  (fp_text value "OLED" (at 0 2.54 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 4970ec6e-3725-4619-b57d-dc2c2cb86ed0)
-  )
-  (fp_text user "OLED" (at 0 -2.54 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    (tstamp e117b9a3-4868-45c7-860c-7a0459b0683b)
-  )
-  (fp_text user "OLED" (at 0 -2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5199ad7b-ab84-4971-9df3-53270a0a37ba)
-  )
-  (fp_text user "${REFERENCE}" (at 0 3.81 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f8b47531-6c06-4e54-9fc9-cd9d0f3dd69f)
-  )
-  (fp_rect (start -5.08 -1.27) (end 5.08 1.27) (layer "B.SilkS") (width 0.15) (fill none) (tstamp 4212bda0-ee13-4d07-bbb6-e1826cca92d4))
-  (fp_rect (start -5.08 -1.27) (end 5.08 1.27) (layer "F.SilkS") (width 0.15) (fill none) (tstamp e00eea7d-e398-464a-ae33-eec95c233325))
-  (fp_rect (start -6 -36.73) (end 6 1.27) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 21a4e5f9-158c-4a1e-a6d3-12c826291e62))
-  (pad "1" thru_hole circle (at -3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 88e4f832-79d6-4c54-9ce3-4328dcb9d5b5))
-  (pad "2" thru_hole circle (at -1.27 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp bc408f2c-2338-4a2e-9d30-e90fd4d4f487))
-  (pad "3" thru_hole circle (at 1.27 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f5a54919-b960-48fc-8517-e9e32dce0bf0))
-  (pad "4" thru_hole circle (at 3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp ee4527a8-96f7-423b-b0eb-5c3b1bed75f9))
-)
diff --git a/footprints/ElsassKabel.pretty/PRO_MICRO.kicad_mod b/footprints/ElsassKabel.pretty/PRO_MICRO.kicad_mod
index 958741f..2fdcc62 100644
--- a/footprints/ElsassKabel.pretty/PRO_MICRO.kicad_mod
+++ b/footprints/ElsassKabel.pretty/PRO_MICRO.kicad_mod
@@ -1,13 +1,15 @@
 (footprint "PRO_MICRO" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 626CF923)
+  (tedit 634C0A49)
   (descr "Pro Micro with USB connector")
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 13.97) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 17.78) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 75674ae0-b1bf-4c29-b26b-9cf08ea1e0a5)
   )
-  (fp_text value ">VALUE" (at 0 15.24) (layer "F.SilkS") hide
+  (fp_text value "Pro Micro" (at 0 -15.24) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 55b5e555-65e3-4402-9416-f117be4dba20)
   )
@@ -75,10 +77,6 @@
     (effects (font (size 1 1) (thickness 0.15)) (justify right))
     (tstamp a07c1abc-ce64-476d-83b9-7eef111249ab)
   )
-  (fp_text user "Pro Micro" (at 0 -15.24 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b8ba0208-17e8-4fe3-a644-416ba6fee04e)
-  )
   (fp_text user "B6" (at 6.35 15.24 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)) (justify right))
     (tstamp ba0fb79c-5713-4cfe-90da-5bfccb1efd63)
@@ -130,52 +128,28 @@
   (fp_line (start -8.89 -16.51) (end -8.89 16.51) (layer "Dwgs.User") (width 0.15) (tstamp 79c86c81-1e60-4067-b0e7-4eaaa5348326))
   (fp_line (start 8.89 16.51) (end 8.89 -16.51) (layer "Dwgs.User") (width 0.15) (tstamp 7f270a66-012c-43c0-b30d-3e3a925cbd61))
   (fp_line (start -3.81 -18.288) (end 3.81 -18.288) (layer "Dwgs.User") (width 0.15) (tstamp e8545b5a-77ca-4d05-a0b8-125f7d8e3629))
-  (pad "1" thru_hole circle (at -7.62 -12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 2dd30b7f-3734-46d0-94cc-1b18069ed498))
-  (pad "2" thru_hole circle (at -7.62 -10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp e88da5de-1524-421c-b544-671bcc707c2a))
-  (pad "3" thru_hole circle (at -7.62 -7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4c34cca3-671e-4cbb-8c98-2c563fd357db))
-  (pad "4" thru_hole circle (at -7.62 -5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp ca5ad450-3902-481b-90b6-83da54a5772d))
-  (pad "5" thru_hole circle (at -7.62 -2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 0374ad91-b215-4fae-ba3c-0c7b8ba2f603))
-  (pad "6" thru_hole circle (at -7.62 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp bd7ee4a2-159a-4837-87f6-4c41a5dd6ce8))
-  (pad "7" thru_hole circle (at -7.62 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 93ffad1a-6bff-4b74-b801-425c4ffe8171))
-  (pad "8" thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4f67b684-7ac6-4368-a86a-2c2754c3821f))
-  (pad "9" thru_hole circle (at -7.62 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp a812f11f-f026-42a0-904e-f8dc88df0747))
-  (pad "10" thru_hole circle (at -7.62 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4c516544-a53a-48f3-ae29-6e5455f8b1e6))
-  (pad "11" thru_hole circle (at -7.62 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp fdcf3a48-bfcf-4640-bd1b-06b68c85f2c2))
-  (pad "12" thru_hole circle (at -7.62 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 850f4c06-51c4-419d-ae91-62019d280a7a))
-  (pad "13" thru_hole circle (at 7.62 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 5c120615-7b34-4376-98c4-994ae5b3b131))
-  (pad "14" thru_hole circle (at 7.62 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp e1b91ddc-33d3-4d4d-8c25-d116e5ba43e0))
-  (pad "15" thru_hole circle (at 7.62 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 3e34f9e8-54f9-4335-9921-f82427e5cf2f))
-  (pad "16" thru_hole circle (at 7.62 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 40f6b9ac-afc1-4f30-82cc-7936ec35abf9))
-  (pad "17" thru_hole circle (at 7.62 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 5026f652-a3c3-40da-b1b3-18817a846309))
-  (pad "18" thru_hole circle (at 7.62 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp e18a0001-fde7-490a-b11e-9d0b18712d51))
-  (pad "19" thru_hole circle (at 7.62 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 6ec503e2-372d-41b4-bd9d-d511c953e3f9))
-  (pad "20" thru_hole circle (at 7.62 -2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 5b6e3898-e35c-47cc-80c8-3557bc05e685))
-  (pad "21" thru_hole circle (at 7.62 -5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 21baffe9-5732-4613-a98e-f6a90188f6d6))
-  (pad "22" thru_hole circle (at 7.62 -7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 1c8bff45-4df4-4df7-8028-c3646cd74fc7))
-  (pad "23" thru_hole circle (at 7.62 -10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 9d712c28-7284-4e0b-bde9-adbfdf06743f))
-  (pad "24" thru_hole circle (at 7.62 -12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp d6d63e09-315e-473d-938e-d2fae58cb5ac))
+  (pad "1" thru_hole circle (at -7.62 -12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 2dd30b7f-3734-46d0-94cc-1b18069ed498))
+  (pad "2" thru_hole circle (at -7.62 -10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp e88da5de-1524-421c-b544-671bcc707c2a))
+  (pad "3" thru_hole circle (at -7.62 -7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 4c34cca3-671e-4cbb-8c98-2c563fd357db))
+  (pad "4" thru_hole circle (at -7.62 -5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp ca5ad450-3902-481b-90b6-83da54a5772d))
+  (pad "5" thru_hole circle (at -7.62 -2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 0374ad91-b215-4fae-ba3c-0c7b8ba2f603))
+  (pad "6" thru_hole circle (at -7.62 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp bd7ee4a2-159a-4837-87f6-4c41a5dd6ce8))
+  (pad "7" thru_hole circle (at -7.62 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 93ffad1a-6bff-4b74-b801-425c4ffe8171))
+  (pad "8" thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 4f67b684-7ac6-4368-a86a-2c2754c3821f))
+  (pad "9" thru_hole circle (at -7.62 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp a812f11f-f026-42a0-904e-f8dc88df0747))
+  (pad "10" thru_hole circle (at -7.62 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 4c516544-a53a-48f3-ae29-6e5455f8b1e6))
+  (pad "11" thru_hole circle (at -7.62 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp fdcf3a48-bfcf-4640-bd1b-06b68c85f2c2))
+  (pad "12" thru_hole circle (at -7.62 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 850f4c06-51c4-419d-ae91-62019d280a7a))
+  (pad "13" thru_hole circle (at 7.62 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 5c120615-7b34-4376-98c4-994ae5b3b131))
+  (pad "14" thru_hole circle (at 7.62 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp e1b91ddc-33d3-4d4d-8c25-d116e5ba43e0))
+  (pad "15" thru_hole circle (at 7.62 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 3e34f9e8-54f9-4335-9921-f82427e5cf2f))
+  (pad "16" thru_hole circle (at 7.62 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 40f6b9ac-afc1-4f30-82cc-7936ec35abf9))
+  (pad "17" thru_hole circle (at 7.62 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 5026f652-a3c3-40da-b1b3-18817a846309))
+  (pad "18" thru_hole circle (at 7.62 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp e18a0001-fde7-490a-b11e-9d0b18712d51))
+  (pad "19" thru_hole circle (at 7.62 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 6ec503e2-372d-41b4-bd9d-d511c953e3f9))
+  (pad "20" thru_hole circle (at 7.62 -2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 5b6e3898-e35c-47cc-80c8-3557bc05e685))
+  (pad "21" thru_hole circle (at 7.62 -5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 21baffe9-5732-4613-a98e-f6a90188f6d6))
+  (pad "22" thru_hole circle (at 7.62 -7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 1c8bff45-4df4-4df7-8028-c3646cd74fc7))
+  (pad "23" thru_hole circle (at 7.62 -10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 9d712c28-7284-4e0b-bde9-adbfdf06743f))
+  (pad "24" thru_hole circle (at 7.62 -12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp d6d63e09-315e-473d-938e-d2fae58cb5ac))
 )
diff --git a/footprints/ElsassKabel.pretty/PRO_MICRO_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/PRO_MICRO_2_SIDES.kicad_mod
deleted file mode 100644
index 6f11173..0000000
--- a/footprints/ElsassKabel.pretty/PRO_MICRO_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,348 +0,0 @@
-(footprint "PRO_MICRO_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 626CF957)
-  (descr "Pro Micro with USB connector")
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 13.97) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 75674ae0-b1bf-4c29-b26b-9cf08ea1e0a5)
-  )
-  (fp_text value ">VALUE" (at 0 15.24) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 55b5e555-65e3-4402-9416-f117be4dba20)
-  )
-  (fp_text user "TX0/D3" (at 8.128 -13.97 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp 00a2f2b5-14aa-4afd-bced-d3d12e759a23)
-  )
-  (fp_text user "VCC" (at -4.572 -6.35 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 0471f253-a72b-4ea7-b6f0-5ec6d893951b)
-  )
-  (fp_text user "B3" (at -4.572 8.89 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 12ad6965-049b-4f26-b47d-a568f8e2f2f4)
-  )
-  (fp_text user "B1" (at -4.572 6.35 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 20068ca8-4d89-40d5-8cc3-a88d2208d864)
-  )
-  (fp_text user "D1/SDA" (at 8.128 -3.81 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp 25a53107-0414-4363-9616-a7d291dc0d84)
-  )
-  (fp_text user "B6" (at -4.572 13.97 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 2f812110-a1b0-44bb-bd91-00be9b91196c)
-  )
-  (fp_text user "B5" (at 8.128 13.97 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp 3d474465-e4a5-4ded-be8e-3c472622f44d)
-  )
-  (fp_text user "GND" (at 8.128 -6.35 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp 3f6ee3b0-d875-482b-bdb8-7c0689c767b1)
-  )
-  (fp_text user "F4" (at -4.572 -3.81 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 4ff94b7b-53b9-491a-ba27-da297da89fb7)
-  )
-  (fp_text user "F7" (at -4.572 3.81 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 683a5b90-f2a4-47d4-a0ef-7004c224fdda)
-  )
-  (fp_text user "D4" (at 8.128 1.27 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp 68513806-7dc4-4ce3-a311-86049a308f19)
-  )
-  (fp_text user "F6" (at -4.572 1.27 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 68e59cb2-edff-4874-ada0-cb63a3c97218)
-  )
-  (fp_text user "RESET" (at -4.572 -8.89 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 78d72c1b-dafe-49ae-aa9e-de2c79ecdc0b)
-  )
-  (fp_text user "Pro Micro" (at 1.778 -16.51 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    (tstamp 8ff5ff5f-7aca-4b11-94e9-b9a22d0ac8fc)
-  )
-  (fp_text user "F5" (at -4.572 -1.27 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp 972ef3e8-b848-4cd8-aa10-d6f277120b01)
-  )
-  (fp_text user "GND" (at -4.572 -11.43 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp b2b51ec4-1a70-47cb-94f8-4032a61a6347)
-  )
-  (fp_text user "E6" (at 8.128 8.89 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp c5c0852d-9913-46e2-b4ba-47e88bebe41d)
-  )
-  (fp_text user "C6" (at 8.128 3.81 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp c8fb4913-3537-44c5-9b4e-c1941745b408)
-  )
-  (fp_text user "D7" (at 8.128 6.35 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp ce638961-0f19-4bf1-99c9-bdb50ade614c)
-  )
-  (fp_text user "RAW" (at -4.572 -13.97 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp d1cd004f-5133-4cc3-8970-e57a12bda7bd)
-  )
-  (fp_text user "GND" (at 8.128 -8.89 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp dc083a86-f1b6-4137-889e-cfdbbf2371b5)
-  )
-  (fp_text user "D0/SCL" (at 8.128 -1.27 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp e27b1c1e-4334-41de-b195-7cb6f531aaad)
-  )
-  (fp_text user "B2" (at -4.549588 11.482294 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right mirror))
-    (tstamp e3426ab6-ea5d-46b0-aa0e-a408fa92b115)
-  )
-  (fp_text user "RX1/D2" (at 8.128 -11.43 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp ea6df596-8304-44a4-a639-ca6e337edac3)
-  )
-  (fp_text user "B4" (at 8.128 11.43 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
-    (tstamp fad66723-7c2a-4915-898a-73ee45780ce6)
-  )
-  (fp_text user "RAW" (at 6.35 -12.7 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp 0f0b13c7-380b-467e-92ce-2b9bc37a2ca1)
-  )
-  (fp_text user "RESET" (at 6.35 -7.62 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp 145563ca-f9b2-4f01-a2fc-1817e91fbf47)
-  )
-  (fp_text user "GND" (at -6.35 -5.08 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 15977b9f-0668-4275-8989-ca48f55d1789)
-  )
-  (fp_text user "C6" (at -6.35 5.08 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 2d1c91d8-38b3-43c0-b97d-fce7765e77d5)
-  )
-  (fp_text user "B3" (at 6.35 10.16 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp 2dbd15f4-4b6b-415b-8517-1bae7016cc9f)
-  )
-  (fp_text user "B2" (at 6.327588 12.752294 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp 3427d123-61e2-4c57-80e1-efb5d2751d47)
-  )
-  (fp_text user "E6" (at -6.35 10.16 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 42589805-d870-4e5e-a7a4-a45895232563)
-  )
-  (fp_text user "RX1/D2" (at -6.35 -10.16 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 51cc475e-b0c8-4783-a70e-6ee2d41eff55)
-  )
-  (fp_text user "D0/SCL" (at -6.35 0 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 52fed30a-98b8-470f-bc66-2a76c10735b8)
-  )
-  (fp_text user "F7" (at 6.35 5.08 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp 55fec84c-f38b-4c24-8678-bb8ae45083f8)
-  )
-  (fp_text user "TX0/D3" (at -6.35 -12.7 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 6597315b-41d3-4f60-89fc-64db10289169)
-  )
-  (fp_text user "B5" (at -6.35 15.24 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 6a18047e-a78b-40c3-afce-b7106af23ae7)
-  )
-  (fp_text user "VCC" (at 6.35 -5.08 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp 842941d2-d9a4-448b-8818-c6f178b91854)
-  )
-  (fp_text user "D1/SDA" (at -6.35 -2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 917efc1a-757f-4a4e-908e-db2a18cf4c79)
-  )
-  (fp_text user "GND" (at -6.35 -7.62 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp 97e39d73-5296-4edc-b75a-073e8d95324f)
-  )
-  (fp_text user "F6" (at 6.35 2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp a07c1abc-ce64-476d-83b9-7eef111249ab)
-  )
-  (fp_text user "B6" (at 6.35 15.24 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp ba0fb79c-5713-4cfe-90da-5bfccb1efd63)
-  )
-  (fp_text user "F5" (at 6.35 0 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp c079aac2-0176-4b29-96e0-2718f74a2581)
-  )
-  (fp_text user "B4" (at -6.35 12.7 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp c1be5a28-10c5-4401-a577-17211b92c028)
-  )
-  (fp_text user "Pro Micro" (at 0 -15.24 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp c7c46d74-5b10-454f-b886-68aa9b9d8635)
-  )
-  (fp_text user "D4" (at -6.35 2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp cd8bfe48-613c-4adc-8292-d3270f8384d3)
-  )
-  (fp_text user "D7" (at -6.35 7.62 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify left))
-    (tstamp cdbebb5e-a816-472c-9169-2f89317f1f2a)
-  )
-  (fp_text user "B1" (at 6.35 7.62 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp def81c60-e7f7-4270-82ae-763a6d45b240)
-  )
-  (fp_text user "GND" (at 6.35 -10.16 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp e5520adb-fe9f-4193-a184-87fad7728a77)
-  )
-  (fp_text user "F4" (at 6.35 -2.54 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify right))
-    (tstamp f6a9392b-9123-48ce-b3dd-762db4241c4e)
-  )
-  (fp_text user "USB" (at 1.778 -18.542) (layer "Dwgs.User")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 2de886e7-ad93-4426-82af-d546706ddb51)
-  )
-  (fp_text user "USB" (at 0 -17.272) (layer "Dwgs.User")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 365c8270-80eb-4a12-8564-ec36a73d5d08)
-  )
-  (fp_line (start -7.112 15.24) (end -7.112 13.97) (layer "B.SilkS") (width 0.15) (tstamp 3271ee5d-60c6-45a6-8330-35d86005f3c1))
-  (fp_line (start -5.842 -17.78) (end -7.112 -17.78) (layer "B.SilkS") (width 0.15) (tstamp 4601dce8-5dca-487b-891a-071c562d572a))
-  (fp_line (start 10.668 15.24) (end 10.668 13.97) (layer "B.SilkS") (width 0.15) (tstamp 48115532-4a1f-40b7-b817-287eeae32735))
-  (fp_line (start -7.112 -17.78) (end -7.112 -16.51) (layer "B.SilkS") (width 0.15) (tstamp 4ebc4c1f-83dd-4d11-be7d-072087a04ed4))
-  (fp_line (start 9.398 15.24) (end 10.668 15.24) (layer "B.SilkS") (width 0.15) (tstamp 7cdcf6c3-788d-415c-a7ac-e2dedce1d00c))
-  (fp_line (start 10.668 -16.51) (end 10.668 -17.78) (layer "B.SilkS") (width 0.15) (tstamp b842e5fa-22b5-4ee9-a1dc-7a46eafd89a1))
-  (fp_line (start 10.668 -17.78) (end 9.398 -17.78) (layer "B.SilkS") (width 0.15) (tstamp db585110-1207-43ee-b01c-739dfd5f4452))
-  (fp_line (start -5.842 15.24) (end -7.112 15.24) (layer "B.SilkS") (width 0.15) (tstamp ea7a3495-beb8-49cd-ac5a-266c47850dcf))
-  (fp_line (start -8.89 -16.51) (end -7.62 -16.51) (layer "F.SilkS") (width 0.15) (tstamp 1bb33481-4665-46d7-bd7a-d01b036c5aff))
-  (fp_line (start 8.89 16.51) (end 8.89 15.24) (layer "F.SilkS") (width 0.15) (tstamp 32048c75-daf8-4769-af74-462aa2cc4ae9))
-  (fp_line (start -7.62 16.51) (end -8.89 16.51) (layer "F.SilkS") (width 0.15) (tstamp 370fa099-a488-4833-9be8-7f0ee0dc2301))
-  (fp_line (start 7.62 16.51) (end 8.89 16.51) (layer "F.SilkS") (width 0.15) (tstamp 430227b6-1153-496c-a36e-e699e49a4b53))
-  (fp_line (start 8.89 -16.51) (end 8.89 -15.24) (layer "F.SilkS") (width 0.15) (tstamp 47d7f0ab-d26d-410a-b2b7-642981cde97b))
-  (fp_line (start 7.62 -16.51) (end 8.89 -16.51) (layer "F.SilkS") (width 0.15) (tstamp 981b55d5-0753-4e86-9d83-e78749534b3d))
-  (fp_line (start -8.89 16.51) (end -8.89 15.24) (layer "F.SilkS") (width 0.15) (tstamp d7d11d6d-ae22-4a72-bb53-dbb44c673afb))
-  (fp_line (start -8.89 -15.24) (end -8.89 -16.51) (layer "F.SilkS") (width 0.15) (tstamp ee87b791-7bf6-4294-bf5f-21508e7078b8))
-  (fp_line (start 5.588 -19.558) (end -2.032 -19.558) (layer "Dwgs.User") (width 0.15) (tstamp 06f1ee8b-edf4-4697-83fd-9e9f1808bc4b))
-  (fp_line (start 3.81 -18.288) (end 3.81 -16.51) (layer "Dwgs.User") (width 0.15) (tstamp 1364471e-6d9a-4296-b76b-342ca1d6faae))
-  (fp_line (start -8.89 16.51) (end 8.89 16.51) (layer "Dwgs.User") (width 0.15) (tstamp 46f3598a-2312-464d-938a-6b7031ae10b2))
-  (fp_line (start -2.032 -19.558) (end -2.032 -17.78) (layer "Dwgs.User") (width 0.15) (tstamp 48f0b9c3-81b3-422b-9b94-c86a10a32650))
-  (fp_line (start -7.112 15.24) (end -7.112 -17.78) (layer "Dwgs.User") (width 0.15) (tstamp 63cb6a1e-a707-4a86-92b7-a8ee87308aa4))
-  (fp_line (start -3.81 -16.51) (end -3.81 -18.288) (layer "Dwgs.User") (width 0.15) (tstamp 69adadb9-ff3c-4ce2-814d-b306f29ff7c0))
-  (fp_line (start 5.588 -17.78) (end 5.588 -19.558) (layer "Dwgs.User") (width 0.15) (tstamp 6da754db-e4c6-4fbe-8e43-8847cc322bf2))
-  (fp_line (start 8.89 -16.51) (end -8.89 -16.51) (layer "Dwgs.User") (width 0.15) (tstamp 71a41c53-c356-43b2-b77e-cfa4fd361a0d))
-  (fp_line (start -8.89 -16.51) (end -8.89 16.51) (layer "Dwgs.User") (width 0.15) (tstamp 79c86c81-1e60-4067-b0e7-4eaaa5348326))
-  (fp_line (start 10.668 15.24) (end -7.112 15.24) (layer "Dwgs.User") (width 0.15) (tstamp 7e87feb7-0101-4554-befb-49d810a78ed2))
-  (fp_line (start 8.89 16.51) (end 8.89 -16.51) (layer "Dwgs.User") (width 0.15) (tstamp 7f270a66-012c-43c0-b30d-3e3a925cbd61))
-  (fp_line (start -7.112 -17.78) (end 10.668 -17.78) (layer "Dwgs.User") (width 0.15) (tstamp 8e4a566a-196c-48c4-879c-c68fae3aede2))
-  (fp_line (start 10.668 -17.78) (end 10.668 15.24) (layer "Dwgs.User") (width 0.15) (tstamp d32ce8b6-0aaf-4ec2-a3c1-e2445b0ab23d))
-  (fp_line (start -3.81 -18.288) (end 3.81 -18.288) (layer "Dwgs.User") (width 0.15) (tstamp e8545b5a-77ca-4d05-a0b8-125f7d8e3629))
-  (pad "1" thru_hole circle (at -7.62 -12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 2dd30b7f-3734-46d0-94cc-1b18069ed498))
-  (pad "1" thru_hole circle (at 9.398 -13.97) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp a61cdee5-4d32-41db-b621-f3a125dbe8b4))
-  (pad "2" thru_hole circle (at 9.398 -11.43) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp e47931f0-4a8c-427e-8a3d-83a8d8902776))
-  (pad "2" thru_hole circle (at -7.62 -10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp e88da5de-1524-421c-b544-671bcc707c2a))
-  (pad "3" thru_hole circle (at -7.62 -7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4c34cca3-671e-4cbb-8c98-2c563fd357db))
-  (pad "3" thru_hole circle (at 9.398 -8.89) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp af0cbc82-9747-4f5c-bf7b-a3e94024473a))
-  (pad "4" thru_hole circle (at -7.62 -5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp ca5ad450-3902-481b-90b6-83da54a5772d))
-  (pad "4" thru_hole circle (at 9.398 -6.35) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp ff8ac255-28e9-4efa-a61c-7a94d4ff99da))
-  (pad "5" thru_hole circle (at -7.62 -2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 0374ad91-b215-4fae-ba3c-0c7b8ba2f603))
-  (pad "5" thru_hole circle (at 9.398 -3.81) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp a2e2a35a-1639-4a45-9317-1cb5d6d19f92))
-  (pad "6" thru_hole circle (at 9.398 -1.27) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 6b443ab8-d13c-4f46-81ca-abbf12c12bfe))
-  (pad "6" thru_hole circle (at -7.62 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp bd7ee4a2-159a-4837-87f6-4c41a5dd6ce8))
-  (pad "7" thru_hole circle (at 9.398 1.27) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 67ffbf9a-9d71-43da-9431-95254cf9512f))
-  (pad "7" thru_hole circle (at -7.62 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 93ffad1a-6bff-4b74-b801-425c4ffe8171))
-  (pad "8" thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4f67b684-7ac6-4368-a86a-2c2754c3821f))
-  (pad "8" thru_hole circle (at 9.398 3.81) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp a4724b59-9fdd-46e1-a37f-4e0695258fe6))
-  (pad "9" thru_hole circle (at -7.62 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp a812f11f-f026-42a0-904e-f8dc88df0747))
-  (pad "9" thru_hole circle (at 9.398 6.35) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp c666e752-30d5-413a-9574-348943906c9e))
-  (pad "10" thru_hole circle (at 9.398 8.89) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4796cc0e-08f8-4712-9b81-9a72ebdfe464))
-  (pad "10" thru_hole circle (at -7.62 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 4c516544-a53a-48f3-ae29-6e5455f8b1e6))
-  (pad "11" thru_hole circle (at 9.398 11.43) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8c8bf826-0d8f-47c8-ba32-f6b7ba5685f5))
-  (pad "11" thru_hole circle (at -7.62 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp fdcf3a48-bfcf-4640-bd1b-06b68c85f2c2))
-  (pad "12" thru_hole circle (at -7.62 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 850f4c06-51c4-419d-ae91-62019d280a7a))
-  (pad "12" thru_hole circle (at 9.398 13.97) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp dfd80ab4-a65f-4c13-ab69-b7a57a38de5a))
-  (pad "13" thru_hole circle (at 7.62 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 5c120615-7b34-4376-98c4-994ae5b3b131))
-  (pad "13" thru_hole circle (at -5.842 13.97) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp d70f5d09-6615-44f1-b6e0-eedec883d879))
-  (pad "14" thru_hole circle (at -5.842 11.43) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 51922175-4c44-4a31-bb11-efc74e3866fe))
-  (pad "14" thru_hole circle (at 7.62 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp e1b91ddc-33d3-4d4d-8c25-d116e5ba43e0))
-  (pad "15" thru_hole circle (at 7.62 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 3e34f9e8-54f9-4335-9921-f82427e5cf2f))
-  (pad "15" thru_hole circle (at -5.842 8.89) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 70d8d5c4-6ca3-4d9d-b0ee-1b92bdb07be0))
-  (pad "16" thru_hole circle (at -5.842 6.35) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 19a7dc8f-95c1-4aed-b807-27027ace376b))
-  (pad "16" thru_hole circle (at 7.62 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 40f6b9ac-afc1-4f30-82cc-7936ec35abf9))
-  (pad "17" thru_hole circle (at -5.842 3.81) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 0b6bb0fd-afaf-441d-98b6-095ac00e7062))
-  (pad "17" thru_hole circle (at 7.62 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 5026f652-a3c3-40da-b1b3-18817a846309))
-  (pad "18" thru_hole circle (at 7.62 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp e18a0001-fde7-490a-b11e-9d0b18712d51))
-  (pad "18" thru_hole circle (at -5.842 1.27) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp eb136cc3-693a-48e0-b2f1-5f3abbed5429))
-  (pad "19" thru_hole circle (at -5.842 -1.27) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 08d6ed6b-83d0-422a-901a-ee867601b833))
-  (pad "19" thru_hole circle (at 7.62 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 6ec503e2-372d-41b4-bd9d-d511c953e3f9))
-  (pad "20" thru_hole circle (at 7.62 -2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 5b6e3898-e35c-47cc-80c8-3557bc05e685))
-  (pad "20" thru_hole circle (at -5.842 -3.81) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f080c537-71c6-4dd9-bb4a-555a57d72838))
-  (pad "21" thru_hole circle (at 7.62 -5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 21baffe9-5732-4613-a98e-f6a90188f6d6))
-  (pad "21" thru_hole circle (at -5.842 -6.35) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 6570818d-b65a-4af2-a941-77a34cdee375))
-  (pad "22" thru_hole circle (at 7.62 -7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 1c8bff45-4df4-4df7-8028-c3646cd74fc7))
-  (pad "22" thru_hole circle (at -5.842 -8.89) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 3eec8770-0c7b-4bb2-86fa-8b30cd211c1c))
-  (pad "23" thru_hole circle (at -5.842 -11.43) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 78e77660-71db-4fcc-880a-f3661429fbe5))
-  (pad "23" thru_hole circle (at 7.62 -10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 9d712c28-7284-4e0b-bde9-adbfdf06743f))
-  (pad "24" thru_hole circle (at -5.842 -13.97) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 91071e44-e7cf-47b2-b33b-9fbb68533ee5))
-  (pad "24" thru_hole circle (at 7.62 -12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp d6d63e09-315e-473d-938e-d2fae58cb5ac))
-)
diff --git a/footprints/ElsassKabel.pretty/RESISTOR.kicad_mod b/footprints/ElsassKabel.pretty/RESISTOR.kicad_mod
index 1427d7e..127298b 100644
--- a/footprints/ElsassKabel.pretty/RESISTOR.kicad_mod
+++ b/footprints/ElsassKabel.pretty/RESISTOR.kicad_mod
@@ -1,26 +1,26 @@
 (footprint "RESISTOR" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 626CF707)
+  (tedit 634C0C1B)
   (descr "Resistor")
   (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 0 unlocked) (layer "F.SilkS")
+  (fp_text reference "REF**" (at 0 -2.54 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 7a1bfc36-ef05-4214-80d9-db7f491573ae)
   )
-  (fp_text value "RESISTOR" (at 0 2.032 unlocked) (layer "F.Fab")
+  (fp_text value "RESISTOR" (at 0 2.54 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp b7cc3d0e-1fc8-4cd7-a3c2-1509da6ebf42)
   )
-  (fp_text user "${REFERENCE}" (at 0 3.556 unlocked) (layer "F.Fab")
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 5915437d-3d33-40dc-bddd-7a4b3a8695a3)
   )
   (fp_line (start -2.54 0) (end -3.175 0) (layer "F.SilkS") (width 0.15) (tstamp 5b7b2907-5f5e-4bca-862b-f3db166563f9))
   (fp_line (start 2.54 0) (end 3.175 0) (layer "F.SilkS") (width 0.15) (tstamp dc7dd0c5-7906-4fe4-afa8-912fb0ffe6ad))
   (fp_rect (start -2.54 -0.762) (end 2.54 0.762) (layer "F.SilkS") (width 0.15) (fill none) (tstamp ef1e359c-18d7-4e86-9972-1f8b4d95c46f))
-  (pad "1" thru_hole circle (at -3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 25a58b38-e4e5-4924-abd3-89b90e72c12a))
-  (pad "2" thru_hole circle (at 3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 677e0101-81f0-4545-8c72-23c9f6cef51e))
+  (fp_rect (start -5.08 -1.27) (end 5.08 1.27) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp abb0809b-06bb-4421-8ce2-56e12207b876))
+  (pad "1" thru_hole circle (at -3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 25a58b38-e4e5-4924-abd3-89b90e72c12a))
+  (pad "2" thru_hole circle (at 3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 677e0101-81f0-4545-8c72-23c9f6cef51e))
 )
diff --git a/footprints/ElsassKabel.pretty/RESISTOR_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/RESISTOR_2_SIDES.kicad_mod
deleted file mode 100644
index 8b0b512..0000000
--- a/footprints/ElsassKabel.pretty/RESISTOR_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,33 +0,0 @@
-(footprint "RESISTOR_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 626CF751)
-  (descr "Resistor")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 0 unlocked) (layer "F.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 7a1bfc36-ef05-4214-80d9-db7f491573ae)
-  )
-  (fp_text value "RESISTOR_2_SIDES" (at 0 2.032 unlocked) (layer "F.Fab")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b7cc3d0e-1fc8-4cd7-a3c2-1509da6ebf42)
-  )
-  (fp_text user "REF**" (at 0 0 unlocked) (layer "B.SilkS")
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    (tstamp fa5d2b8a-dbbf-454c-a9bb-638c6b670c9e)
-  )
-  (fp_text user "${REFERENCE}" (at 0 3.556 unlocked) (layer "F.Fab")
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 5915437d-3d33-40dc-bddd-7a4b3a8695a3)
-  )
-  (fp_line (start -2.54 0) (end -3.175 0) (layer "B.SilkS") (width 0.15) (tstamp 212a3201-764e-4e1b-bfc5-377fbc81f902))
-  (fp_line (start 2.54 0) (end 3.175 0) (layer "B.SilkS") (width 0.15) (tstamp 6e34c56e-9eac-4e0c-98ea-41a21c440314))
-  (fp_rect (start 2.54 -0.762) (end -2.54 0.762) (layer "B.SilkS") (width 0.15) (fill none) (tstamp 20e8eb62-4123-4870-bceb-de88af883c77))
-  (fp_line (start -2.54 0) (end -3.175 0) (layer "F.SilkS") (width 0.15) (tstamp 5b7b2907-5f5e-4bca-862b-f3db166563f9))
-  (fp_line (start 2.54 0) (end 3.175 0) (layer "F.SilkS") (width 0.15) (tstamp dc7dd0c5-7906-4fe4-afa8-912fb0ffe6ad))
-  (fp_rect (start -2.54 -0.762) (end 2.54 0.762) (layer "F.SilkS") (width 0.15) (fill none) (tstamp ef1e359c-18d7-4e86-9972-1f8b4d95c46f))
-  (pad "1" thru_hole circle (at -3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 25a58b38-e4e5-4924-abd3-89b90e72c12a))
-  (pad "2" thru_hole circle (at 3.81 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 677e0101-81f0-4545-8c72-23c9f6cef51e))
-)
diff --git a/footprints/ElsassKabel.pretty/ROTARY_ENCODER.kicad_mod b/footprints/ElsassKabel.pretty/ROTARY_ENCODER.kicad_mod
new file mode 100644
index 0000000..eafce72
--- /dev/null
+++ b/footprints/ElsassKabel.pretty/ROTARY_ENCODER.kicad_mod
@@ -0,0 +1,36 @@
+(footprint "ROTARY_ENCODER" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 634C0E5C)
+  (descr "Rotary encoder with select switch")
+  (tags "ROTARY ENCODER W/ SELECT SWITCH")
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
+  (fp_text reference "REF**" (at 0 -8.89 180) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 5a1aa7ff-f7ef-4d1a-ab6d-07a84f285065)
+  )
+  (fp_text value "ROTARY_ENCODER" (at 0 8.89) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp f227350f-56c6-4b75-b4e6-94fe531345bb)
+  )
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 28168752-56b0-4e7c-905e-5696ed3a23e6)
+  )
+  (fp_line (start -5.588 -5.842) (end -6.858 -5.842) (layer "F.SilkS") (width 0.15) (tstamp 1554f9da-59b0-42c3-ac40-4b2115f40667))
+  (fp_line (start 6.858 -5.842) (end 5.588 -5.842) (layer "F.SilkS") (width 0.15) (tstamp 50977af3-bb05-4be4-a99e-e527ec040599))
+  (fp_line (start -6.858 -5.842) (end -6.858 -4.572) (layer "F.SilkS") (width 0.15) (tstamp 53840da6-ef27-4802-a2bf-4f2db1376f02))
+  (fp_line (start 5.588 5.842) (end 6.858 5.842) (layer "F.SilkS") (width 0.15) (tstamp 6ca73f16-e136-448e-b51e-2dd4d76e6b53))
+  (fp_line (start -6.858 5.842) (end -6.858 4.572) (layer "F.SilkS") (width 0.15) (tstamp 94639bb9-0775-452e-a970-139aa5b1e234))
+  (fp_line (start -6.858 5.842) (end -5.588 5.842) (layer "F.SilkS") (width 0.15) (tstamp 959cf25a-cf37-49eb-9e07-25a1a09de908))
+  (fp_line (start 6.858 -5.842) (end 6.858 -4.572) (layer "F.SilkS") (width 0.15) (tstamp c7de22c5-aba4-4acd-8a8e-5a40b7e77df8))
+  (fp_line (start 6.858 5.842) (end 6.858 4.572) (layer "F.SilkS") (width 0.15) (tstamp f722e380-fed6-4ec7-be3b-da3399fd6ed7))
+  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp acd18701-a4ed-492d-a44b-f46c0ff11a07))
+  (pad "" thru_hole circle (at 0 -5.588 180) (size 3.302 3.302) (drill 2.286) (layers *.Cu *.Mask) (tstamp 2d1ee980-fb33-457a-a1f9-e387a586d664))
+  (pad "" thru_hole circle (at 0 5.588 180) (size 3.302 3.302) (drill 2.286) (layers *.Cu *.Mask) (tstamp 7bb2edc1-0640-4bbb-bc5c-d6eb028a135c))
+  (pad "1" thru_hole circle (at 6.985 2.54 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask) (tstamp 2dbfff57-2e19-4938-b7b7-2d2edd4a4b8f))
+  (pad "2" thru_hole circle (at 6.985 -2.54 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask) (tstamp 28917afb-f49d-48d4-b2dd-93033eddc841))
+  (pad "A" thru_hole circle (at -7.493 -2.54 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask) (tstamp 7127734b-7295-49f7-bb09-e6dd9e50ab45))
+  (pad "B" thru_hole circle (at -7.493 2.54 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask) (tstamp ba7247f9-538e-4ad0-8235-b65e2fd341d1))
+  (pad "C" thru_hole circle (at -7.493 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask) (tstamp 7cd8aefa-71f6-41d2-b6cd-0b60bd908f4e))
+)
diff --git a/footprints/ElsassKabel.pretty/SK6812.kicad_mod b/footprints/ElsassKabel.pretty/SK6812.kicad_mod
deleted file mode 100644
index 8df44dd..0000000
--- a/footprints/ElsassKabel.pretty/SK6812.kicad_mod
+++ /dev/null
@@ -1,32 +0,0 @@
-(footprint "SK6812" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6290C7FD)
-  (descr "LED SK6812")
-  (solder_mask_margin 0.1)
-  (attr smd)
-  (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f683b564-906b-42f6-a233-cd22c58657dd)
-  )
-  (fp_text value "SK6812" (at 0 1 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 013a1c32-db17-4fdf-9087-65b8bebaf5c1)
-  )
-  (fp_text user "${REFERENCE}" (at -0.5 7 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5316dab-96ab-4569-a34d-520f96a50c86)
-  )
-  (fp_line (start 2.5 2) (end 2 2.5) (layer "F.SilkS") (width 0.15) (tstamp 301727b6-248b-4eb4-8c37-cb369ee1a241))
-  (fp_line (start 2 2.5) (end -2.5 2.5) (layer "F.SilkS") (width 0.15) (tstamp 4cd135a5-fdd1-4851-864a-dadf7c96d9ff))
-  (fp_line (start -2.5 2.5) (end -2.5 -2.5) (layer "F.SilkS") (width 0.15) (tstamp 5900b9d3-f54e-4689-953a-e125f5f9fa71))
-  (fp_line (start -2.5 -2.5) (end 2.5 -2.5) (layer "F.SilkS") (width 0.15) (tstamp 6f75ea3e-6135-44f5-9313-1aad839ab6f6))
-  (fp_line (start 2.5 -2.5) (end 2.5 2) (layer "F.SilkS") (width 0.15) (tstamp d6962950-4b71-4ba8-ac78-7b9bfb3edf70))
-  (pad "1" smd rect (at 2.55 1.6) (size 1.8 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp f3df0678-96d4-4652-9001-a89868c1f45e))
-  (pad "2" smd rect (at 2.55 -1.6) (size 1.8 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp f656a274-a08d-4499-8245-beb474616c55))
-  (pad "3" smd rect (at -2.55 -1.6) (size 1.8 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp d2456fb5-2b99-45e1-9d17-eb9a485a3bd3))
-  (pad "4" smd rect (at -2.55 1.66) (size 1.8 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 6dda73be-73a3-4bdf-aea3-f2d520a51491))
-)
diff --git a/footprints/ElsassKabel.pretty/SK6812_MINI_HS.kicad_mod b/footprints/ElsassKabel.pretty/SK6812_MINI_HS.kicad_mod
deleted file mode 100644
index 940d216..0000000
--- a/footprints/ElsassKabel.pretty/SK6812_MINI_HS.kicad_mod
+++ /dev/null
@@ -1,32 +0,0 @@
-(footprint "SK6812_MINI_HS" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6290C7B9)
-  (descr "LED SK6812 MINI HS")
-  (solder_mask_margin 0.1)
-  (attr smd)
-  (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f683b564-906b-42f6-a233-cd22c58657dd)
-  )
-  (fp_text value "SK6812_MINI_HS" (at 0 1 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 013a1c32-db17-4fdf-9087-65b8bebaf5c1)
-  )
-  (fp_text user "${REFERENCE}" (at -0.5 7 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5316dab-96ab-4569-a34d-520f96a50c86)
-  )
-  (fp_line (start 1.75 1) (end 1 1.75) (layer "F.SilkS") (width 0.15) (tstamp 301727b6-248b-4eb4-8c37-cb369ee1a241))
-  (fp_line (start 1 1.75) (end -1.75 1.75) (layer "F.SilkS") (width 0.15) (tstamp 4cd135a5-fdd1-4851-864a-dadf7c96d9ff))
-  (fp_line (start -1.75 1.75) (end -1.75 -1.75) (layer "F.SilkS") (width 0.15) (tstamp 5900b9d3-f54e-4689-953a-e125f5f9fa71))
-  (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer "F.SilkS") (width 0.15) (tstamp 6f75ea3e-6135-44f5-9313-1aad839ab6f6))
-  (fp_line (start 1.75 -1.75) (end 1.75 1) (layer "F.SilkS") (width 0.15) (tstamp d6962950-4b71-4ba8-ac78-7b9bfb3edf70))
-  (pad "1" smd rect (at 1.65 0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp ad1b11b8-c307-4033-98b8-be675f4d2f7b))
-  (pad "2" smd rect (at 1.65 -0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp c63006f4-f9c8-46c7-9bb9-8175dd3f9e59))
-  (pad "3" smd rect (at -1.65 -0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp d2456fb5-2b99-45e1-9d17-eb9a485a3bd3))
-  (pad "4" smd rect (at -1.65 0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp a2b3b372-641f-49b6-90b0-978c50cc6985))
-)
diff --git a/footprints/ElsassKabel.pretty/SK6812_MINI_HS_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/SK6812_MINI_HS_2_SIDES.kicad_mod
deleted file mode 100644
index 1ad1d05..0000000
--- a/footprints/ElsassKabel.pretty/SK6812_MINI_HS_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,45 +0,0 @@
-(footprint "SK6812_MINI_HS_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6291CA9C)
-  (descr "LED SK6812 MINI HS")
-  (solder_mask_margin 0.1)
-  (attr smd)
-  (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp f683b564-906b-42f6-a233-cd22c58657dd)
-  )
-  (fp_text value "SK6812_MINI_HS_2_SIDES" (at 0 1 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 013a1c32-db17-4fdf-9087-65b8bebaf5c1)
-  )
-  (fp_text user "${REFERENCE}" (at -0.5 7 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5316dab-96ab-4569-a34d-520f96a50c86)
-  )
-  (fp_line (start -1.75 -1.75) (end -1.75 1.75) (layer "B.SilkS") (width 0.15) (tstamp 5b918e6b-2a60-4fa5-ad8b-e73e23f85e4f))
-  (fp_line (start 1.75 -1) (end 1 -1.75) (layer "B.SilkS") (width 0.15) (tstamp 7e14a6ba-72c9-486f-8ebf-f83333348517))
-  (fp_line (start 1 -1.75) (end -1.75 -1.75) (layer "B.SilkS") (width 0.15) (tstamp 91c784cb-86f4-4eb1-9d7f-7df9c50ff534))
-  (fp_line (start 1.75 1.75) (end 1.75 -1) (layer "B.SilkS") (width 0.15) (tstamp b14c35da-dd14-4b8d-93a9-00f219a92f41))
-  (fp_line (start -1.75 1.75) (end 1.75 1.75) (layer "B.SilkS") (width 0.15) (tstamp b746e97a-71d3-4558-80c6-41ab04fe3fba))
-  (fp_line (start 1.75 1) (end 1 1.75) (layer "F.SilkS") (width 0.15) (tstamp 301727b6-248b-4eb4-8c37-cb369ee1a241))
-  (fp_line (start 1 1.75) (end -1.75 1.75) (layer "F.SilkS") (width 0.15) (tstamp 4cd135a5-fdd1-4851-864a-dadf7c96d9ff))
-  (fp_line (start -1.75 1.75) (end -1.75 -1.75) (layer "F.SilkS") (width 0.15) (tstamp 5900b9d3-f54e-4689-953a-e125f5f9fa71))
-  (fp_line (start -1.75 -1.75) (end 1.75 -1.75) (layer "F.SilkS") (width 0.15) (tstamp 6f75ea3e-6135-44f5-9313-1aad839ab6f6))
-  (fp_line (start 1.75 -1.75) (end 1.75 1) (layer "F.SilkS") (width 0.15) (tstamp d6962950-4b71-4ba8-ac78-7b9bfb3edf70))
-  (pad "1" smd rect (at 1.65 -0.9 180) (size 1.5 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 51a502e9-5635-4e96-97f0-80e9b324d808))
-  (pad "1" smd rect (at 1.65 0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp ad1b11b8-c307-4033-98b8-be675f4d2f7b))
-  (pad "2" smd rect (at 1.65 0.9 180) (size 1.5 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 684829a1-14fb-436a-9093-a9211cbef360))
-  (pad "2" smd rect (at 1.65 -0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp c63006f4-f9c8-46c7-9bb9-8175dd3f9e59))
-  (pad "3" smd rect (at -1.65 0.9 180) (size 1.5 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 8a2de80f-1df5-4bd5-a81c-0dc71a22a3a3))
-  (pad "3" smd rect (at -1.65 -0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp d2456fb5-2b99-45e1-9d17-eb9a485a3bd3))
-  (pad "4" smd rect (at -1.65 0.9) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp a2b3b372-641f-49b6-90b0-978c50cc6985))
-  (pad "4" smd rect (at -1.65 -0.9 180) (size 1.5 1) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp b082fdbd-d670-4041-a5e5-3ca0b09bb0a0))
-)
diff --git a/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M2_PAD.kicad_mod b/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M2_PAD.kicad_mod
index d3838cc..fcbc2d9 100644
--- a/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M2_PAD.kicad_mod
+++ b/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M2_PAD.kicad_mod
@@ -1,20 +1,21 @@
 (footprint "STANDOFF_HOLE_M2_PAD" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 62702A1C)
+  (tedit 634C0B9B)
   (descr "Standoff hole for M2 screw with pads (top, bot)")
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 -3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 -3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 5fbbaf43-ba7f-44ca-83cd-b97297f0da6a)
   )
-  (fp_text value "STANDOFF_HOLE_M2_PAD" (at 0 5.08 unlocked) (layer "F.Fab") hide
+  (fp_text value "STANDOFF_HOLE_M2_PAD" (at 0 3.81 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d8d8e5cd-908c-4cc6-9c66-65441b9b9042)
   )
-  (fp_text user "${REFERENCE}" (at 0 7.62 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ccf3d06b-f435-4793-b285-ca3c1bd459fa)
   )
-  (pad "1" thru_hole circle (at 0 0) (size 5 5) (drill 4.1) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
+  (pad "1" thru_hole circle (at 0 0) (size 5 5) (drill 4.1) (layers *.Cu *.Mask) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
 )
diff --git a/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M3_PAD.kicad_mod b/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M3_PAD.kicad_mod
index 0abe109..12e712f 100644
--- a/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M3_PAD.kicad_mod
+++ b/footprints/ElsassKabel.pretty/STANDOFF_HOLE_M3_PAD.kicad_mod
@@ -1,20 +1,21 @@
 (footprint "STANDOFF_HOLE_M3_PAD" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 62702A26)
+  (tedit 634C0B8F)
   (descr "Standoff hole for M3 screw with pads (top, bot)")
+  (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 -3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 -5.08 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 5fbbaf43-ba7f-44ca-83cd-b97297f0da6a)
   )
-  (fp_text value "STANDOFF_HOLE_M3_PAD" (at 0 5.08 unlocked) (layer "F.Fab") hide
+  (fp_text value "STANDOFF_HOLE_M3_PAD" (at 0 5.08 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d8d8e5cd-908c-4cc6-9c66-65441b9b9042)
   )
-  (fp_text user "${REFERENCE}" (at 0 7.62 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ccf3d06b-f435-4793-b285-ca3c1bd459fa)
   )
-  (pad "1" thru_hole circle (at 0 0) (size 6 6) (drill 5.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
+  (pad "1" thru_hole circle (at 0 0) (size 6 6) (drill 5.2) (layers *.Cu *.Mask) (tstamp 9f4f109a-7719-41d6-8056-6cbe1b40d34e))
 )
diff --git a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX.kicad_mod
index 3f11dc6..71ab995 100644
--- a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX.kicad_mod
+++ b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX.kicad_mod
@@ -1,31 +1,34 @@
 (footprint "SWITCH_CHERRY_MX" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 6290B4E9)
+  (tedit 634C0F1E)
   (descr "Cherry MX style switch")
   (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
   )
-  (fp_text value "SWITCH_CHERRY_MX" (at 0 1 unlocked) (layer "F.Fab") hide
+  (fp_text value "SWITCH_CHERRY_MX" (at 0 11.43 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
   )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
   )
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (fp_rect (start -7 -7) (end 7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp de164944-e0ff-4245-95cd-3a1fe8a54ea1))
-  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "1" thru_hole circle (at -3.81 -2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "2" thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
+  (fp_line (start -6.985 -6.985) (end -5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 45422bbb-90eb-4a28-b94f-95b36b1d7c82))
+  (fp_line (start 6.985 -5.715) (end 6.985 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 54d05816-bdfa-450b-939f-fffbc2d3c01c))
+  (fp_line (start 6.985 -6.985) (end 5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 7b484678-4d77-48ca-afb1-6ee93a919f6d))
+  (fp_line (start -6.985 6.985) (end -5.715 6.985) (layer "F.SilkS") (width 0.15) (tstamp a75422d9-422e-4778-9063-f8afd560e898))
+  (fp_line (start 6.985 6.985) (end 6.985 5.715) (layer "F.SilkS") (width 0.15) (tstamp b77cbb9f-3455-44c3-9644-c099a52f9ab8))
+  (fp_line (start 5.715 6.985) (end 6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp e4190bb1-a226-49ff-9764-76a54e44e434))
+  (fp_line (start -6.985 -6.985) (end -6.985 -5.715) (layer "F.SilkS") (width 0.15) (tstamp e8a485f7-8f0c-45d1-8c6e-081d37b0f66f))
+  (fp_line (start -6.985 5.715) (end -6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp fb243ab3-66a3-4311-b4b5-4b425d6daf69))
+  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
+  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
+  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
+  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
+  (pad "1" thru_hole circle (at -3.81 -2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
+  (pad "2" thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
 )
diff --git a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_2_SIDES.kicad_mod
deleted file mode 100644
index 3b7e4b2..0000000
--- a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,35 +0,0 @@
-(footprint "SWITCH_CHERRY_MX_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6290B513)
-  (descr "Cherry MX style switch (2 sides)")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
-  )
-  (fp_text value "SWITCH_CHERRY_MX_2_SIDE" (at 0 1 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
-  )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
-  )
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (fp_rect (start -7 -7) (end 7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp de164944-e0ff-4245-95cd-3a1fe8a54ea1))
-  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "1" thru_hole circle (at 3.795 -2.555) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 624700dd-baae-4a20-a2e6-b73e4b0e622b))
-  (pad "1" thru_hole circle (at -3.81 -2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "2" thru_hole circle (at -2.555 -5.095) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp d585006f-9358-47f4-9303-a822a0a26736))
-  (pad "2" thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
-)
diff --git a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_HOTSWAP.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_HOTSWAP.kicad_mod
index e12b627..1efe494 100644
--- a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_HOTSWAP.kicad_mod
+++ b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_HOTSWAP.kicad_mod
@@ -1,18 +1,19 @@
 (footprint "SWITCH_CHERRY_MX_HOTSWAP" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 6290B9F3)
+  (tedit 634C0F1B)
   (descr "Cherry MX style switch with hotswap socket")
   (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr smd)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
   )
-  (fp_text value "SWITCH_CHERRY_MX_HOTSWAP" (at 0 1 unlocked) (layer "F.Fab") hide
+  (fp_text value "SWITCH_CHERRY_MX_HOTSWAP" (at 0 11.43 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
   )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
   )
@@ -23,20 +24,20 @@
   (fp_line (start 4.8006 -6.7564) (end 4.8006 -2.7432) (layer "B.SilkS") (width 0.15) (tstamp 77db9235-89b0-4b41-9039-5e76b93e13e4))
   (fp_arc (start -2.1082 -0.8636) (mid -1.557678 -2.192678) (end -0.2286 -2.7432) (layer "B.SilkS") (width 0.15) (tstamp 830d86b3-78eb-4c6c-a352-bf19ba50bd18))
   (fp_arc (start -6.1214 -4.8768) (mid -5.570878 -6.205878) (end -4.2418 -6.7564) (layer "B.SilkS") (width 0.15) (tstamp a2abc84b-8987-4a83-b329-dceb6c04fe7c))
-  (fp_rect (start -7 -7) (end 7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 3840e91e-0efb-47a3-bd0e-13b143df20fb))
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at -3.81 -2.54) (size 3 3) (drill 3) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "" np_thru_hole circle (at 2.54 -5.08) (size 3 3) (drill 3) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
-  (pad "1" smd rect (at -7.493 -2.54) (size 2.55 2.5) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 5ce2b821-ee51-47bf-a99a-99a689e122d8))
-  (pad "2" smd rect (at 6.223 -5.08) (size 2.55 2.5) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 353d8f56-c879-4848-ac81-f1be0cc16cb5))
+  (fp_line (start 6.985 6.985) (end 6.985 5.715) (layer "F.SilkS") (width 0.15) (tstamp 182453ab-fe88-4ddd-ac38-e1316b6ce90f))
+  (fp_line (start 6.985 -6.985) (end 5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 3a8ce589-0588-4bbd-b6b0-56afa7e14f46))
+  (fp_line (start 5.715 6.985) (end 6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp 3fc37943-8d57-4586-af0d-999df180df70))
+  (fp_line (start -6.985 -6.985) (end -6.985 -5.715) (layer "F.SilkS") (width 0.15) (tstamp 56809caa-e153-470f-aa02-e08a3f50a375))
+  (fp_line (start -6.985 -6.985) (end -5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 7fed9ee8-035d-44c3-a220-a2db37b1c99c))
+  (fp_line (start -6.985 5.715) (end -6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp af655c64-008f-4ecc-b615-20ea755c744c))
+  (fp_line (start 6.985 -5.715) (end 6.985 -6.985) (layer "F.SilkS") (width 0.15) (tstamp beadb26d-5d17-4a15-a38c-dc37773bbb03))
+  (fp_line (start -6.985 6.985) (end -5.715 6.985) (layer "F.SilkS") (width 0.15) (tstamp dae719b9-2b36-4a6c-8399-1d5f2e561efd))
+  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
+  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
+  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
+  (pad "" np_thru_hole circle (at -3.81 -2.54) (size 3 3) (drill 3) (layers F&B.Cu *.Mask) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
+  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
+  (pad "" np_thru_hole circle (at 2.54 -5.08) (size 3 3) (drill 3) (layers F&B.Cu *.Mask) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
+  (pad "1" smd rect (at -7.493 -2.54) (size 2.55 2.5) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 5ce2b821-ee51-47bf-a99a-99a689e122d8))
+  (pad "2" smd rect (at 6.223 -5.08) (size 2.55 2.5) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 353d8f56-c879-4848-ac81-f1be0cc16cb5))
 )
diff --git a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_HOTSWAP_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_HOTSWAP_2_SIDES.kicad_mod
deleted file mode 100644
index 931aa89..0000000
--- a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_HOTSWAP_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,57 +0,0 @@
-(footprint "SWITCH_CHERRY_MX_HOTSWAP_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6290BB8B)
-  (descr "Cherry MX style switch with hotswap socket (2 sides)")
-  (solder_mask_margin 0.1)
-  (attr smd)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
-  )
-  (fp_text value "SWITCH_CHERRY_MX_HOTSWAP_2_SIDES" (at 0 1 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
-  )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
-  )
-  (fp_line (start -6.1214 -0.8636) (end -6.1214 -4.8768) (layer "B.SilkS") (width 0.15) (tstamp 35a8d4cc-4bbc-49c6-8023-e7b98daa01b6))
-  (fp_line (start 4.8006 -6.7564) (end 4.8006 -2.7432) (layer "B.SilkS") (width 0.15) (tstamp 3a219f63-a938-472a-a309-90297373c1b9))
-  (fp_line (start -6.1214 -0.8636) (end -2.1082 -0.8636) (layer "B.SilkS") (width 0.15) (tstamp 4375774b-2b03-4e7b-8d7e-6daba59b99ac))
-  (fp_line (start -4.2418 -6.7564) (end 4.8006 -6.7564) (layer "B.SilkS") (width 0.15) (tstamp a38dd7a0-2b9e-476c-b632-2907dd07a88d))
-  (fp_line (start 4.8006 -2.7432) (end -0.2286 -2.7432) (layer "B.SilkS") (width 0.15) (tstamp e03e61ca-23ea-46be-bad8-66ee27ce7be6))
-  (fp_arc (start -6.1214 -4.8768) (mid -5.570878 -6.205878) (end -4.2418 -6.7564) (layer "B.SilkS") (width 0.15) (tstamp 4bcc5ae1-145e-46d7-92d5-d611a1d6baf6))
-  (fp_arc (start -2.1082 -0.8636) (mid -1.557678 -2.192678) (end -0.2286 -2.7432) (layer "B.SilkS") (width 0.15) (tstamp b5253622-275c-488c-850c-108e624348e3))
-  (fp_line (start -4.826 -2.7432) (end 0.2032 -2.7432) (layer "F.SilkS") (width 0.15) (tstamp 74dc74ce-18f5-4d60-a2e9-512c9ae00932))
-  (fp_line (start 6.096 -0.8636) (end 6.096 -4.8768) (layer "F.SilkS") (width 0.15) (tstamp 87fe4799-c5bf-416f-97e6-b023e8854c51))
-  (fp_line (start 4.2164 -6.7564) (end -4.826 -6.7564) (layer "F.SilkS") (width 0.15) (tstamp 9acd0284-010d-4802-96d0-fa90781334ba))
-  (fp_line (start -4.826 -6.7564) (end -4.826 -2.7432) (layer "F.SilkS") (width 0.15) (tstamp c7b701da-2db5-47dd-bc5f-d3f473ce5918))
-  (fp_line (start 6.096 -0.8636) (end 2.0828 -0.8636) (layer "F.SilkS") (width 0.15) (tstamp d05a8a57-532c-4506-871c-b337dab47fdc))
-  (fp_arc (start 4.2164 -6.7564) (mid 5.545478 -6.205878) (end 6.096 -4.8768) (layer "F.SilkS") (width 0.15) (tstamp 8a2eb2bc-2784-4fa0-86f1-ad0762ac8e56))
-  (fp_arc (start 0.2032 -2.7432) (mid 1.532278 -2.192678) (end 2.0828 -0.8636) (layer "F.SilkS") (width 0.15) (tstamp def60589-179c-4f0b-b57f-c2654cc8e681))
-  (fp_rect (start -7 -7) (end 7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 3db993b2-028e-4fe5-ae77-9af003e87612))
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (pad "" np_thru_hole circle (at 3.81 -2.54) (size 3 3) (drill 3) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 0cf5128c-e217-48c5-8f79-0662f10a805a))
-  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at -3.81 -2.54) (size 3 3) (drill 3) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "" np_thru_hole circle (at 2.54 -5.08) (size 3 3) (drill 3) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
-  (pad "" np_thru_hole circle (at -2.54 -5.08) (size 3 3) (drill 3) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f2ba1a27-e532-4fae-ab61-113a78a8283e))
-  (pad "1" smd rect (at -7.493 -2.54) (size 2.55 2.5) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 5ce2b821-ee51-47bf-a99a-99a689e122d8))
-  (pad "1" smd rect (at 7.493 -2.54) (size 2.55 2.5) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp a3425917-a21e-4245-a985-ab4010fbb495))
-  (pad "2" smd rect (at 6.223 -5.08) (size 2.55 2.5) (layers "B.Cu" "B.Paste" "B.Mask")
-    (solder_mask_margin 0.1) (tstamp 353d8f56-c879-4848-ac81-f1be0cc16cb5))
-  (pad "2" smd rect (at -6.223 -5.08) (size 2.55 2.5) (layers "F.Cu" "F.Paste" "F.Mask")
-    (solder_mask_margin 0.1) (tstamp 8d8fff34-bdfe-40fd-8db6-b59d24bcb492))
-)
diff --git a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_KAILH_CHOC.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_KAILH_CHOC.kicad_mod
index 01327de..7eac6a4 100644
--- a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_KAILH_CHOC.kicad_mod
+++ b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_KAILH_CHOC.kicad_mod
@@ -1,41 +1,39 @@
 (footprint "SWITCH_CHERRY_MX_KAILH_CHOC" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 6290B544)
+  (tedit 634C0F18)
   (descr "Cherry MX style + Kailh choc switch")
   (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
   )
-  (fp_text value "SWITCH_CHERRY_MX_KAILH_CHOC" (at 0 1 unlocked) (layer "F.Fab") hide
+  (fp_text value "SWITCH_CHERRY_MX_KAILH_CHOC" (at 0 11.43 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
   )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
   )
-  (fp_rect (start -7 -7) (end 7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 36a335a7-738b-4359-82a6-2e39adef3046))
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 1f73c229-2255-4e1e-8f3a-baf695ef532e))
-  (pad "" np_thru_hole circle (at -5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 3defaca2-da09-413b-8e01-bac4b2c97437))
-  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "" np_thru_hole circle (at 5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp c8786aa9-3f18-48c7-bac6-4a3cce603fc6))
-  (pad "1" thru_hole circle (at -5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 1135a936-ede7-481e-a484-d3fab85b2d0e))
-  (pad "1" thru_hole circle (at -3.81 -2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "2" thru_hole circle (at 0 -5.9) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 20ec74bb-77d2-4b6f-a40c-c578cb255ece))
-  (pad "2" thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
+  (fp_line (start -6.985 -6.985) (end -5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 2af693d5-31e8-4268-96f7-fb24d05f0b28))
+  (fp_line (start 6.985 -5.715) (end 6.985 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 2ec0940d-c233-4a46-aa6b-a5e0c0f81dc6))
+  (fp_line (start 6.985 6.985) (end 6.985 5.715) (layer "F.SilkS") (width 0.15) (tstamp 2f1f65c3-26f2-4423-ab54-4550f5e217ac))
+  (fp_line (start 6.985 -6.985) (end 5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 3778786b-696c-4b97-bf35-b2251820f1f0))
+  (fp_line (start 5.715 6.985) (end 6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp 65953505-5ed8-44cc-a5e7-7dd4b6856f83))
+  (fp_line (start -6.985 6.985) (end -5.715 6.985) (layer "F.SilkS") (width 0.15) (tstamp 76a6be39-3a8f-4344-b084-b24eb830150d))
+  (fp_line (start -6.985 -6.985) (end -6.985 -5.715) (layer "F.SilkS") (width 0.15) (tstamp c3f4e4fd-33f7-404b-a4b5-b1fa76c627d6))
+  (fp_line (start -6.985 5.715) (end -6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp e3d9f89a-ba19-4459-ab55-3b945cb0d52d))
+  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp fb86085c-98a7-4536-8cb4-4cdf37753e64))
+  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
+  (pad "" np_thru_hole circle (at 5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask) (tstamp 1f73c229-2255-4e1e-8f3a-baf695ef532e))
+  (pad "" np_thru_hole circle (at -5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask) (tstamp 3defaca2-da09-413b-8e01-bac4b2c97437))
+  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
+  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
+  (pad "" np_thru_hole circle (at 5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask) (tstamp c8786aa9-3f18-48c7-bac6-4a3cce603fc6))
+  (pad "1" thru_hole circle (at -5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask) (tstamp 1135a936-ede7-481e-a484-d3fab85b2d0e))
+  (pad "1" thru_hole circle (at -3.81 -2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
+  (pad "2" thru_hole circle (at 0 -5.9) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask) (tstamp 20ec74bb-77d2-4b6f-a40c-c578cb255ece))
+  (pad "2" thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
 )
diff --git a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_KAILH_CHOC_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_KAILH_CHOC_2_SIDES.kicad_mod
deleted file mode 100644
index 6da0ce4..0000000
--- a/footprints/ElsassKabel.pretty/SWITCH_CHERRY_MX_KAILH_CHOC_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,49 +0,0 @@
-(footprint "SWITCH_CHERRY_MX_KAILH_CHOC_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6290B552)
-  (descr "Cherry MX style + Kailh choc switch (2 sides)")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
-  )
-  (fp_text value "SWITCH_CHERRY_MX_KAILH_CHOC_2_SIDES" (at 0 1 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
-  )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
-  )
-  (fp_rect (start 7 -7) (end -7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 2ae86544-8c7a-4fb4-af45-3af6e5c2f9b9))
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (pad "" np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 1f73c229-2255-4e1e-8f3a-baf695ef532e))
-  (pad "" np_thru_hole circle (at -5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 3defaca2-da09-413b-8e01-bac4b2c97437))
-  (pad "" np_thru_hole circle (at 0 0) (size 4.0894 4.0894) (drill 4.0894) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "" np_thru_hole circle (at -5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp a3f3d4b9-5dd2-4c81-aacc-9d1c84eb40dd))
-  (pad "" np_thru_hole circle (at 5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp c8786aa9-3f18-48c7-bac6-4a3cce603fc6))
-  (pad "1" thru_hole circle (at -5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 1135a936-ede7-481e-a484-d3fab85b2d0e))
-  (pad "1" thru_hole circle (at 5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 74ccd9e5-8a22-4c24-ae30-3bfa975478e9))
-  (pad "1" thru_hole circle (at -3.81 -2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "1" thru_hole circle (at 3.81 -2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f8c486bc-4643-4531-9f53-9d1bfc8b9232))
-  (pad "2" thru_hole circle (at 0 -5.9) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 20ec74bb-77d2-4b6f-a40c-c578cb255ece))
-  (pad "2" thru_hole circle (at -2.54 -5.08) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp a31c9ac4-19d3-435b-a32a-8eee487f99fb))
-  (pad "2" thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
-)
diff --git a/footprints/ElsassKabel.pretty/SWITCH_KAILH_CHOC.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_KAILH_CHOC.kicad_mod
index 0d588ca..61c8d38 100644
--- a/footprints/ElsassKabel.pretty/SWITCH_KAILH_CHOC.kicad_mod
+++ b/footprints/ElsassKabel.pretty/SWITCH_KAILH_CHOC.kicad_mod
@@ -1,33 +1,35 @@
 (footprint "SWITCH_KAILH_CHOC" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 6290B55E)
+  (tedit 634C0F0A)
   (descr "Kailh choc switch")
   (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
   )
-  (fp_text value "SWITCH_KAILH_CHOC" (at 0 1 unlocked) (layer "F.Fab") hide
+  (fp_text value "SWITCH_KAILH_CHOC" (at 0 11.43 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
   )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
   )
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (fp_rect (start -7 -7) (end 7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp de164944-e0ff-4245-95cd-3a1fe8a54ea1))
-  (pad "" np_thru_hole circle (at -5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 0 0) (size 3.4 3.4) (drill 3.4) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at 5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "" np_thru_hole circle (at 5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp cb529731-ad89-4f50-9cb5-385f3e06ad96))
-  (pad "1" thru_hole circle (at -5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "2" thru_hole circle (at 0 -5.9) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
+  (fp_line (start 6.985 6.985) (end 6.985 5.715) (layer "F.SilkS") (width 0.15) (tstamp 0aea80b3-5920-4614-b5a1-211fc72588f6))
+  (fp_line (start -6.985 6.985) (end -5.715 6.985) (layer "F.SilkS") (width 0.15) (tstamp 0b1a71c3-e09d-4ef0-89b0-db61108da5e8))
+  (fp_line (start 6.985 -6.985) (end 5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 3b0eb3d0-4c1b-4d23-881b-acbb21fccdac))
+  (fp_line (start -6.985 -6.985) (end -5.715 -6.985) (layer "F.SilkS") (width 0.15) (tstamp 9472cabf-848d-4d17-9df0-8ca6c15a78bc))
+  (fp_line (start 6.985 -5.715) (end 6.985 -6.985) (layer "F.SilkS") (width 0.15) (tstamp b767b8f8-ecce-4a00-9757-4efa3a524318))
+  (fp_line (start -6.985 5.715) (end -6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp ba923e1d-10cc-488e-be02-3d1767d90c29))
+  (fp_line (start -6.985 -6.985) (end -6.985 -5.715) (layer "F.SilkS") (width 0.15) (tstamp d408b27d-ea71-4900-b0e7-cb8fd5299291))
+  (fp_line (start 5.715 6.985) (end 6.985 6.985) (layer "F.SilkS") (width 0.15) (tstamp f1df8eee-8a89-44d0-bde3-f8189f69bdae))
+  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 4a44358c-7759-40f7-b824-5218ed25ca2b))
+  (pad "" np_thru_hole circle (at -5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
+  (pad "" np_thru_hole circle (at 0 0) (size 3.4 3.4) (drill 3.4) (layers F&B.Cu *.Mask) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
+  (pad "" np_thru_hole circle (at 5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
+  (pad "" np_thru_hole circle (at 5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask) (tstamp cb529731-ad89-4f50-9cb5-385f3e06ad96))
+  (pad "1" thru_hole circle (at -5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
+  (pad "2" thru_hole circle (at 0 -5.9) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
 )
diff --git a/footprints/ElsassKabel.pretty/SWITCH_KAILH_CHOC_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_KAILH_CHOC_2_SIDES.kicad_mod
deleted file mode 100644
index 00cc04b..0000000
--- a/footprints/ElsassKabel.pretty/SWITCH_KAILH_CHOC_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,37 +0,0 @@
-(footprint "SWITCH_KAILH_CHOC_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6290B56A)
-  (descr "Kailh choc switch (2 sides)")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference ">NAME" (at 0 3.81 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 9b79e4e9-50fa-4fbd-b495-c50c8a5c8a61)
-  )
-  (fp_text value "SWITCH_KAILH_CHOC_2_SIDES" (at 0 1 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d5d84041-f058-46bc-bcac-bc4dad182f69)
-  )
-  (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp ece1120e-83f7-4ee5-8aff-6dd4668f5cf4)
-  )
-  (fp_rect (start -7 -7) (end 7 7) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp 6131eb75-3400-4160-b54e-66401a49f1f7))
-  (fp_rect (start -9.525 -9.525) (end 9.525 9.525) (layer "Dwgs.User") (width 0.15) (fill none) (tstamp b7c0da7b-7c85-4651-85c5-22caf15fc674))
-  (pad "" np_thru_hole circle (at -5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 06ea578f-4ffe-4133-9157-a8de2c2cff9b))
-  (pad "" np_thru_hole circle (at -5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 0f783898-8b67-4339-aa57-4579dfddbfb6))
-  (pad "" np_thru_hole circle (at 0 0) (size 3.4 3.4) (drill 3.4) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 76a16b35-d931-4996-8938-9da762e9492c))
-  (pad "" np_thru_hole circle (at 5.5 0) (size 1.9 1.9) (drill 1.9) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp 9bfedecc-3f86-4a36-ab15-24a0f83e5efc))
-  (pad "" np_thru_hole circle (at 5.22 4.2) (size 1.9 1.9) (drill 1.2) (layers F&B.Cu *.Mask)
-    (solder_mask_margin 0.1016) (tstamp cb529731-ad89-4f50-9cb5-385f3e06ad96))
-  (pad "1" thru_hole circle (at -5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp 8619b003-4ddf-4ed8-abee-c68340460103))
-  (pad "1" thru_hole circle (at 5 -3.8) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp c7f16784-da95-4ab7-905d-9889694975ee))
-  (pad "2" thru_hole circle (at 0 -5.9) (size 1.9 1.9) (drill 1.2) (layers *.Cu *.Mask)
-    (solder_mask_margin 0.1) (tstamp f178515b-b448-485d-b4f3-17f976e8a7a0))
-)
diff --git a/footprints/ElsassKabel.pretty/SWITCH_TACT_2PIN.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_TACT_2PIN.kicad_mod
index 3fa3048..0ee262d 100644
--- a/footprints/ElsassKabel.pretty/SWITCH_TACT_2PIN.kicad_mod
+++ b/footprints/ElsassKabel.pretty/SWITCH_TACT_2PIN.kicad_mod
@@ -1,23 +1,25 @@
 (footprint "SWITCH_TACT_2PIN" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 6289F715)
+  (tedit 634C0F58)
   (descr "Tactile switch 2 pins")
   (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 -4 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 -3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d348d117-4b9d-47d4-9150-4630fb2e9cf8)
   )
-  (fp_text value "SWITCH_TACT_2PIN" (at 0 4.5 unlocked) (layer "F.Fab") hide
+  (fp_text value "SWITCH_TACT_2PIN" (at 0 3.81 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp d98ff9ae-e1f8-4424-8c9a-9e8a74700dc5)
   )
-  (fp_text user "${REFERENCE}" (at 0 6 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 8fec7a85-0782-4e68-84e4-1af1e7efedfe)
   )
   (fp_rect (start -1.5 -0.75) (end 1.5 0.75) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 116d155f-066d-4394-8897-f470a7ea739b))
   (fp_rect (start -3 -1.75) (end 3 1.75) (layer "F.SilkS") (width 0.15) (fill none) (tstamp f1ad3f74-02d3-4eac-9cda-900ca8378735))
+  (fp_rect (start -3.81 -1.905) (end 3.81 1.905) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp e2185ddc-51b6-404f-a8b4-cb4dffd30778))
   (pad "1" thru_hole circle (at -3.25 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 5338c7e8-2840-4211-817d-a6a02bfa9066))
   (pad "2" thru_hole circle (at 3.25 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp db00ed9d-5cbd-42e1-a367-f32e41a8348a))
 )
diff --git a/footprints/ElsassKabel.pretty/SWITCH_TACT_2PIN_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_TACT_2PIN_2_SIDES.kicad_mod
deleted file mode 100644
index fa7ac8f..0000000
--- a/footprints/ElsassKabel.pretty/SWITCH_TACT_2PIN_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,25 +0,0 @@
-(footprint "SWITCH_TACT_2PIN_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6289F726)
-  (descr "Tactile switch 2 pins")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 -4 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d348d117-4b9d-47d4-9150-4630fb2e9cf8)
-  )
-  (fp_text value "SWITCH_TACT_2PIN_2_SIDES" (at 0 4.5 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp d98ff9ae-e1f8-4424-8c9a-9e8a74700dc5)
-  )
-  (fp_text user "${REFERENCE}" (at 0 6 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 8fec7a85-0782-4e68-84e4-1af1e7efedfe)
-  )
-  (fp_rect (start 3 -1.75) (end -3 1.75) (layer "B.SilkS") (width 0.15) (fill none) (tstamp 64eb1ba8-8f26-45fc-8b44-198922f1ecef))
-  (fp_rect (start 1.5 -0.75) (end -1.5 0.75) (layer "B.SilkS") (width 0.15) (fill none) (tstamp 72c154d2-0438-41fd-8965-7baa4162aa0d))
-  (fp_rect (start -1.5 -0.75) (end 1.5 0.75) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 116d155f-066d-4394-8897-f470a7ea739b))
-  (fp_rect (start -3 -1.75) (end 3 1.75) (layer "F.SilkS") (width 0.15) (fill none) (tstamp f1ad3f74-02d3-4eac-9cda-900ca8378735))
-  (pad "1" thru_hole circle (at -3.25 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 5338c7e8-2840-4211-817d-a6a02bfa9066))
-  (pad "2" thru_hole circle (at 3.25 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp db00ed9d-5cbd-42e1-a367-f32e41a8348a))
-)
diff --git a/footprints/ElsassKabel.pretty/SWITCH_TACT_SWITCH_4PIN.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_TACT_4PIN.kicad_mod
similarity index 71%
rename from footprints/ElsassKabel.pretty/SWITCH_TACT_SWITCH_4PIN.kicad_mod
rename to footprints/ElsassKabel.pretty/SWITCH_TACT_4PIN.kicad_mod
index bf8fb88..745d491 100644
--- a/footprints/ElsassKabel.pretty/SWITCH_TACT_SWITCH_4PIN.kicad_mod
+++ b/footprints/ElsassKabel.pretty/SWITCH_TACT_4PIN.kicad_mod
@@ -1,23 +1,25 @@
-(footprint "SWITCH_TACT_SWITCH_4PIN" (version 20211014) (generator pcbnew)
+(footprint "SWITCH_TACT_4PIN" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 6289F734)
+  (tedit 634C0F76)
   (descr "Tactile switch 4 pins")
   (solder_mask_margin 0.1)
+  (clearance 0.1)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 -6.35 unlocked) (layer "F.SilkS") hide
+  (fp_text reference "REF**" (at 0 -5.08 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp acfcaba7-a8b8-4c21-a793-d3e0373f34dc)
   )
-  (fp_text value "SWITCH_TACT_SWITCH_4PIN" (at 0 6.35 unlocked) (layer "F.Fab") hide
+  (fp_text value "SWITCH_TACT_SWITCH_4PIN" (at 0 5.08 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 6ae901e7-3f37-4fdc-9fbb-f82666744826)
   )
-  (fp_text user "${REFERENCE}" (at 0 7.85 unlocked) (layer "F.Fab") hide
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp b7ed4c31-5417-4fb5-9261-7dca42c1c776)
   )
   (fp_rect (start -3 -3) (end 3 3) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 4bc286e0-6a16-4d35-a592-670f1762f921))
   (fp_circle (center 0 0) (end 1.75 0) (layer "F.SilkS") (width 0.15) (fill none) (tstamp a83a46a9-63ee-4d26-bfce-0ba963092218))
+  (fp_rect (start -3.81 -3.175) (end 3.81 3.175) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 3f63a435-d6c2-4adb-81cf-02dd962312f4))
   (pad "1" thru_hole circle (at -3.25 -2.25) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp e208ea3a-d990-4992-b395-c95b18b77f83))
   (pad "2" thru_hole circle (at 3.25 -2.25) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 395c69d5-4334-48e5-8637-2379eafb3eeb))
   (pad "3" thru_hole circle (at -3.25 2.25) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp eab7c737-4450-406f-9f80-b2e18bb45dd6))
diff --git a/footprints/ElsassKabel.pretty/SWITCH_TACT_4PIN_2_SIDES.kicad_mod b/footprints/ElsassKabel.pretty/SWITCH_TACT_4PIN_2_SIDES.kicad_mod
deleted file mode 100644
index a4bdbfd..0000000
--- a/footprints/ElsassKabel.pretty/SWITCH_TACT_4PIN_2_SIDES.kicad_mod
+++ /dev/null
@@ -1,27 +0,0 @@
-(footprint "SWITCH_TACT_4PIN_2_SIDES" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 6289F744)
-  (descr "Tactile switch 4 pins")
-  (solder_mask_margin 0.1)
-  (attr through_hole)
-  (fp_text reference "REF**" (at 0 -6.35 unlocked) (layer "F.SilkS") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp acfcaba7-a8b8-4c21-a793-d3e0373f34dc)
-  )
-  (fp_text value "SWITCH_TACT_4PIN_2_SIDES" (at 0 6.35 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp 6ae901e7-3f37-4fdc-9fbb-f82666744826)
-  )
-  (fp_text user "${REFERENCE}" (at 0 7.85 unlocked) (layer "F.Fab") hide
-    (effects (font (size 1 1) (thickness 0.15)))
-    (tstamp b7ed4c31-5417-4fb5-9261-7dca42c1c776)
-  )
-  (fp_rect (start 3 -3) (end -3 3) (layer "B.SilkS") (width 0.15) (fill none) (tstamp e89e487d-962c-468f-8748-4a78b03a2d87))
-  (fp_circle (center 0 0) (end -1.75 0) (layer "B.SilkS") (width 0.15) (fill none) (tstamp b41b8662-a47e-4e32-89cc-be25aca3d202))
-  (fp_rect (start -3 -3) (end 3 3) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 4bc286e0-6a16-4d35-a592-670f1762f921))
-  (fp_circle (center 0 0) (end 1.75 0) (layer "F.SilkS") (width 0.15) (fill none) (tstamp a83a46a9-63ee-4d26-bfce-0ba963092218))
-  (pad "1" thru_hole circle (at -3.25 -2.25) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp e208ea3a-d990-4992-b395-c95b18b77f83))
-  (pad "2" thru_hole circle (at 3.25 -2.25) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 395c69d5-4334-48e5-8637-2379eafb3eeb))
-  (pad "3" thru_hole circle (at -3.25 2.25) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp eab7c737-4450-406f-9f80-b2e18bb45dd6))
-  (pad "4" thru_hole circle (at 3.25 2.25) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 303c400a-1ac8-4f8f-ae11-254f46fa0fb3))
-)