Updated library paths and replaced keys for cherry mx footprints

.gitmodules

@@ -1,18 +1,21 @@
 [submodule "hardware/lib/hasu_components"]
-	path = hardware/lib/hasu_components
+	path = hardware/lib/tmk_keyboard_symbols.pretty
 	url = https://github.com/tmk/kicad_lib_tmk.git
 [submodule "hardware/lib/hasu_parts"]
-	path = hardware/lib/hasu_parts
+	path = hardware/lib/tmk_keyboard_footprints.pretty
 	url = https://github.com/tmk/keyboard_parts.pretty.git
 [submodule "hardware/lib/keebs_pretty"]
-	path = hardware/lib/keebs_pretty
+	path = hardware/lib/keebs_footprints.pretty
 	url = https://github.com/egladman/keebs.pretty.git
 [submodule "hardware/lib/tmk"]
 	path = hardware/lib/tmk
 	url = https://github.com/tmk/kicad_lib_tmk.git
 [submodule "hardware/lib/teensy_footprints"]
-	path = hardware/lib/teensy_footprints
+	path = hardware/lib/teensy_footprints.pretty
 	url = https://github.com/XenGi/teensy.pretty.git
 [submodule "hardware/lib/teensy_symbols"]
-	path = hardware/lib/teensy_symbols
+	path = hardware/lib/teensy_symbols.pretty
 	url = https://github.com/XenGi/teensy_library.git
+[submodule "hardware/lib/kicad_keyboard_footprints.pretty"]
+	path = hardware/lib/kicad_keyboard_footprints.pretty
+	url = https://github.com/KiCad/Buttons_Switches_Keyboard.pretty.git

hardware/keyboard/fp-lib-table

@@ -1,6 +1,6 @@
 (fp_lib_table
-  (lib (name custom_keebs_pretty)(type KiCad)(uri ${KEYBOARD_PROJ_1}/keebs_pretty)(options "")(descr ""))
+  (lib (name custom_keebs)(type KiCad)(uri ${KEYBOARD_PROJ_1}/keebs_footprints.pretty)(options "")(descr ""))
-  (lib (name custom_hasu_parts)(type KiCad)(uri ${KEYBOARD_PROJ_1}/hasu_parts)(options "")(descr ""))
+  (lib (name custom_tmk)(type KiCad)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_footprints.pretty)(options "")(descr ""))
-  (lib (name custom_hasu_components)(type KiCad)(uri ${KEYBOARD_PROJ_1}/hasu_components)(options "")(descr ""))
+  (lib (name custom_teensy)(type KiCad)(uri ${KEYBOARD_PROJ_1}/teensy_footprints.pretty)(options "")(descr ""))
-  (lib (name teensy)(type KiCad)(uri ${KEYBOARD_PROJ_1}/teensy_footprints)(options "")(descr ""))
+  (lib (name keyboard)(type KiCad)(uri ${KEYBOARD_PROJ_1}/kicad_keyboard_footprints.pretty)(options "")(descr ""))
 )

hardware/keyboard/keyboard-cache.lib

@@ -23,46 +23,46 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# hasu_keayboard_TEENSY2.0
+# custom_teensy_Teensy2.0_(Arduino)
 #
-DEF hasu_keayboard_TEENSY2.0 U 0 40 Y Y 1 F N
+DEF custom_teensy_Teensy2.0_(Arduino) U 0 40 Y Y 1 F N
-F0 "U" 50 0 60 V V C CNN
+F0 "U" 0 950 60 H V C CNN
-F1 "hasu_keayboard_TEENSY2.0" -50 0 60 V V C CNN
+F1 "custom_teensy_Teensy2.0_(Arduino)" 0 -950 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
+F2 "" 100 -1050 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F3 "" 100 -1050 60 H V C CNN
 DRAW
-S -400 1350 400 -1350 0 1 0 N
+S -500 850 500 -850 0 1 0 N
-X GND 1 -600 -850 200 R 50 50 1 1 w
+X GND 1 -700 750 200 R 50 50 1 1 W
-X PD3 10 600 -100 200 L 50 50 1 1 B
+X 8_INT3_TX 10 -700 -150 200 R 50 50 1 1 B
-X PC6 11 600 450 200 L 50 50 1 1 B
+X 9_PWM 11 -700 -250 200 R 50 50 1 1 B
-X PC7 12 600 350 200 L 50 50 1 1 B
+X 10_PWM 12 -700 -350 200 R 50 50 1 1 B
-X PD5 13 600 -300 200 L 50 50 1 1 B
+X 23 13 -700 -450 200 R 50 50 1 1 B
-X VCC 14 -600 -400 200 R 50 50 1 1 w
+X +5V 14 -700 -550 200 R 50 50 1 1 W
-X GND 15 -600 -950 200 R 50 50 1 1 w
+X GND 15 -700 -650 200 R 50 50 1 1 W
-X RST 16 -600 1300 200 R 50 50 1 1 I I
+X RST 16 -700 -750 200 R 50 50 1 1 I
-X PD4 17 600 -200 200 L 50 50 1 1 B
+X 22_A11 17 700 -750 200 L 50 50 1 1 B
-X PD6 18 600 -400 200 L 50 50 1 1 B
+X 11_A10_LED 18 700 -650 200 L 50 50 1 1 B
-X PD7 19 600 -500 200 L 50 50 1 1 B
+X 12_A9_PWM 19 700 -550 200 L 50 50 1 1 B
-X PB0 2 600 1300 200 L 50 50 1 1 B
+X 0 2 -700 650 200 R 50 50 1 1 B
-X PB4 20 600 900 200 L 50 50 1 1 B
+X 13_A8 20 700 -450 200 L 50 50 1 1 B
-X PB5 21 600 800 200 L 50 50 1 1 B
+X 14_A7_PWM 21 700 -350 200 L 50 50 1 1 B
-X PB6 22 600 700 200 L 50 50 1 1 B
+X 15_A6_PWM 22 700 -250 200 L 50 50 1 1 B
-X PF7 23 600 -1300 200 L 50 50 1 1 B
+X 16_A5 23 700 -150 200 L 50 50 1 1 B
-X PF6 24 600 -1200 200 L 50 50 1 1 B
+X 17_A4 24 700 -50 200 L 50 50 1 1 B
-X PF5 25 600 -1100 200 L 50 50 1 1 B
+X 18_A3 25 700 50 200 L 50 50 1 1 B
-X PF4 26 600 -1000 200 L 50 50 1 1 B
+X 19_A2 26 700 150 200 L 50 50 1 1 B
-X PF1 27 600 -900 200 L 50 50 1 1 B
+X 20_A1 27 700 250 200 L 50 50 1 1 B
-X PF0 28 600 -800 200 L 50 50 1 1 B
+X 21_A0 28 700 350 200 L 50 50 1 1 B
-X VCC 29 -600 -500 200 R 50 50 1 1 w
+X +5V 29 700 450 200 L 50 50 1 1 W
-X PB1 3 600 1200 200 L 50 50 1 1 B
+X 1 3 -700 550 200 R 50 50 1 1 B
-X AREF 30 -600 1200 200 R 50 50 1 1 I
+X 24 30 700 550 200 L 50 50 1 1 B
-X PE6 31 600 -650 200 L 50 50 1 1 B
+X AREF 31 700 650 200 L 50 50 1 1 I
-X PB2 4 600 1100 200 L 50 50 1 1 B
+X 2 4 -700 450 200 R 50 50 1 1 B
-X PB3 5 600 1000 200 L 50 50 1 1 B
+X 3 5 -700 350 200 R 50 50 1 1 B
-X PB7 6 600 600 200 L 50 50 1 1 B
+X 4_PWM 6 -700 250 200 R 50 50 1 1 B
-X PD0 7 600 200 200 L 50 50 1 1 B
+X 5_INT0_PWM 7 -700 150 200 R 50 50 1 1 B
-X PD1 8 600 100 200 L 50 50 1 1 B
+X 6_INT1 8 -700 50 200 R 50 50 1 1 B
-X PD2 9 600 0 200 L 50 50 1 1 B
+X 7_INT2_RX 9 -700 -50 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #

hardware/keyboard/keyboard-rescue.lib

@@ -17,4 +17,47 @@ X ~ 2 -300 0 50 R 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
+# TEENSY2.0-hasu_keayboard
+#
+DEF TEENSY2.0-hasu_keayboard U 0 40 Y Y 1 F N
+F0 "U" 50 0 60 V V C CNN
+F1 "TEENSY2.0-hasu_keayboard" -50 0 60 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -400 1350 400 -1350 0 1 0 N
+X GND 1 -600 -850 200 R 50 50 1 1 w
+X PD3 10 600 -100 200 L 50 50 1 1 B
+X PC6 11 600 450 200 L 50 50 1 1 B
+X PC7 12 600 350 200 L 50 50 1 1 B
+X PD5 13 600 -300 200 L 50 50 1 1 B
+X VCC 14 -600 -400 200 R 50 50 1 1 w
+X GND 15 -600 -950 200 R 50 50 1 1 w
+X RST 16 -600 1300 200 R 50 50 1 1 I I
+X PD4 17 600 -200 200 L 50 50 1 1 B
+X PD6 18 600 -400 200 L 50 50 1 1 B
+X PD7 19 600 -500 200 L 50 50 1 1 B
+X PB0 2 600 1300 200 L 50 50 1 1 B
+X PB4 20 600 900 200 L 50 50 1 1 B
+X PB5 21 600 800 200 L 50 50 1 1 B
+X PB6 22 600 700 200 L 50 50 1 1 B
+X PF7 23 600 -1300 200 L 50 50 1 1 B
+X PF6 24 600 -1200 200 L 50 50 1 1 B
+X PF5 25 600 -1100 200 L 50 50 1 1 B
+X PF4 26 600 -1000 200 L 50 50 1 1 B
+X PF1 27 600 -900 200 L 50 50 1 1 B
+X PF0 28 600 -800 200 L 50 50 1 1 B
+X VCC 29 -600 -500 200 R 50 50 1 1 w
+X PB1 3 600 1200 200 L 50 50 1 1 B
+X AREF 30 -600 1200 200 R 50 50 1 1 I
+X PE6 31 600 -650 200 L 50 50 1 1 B
+X PB2 4 600 1100 200 L 50 50 1 1 B
+X PB3 5 600 1000 200 L 50 50 1 1 B
+X PB7 6 600 600 200 L 50 50 1 1 B
+X PD0 7 600 200 200 L 50 50 1 1 B
+X PD1 8 600 100 200 L 50 50 1 1 B
+X PD2 9 600 0 200 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 #End Library

hardware/keyboard/keyboard.sch

@@ -13,65 +13,8 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
+Text GLabel 850  950  0    50   BiDi ~ 0
-L hasu_keayboard:TEENSY2.0 U1
-U 1 1 5E4A017B
-P 1700 4550
-F 0 "U1" H 1700 6097 60  0000 C CNN
-F 1 "TEENSY2.0" H 1700 5991 60  0000 C CNN
-F 2 "teensy:Teensy2.0" H 1700 4550 60  0001 C CNN
-F 3 "" H 1700 4550 60  0000 C CNN
-	1    1700 4550
-	1    0    0    -1  
-$EndComp
-Text GLabel 2450 4350 2    50   BiDi ~ 0
-col0
-Text GLabel 2450 4450 2    50   BiDi ~ 0
-col1
-Text GLabel 2450 3950 2    50   BiDi ~ 0
-row0
-Text GLabel 2450 3550 2    50   BiDi ~ 0
-row1
-Text GLabel 2450 3450 2    50   BiDi ~ 0
-row2
-Text GLabel 2450 3350 2    50   BiDi ~ 0
-row3
-Text GLabel 2450 3250 2    50   BiDi ~ 0
 row4
-Text GLabel 2450 4550 2    50   BiDi ~ 0
-col2
-Text GLabel 2450 4650 2    50   BiDi ~ 0
-col3
-Text GLabel 2450 4100 2    50   BiDi ~ 0
-col4
-Text GLabel 2450 4200 2    50   BiDi ~ 0
-col5
-Text GLabel 2450 4850 2    50   BiDi ~ 0
-col6
-Wire Wire Line
-	2300 3250 2450 3250
-Wire Wire Line
-	2300 3350 2450 3350
-Wire Wire Line
-	2300 3450 2450 3450
-Wire Wire Line
-	2300 3550 2450 3550
-Wire Wire Line
-	2300 3950 2450 3950
-Wire Wire Line
-	2300 4100 2450 4100
-Wire Wire Line
-	2300 4200 2450 4200
-Wire Wire Line
-	2300 4350 2450 4350
-Wire Wire Line
-	2300 4450 2450 4450
-Wire Wire Line
-	2300 4550 2450 4550
-Wire Wire Line
-	2300 4650 2450 4650
-Wire Wire Line
-	2300 4850 2450 4850
 Wire Wire Line
 	4450 2800 4400 2800
 Wire Wire Line
@@ -151,7 +94,7 @@ U 1 1 5E42490B
 P 5250 4050
 F 0 "K22" H 5250 4283 60  0000 C CNN
 F 1 "KEYSW" H 5250 3950 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 5250 4050 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5250 4050 60  0001 C CNN
 F 3 "" H 5250 4050 60  0000 C CNN
 	1    5250 4050
 	1    0    0    -1  
@@ -162,7 +105,7 @@ U 1 1 5E424905
 P 4050 4050
 F 0 "K21" H 4050 4283 60  0000 C CNN
 F 1 "KEYSW" H 4050 3950 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 4050 4050 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4050 4050 60  0001 C CNN
 F 3 "" H 4050 4050 60  0000 C CNN
 	1    4050 4050
 	1    0    0    -1  
@@ -173,7 +116,7 @@ U 1 1 5E423041
 P 4050 3100
 F 0 "K11" H 4050 3333 60  0000 C CNN
 F 1 "KEYSW" H 4050 3000 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 4050 3100 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4050 3100 60  0001 C CNN
 F 3 "" H 4050 3100 60  0000 C CNN
 	1    4050 3100
 	1    0    0    -1  
@@ -186,7 +129,7 @@ U 1 1 5E423F93
 P 5200 3100
 F 0 "K12" H 5200 3333 60  0000 C CNN
 F 1 "KEYSW" H 5200 3000 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 5200 3100 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5200 3100 60  0001 C CNN
 F 3 "" H 5200 3100 60  0000 C CNN
 	1    5200 3100
 	1    0    0    -1  
@@ -231,7 +174,7 @@ U 1 1 5E4C750E
 P 6450 4050
 F 0 "K23" H 6450 4283 60  0000 C CNN
 F 1 "KEYSW" H 6450 3950 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 6450 4050 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6450 4050 60  0001 C CNN
 F 3 "" H 6450 4050 60  0000 C CNN
 	1    6450 4050
 	1    0    0    -1  
@@ -244,7 +187,7 @@ U 1 1 5E4C7516
 P 6350 3100
 F 0 "K13" H 6350 3333 60  0000 C CNN
 F 1 "KEYSW" H 6350 3000 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 6350 3100 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6350 3100 60  0001 C CNN
 F 3 "" H 6350 3100 60  0000 C CNN
 	1    6350 3100
 	1    0    0    -1  
@@ -293,7 +236,7 @@ U 1 1 5E4D8475
 P 5250 5050
 F 0 "K32" H 5250 5283 60  0000 C CNN
 F 1 "KEYSW" H 5250 4950 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 5250 5050 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 5250 5050 60  0001 C CNN
 F 3 "" H 5250 5050 60  0000 C CNN
 	1    5250 5050
 	1    0    0    -1  
@@ -304,7 +247,7 @@ U 1 1 5E4D847B
 P 4050 5050
 F 0 "K31" H 4050 5283 60  0000 C CNN
 F 1 "KEYSW" H 4050 4950 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 4050 5050 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4050 5050 60  0001 C CNN
 F 3 "" H 4050 5050 60  0000 C CNN
 	1    4050 5050
 	1    0    0    -1  
@@ -332,7 +275,7 @@ U 1 1 5E4D848B
 P 6450 5050
 F 0 "K33" H 6450 5283 60  0000 C CNN
 F 1 "KEYSW" H 6450 4950 60  0001 C CNN
-F 2 "custom_keebs_pretty:Mx_Alps_100" H 6450 5050 60  0001 C CNN
+F 2 "keyboard:SW_Cherry_MX1A_1.00u_PCB" H 6450 5050 60  0001 C CNN
 F 3 "" H 6450 5050 60  0000 C CNN
 	1    6450 5050
 	1    0    0    -1  
@@ -408,4 +351,61 @@ Connection ~ 5650 4050
 Connection ~ 5650 3100
 Wire Wire Line
 	5500 3100 5650 3100
+$Comp
+L custom_teensy:Teensy2.0_(Arduino) Microcontroller1
+U 1 1 5E4F032A
+P 1650 1600
+F 0 "Microcontroller1" H 1650 2637 60  0000 C CNN
+F 1 "Teensy2.0_(Arduino)" H 1650 2531 60  0000 C CNN
+F 2 "custom_teensy:Teensy2.0" H 1750 550 60  0001 C CNN
+F 3 "" H 1750 550 60  0000 C CNN
+	1    1650 1600
+	1    0    0    -1  
+$EndComp
+Text GLabel 850  2050 0    50   BiDi ~ 0
+col6
+Text GLabel 850  1950 0    50   BiDi ~ 0
+col5
+Text GLabel 850  1850 0    50   BiDi ~ 0
+col4
+Text GLabel 850  1750 0    50   BiDi ~ 0
+col3
+Text GLabel 850  1650 0    50   BiDi ~ 0
+col2
+Text GLabel 850  1050 0    50   BiDi ~ 0
+row3
+Text GLabel 850  1150 0    50   BiDi ~ 0
+row2
+Text GLabel 850  1250 0    50   BiDi ~ 0
+row1
+Text GLabel 850  1350 0    50   BiDi ~ 0
+row0
+Text GLabel 850  1550 0    50   BiDi ~ 0
+col1
+Text GLabel 850  1450 0    50   BiDi ~ 0
+col0
+Wire Wire Line
+	850  950  950  950 
+Wire Wire Line
+	850  1050 950  1050
+Wire Wire Line
+	850  1150 950  1150
+Wire Wire Line
+	850  1250 950  1250
+Wire Wire Line
+	850  1350 950  1350
+Wire Wire Line
+	850  1450 950  1450
+Wire Wire Line
+	850  1550 950  1550
+Wire Wire Line
+	850  1650 950  1650
+Wire Wire Line
+	850  1750 950  1750
+Wire Wire Line
+	850  1850 950  1850
+Wire Wire Line
+	850  1950 950  1950
+Wire Wire Line
+	850  2050 950  2050
 $EndSCHEMATC

hardware/keyboard/keyboard.sch-bak

@@ -13,65 +13,8 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
+Text GLabel 850  950  0    50   BiDi ~ 0
-L hasu_keayboard:TEENSY2.0 U1
-U 1 1 5E4A017B
-P 1700 4550
-F 0 "U1" H 1700 6097 60  0000 C CNN
-F 1 "TEENSY2.0" H 1700 5991 60  0000 C CNN
-F 2 "teensy:Teensy2.0" H 1700 4550 60  0001 C CNN
-F 3 "" H 1700 4550 60  0000 C CNN
-	1    1700 4550
-	1    0    0    -1  
-$EndComp
-Text GLabel 2450 4350 2    50   BiDi ~ 0
-col0
-Text GLabel 2450 4450 2    50   BiDi ~ 0
-col1
-Text GLabel 2450 3950 2    50   BiDi ~ 0
-row0
-Text GLabel 2450 3550 2    50   BiDi ~ 0
-row1
-Text GLabel 2450 3450 2    50   BiDi ~ 0
-row2
-Text GLabel 2450 3350 2    50   BiDi ~ 0
-row3
-Text GLabel 2450 3250 2    50   BiDi ~ 0
 row4
-Text GLabel 2450 4550 2    50   BiDi ~ 0
-col2
-Text GLabel 2450 4650 2    50   BiDi ~ 0
-col3
-Text GLabel 2450 4100 2    50   BiDi ~ 0
-col4
-Text GLabel 2450 4200 2    50   BiDi ~ 0
-col5
-Text GLabel 2450 4850 2    50   BiDi ~ 0
-col6
-Wire Wire Line
-	2300 3250 2450 3250
-Wire Wire Line
-	2300 3350 2450 3350
-Wire Wire Line
-	2300 3450 2450 3450
-Wire Wire Line
-	2300 3550 2450 3550
-Wire Wire Line
-	2300 3950 2450 3950
-Wire Wire Line
-	2300 4100 2450 4100
-Wire Wire Line
-	2300 4200 2450 4200
-Wire Wire Line
-	2300 4350 2450 4350
-Wire Wire Line
-	2300 4450 2450 4450
-Wire Wire Line
-	2300 4550 2450 4550
-Wire Wire Line
-	2300 4650 2450 4650
-Wire Wire Line
-	2300 4850 2450 4850
 Wire Wire Line
 	4450 2800 4400 2800
 Wire Wire Line
@@ -258,7 +201,7 @@ Wire Wire Line
 Wire Wire Line
 	3550 5750 3300 5750
 Text GLabel 3300 5750 0    50   BiDi ~ 0
-row1
+row2
 Wire Wire Line
 	3550 5200 3550 5050
 Wire Wire Line
@@ -408,4 +351,61 @@ Connection ~ 5650 4050
 Connection ~ 5650 3100
 Wire Wire Line
 	5500 3100 5650 3100
+$Comp
+L custom_teensy:Teensy2.0_(Arduino) Microcontroller1
+U 1 1 5E4F032A
+P 1650 1600
+F 0 "Microcontroller1" H 1650 2637 60  0000 C CNN
+F 1 "Teensy2.0_(Arduino)" H 1650 2531 60  0000 C CNN
+F 2 "" H 1750 550 60  0000 C CNN
+F 3 "" H 1750 550 60  0000 C CNN
+	1    1650 1600
+	1    0    0    -1  
+$EndComp
+Text GLabel 850  2050 0    50   BiDi ~ 0
+col6
+Text GLabel 850  1950 0    50   BiDi ~ 0
+col5
+Text GLabel 850  1850 0    50   BiDi ~ 0
+col4
+Text GLabel 850  1750 0    50   BiDi ~ 0
+col3
+Text GLabel 850  1650 0    50   BiDi ~ 0
+col2
+Text GLabel 850  1050 0    50   BiDi ~ 0
+row3
+Text GLabel 850  1150 0    50   BiDi ~ 0
+row2
+Text GLabel 850  1250 0    50   BiDi ~ 0
+row1
+Text GLabel 850  1350 0    50   BiDi ~ 0
+row0
+Text GLabel 850  1550 0    50   BiDi ~ 0
+col1
+Text GLabel 850  1450 0    50   BiDi ~ 0
+col0
+Wire Wire Line
+	850  950  950  950 
+Wire Wire Line
+	850  1050 950  1050
+Wire Wire Line
+	850  1150 950  1150
+Wire Wire Line
+	850  1250 950  1250
+Wire Wire Line
+	850  1350 950  1350
+Wire Wire Line
+	850  1450 950  1450
+Wire Wire Line
+	850  1550 950  1550
+Wire Wire Line
+	850  1650 950  1650
+Wire Wire Line
+	850  1750 950  1750
+Wire Wire Line
+	850  1850 950  1850
+Wire Wire Line
+	850  1950 950  1950
+Wire Wire Line
+	850  2050 950  2050
 $EndSCHEMATC

hardware/keyboard/sym-lib-table

@@ -1,6 +1,6 @@
 (sym_lib_table
-  (lib (name hasu_keayboard)(type Legacy)(uri ${KEYBOARD_PROJ_1}/hasu_components/keyboard_parts.lib)(options "")(descr ""))
+  (lib (name custom_tmk_keayboard)(type Legacy)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_symbols.pretty/keyboard_parts.lib)(options "")(descr ""))
-  (lib (name hasu_mk)(type Legacy)(uri ${KEYBOARD_PROJ_1}/hasu_components/mkl27z256vfm4.lib)(options "")(descr ""))
+  (lib (name custom_tmk_mk)(type Legacy)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_symbols.pretty/mkl27z256vfm4.lib)(options "")(descr ""))
   (lib (name keyboard-rescue)(type Legacy)(uri ${KIPRJMOD}/keyboard-rescue.lib)(options "")(descr ""))
-  (lib (name teensy)(type Legacy)(uri ${KEYBOARD_PROJ_1}/teensy_symbols/teensy.lib)(options "")(descr ""))
+  (lib (name custom_teensy)(type Legacy)(uri ${KEYBOARD_PROJ_1}/teensy_symbols.pretty/teensy.lib)(options "")(descr ""))
 )

hardware/lib/kicad_keyboard_footprints.pretty

@@ -0,0 +1 @@
+Subproject commit 069bd00f58489cee6a5ba54af9cc3b730d2c283b