Re-route with a new footprint; Good clearances; Re-generate gerbers

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "cherry-mx-keycaps"]
 	path = cherry-mx-keycaps
 	url = https://github.com/ConstantinoSchillebeeckx/cherry-mx-keycaps
+[submodule "KiCAD-Keyboard-Tutorial"]
+	path = KiCAD-Keyboard-Tutorial
+	url = https://github.com/BathroomEpiphanies/KiCAD-Keyboard-Tutorial

KiCAD-Keyboard-Tutorial

@@ -0,0 +1 @@
+Subproject commit db52954a9803c5720d9bc87bc5566f3c9de1e266

dashie-keys.sch

@@ -20,7 +20,7 @@ U 1 1 5A63B164
 P 1850 2350
 F 0 "SW1" V 1804 2498 50  0000 L CNN
 F 1 "esc" V 1895 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 1850 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 1850 2550 50  0001 C CNN
 F 3 "" H 1850 2550 50  0001 C CNN
 	1    1850 2350
 	0    1    1    0   
@@ -31,7 +31,7 @@ U 1 1 5A63B21D
 P 2450 2350
 F 0 "SW2" V 2404 2498 50  0000 L CNN
 F 1 "f1" V 2495 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 2550 50  0001 C CNN
 F 3 "" H 2450 2550 50  0001 C CNN
 	1    2450 2350
 	0    1    1    0   
@@ -42,7 +42,7 @@ U 1 1 5A63B251
 P 3000 2350
 F 0 "SW3" V 2954 2498 50  0000 L CNN
 F 1 "f2" V 3045 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 2550 50  0001 C CNN
 F 3 "" H 3000 2550 50  0001 C CNN
 	1    3000 2350
 	0    1    1    0   
@@ -53,7 +53,7 @@ U 1 1 5A63B279
 P 3550 2350
 F 0 "SW4" V 3504 2498 50  0000 L CNN
 F 1 "f3" V 3595 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3550 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3550 2550 50  0001 C CNN
 F 3 "" H 3550 2550 50  0001 C CNN
 	1    3550 2350
 	0    1    1    0   
@@ -64,7 +64,7 @@ U 1 1 5A63B30B
 P 4100 2350
 F 0 "SW5" V 4054 2498 50  0000 L CNN
 F 1 "f4" V 4145 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4100 2550 50  0001 C CNN
 F 3 "" H 4100 2550 50  0001 C CNN
 	1    4100 2350
 	0    1    1    0   
@@ -75,7 +75,7 @@ U 1 1 5A63B343
 P 4650 2350
 F 0 "SW6" V 4604 2498 50  0000 L CNN
 F 1 "f5" V 4695 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4650 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4650 2550 50  0001 C CNN
 F 3 "" H 4650 2550 50  0001 C CNN
 	1    4650 2350
 	0    1    1    0   
@@ -86,7 +86,7 @@ U 1 1 5A63B371
 P 5200 2350
 F 0 "SW7" V 5154 2498 50  0000 L CNN
 F 1 "del" V 5245 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5200 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 5200 2550 50  0001 C CNN
 F 3 "" H 5200 2550 50  0001 C CNN
 	1    5200 2350
 	0    1    1    0   
@@ -97,7 +97,7 @@ U 1 1 5A63B431
 P 5750 2350
 F 0 "SW8" V 5704 2498 50  0000 L CNN
 F 1 "f6" V 5795 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5750 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 5750 2550 50  0001 C CNN
 F 3 "" H 5750 2550 50  0001 C CNN
 	1    5750 2350
 	0    1    1    0   
@@ -108,7 +108,7 @@ U 1 1 5A63B463
 P 6300 2350
 F 0 "SW9" V 6254 2498 50  0000 L CNN
 F 1 "f7" V 6345 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6300 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6300 2550 50  0001 C CNN
 F 3 "" H 6300 2550 50  0001 C CNN
 	1    6300 2350
 	0    1    1    0   
@@ -119,7 +119,7 @@ U 1 1 5A63B49B
 P 6850 2350
 F 0 "SW10" V 6804 2498 50  0000 L CNN
 F 1 "f8" V 6895 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6850 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6850 2550 50  0001 C CNN
 F 3 "" H 6850 2550 50  0001 C CNN
 	1    6850 2350
 	0    1    1    0   
@@ -130,7 +130,7 @@ U 1 1 5A63B4D1
 P 7400 2350
 F 0 "SW11" V 7354 2498 50  0000 L CNN
 F 1 "f9" V 7445 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 2550 50  0001 C CNN
 F 3 "" H 7400 2550 50  0001 C CNN
 	1    7400 2350
 	0    1    1    0   
@@ -141,7 +141,7 @@ U 1 1 5A63B62B
 P 7950 2350
 F 0 "SW12" V 7904 2498 50  0000 L CNN
 F 1 "f10" V 7995 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 2550 50  0001 C CNN
 F 3 "" H 7950 2550 50  0001 C CNN
 	1    7950 2350
 	0    1    1    0   
@@ -152,7 +152,7 @@ U 1 1 5A63B665
 P 8500 2350
 F 0 "SW13" V 8454 2498 50  0000 L CNN
 F 1 "f11" V 8545 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 2550 50  0001 C CNN
 F 3 "" H 8500 2550 50  0001 C CNN
 	1    8500 2350
 	0    1    1    0   
@@ -163,7 +163,7 @@ U 1 1 5A63B6A1
 P 9050 2350
 F 0 "SW14" V 9004 2498 50  0000 L CNN
 F 1 "f12" V 9095 2498 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 9050 2550 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 9050 2550 50  0001 C CNN
 F 3 "" H 9050 2550 50  0001 C CNN
 	1    9050 2350
 	0    1    1    0   
@@ -451,7 +451,7 @@ U 1 1 5A6626B1
 P 1850 3300
 F 0 "SW15" V 1804 3448 50  0000 L CNN
 F 1 "tilde" V 1895 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 1850 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 1850 3500 50  0001 C CNN
 F 3 "" H 1850 3500 50  0001 C CNN
 	1    1850 3300
 	0    1    1    0   
@@ -462,7 +462,7 @@ U 1 1 5A6626B7
 P 2450 3300
 F 0 "SW16" V 2404 3448 50  0000 L CNN
 F 1 "1" V 2495 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 3500 50  0001 C CNN
 F 3 "" H 2450 3500 50  0001 C CNN
 	1    2450 3300
 	0    1    1    0   
@@ -473,7 +473,7 @@ U 1 1 5A6626BD
 P 3000 3300
 F 0 "SW17" V 2954 3448 50  0000 L CNN
 F 1 "2" V 3045 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 3500 50  0001 C CNN
 F 3 "" H 3000 3500 50  0001 C CNN
 	1    3000 3300
 	0    1    1    0   
@@ -484,7 +484,7 @@ U 1 1 5A6626C3
 P 3550 3300
 F 0 "SW18" V 3504 3448 50  0000 L CNN
 F 1 "3" V 3595 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3550 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3550 3500 50  0001 C CNN
 F 3 "" H 3550 3500 50  0001 C CNN
 	1    3550 3300
 	0    1    1    0   
@@ -495,7 +495,7 @@ U 1 1 5A6626C9
 P 4100 3300
 F 0 "SW19" V 4054 3448 50  0000 L CNN
 F 1 "4" V 4145 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4100 3500 50  0001 C CNN
 F 3 "" H 4100 3500 50  0001 C CNN
 	1    4100 3300
 	0    1    1    0   
@@ -506,7 +506,7 @@ U 1 1 5A6626CF
 P 4650 3300
 F 0 "SW20" V 4604 3448 50  0000 L CNN
 F 1 "5" V 4695 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4650 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4650 3500 50  0001 C CNN
 F 3 "" H 4650 3500 50  0001 C CNN
 	1    4650 3300
 	0    1    1    0   
@@ -517,7 +517,7 @@ U 1 1 5A6626D5
 P 5200 3300
 F 0 "SW21" V 5154 3448 50  0000 L CNN
 F 1 "bkpce" V 5245 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5200 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 5200 3500 50  0001 C CNN
 F 3 "" H 5200 3500 50  0001 C CNN
 	1    5200 3300
 	0    1    1    0   
@@ -528,7 +528,7 @@ U 1 1 5A6626DB
 P 5750 3300
 F 0 "SW22" V 5704 3448 50  0000 L CNN
 F 1 "6" V 5795 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5750 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 5750 3500 50  0001 C CNN
 F 3 "" H 5750 3500 50  0001 C CNN
 	1    5750 3300
 	0    1    1    0   
@@ -539,7 +539,7 @@ U 1 1 5A6626E1
 P 6300 3300
 F 0 "SW23" V 6254 3448 50  0000 L CNN
 F 1 "7" V 6345 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6300 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6300 3500 50  0001 C CNN
 F 3 "" H 6300 3500 50  0001 C CNN
 	1    6300 3300
 	0    1    1    0   
@@ -550,7 +550,7 @@ U 1 1 5A6626E7
 P 6850 3300
 F 0 "SW24" V 6804 3448 50  0000 L CNN
 F 1 "8" V 6895 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6850 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6850 3500 50  0001 C CNN
 F 3 "" H 6850 3500 50  0001 C CNN
 	1    6850 3300
 	0    1    1    0   
@@ -561,7 +561,7 @@ U 1 1 5A6626ED
 P 7400 3300
 F 0 "SW25" V 7354 3448 50  0000 L CNN
 F 1 "9" V 7445 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 3500 50  0001 C CNN
 F 3 "" H 7400 3500 50  0001 C CNN
 	1    7400 3300
 	0    1    1    0   
@@ -572,7 +572,7 @@ U 1 1 5A6626F3
 P 7950 3300
 F 0 "SW26" V 7904 3448 50  0000 L CNN
 F 1 "0" V 7995 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 3500 50  0001 C CNN
 F 3 "" H 7950 3500 50  0001 C CNN
 	1    7950 3300
 	0    1    1    0   
@@ -583,7 +583,7 @@ U 1 1 5A6626F9
 P 8500 3300
 F 0 "SW27" V 8454 3448 50  0000 L CNN
 F 1 "-" V 8545 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 3500 50  0001 C CNN
 F 3 "" H 8500 3500 50  0001 C CNN
 	1    8500 3300
 	0    1    1    0   
@@ -594,7 +594,7 @@ U 1 1 5A6626FF
 P 9050 3300
 F 0 "SW28" V 9004 3448 50  0000 L CNN
 F 1 "+" V 9095 3448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 9050 3500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 9050 3500 50  0001 C CNN
 F 3 "" H 9050 3500 50  0001 C CNN
 	1    9050 3300
 	0    1    1    0   
@@ -985,7 +985,7 @@ U 1 1 5A6F7DCA
 P 1850 4400
 F 0 "SW29" V 1804 4548 50  0000 L CNN
 F 1 "tab" V 1895 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 1850 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 1850 4600 50  0001 C CNN
 F 3 "" H 1850 4600 50  0001 C CNN
 	1    1850 4400
 	0    1    1    0   
@@ -996,7 +996,7 @@ U 1 1 5A6F7DD0
 P 2450 4400
 F 0 "SW30" V 2404 4548 50  0000 L CNN
 F 1 "q" V 2495 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 4600 50  0001 C CNN
 F 3 "" H 2450 4600 50  0001 C CNN
 	1    2450 4400
 	0    1    1    0   
@@ -1007,7 +1007,7 @@ U 1 1 5A6F7DD6
 P 3000 4400
 F 0 "SW31" V 2954 4548 50  0000 L CNN
 F 1 "w" V 3045 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 4600 50  0001 C CNN
 F 3 "" H 3000 4600 50  0001 C CNN
 	1    3000 4400
 	0    1    1    0   
@@ -1018,7 +1018,7 @@ U 1 1 5A6F7DDC
 P 3550 4400
 F 0 "SW32" V 3504 4548 50  0000 L CNN
 F 1 "e" V 3595 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3550 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3550 4600 50  0001 C CNN
 F 3 "" H 3550 4600 50  0001 C CNN
 	1    3550 4400
 	0    1    1    0   
@@ -1029,7 +1029,7 @@ U 1 1 5A6F7DE2
 P 4100 4400
 F 0 "SW33" V 4054 4548 50  0000 L CNN
 F 1 "r" V 4145 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4100 4600 50  0001 C CNN
 F 3 "" H 4100 4600 50  0001 C CNN
 	1    4100 4400
 	0    1    1    0   
@@ -1040,7 +1040,7 @@ U 1 1 5A6F7DE8
 P 4650 4400
 F 0 "SW34" V 4604 4548 50  0000 L CNN
 F 1 "t" V 4695 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4650 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4650 4600 50  0001 C CNN
 F 3 "" H 4650 4600 50  0001 C CNN
 	1    4650 4400
 	0    1    1    0   
@@ -1051,7 +1051,7 @@ U 1 1 5A6F7DF4
 P 5750 4400
 F 0 "SW35" V 5704 4548 50  0000 L CNN
 F 1 "y" V 5795 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5750 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 5750 4600 50  0001 C CNN
 F 3 "" H 5750 4600 50  0001 C CNN
 	1    5750 4400
 	0    1    1    0   
@@ -1062,7 +1062,7 @@ U 1 1 5A6F7DFA
 P 6300 4400
 F 0 "SW36" V 6254 4548 50  0000 L CNN
 F 1 "u" V 6345 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6300 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6300 4600 50  0001 C CNN
 F 3 "" H 6300 4600 50  0001 C CNN
 	1    6300 4400
 	0    1    1    0   
@@ -1073,7 +1073,7 @@ U 1 1 5A6F7E00
 P 6850 4400
 F 0 "SW37" V 6804 4548 50  0000 L CNN
 F 1 "i" V 6895 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6850 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6850 4600 50  0001 C CNN
 F 3 "" H 6850 4600 50  0001 C CNN
 	1    6850 4400
 	0    1    1    0   
@@ -1084,7 +1084,7 @@ U 1 1 5A6F7E06
 P 7400 4400
 F 0 "SW38" V 7354 4548 50  0000 L CNN
 F 1 "o" V 7445 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 4600 50  0001 C CNN
 F 3 "" H 7400 4600 50  0001 C CNN
 	1    7400 4400
 	0    1    1    0   
@@ -1095,7 +1095,7 @@ U 1 1 5A6F7E0C
 P 7950 4400
 F 0 "SW39" V 7904 4548 50  0000 L CNN
 F 1 "p" V 7995 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 4600 50  0001 C CNN
 F 3 "" H 7950 4600 50  0001 C CNN
 	1    7950 4400
 	0    1    1    0   
@@ -1106,7 +1106,7 @@ U 1 1 5A6F7E12
 P 8500 4400
 F 0 "SW40" V 8454 4548 50  0000 L CNN
 F 1 "{" V 8545 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 4600 50  0001 C CNN
 F 3 "" H 8500 4600 50  0001 C CNN
 	1    8500 4400
 	0    1    1    0   
@@ -1117,7 +1117,7 @@ U 1 1 5A6F7E18
 P 9050 4400
 F 0 "SW41" V 9004 4548 50  0000 L CNN
 F 1 "}" V 9095 4548 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 9050 4600 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 9050 4600 50  0001 C CNN
 F 3 "" H 9050 4600 50  0001 C CNN
 	1    9050 4400
 	0    1    1    0   
@@ -1271,7 +1271,7 @@ U 1 1 5A700353
 P 1850 5600
 F 0 "SW42" V 1804 5748 50  0000 L CNN
 F 1 "shift_l" V 1895 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_2.00u_Vertical_PCB" H 1850 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_200V" H 1850 5800 50  0001 C CNN
 F 3 "" H 1850 5800 50  0001 C CNN
 	1    1850 5600
 	0    1    1    0   
@@ -1282,7 +1282,7 @@ U 1 1 5A700359
 P 2450 5600
 F 0 "SW43" V 2404 5748 50  0000 L CNN
 F 1 "a" V 2495 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 5800 50  0001 C CNN
 F 3 "" H 2450 5800 50  0001 C CNN
 	1    2450 5600
 	0    1    1    0   
@@ -1293,7 +1293,7 @@ U 1 1 5A70035F
 P 3000 5600
 F 0 "SW44" V 2954 5748 50  0000 L CNN
 F 1 "s" V 3045 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 5800 50  0001 C CNN
 F 3 "" H 3000 5800 50  0001 C CNN
 	1    3000 5600
 	0    1    1    0   
@@ -1304,7 +1304,7 @@ U 1 1 5A700365
 P 3550 5600
 F 0 "SW45" V 3504 5748 50  0000 L CNN
 F 1 "d" V 3595 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3550 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3550 5800 50  0001 C CNN
 F 3 "" H 3550 5800 50  0001 C CNN
 	1    3550 5600
 	0    1    1    0   
@@ -1315,7 +1315,7 @@ U 1 1 5A70036B
 P 4100 5600
 F 0 "SW46" V 4054 5748 50  0000 L CNN
 F 1 "f" V 4145 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4100 5800 50  0001 C CNN
 F 3 "" H 4100 5800 50  0001 C CNN
 	1    4100 5600
 	0    1    1    0   
@@ -1326,7 +1326,7 @@ U 1 1 5A700371
 P 4650 5600
 F 0 "SW47" V 4604 5748 50  0000 L CNN
 F 1 "g" V 4695 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4650 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4650 5800 50  0001 C CNN
 F 3 "" H 4650 5800 50  0001 C CNN
 	1    4650 5600
 	0    1    1    0   
@@ -1337,7 +1337,7 @@ U 1 1 5A700377
 P 5750 5600
 F 0 "SW49" V 5704 5748 50  0000 L CNN
 F 1 "h" V 5795 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5750 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 5750 5800 50  0001 C CNN
 F 3 "" H 5750 5800 50  0001 C CNN
 	1    5750 5600
 	0    1    1    0   
@@ -1348,7 +1348,7 @@ U 1 1 5A70037D
 P 6300 5600
 F 0 "SW50" V 6254 5748 50  0000 L CNN
 F 1 "j" V 6345 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6300 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6300 5800 50  0001 C CNN
 F 3 "" H 6300 5800 50  0001 C CNN
 	1    6300 5600
 	0    1    1    0   
@@ -1359,7 +1359,7 @@ U 1 1 5A700383
 P 6850 5600
 F 0 "SW51" V 6804 5748 50  0000 L CNN
 F 1 "k" V 6895 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6850 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6850 5800 50  0001 C CNN
 F 3 "" H 6850 5800 50  0001 C CNN
 	1    6850 5600
 	0    1    1    0   
@@ -1370,7 +1370,7 @@ U 1 1 5A700389
 P 7400 5600
 F 0 "SW52" V 7354 5748 50  0000 L CNN
 F 1 "l" V 7445 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 5800 50  0001 C CNN
 F 3 "" H 7400 5800 50  0001 C CNN
 	1    7400 5600
 	0    1    1    0   
@@ -1381,7 +1381,7 @@ U 1 1 5A70038F
 P 7950 5600
 F 0 "SW53" V 7904 5748 50  0000 L CNN
 F 1 ";" V 7995 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 5800 50  0001 C CNN
 F 3 "" H 7950 5800 50  0001 C CNN
 	1    7950 5600
 	0    1    1    0   
@@ -1392,7 +1392,7 @@ U 1 1 5A700395
 P 8500 5600
 F 0 "SW54" V 8454 5748 50  0000 L CNN
 F 1 "'" V 8545 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 5800 50  0001 C CNN
 F 3 "" H 8500 5800 50  0001 C CNN
 	1    8500 5600
 	0    1    1    0   
@@ -1403,7 +1403,7 @@ U 1 1 5A70039B
 P 9050 5600
 F 0 "SW55" V 9004 5748 50  0000 L CNN
 F 1 "shift_r" V 9095 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_2.00u_Vertical_PCB" H 9050 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_200V" H 9050 5800 50  0001 C CNN
 F 3 "" H 9050 5800 50  0001 C CNN
 	1    9050 5600
 	0    1    1    0   
@@ -1557,7 +1557,7 @@ U 1 1 5A707F5E
 P 5200 5600
 F 0 "SW48" V 5154 5748 50  0000 L CNN
 F 1 "enter" V 5245 5748 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_2.00u_Vertical_PCB" H 5200 5800 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_200V" H 5200 5800 50  0001 C CNN
 F 3 "" H 5200 5800 50  0001 C CNN
 	1    5200 5600
 	0    1    1    0   
@@ -1579,7 +1579,7 @@ U 1 1 5A70BBA2
 P 2450 7000
 F 0 "SW56" V 2404 7148 50  0000 L CNN
 F 1 "z" V 2495 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 7200 50  0001 C CNN
 F 3 "" H 2450 7200 50  0001 C CNN
 	1    2450 7000
 	0    1    1    0   
@@ -1590,7 +1590,7 @@ U 1 1 5A70BBA8
 P 3000 7000
 F 0 "SW57" V 2954 7148 50  0000 L CNN
 F 1 "x" V 3045 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 7200 50  0001 C CNN
 F 3 "" H 3000 7200 50  0001 C CNN
 	1    3000 7000
 	0    1    1    0   
@@ -1601,7 +1601,7 @@ U 1 1 5A70BBAE
 P 3550 7000
 F 0 "SW58" V 3504 7148 50  0000 L CNN
 F 1 "c" V 3595 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3550 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3550 7200 50  0001 C CNN
 F 3 "" H 3550 7200 50  0001 C CNN
 	1    3550 7000
 	0    1    1    0   
@@ -1612,7 +1612,7 @@ U 1 1 5A70BBB4
 P 4100 7000
 F 0 "SW59" V 4054 7148 50  0000 L CNN
 F 1 "b" V 4145 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4100 7200 50  0001 C CNN
 F 3 "" H 4100 7200 50  0001 C CNN
 	1    4100 7000
 	0    1    1    0   
@@ -1623,7 +1623,7 @@ U 1 1 5A70BBBA
 P 4650 7000
 F 0 "SW60" V 4604 7148 50  0000 L CNN
 F 1 "b" V 4695 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4650 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 4650 7200 50  0001 C CNN
 F 3 "" H 4650 7200 50  0001 C CNN
 	1    4650 7000
 	0    1    1    0   
@@ -1634,7 +1634,7 @@ U 1 1 5A70BBC0
 P 5750 7000
 F 0 "SW61" V 5704 7148 50  0000 L CNN
 F 1 "n" V 5795 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5750 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 5750 7200 50  0001 C CNN
 F 3 "" H 5750 7200 50  0001 C CNN
 	1    5750 7000
 	0    1    1    0   
@@ -1645,7 +1645,7 @@ U 1 1 5A70BBC6
 P 6300 7000
 F 0 "SW62" V 6254 7148 50  0000 L CNN
 F 1 "m" V 6345 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6300 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6300 7200 50  0001 C CNN
 F 3 "" H 6300 7200 50  0001 C CNN
 	1    6300 7000
 	0    1    1    0   
@@ -1656,7 +1656,7 @@ U 1 1 5A70BBCC
 P 6850 7000
 F 0 "SW63" V 6804 7148 50  0000 L CNN
 F 1 "," V 6895 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6850 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6850 7200 50  0001 C CNN
 F 3 "" H 6850 7200 50  0001 C CNN
 	1    6850 7000
 	0    1    1    0   
@@ -1667,7 +1667,7 @@ U 1 1 5A70BBD2
 P 7400 7000
 F 0 "SW64" V 7354 7148 50  0000 L CNN
 F 1 "." V 7445 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 7200 50  0001 C CNN
 F 3 "" H 7400 7200 50  0001 C CNN
 	1    7400 7000
 	0    1    1    0   
@@ -1678,7 +1678,7 @@ U 1 1 5A70BBD8
 P 7950 7000
 F 0 "SW65" V 7904 7148 50  0000 L CNN
 F 1 "/" V 7995 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 7200 50  0001 C CNN
 F 3 "" H 7950 7200 50  0001 C CNN
 	1    7950 7000
 	0    1    1    0   
@@ -1689,7 +1689,7 @@ U 1 1 5A70BBDE
 P 8500 7000
 F 0 "SW66" V 8454 7148 50  0000 L CNN
 F 1 "\\" V 8545 7148 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 7200 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 7200 50  0001 C CNN
 F 3 "" H 8500 7200 50  0001 C CNN
 	1    8500 7000
 	0    1    1    0   
@@ -1821,7 +1821,7 @@ U 1 1 5A71CF74
 P 1850 8150
 F 0 "SW67" V 1804 8298 50  0000 L CNN
 F 1 "ctrl" V 1895 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 1850 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 1850 8350 50  0001 C CNN
 F 3 "" H 1850 8350 50  0001 C CNN
 	1    1850 8150
 	0    1    1    0   
@@ -1832,7 +1832,7 @@ U 1 1 5A71CF7A
 P 2450 8150
 F 0 "SW68" V 2404 8298 50  0000 L CNN
 F 1 "ppause" V 2495 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 8350 50  0001 C CNN
 F 3 "" H 2450 8350 50  0001 C CNN
 	1    2450 8150
 	0    1    1    0   
@@ -1843,7 +1843,7 @@ U 1 1 5A71CFAA
 P 7400 8150
 F 0 "SW71" V 7354 8298 50  0000 L CNN
 F 1 "home" V 7445 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 8350 50  0001 C CNN
 F 3 "" H 7400 8350 50  0001 C CNN
 	1    7400 8150
 	0    1    1    0   
@@ -1854,7 +1854,7 @@ U 1 1 5A71CFB0
 P 7950 8150
 F 0 "SW72" V 7904 8298 50  0000 L CNN
 F 1 "up" V 7995 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 8350 50  0001 C CNN
 F 3 "" H 7950 8350 50  0001 C CNN
 	1    7950 8150
 	0    1    1    0   
@@ -1865,7 +1865,7 @@ U 1 1 5A71CFB6
 P 8500 8150
 F 0 "SW73" V 8454 8298 50  0000 L CNN
 F 1 "end" V 8545 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 8350 50  0001 C CNN
 F 3 "" H 8500 8350 50  0001 C CNN
 	1    8500 8150
 	0    1    1    0   
@@ -1876,7 +1876,7 @@ U 1 1 5A71CFBC
 P 9050 8150
 F 0 "SW74" V 9004 8298 50  0000 L CNN
 F 1 "page_up" V 9095 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 9050 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 9050 8350 50  0001 C CNN
 F 3 "" H 9050 8350 50  0001 C CNN
 	1    9050 8150
 	0    1    1    0   
@@ -1953,7 +1953,7 @@ U 1 1 5A71D010
 P 5200 8150
 F 0 "SW70" V 5154 8298 50  0000 L CNN
 F 1 "space" V 5245 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_6.25u_PCB" H 5200 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_625H" H 5200 8350 50  0001 C CNN
 F 3 "" H 5200 8350 50  0001 C CNN
 	1    5200 8150
 	0    1    1    0   
@@ -1975,7 +1975,7 @@ U 1 1 5A747F04
 P 1850 9200
 F 0 "SW75" V 1804 9348 50  0000 L CNN
 F 1 "fn" V 1895 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 1850 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 1850 9400 50  0001 C CNN
 F 3 "" H 1850 9400 50  0001 C CNN
 	1    1850 9200
 	0    1    1    0   
@@ -1986,7 +1986,7 @@ U 1 1 5A747F0A
 P 2450 9200
 F 0 "SW76" V 2404 9348 50  0000 L CNN
 F 1 "start" V 2495 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 9400 50  0001 C CNN
 F 3 "" H 2450 9400 50  0001 C CNN
 	1    2450 9200
 	0    1    1    0   
@@ -1997,7 +1997,7 @@ U 1 1 5A747F10
 P 3000 9200
 F 0 "SW77" V 2954 9348 50  0000 L CNN
 F 1 "alt_l" V 3045 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 9400 50  0001 C CNN
 F 3 "" H 3000 9400 50  0001 C CNN
 	1    3000 9200
 	0    1    1    0   
@@ -2008,7 +2008,7 @@ U 1 1 5A747F16
 P 3550 9200
 F 0 "SW78" V 3504 9348 50  0000 L CNN
 F 1 "empty2" V 3595 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3550 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3550 9400 50  0001 C CNN
 F 3 "" H 3550 9400 50  0001 C CNN
 	1    3550 9200
 	0    1    1    0   
@@ -2019,7 +2019,7 @@ U 1 1 5A747F1C
 P 6850 9200
 F 0 "SW79" V 6804 9348 50  0000 L CNN
 F 1 "alt_r" V 6895 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6850 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6850 9400 50  0001 C CNN
 F 3 "" H 6850 9400 50  0001 C CNN
 	1    6850 9200
 	0    1    1    0   
@@ -2030,7 +2030,7 @@ U 1 1 5A747F22
 P 7400 9200
 F 0 "SW80" V 7354 9348 50  0000 L CNN
 F 1 "left" V 7445 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 9400 50  0001 C CNN
 F 3 "" H 7400 9400 50  0001 C CNN
 	1    7400 9200
 	0    1    1    0   
@@ -2041,7 +2041,7 @@ U 1 1 5A747F28
 P 7950 9200
 F 0 "SW81" V 7904 9348 50  0000 L CNN
 F 1 "down" V 7995 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 9400 50  0001 C CNN
 F 3 "" H 7950 9400 50  0001 C CNN
 	1    7950 9200
 	0    1    1    0   
@@ -2052,7 +2052,7 @@ U 1 1 5A747F2E
 P 8500 9200
 F 0 "SW82" V 8454 9348 50  0000 L CNN
 F 1 "right" V 8545 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 9400 50  0001 C CNN
 F 3 "" H 8500 9400 50  0001 C CNN
 	1    8500 9200
 	0    1    1    0   
@@ -2063,7 +2063,7 @@ U 1 1 5A747F34
 P 9050 9200
 F 0 "SW83" V 9004 9348 50  0000 L CNN
 F 1 "page_down" V 9095 9348 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 9050 9400 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 9050 9400 50  0001 C CNN
 F 3 "" H 9050 9400 50  0001 C CNN
 	1    9050 9200
 	0    1    1    0   
@@ -2173,7 +2173,7 @@ U 1 1 5A74D144
 P 1850 10300
 F 0 "SW84" V 1804 10448 50  0000 L CNN
 F 1 "empty3" V 1895 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 1850 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 1850 10500 50  0001 C CNN
 F 3 "" H 1850 10500 50  0001 C CNN
 	1    1850 10300
 	0    1    1    0   
@@ -2184,7 +2184,7 @@ U 1 1 5A74D15C
 P 6850 10300
 F 0 "SW88" V 6804 10448 50  0000 L CNN
 F 1 "empty7" V 6895 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6850 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 6850 10500 50  0001 C CNN
 F 3 "" H 6850 10500 50  0001 C CNN
 	1    6850 10300
 	0    1    1    0   
@@ -2195,7 +2195,7 @@ U 1 1 5A74D162
 P 7400 10300
 F 0 "SW89" V 7354 10448 50  0000 L CNN
 F 1 "empty8" V 7445 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7400 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7400 10500 50  0001 C CNN
 F 3 "" H 7400 10500 50  0001 C CNN
 	1    7400 10300
 	0    1    1    0   
@@ -2206,7 +2206,7 @@ U 1 1 5A74D168
 P 7950 10300
 F 0 "SW90" V 7904 10448 50  0000 L CNN
 F 1 "empty9" V 7995 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 7950 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 7950 10500 50  0001 C CNN
 F 3 "" H 7950 10500 50  0001 C CNN
 	1    7950 10300
 	0    1    1    0   
@@ -2217,7 +2217,7 @@ U 1 1 5A74D16E
 P 8500 10300
 F 0 "SW91" V 8454 10448 50  0000 L CNN
 F 1 "empty10" V 8545 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8500 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 8500 10500 50  0001 C CNN
 F 3 "" H 8500 10500 50  0001 C CNN
 	1    8500 10300
 	0    1    1    0   
@@ -2228,7 +2228,7 @@ U 1 1 5A74D174
 P 9050 10300
 F 0 "SW92" V 9004 10448 50  0000 L CNN
 F 1 "empty11" V 9095 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 9050 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 9050 10500 50  0001 C CNN
 F 3 "" H 9050 10500 50  0001 C CNN
 	1    9050 10300
 	0    1    1    0   
@@ -2338,7 +2338,7 @@ U 1 1 5A758230
 P 2450 10300
 F 0 "SW85" V 2404 10448 50  0000 L CNN
 F 1 "empty4" V 2495 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 2450 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 2450 10500 50  0001 C CNN
 F 3 "" H 2450 10500 50  0001 C CNN
 	1    2450 10300
 	0    1    1    0   
@@ -2349,7 +2349,7 @@ U 1 1 5A7583D0
 P 3000 10300
 F 0 "SW86" V 2954 10448 50  0000 L CNN
 F 1 "empty5" V 3045 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 10500 50  0001 C CNN
 F 3 "" H 3000 10500 50  0001 C CNN
 	1    3000 10300
 	0    1    1    0   
@@ -2360,7 +2360,7 @@ U 1 1 5A758566
 P 3550 10300
 F 0 "SW87" V 3504 10448 50  0000 L CNN
 F 1 "empty6" V 3595 10448 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3550 10500 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3550 10500 50  0001 C CNN
 F 3 "" H 3550 10500 50  0001 C CNN
 	1    3550 10300
 	0    1    1    0   
@@ -3357,7 +3357,7 @@ U 1 1 5D1FBF42
 P 3000 8150
 F 0 "SW69" V 2954 8298 50  0000 L CNN
 F 1 "empty1" V 3045 8298 50  0000 L CNN
-F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 8350 50  0001 C CNN
+F 2 "footprints_cherry:CHERRY_PCB_100H" H 3000 8350 50  0001 C CNN
 F 3 "" H 3000 8350 50  0001 C CNN
 	1    3000 8150
 	0    1    1    0   

fp-lib-table

@@ -1,3 +1,4 @@
 (fp_lib_table
   (lib (name teensy)(type KiCad)(uri "$(KIPRJMOD)/teensy.pretty")(options "")(descr ""))
+  (lib (name footprints_cherry)(type KiCad)(uri "$(KIPRJMOD)/KiCAD-Keyboard-Tutorial/footprints.pretty")(options "")(descr ""))
 )

gerbers/dashie-keys-B.Paste.gbp

@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,no-vcs-found-cba430d~61~ubuntu17.10.1*
-G04 #@! TF.CreationDate,2018-01-23T09:00:41+01:00*
+G04 #@! TF.CreationDate,2018-01-23T17:21:31+01:00*
 G04 #@! TF.ProjectId,dashie-keys,6461736869652D6B6579732E6B696361,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Paste,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW no-vcs-found-cba430d~61~ubuntu17.10.1) date Tue Jan 23 09:00:41 2018*
+G04 Created by KiCad (PCBNEW no-vcs-found-cba430d~61~ubuntu17.10.1) date Tue Jan 23 17:21:31 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -15,192 +15,194 @@ G04 APERTURE LIST*
 %ADD11R,1.000000X1.600000*%
 G04 APERTURE END LIST*
 D10*
-X55880000Y-75160000D03*
-X55880000Y-72160000D03*
-X76200000Y-72160000D03*
-X76200000Y-75160000D03*
-X96520000Y-75160000D03*
-X96520000Y-72160000D03*
-X116840000Y-72160000D03*
-X116840000Y-75160000D03*
-X137160000Y-75160000D03*
-X137160000Y-72160000D03*
-X157480000Y-72160000D03*
-X157480000Y-75160000D03*
-X177800000Y-72160000D03*
-X177800000Y-75160000D03*
-X198120000Y-72160000D03*
-X198120000Y-75160000D03*
-X218440000Y-75160000D03*
-X218440000Y-72160000D03*
-X238760000Y-72160000D03*
-X238760000Y-75160000D03*
-X259080000Y-75160000D03*
-X259080000Y-72160000D03*
-X279400000Y-72160000D03*
-X279400000Y-75160000D03*
-X299720000Y-75160000D03*
-X299720000Y-72160000D03*
-X320040000Y-72160000D03*
-X320040000Y-75160000D03*
-X55880000Y-95480000D03*
-X55880000Y-92480000D03*
-X76200000Y-92480000D03*
-X76200000Y-95480000D03*
-X96520000Y-95480000D03*
-X96520000Y-92480000D03*
-X116840000Y-92480000D03*
-X116840000Y-95480000D03*
-X137160000Y-95480000D03*
-X137160000Y-92480000D03*
-X157480000Y-92480000D03*
-X157480000Y-95480000D03*
-X177800000Y-95480000D03*
-X177800000Y-92480000D03*
-X198120000Y-92480000D03*
-X198120000Y-95480000D03*
-X218440000Y-95480000D03*
-X218440000Y-92480000D03*
-X238760000Y-92480000D03*
-X238760000Y-95480000D03*
-X259080000Y-95480000D03*
-X259080000Y-92480000D03*
-X279400000Y-95480000D03*
-X279400000Y-92480000D03*
-X299720000Y-92480000D03*
-X299720000Y-95480000D03*
-X320040000Y-95480000D03*
-X320040000Y-92480000D03*
-X55880000Y-112800000D03*
-X55880000Y-115800000D03*
-X76200000Y-115800000D03*
-X76200000Y-112800000D03*
-X96520000Y-112800000D03*
-X96520000Y-115800000D03*
-X116840000Y-115800000D03*
-X116840000Y-112800000D03*
-X137160000Y-112800000D03*
-X137160000Y-115800000D03*
-X157480000Y-115800000D03*
-X157480000Y-112800000D03*
-X198120000Y-112800000D03*
-X198120000Y-115800000D03*
-X218440000Y-115800000D03*
-X218440000Y-112800000D03*
-X238760000Y-115800000D03*
-X238760000Y-112800000D03*
-X259080000Y-112800000D03*
-X259080000Y-115800000D03*
-X279400000Y-115800000D03*
-X279400000Y-112800000D03*
-X299720000Y-112800000D03*
-X299720000Y-115800000D03*
-X320040000Y-115800000D03*
-X320040000Y-112800000D03*
-X55880000Y-130580000D03*
-X55880000Y-133580000D03*
-X76200000Y-133120000D03*
-X76200000Y-136120000D03*
-X96520000Y-136120000D03*
-X96520000Y-133120000D03*
-X116840000Y-133120000D03*
-X116840000Y-136120000D03*
-X137160000Y-136120000D03*
-X137160000Y-133120000D03*
-X157480000Y-133120000D03*
-X157480000Y-136120000D03*
+X23368000Y-52046000D03*
+X23368000Y-49046000D03*
+X42418000Y-49046000D03*
+X42418000Y-52046000D03*
+X61468000Y-52046000D03*
+X61468000Y-49046000D03*
+X80518000Y-49046000D03*
+X80518000Y-52046000D03*
+X99568000Y-52046000D03*
+X99568000Y-49046000D03*
+X118618000Y-49046000D03*
+X118618000Y-52046000D03*
+X137668000Y-49046000D03*
+X137668000Y-52046000D03*
+X156718000Y-49046000D03*
+X156718000Y-52046000D03*
+X175768000Y-52046000D03*
+X175768000Y-49046000D03*
+X194818000Y-49046000D03*
+X194818000Y-52046000D03*
+X213868000Y-52046000D03*
+X213868000Y-49046000D03*
+X232918000Y-49046000D03*
+X232918000Y-52046000D03*
+X251968000Y-52046000D03*
+X251968000Y-49046000D03*
+X271018000Y-49046000D03*
+X271018000Y-52046000D03*
+X23368000Y-71096000D03*
+X23368000Y-68096000D03*
+X42418000Y-68096000D03*
+X42418000Y-71096000D03*
+X61468000Y-71096000D03*
+X61468000Y-68096000D03*
+X80518000Y-68096000D03*
+X80518000Y-71096000D03*
+X99568000Y-71096000D03*
+X99568000Y-68096000D03*
+X118618000Y-68096000D03*
+X118618000Y-71096000D03*
+X137668000Y-71096000D03*
+X137668000Y-68096000D03*
+X156718000Y-68096000D03*
+X156718000Y-71096000D03*
+X175768000Y-71096000D03*
+X175768000Y-68096000D03*
+X194818000Y-68096000D03*
+X194818000Y-71096000D03*
+X213868000Y-71096000D03*
+X213868000Y-68096000D03*
+X232918000Y-71096000D03*
+X232918000Y-68096000D03*
+X251968000Y-68096000D03*
+X251968000Y-71096000D03*
+X271018000Y-71096000D03*
+X271018000Y-68096000D03*
+X23368000Y-87146000D03*
+X23368000Y-90146000D03*
+X42418000Y-90146000D03*
+X42418000Y-87146000D03*
+X61468000Y-87146000D03*
+X61468000Y-90146000D03*
+X80518000Y-90146000D03*
+X80518000Y-87146000D03*
+X99568000Y-87146000D03*
+X99568000Y-90146000D03*
+X118618000Y-90146000D03*
+X118618000Y-87146000D03*
+X156718000Y-87146000D03*
+X156718000Y-90146000D03*
+X175768000Y-90146000D03*
+X175768000Y-87146000D03*
+X194818000Y-90146000D03*
+X194818000Y-87146000D03*
+X213868000Y-87146000D03*
+X213868000Y-90146000D03*
+X232918000Y-90146000D03*
+X232918000Y-87146000D03*
+X251968000Y-87146000D03*
+X251968000Y-90146000D03*
+X271018000Y-90146000D03*
+X271018000Y-87146000D03*
 D11*
-X172490000Y-133350000D03*
-X175490000Y-133350000D03*
+X27662000Y-121920000D03*
+X24662000Y-121920000D03*
 D10*
-X198120000Y-136120000D03*
-X198120000Y-133120000D03*
-X218440000Y-133120000D03*
-X218440000Y-136120000D03*
-X238760000Y-133120000D03*
-X238760000Y-136120000D03*
-X259080000Y-133120000D03*
-X259080000Y-136120000D03*
-X279400000Y-136120000D03*
-X279400000Y-133120000D03*
-X299720000Y-133120000D03*
-X299720000Y-136120000D03*
+X42418000Y-106196000D03*
+X42418000Y-109196000D03*
+X61468000Y-109196000D03*
+X61468000Y-106196000D03*
+X80518000Y-106196000D03*
+X80518000Y-109196000D03*
+X99568000Y-109196000D03*
+X99568000Y-106196000D03*
+X118618000Y-106196000D03*
+X118618000Y-109196000D03*
 D11*
-X314730000Y-133350000D03*
-X317730000Y-133350000D03*
+X141962000Y-122428000D03*
+X138962000Y-122428000D03*
 D10*
-X76200000Y-156440000D03*
-X76200000Y-153440000D03*
-X96520000Y-153440000D03*
-X96520000Y-156440000D03*
-X116840000Y-156440000D03*
-X116840000Y-153440000D03*
-X137160000Y-153440000D03*
-X137160000Y-156440000D03*
-X157480000Y-156440000D03*
-X157480000Y-153440000D03*
-X198120000Y-153440000D03*
-X198120000Y-156440000D03*
-X218440000Y-156440000D03*
-X218440000Y-153440000D03*
-X238760000Y-153440000D03*
-X238760000Y-156440000D03*
-X259080000Y-156440000D03*
-X259080000Y-153440000D03*
-X279400000Y-153440000D03*
-X279400000Y-156440000D03*
-X299720000Y-153440000D03*
-X299720000Y-156440000D03*
-X55880000Y-176760000D03*
-X55880000Y-173760000D03*
-X76200000Y-173760000D03*
-X76200000Y-176760000D03*
-X96520000Y-176760000D03*
-X96520000Y-173760000D03*
-X177800000Y-173760000D03*
-X177800000Y-176760000D03*
-X259080000Y-173760000D03*
-X259080000Y-176760000D03*
-X279400000Y-176760000D03*
-X279400000Y-173760000D03*
-X299720000Y-173760000D03*
-X299720000Y-176760000D03*
-X320040000Y-176760000D03*
-X320040000Y-173760000D03*
-X55880000Y-194080000D03*
-X55880000Y-197080000D03*
-X76200000Y-197080000D03*
-X76200000Y-194080000D03*
-X96520000Y-197080000D03*
-X96520000Y-194080000D03*
-X116840000Y-194080000D03*
-X116840000Y-197080000D03*
-X238760000Y-197080000D03*
-X238760000Y-194080000D03*
-X259080000Y-194080000D03*
-X259080000Y-197080000D03*
-X279400000Y-197080000D03*
-X279400000Y-194080000D03*
-X299720000Y-194080000D03*
-X299720000Y-197080000D03*
-X320040000Y-197080000D03*
-X320040000Y-194080000D03*
-X55880000Y-51840000D03*
-X55880000Y-54840000D03*
-X76200000Y-55094000D03*
-X76200000Y-52094000D03*
-X96520000Y-52094000D03*
-X96520000Y-55094000D03*
-X116840000Y-52094000D03*
-X116840000Y-55094000D03*
-X238760000Y-55094000D03*
-X238760000Y-52094000D03*
-X259080000Y-52094000D03*
-X259080000Y-55094000D03*
-X279400000Y-55094000D03*
-X279400000Y-52094000D03*
-X299720000Y-52094000D03*
-X299720000Y-55094000D03*
-X320040000Y-52094000D03*
-X320040000Y-55094000D03*
+X156718000Y-109196000D03*
+X156718000Y-106196000D03*
+X175768000Y-106196000D03*
+X175768000Y-109196000D03*
+X194818000Y-106196000D03*
+X194818000Y-109196000D03*
+X213868000Y-106196000D03*
+X213868000Y-109196000D03*
+X232918000Y-109196000D03*
+X232918000Y-106196000D03*
+X251968000Y-106196000D03*
+X251968000Y-109196000D03*
+D11*
+X269264000Y-120904000D03*
+X272264000Y-120904000D03*
+D10*
+X42418000Y-128246000D03*
+X42418000Y-125246000D03*
+X61468000Y-125246000D03*
+X61468000Y-128246000D03*
+X80518000Y-128246000D03*
+X80518000Y-125246000D03*
+X99568000Y-125246000D03*
+X99568000Y-128246000D03*
+X118618000Y-128246000D03*
+X118618000Y-125246000D03*
+X156718000Y-125246000D03*
+X156718000Y-128246000D03*
+X175768000Y-128246000D03*
+X175768000Y-125246000D03*
+X194818000Y-125246000D03*
+X194818000Y-128246000D03*
+X213868000Y-128246000D03*
+X213868000Y-125246000D03*
+X232918000Y-125246000D03*
+X232918000Y-128246000D03*
+X251968000Y-125246000D03*
+X251968000Y-128246000D03*
+X23368000Y-147550000D03*
+X23368000Y-144550000D03*
+X42418000Y-144550000D03*
+X42418000Y-147550000D03*
+X61468000Y-147550000D03*
+X61468000Y-144550000D03*
+X137668000Y-144296000D03*
+X137668000Y-147296000D03*
+X213868000Y-144550000D03*
+X213868000Y-147550000D03*
+X232918000Y-147550000D03*
+X232918000Y-144550000D03*
+X251968000Y-144550000D03*
+X251968000Y-147550000D03*
+X271018000Y-147550000D03*
+X271018000Y-144550000D03*
+X23368000Y-163600000D03*
+X23368000Y-166600000D03*
+X42418000Y-166600000D03*
+X42418000Y-163600000D03*
+X61468000Y-166600000D03*
+X61468000Y-163600000D03*
+X80518000Y-163600000D03*
+X80518000Y-166600000D03*
+X194818000Y-166600000D03*
+X194818000Y-163600000D03*
+X213868000Y-163600000D03*
+X213868000Y-166600000D03*
+X232918000Y-166600000D03*
+X232918000Y-163600000D03*
+X251968000Y-163600000D03*
+X251968000Y-166600000D03*
+X271018000Y-166600000D03*
+X271018000Y-163600000D03*
+X23368000Y-29996000D03*
+X23368000Y-32996000D03*
+X42418000Y-32996000D03*
+X42418000Y-29996000D03*
+X61468000Y-29996000D03*
+X61468000Y-32996000D03*
+X80518000Y-29996000D03*
+X80518000Y-32996000D03*
+X194818000Y-32996000D03*
+X194818000Y-29996000D03*
+X213868000Y-29996000D03*
+X213868000Y-32996000D03*
+X232918000Y-32996000D03*
+X232918000Y-29996000D03*
+X251968000Y-29996000D03*
+X251968000Y-32996000D03*
+X271018000Y-29996000D03*
+X271018000Y-32996000D03*
 M02*

gerbers/dashie-keys-Edge.Cuts.gm1

@@ -1,32 +0,0 @@
-G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,no-vcs-found-cba430d~61~ubuntu17.10.1*
-G04 #@! TF.CreationDate,2018-01-23T09:00:41+01:00*
-G04 #@! TF.ProjectId,dashie-keys,6461736869652D6B6579732E6B696361,rev?*
-G04 #@! TF.SameCoordinates,Original*
-G04 #@! TF.FileFunction,Profile,NP*
-%FSLAX46Y46*%
-G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW no-vcs-found-cba430d~61~ubuntu17.10.1) date Tue Jan 23 09:00:41 2018*
-%MOMM*%
-%LPD*%
-G01*
-G04 APERTURE LIST*
-%ADD10C,0.150000*%
-G04 APERTURE END LIST*
-D10*
-X171450000Y-123190000D02*
-X171450000Y-99060000D01*
-X191770000Y-123190000D02*
-X171450000Y-123190000D01*
-X191770000Y-99060000D02*
-X191770000Y-123190000D01*
-X171450000Y-99060000D02*
-X191770000Y-99060000D01*
-X49530000Y-200830000D02*
-X334010000Y-200830000D01*
-X334010000Y-200830000D02*
-X334010000Y-36830000D01*
-X49530000Y-36830000D02*
-X49530000Y-200830000D01*
-X334010000Y-36830000D02*
-X49530000Y-36830000D01*
-M02*

gerbers/dashie-keys-F.Paste.gtp

@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,no-vcs-found-cba430d~61~ubuntu17.10.1*
-G04 #@! TF.CreationDate,2018-01-23T09:00:41+01:00*
+G04 #@! TF.CreationDate,2018-01-23T17:21:31+01:00*
 G04 #@! TF.ProjectId,dashie-keys,6461736869652D6B6579732E6B696361,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Paste,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW no-vcs-found-cba430d~61~ubuntu17.10.1) date Tue Jan 23 09:00:41 2018*
+G04 Created by KiCad (PCBNEW no-vcs-found-cba430d~61~ubuntu17.10.1) date Tue Jan 23 17:21:31 2018*
 %MOMM*%
 %LPD*%
 G01*