diff --git a/Kicad/BACKLIT.sch b/Kicad/BACKLIT.sch
index 43fda08..91a3563 100644
--- a/Kicad/BACKLIT.sch
+++ b/Kicad/BACKLIT.sch
@@ -27,10 +27,10 @@ F 3 "" H 1100 1600 50  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L VCC #PWR015
+L VCC #PWR15
 U 1 1 5932E02F
 P 1100 1000
-F 0 "#PWR015" H 1100 850 50  0001 C CNN
+F 0 "#PWR15" H 1100 850 50  0001 C CNN
 F 1 "VCC" H 1100 1150 50  0000 C CNN
 F 2 "" H 1100 1000 50  0000 C CNN
 F 3 "" H 1100 1000 50  0000 C CNN
@@ -49,10 +49,10 @@ F 3 "" H 2450 1350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR16
 U 1 1 5932E0A0
 P 1100 2200
-F 0 "#PWR016" H 1100 1950 50  0001 C CNN
+F 0 "#PWR16" H 1100 1950 50  0001 C CNN
 F 1 "GND" H 1100 2050 50  0000 C CNN
 F 2 "" H 1100 2200 50  0000 C CNN
 F 3 "" H 1100 2200 50  0000 C CNN
@@ -82,10 +82,10 @@ F 3 "" H 3900 1400 50  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR17
 U 1 1 5932EBAF
 P 3900 2200
-F 0 "#PWR017" H 3900 1950 50  0001 C CNN
+F 0 "#PWR17" H 3900 1950 50  0001 C CNN
 F 1 "GND" H 3900 2050 50  0000 C CNN
 F 2 "" H 3900 2200 50  0000 C CNN
 F 3 "" H 3900 2200 50  0000 C CNN
diff --git a/Kicad/DK60TP.sch b/Kicad/DK60TP.sch
index 4bc669d..3f956ec 100644
--- a/Kicad/DK60TP.sch
+++ b/Kicad/DK60TP.sch
@@ -49,10 +49,10 @@ F 3 "" H 7650 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR14
 U 1 1 5904AF3A
 P 7200 4800
-F 0 "#PWR01" H 7200 4550 50  0001 C CNN
+F 0 "#PWR14" H 7200 4550 50  0001 C CNN
 F 1 "GND" H 7200 4650 50  0000 C CNN
 F 2 "" H 7200 4800 50  0001 C CNN
 F 3 "" H 7200 4800 50  0001 C CNN
@@ -60,10 +60,10 @@ F 3 "" H 7200 4800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR02
+L VCC #PWR3
 U 1 1 5904B57E
 P 1900 4150
-F 0 "#PWR02" H 1900 4000 50  0001 C CNN
+F 0 "#PWR3" H 1900 4000 50  0001 C CNN
 F 1 "VCC" H 1900 4300 50  0000 C CNN
 F 2 "" H 1900 4150 50  0001 C CNN
 F 3 "" H 1900 4150 50  0001 C CNN
@@ -126,10 +126,10 @@ F 3 "" H 2500 4400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR4
 U 1 1 5904B906
 P 1900 4600
-F 0 "#PWR03" H 1900 4350 50  0001 C CNN
+F 0 "#PWR4" H 1900 4350 50  0001 C CNN
 F 1 "GND" H 1900 4450 50  0000 C CNN
 F 2 "" H 1900 4600 50  0001 C CNN
 F 3 "" H 1900 4600 50  0001 C CNN
@@ -159,10 +159,10 @@ F 3 "" H 3500 4250 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR04
+L VCC #PWR6
 U 1 1 5904C66A
 P 3200 4150
-F 0 "#PWR04" H 3200 4000 50  0001 C CNN
+F 0 "#PWR6" H 3200 4000 50  0001 C CNN
 F 1 "VCC" H 3200 4300 50  0000 C CNN
 F 2 "" H 3200 4150 50  0001 C CNN
 F 3 "" H 3200 4150 50  0001 C CNN
@@ -170,10 +170,10 @@ F 3 "" H 3200 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR7
 U 1 1 5904C8AA
 P 3200 4600
-F 0 "#PWR05" H 3200 4350 50  0001 C CNN
+F 0 "#PWR7" H 3200 4350 50  0001 C CNN
 F 1 "GND" H 3200 4450 50  0000 C CNN
 F 2 "" H 3200 4600 50  0001 C CNN
 F 3 "" H 3200 4600 50  0001 C CNN
@@ -192,10 +192,10 @@ F 3 "" H 5150 2300 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR11
 U 1 1 5904D1CD
 P 5150 2600
-F 0 "#PWR06" H 5150 2350 50  0001 C CNN
+F 0 "#PWR11" H 5150 2350 50  0001 C CNN
 F 1 "GND" H 5150 2450 50  0000 C CNN
 F 2 "" H 5150 2600 50  0001 C CNN
 F 3 "" H 5150 2600 50  0001 C CNN
@@ -225,10 +225,10 @@ F 3 "" H 1050 1100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR07
+L VCC #PWR1
 U 1 1 5920545A
 P 1800 850
-F 0 "#PWR07" H 1800 700 50  0001 C CNN
+F 0 "#PWR1" H 1800 700 50  0001 C CNN
 F 1 "VCC" H 1800 1000 50  0000 C CNN
 F 2 "" H 1800 850 50  0001 C CNN
 F 3 "" H 1800 850 50  0001 C CNN
@@ -275,10 +275,10 @@ D2
 Text Notes 10550 7650 0    60   ~ 0
 B
 $Comp
-L GND #PWR08
+L GND #PWR8
 U 1 1 593106C4
 P 4850 950
-F 0 "#PWR08" H 4850 700 50  0001 C CNN
+F 0 "#PWR8" H 4850 700 50  0001 C CNN
 F 1 "GND" H 4850 800 50  0000 C CNN
 F 2 "" H 4850 950 50  0001 C CNN
 F 3 "" H 4850 950 50  0001 C CNN
@@ -300,10 +300,10 @@ F0 "Function Leds" 60
 F1 "Function_leds.sch" 60
 $EndSheet
 $Comp
-L GND #PWR09
+L GND #PWR5
 U 1 1 59349AA8
 P 2800 3350
-F 0 "#PWR09" H 2800 3100 50  0001 C CNN
+F 0 "#PWR5" H 2800 3100 50  0001 C CNN
 F 1 "GND" H 2800 3200 50  0000 C CNN
 F 2 "" H 2800 3350 50  0001 C CNN
 F 3 "" H 2800 3350 50  0001 C CNN
@@ -317,7 +317,7 @@ S 5550 1550 1250 500
 U 5934BBCF
 F0 "TRACKPOINT" 60
 F1 "TRACKPOINT.sch" 60
-F2 "Col5" I L 5550 1600 60 
+F2 "Col8" I L 5550 1600 60 
 F3 "Col4" I L 5550 1700 60 
 F4 "Col3" I L 5550 1800 60 
 F5 "Row4" I L 5550 1900 60 
@@ -366,10 +366,10 @@ Row2
 Text GLabel 2500 1650 0    60   Input ~ 0
 Row3
 $Comp
-L GND #PWR010
+L GND #PWR9
 U 1 1 593621F1
 P 4900 1750
-F 0 "#PWR010" H 4900 1500 50  0001 C CNN
+F 0 "#PWR9" H 4900 1500 50  0001 C CNN
 F 1 "GND" H 4900 1600 50  0000 C CNN
 F 2 "" H 4900 1750 50  0001 C CNN
 F 3 "" H 4900 1750 50  0001 C CNN
@@ -377,10 +377,10 @@ F 3 "" H 4900 1750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR011
+L VCC #PWR12
 U 1 1 593B1C08
 P 5250 800
-F 0 "#PWR011" H 5250 650 50  0001 C CNN
+F 0 "#PWR12" H 5250 650 50  0001 C CNN
 F 1 "VCC" H 5250 950 50  0000 C CNN
 F 2 "" H 5250 800 50  0001 C CNN
 F 3 "" H 5250 800 50  0001 C CNN
@@ -398,10 +398,10 @@ RESET
 Text GLabel 2500 2050 0    60   Input ~ 0
 RESET
 $Comp
-L VCC #PWR012
+L VCC #PWR2
 U 1 1 59395D72
 P 1800 1750
-F 0 "#PWR012" H 1800 1600 50  0001 C CNN
+F 0 "#PWR2" H 1800 1600 50  0001 C CNN
 F 1 "VCC" H 1800 1900 50  0000 C CNN
 F 2 "" H 1800 1750 50  0001 C CNN
 F 3 "" H 1800 1750 50  0001 C CNN
@@ -461,10 +461,10 @@ Col3
 Text GLabel 5600 4500 2    60   Input ~ 0
 Row4
 $Comp
-L GND #PWR013
+L GND #PWR13
 U 1 1 593CBEF2
 P 6250 4500
-F 0 "#PWR013" H 6250 4250 50  0001 C CNN
+F 0 "#PWR13" H 6250 4250 50  0001 C CNN
 F 1 "GND" H 6250 4350 50  0000 C CNN
 F 2 "" H 6250 4500 50  0001 C CNN
 F 3 "" H 6250 4500 50  0001 C CNN
@@ -487,10 +487,10 @@ F 3 "" H 900 4300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR014
+L VCC #PWR10
 U 1 1 593CBBEA
 P 5000 4100
-F 0 "#PWR014" H 5000 3950 50  0001 C CNN
+F 0 "#PWR10" H 5000 3950 50  0001 C CNN
 F 1 "VCC" H 5000 4250 50  0000 C CNN
 F 2 "" H 5000 4100 50  0001 C CNN
 F 3 "" H 5000 4100 50  0001 C CNN
diff --git a/Kicad/Function_leds.sch b/Kicad/Function_leds.sch
index 702b864..e2b7a6d 100644
--- a/Kicad/Function_leds.sch
+++ b/Kicad/Function_leds.sch
@@ -38,10 +38,10 @@ F 3 "" H 2050 1400 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR18
 U 1 1 5907C578
 P 3150 1700
-F 0 "#PWR018" H 3150 1450 50  0001 C CNN
+F 0 "#PWR18" H 3150 1450 50  0001 C CNN
 F 1 "GND" H 3150 1550 50  0000 C CNN
 F 2 "" H 3150 1700 50  0001 C CNN
 F 3 "" H 3150 1700 50  0001 C CNN
diff --git a/Kicad/HOLES.sch b/Kicad/HOLES.sch
index 88de561..206adb4 100644
--- a/Kicad/HOLES.sch
+++ b/Kicad/HOLES.sch
@@ -342,4 +342,37 @@ F 3 "" H 7050 5350 60  0000 C CNN
 	1    7050 5350
 	1    0    0    -1  
 $EndComp
+$Comp
+L MOUNT_HOLE SPC_275_0
+U 1 1 59DE9C95
+P 6350 5850
+F 0 "SPC_275_0" H 6350 6000 60  0000 C CNN
+F 1 "SPC_275_0" H 6350 5700 60  0000 C CNN
+F 2 "Footprint:MXST" H 6350 5850 60  0001 C CNN
+F 3 "" H 6350 5850 60  0000 C CNN
+	1    6350 5850
+	1    0    0    -1  
+$EndComp
+$Comp
+L MOUNT_HOLE SPC_275_1
+U 1 1 59DE9D0D
+P 7050 5850
+F 0 "SPC_275_1" H 7050 6000 60  0000 C CNN
+F 1 "SPC_275_1" H 7050 5700 60  0000 C CNN
+F 2 "Footprint:MXST" H 7050 5850 60  0001 C CNN
+F 3 "" H 7050 5850 60  0000 C CNN
+	1    7050 5850
+	1    0    0    -1  
+$EndComp
+$Comp
+L MOUNT_HOLE SPC_225_0
+U 1 1 59DE9D8E
+P 6350 6350
+F 0 "SPC_225_0" H 6350 6500 60  0000 C CNN
+F 1 "SPC_225_0" H 6350 6200 60  0000 C CNN
+F 2 "Footprint:MXST" H 6350 6350 60  0001 C CNN
+F 3 "" H 6350 6350 60  0000 C CNN
+	1    6350 6350
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/Kicad/MATRIX.sch b/Kicad/MATRIX.sch
index 7877756..d40ffc9 100644
--- a/Kicad/MATRIX.sch
+++ b/Kicad/MATRIX.sch
@@ -2089,4 +2089,71 @@ Connection ~ 8350 5850
 Connection ~ 8350 6150
 Connection ~ 9050 5850
 Connection ~ 9750 5850
+$Comp
+L KEYSW K540
+U 1 1 59DE9804
+P 4450 5550
+F 0 "K540" H 4400 5550 60  0001 C CNN
+F 1 "K465" H 4450 5450 60  0000 C CNN
+F 2 "Footprint:Mx_275" H 4450 5550 60  0001 C CNN
+F 3 "" H 4450 5550 60  0000 C CNN
+	1    4450 5550
+	1    0    0    -1  
+$EndComp
+$Comp
+L KEYSW K740
+U 1 1 59DE980F
+P 5850 5550
+F 0 "K740" H 5800 5550 60  0001 C CNN
+F 1 "K47" H 5850 5450 60  0000 C CNN
+F 2 "Footprint:Mx_225" H 5850 5550 60  0001 C CNN
+F 3 "" H 5850 5550 60  0000 C CNN
+	1    5850 5550
+	1    0    0    -1  
+$EndComp
+Text GLabel 4750 5250 0    60   Input ~ 0
+Col5
+Text GLabel 6150 5250 0    60   Input ~ 0
+Col7
+$Comp
+L D DK74
+U 1 1 59DE981E
+P 6150 5400
+F 0 "DK74" H 6150 5500 50  0001 C CNN
+F 1 "D47" H 6150 5300 50  0001 C CNN
+F 2 "Footprint:D_SOD123" H 6150 5400 50  0001 C CNN
+F 3 "" H 6150 5400 50  0000 C CNN
+	1    6150 5400
+	0    -1   -1   0   
+$EndComp
+$Comp
+L D DK54
+U 1 1 59DE9829
+P 4750 5400
+F 0 "DK54" H 4750 5500 50  0001 C CNN
+F 1 "D45" H 4750 5300 50  0001 C CNN
+F 2 "Footprint:D_SOD123" H 4750 5400 50  0001 C CNN
+F 3 "" H 4750 5400 50  0000 C CNN
+	1    4750 5400
+	0    -1   -1   0   
+$EndComp
+$Comp
+L KEYSW K643
+U 1 1 59DE985B
+P 5150 5700
+F 0 "K643" H 5100 5700 60  0001 C CNN
+F 1 "K46" H 5150 5600 60  0001 C CNN
+F 2 "Footprint:Mx_100" H 5150 5700 60  0001 C CNN
+F 3 "" H 5150 5700 60  0000 C CNN
+	1    5150 5700
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	4150 5550 4150 6400
+Connection ~ 4150 6400
+Wire Wire Line
+	5550 5550 5550 6400
+Connection ~ 5550 6400
+Connection ~ 4850 5700
+Connection ~ 5450 5700
 $EndSCHEMATC
diff --git a/Kicad/RGB_UNDERGLOW.sch b/Kicad/RGB_UNDERGLOW.sch
index 8a694e9..cfc1fd0 100644
--- a/Kicad/RGB_UNDERGLOW.sch
+++ b/Kicad/RGB_UNDERGLOW.sch
@@ -16,10 +16,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VCC #PWR019
+L VCC #PWR19
 U 1 1 593558DB
 P 1700 1100
-F 0 "#PWR019" H 1700 950 50  0001 C CNN
+F 0 "#PWR19" H 1700 950 50  0001 C CNN
 F 1 "VCC" H 1700 1250 50  0000 C CNN
 F 2 "" H 1700 1100 50  0000 C CNN
 F 3 "" H 1700 1100 50  0000 C CNN
@@ -95,10 +95,10 @@ F 3 "" H 2700 3850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR28
 U 1 1 59355E8A
 P 3200 6000
-F 0 "#PWR020" H 3200 5750 50  0001 C CNN
+F 0 "#PWR28" H 3200 5750 50  0001 C CNN
 F 1 "GND" H 3200 5850 50  0000 C CNN
 F 2 "" H 3200 6000 50  0000 C CNN
 F 3 "" H 3200 6000 50  0000 C CNN
@@ -139,10 +139,10 @@ F 3 "" H 1950 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR20
 U 1 1 59356713
 P 1950 1700
-F 0 "#PWR021" H 1950 1450 50  0001 C CNN
+F 0 "#PWR20" H 1950 1450 50  0001 C CNN
 F 1 "GND" H 1950 1550 50  0000 C CNN
 F 2 "" H 1950 1700 50  0000 C CNN
 F 3 "" H 1950 1700 50  0000 C CNN
@@ -150,10 +150,10 @@ F 3 "" H 1950 1700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR21
 U 1 1 59356739
 P 1950 2300
-F 0 "#PWR022" H 1950 2050 50  0001 C CNN
+F 0 "#PWR21" H 1950 2050 50  0001 C CNN
 F 1 "GND" H 1950 2150 50  0000 C CNN
 F 2 "" H 1950 2300 50  0000 C CNN
 F 3 "" H 1950 2300 50  0000 C CNN
@@ -161,10 +161,10 @@ F 3 "" H 1950 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR22
 U 1 1 5935675F
 P 1950 2900
-F 0 "#PWR023" H 1950 2650 50  0001 C CNN
+F 0 "#PWR22" H 1950 2650 50  0001 C CNN
 F 1 "GND" H 1950 2750 50  0000 C CNN
 F 2 "" H 1950 2900 50  0000 C CNN
 F 3 "" H 1950 2900 50  0000 C CNN
@@ -172,10 +172,10 @@ F 3 "" H 1950 2900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR23
 U 1 1 59356785
 P 1950 3500
-F 0 "#PWR024" H 1950 3250 50  0001 C CNN
+F 0 "#PWR23" H 1950 3250 50  0001 C CNN
 F 1 "GND" H 1950 3350 50  0000 C CNN
 F 2 "" H 1950 3500 50  0000 C CNN
 F 3 "" H 1950 3500 50  0000 C CNN
@@ -194,10 +194,10 @@ F 3 "" H 4450 2100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR025
+L VCC #PWR30
 U 1 1 59356ADE
 P 5700 2600
-F 0 "#PWR025" H 5700 2450 50  0001 C CNN
+F 0 "#PWR30" H 5700 2450 50  0001 C CNN
 F 1 "VCC" H 5700 2750 50  0000 C CNN
 F 2 "" H 5700 2600 50  0000 C CNN
 F 3 "" H 5700 2600 50  0000 C CNN
@@ -205,10 +205,10 @@ F 3 "" H 5700 2600 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR29
 U 1 1 59356B44
 P 5450 2600
-F 0 "#PWR026" H 5450 2350 50  0001 C CNN
+F 0 "#PWR29" H 5450 2350 50  0001 C CNN
 F 1 "GND" H 5450 2450 50  0000 C CNN
 F 2 "" H 5450 2600 50  0000 C CNN
 F 3 "" H 5450 2600 50  0000 C CNN
@@ -332,10 +332,10 @@ Wire Wire Line
 	1950 3900 1950 3750
 Connection ~ 1950 3750
 $Comp
-L GND #PWR027
+L GND #PWR24
 U 1 1 59357568
 P 1950 4100
-F 0 "#PWR027" H 1950 3850 50  0001 C CNN
+F 0 "#PWR24" H 1950 3850 50  0001 C CNN
 F 1 "GND" H 1950 3950 50  0000 C CNN
 F 2 "" H 1950 4100 50  0000 C CNN
 F 3 "" H 1950 4100 50  0000 C CNN
@@ -472,10 +472,10 @@ Wire Wire Line
 	1950 5550 1950 5700
 Connection ~ 1950 5550
 $Comp
-L GND #PWR028
+L GND #PWR25
 U 1 1 59EC95F1
 P 1950 4700
-F 0 "#PWR028" H 1950 4450 50  0001 C CNN
+F 0 "#PWR25" H 1950 4450 50  0001 C CNN
 F 1 "GND" H 1950 4550 50  0000 C CNN
 F 2 "" H 1950 4700 50  0000 C CNN
 F 3 "" H 1950 4700 50  0000 C CNN
@@ -483,10 +483,10 @@ F 3 "" H 1950 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR26
 U 1 1 59EC962F
 P 1950 5300
-F 0 "#PWR029" H 1950 5050 50  0001 C CNN
+F 0 "#PWR26" H 1950 5050 50  0001 C CNN
 F 1 "GND" H 1950 5150 50  0000 C CNN
 F 2 "" H 1950 5300 50  0000 C CNN
 F 3 "" H 1950 5300 50  0000 C CNN
@@ -494,10 +494,10 @@ F 3 "" H 1950 5300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR27
 U 1 1 59EC9D11
 P 1950 5900
-F 0 "#PWR030" H 1950 5650 50  0001 C CNN
+F 0 "#PWR27" H 1950 5650 50  0001 C CNN
 F 1 "GND" H 1950 5750 50  0000 C CNN
 F 2 "" H 1950 5900 50  0000 C CNN
 F 3 "" H 1950 5900 50  0000 C CNN
diff --git a/Kicad/TRACKPOINT.sch b/Kicad/TRACKPOINT.sch
index 968fc5b..24a6ae8 100644
--- a/Kicad/TRACKPOINT.sch
+++ b/Kicad/TRACKPOINT.sch
@@ -38,10 +38,10 @@ F 3 "" H 6400 1300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L KEYSW K540
+L KEYSW K840
 U 1 1 593C141B
 P 7250 1300
-F 0 "K540" H 7200 1300 60  0001 C CNN
+F 0 "K840" H 7200 1300 60  0001 C CNN
 F 1 "RMB" H 7250 1200 60  0000 C CNN
 F 2 "Footprint:Mx_100" H 7250 1300 60  0001 C CNN
 F 3 "" H 7250 1300 60  0000 C CNN
@@ -60,10 +60,10 @@ F 3 "" H 5550 1550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L KEYSW K541
+L KEYSW K841
 U 1 1 593C149E
 P 7250 1550
-F 0 "K541" H 7200 1550 60  0001 C CNN
+F 0 "K841" H 7200 1550 60  0001 C CNN
 F 1 "RMB" H 7250 1450 60  0001 C CNN
 F 2 "Footprint:Mx_125" H 7250 1550 60  0001 C CNN
 F 3 "" H 7250 1550 60  0000 C CNN
@@ -93,11 +93,11 @@ F 3 "" H 6700 1150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L D DK54
+L D DK84
 U 1 1 593C19F1
 P 7550 1150
-F 0 "DK54" H 7550 1250 50  0001 C CNN
-F 1 "D45" H 7550 1050 50  0001 C CNN
+F 0 "DK84" H 7550 1250 50  0001 C CNN
+F 1 "D48" H 7550 1050 50  0001 C CNN
 F 2 "Footprint:D_SOD123" H 7550 1150 50  0001 C CNN
 F 3 "" H 7550 1150 50  0000 C CNN
 	1    7550 1150
@@ -159,7 +159,7 @@ F 3 "" H 2150 1400 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 Text HLabel 1100 800  0    60   Input ~ 0
-Col5
+Col8
 Text HLabel 1100 900  0    60   Input ~ 0
 Col4
 Text HLabel 1100 1050 0    60   Input ~ 0
@@ -252,9 +252,9 @@ D2
 Text Label 8050 1350 0    60   ~ 0
 D2
 Text Label 1350 800  0    60   ~ 0
-Col5
+Col8
 Text Label 7600 900  0    60   ~ 0
-Col5
+Col8
 Text Label 8050 1250 0    60   ~ 0
 Col5
 Wire Wire Line
diff --git a/Previews/DK60TP.png b/Previews/DK60TP.png
index 75cb0c6..27ae39b 100644
Binary files a/Previews/DK60TP.png and b/Previews/DK60TP.png differ
diff --git a/cols2rows.ods b/cols2rows.ods
index 221f4a4..4681ceb 100644
Binary files a/cols2rows.ods and b/cols2rows.ods differ