Started a slightly improved layout

Hardware/Rev. 2/MacroPad/MCU.kicad_sch

@@ -1784,16 +1784,6 @@
 		)
 		(uuid "0647d852-95a2-4255-b4be-f15631e8bbab")
 	)
-	(wire
-		(pts
-			(xy 144.78 83.82) (xy 165.1 83.82)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "0b214b28-1909-43d9-9aab-ea2bf21573e8")
-	)
 	(wire
 		(pts
 			(xy 107.95 58.42) (xy 114.3 58.42)
@@ -1804,6 +1794,16 @@
 		)
 		(uuid "0b47936d-6d3b-46a3-abfb-5c68a8a55bab")
 	)
+	(wire
+		(pts
+			(xy 144.78 58.42) (xy 165.1 58.42)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0f5a1b28-25e5-4465-9945-085c8b649971")
+	)
 	(wire
 		(pts
 			(xy 100.33 71.12) (xy 114.3 71.12)
@@ -1826,13 +1826,13 @@
 	)
 	(wire
 		(pts
-			(xy 144.78 88.9) (xy 165.1 88.9)
+			(xy 144.78 76.2) (xy 165.1 76.2)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "189b6219-de9c-4c47-bd26-cc1957ed4bd4")
+		(uuid "222810ed-2237-4fd8-ba7b-baed3d2ef3f6")
 	)
 	(wire
 		(pts
@@ -1844,6 +1844,16 @@
 		)
 		(uuid "2d8c4e5f-c569-4206-add4-82abcf3a209d")
 	)
+	(wire
+		(pts
+			(xy 144.78 55.88) (xy 165.1 55.88)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "339d29b2-6ade-4fde-976f-4028691d2293")
+	)
 	(wire
 		(pts
 			(xy 91.44 49.53) (xy 93.98 49.53)
@@ -1854,6 +1864,16 @@
 		)
 		(uuid "39050435-874e-4f5e-a268-94c58387b07b")
 	)
+	(wire
+		(pts
+			(xy 144.78 78.74) (xy 165.1 78.74)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "3d8bf525-0161-4592-b6fd-13390c62e1e5")
+	)
 	(wire
 		(pts
 			(xy 127 127) (xy 127 129.54)
@@ -1874,16 +1894,6 @@
 		)
 		(uuid "41ed5496-9864-4471-86ca-de77ff944a4b")
 	)
-	(wire
-		(pts
-			(xy 144.78 53.34) (xy 165.1 53.34)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "46ffd100-7616-4539-b81e-9f4617c8c6f9")
-	)
 	(wire
 		(pts
 			(xy 111.76 63.5) (xy 114.3 63.5)
@@ -1904,6 +1914,16 @@
 		)
 		(uuid "586a36f8-82dd-4d1f-bb00-fe2c88a60eaa")
 	)
+	(wire
+		(pts
+			(xy 144.78 73.66) (xy 165.1 73.66)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "592684d8-5aca-4ec3-a428-f84cc5afa228")
+	)
 	(wire
 		(pts
 			(xy 104.14 48.26) (xy 114.3 48.26)
@@ -1944,6 +1964,16 @@
 		)
 		(uuid "6001bd8c-ff77-4538-9f22-770b0d57d1f0")
 	)
+	(wire
+		(pts
+			(xy 144.78 53.34) (xy 165.1 53.34)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "61d3ee41-d29c-4f05-b5e2-55d948895adb")
+	)
 	(wire
 		(pts
 			(xy 127 31.75) (xy 127 35.56)
@@ -1964,16 +1994,6 @@
 		)
 		(uuid "69c86746-2b48-44ef-a2fb-4d08a89b9f69")
 	)
-	(wire
-		(pts
-			(xy 144.78 86.36) (xy 165.1 86.36)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "6c88657a-2dbe-4b02-b376-d4c35832b5ec")
-	)
 	(wire
 		(pts
 			(xy 129.54 127) (xy 129.54 129.54)
@@ -1994,6 +2014,16 @@
 		)
 		(uuid "6cd1ce2f-2488-4299-9434-fa6cf4ec1fab")
 	)
+	(wire
+		(pts
+			(xy 144.78 81.28) (xy 165.1 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "6e40c28c-d1cb-4a41-8dbc-87836b3838ae")
+	)
 	(wire
 		(pts
 			(xy 101.6 43.18) (xy 104.14 43.18)
@@ -2044,16 +2074,6 @@
 		)
 		(uuid "86b6edac-09dd-49b5-89b2-17ef29201657")
 	)
-	(wire
-		(pts
-			(xy 144.78 66.04) (xy 165.1 66.04)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "8df5a9c1-157f-46cc-9ee4-1330b0cbeadb")
-	)
 	(wire
 		(pts
 			(xy 127 129.54) (xy 127 132.08)
@@ -2074,6 +2094,16 @@
 		)
 		(uuid "93f54885-aa40-4996-80f8-0f544d55aac5")
 	)
+	(wire
+		(pts
+			(xy 144.78 66.04) (xy 165.1 66.04)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "97469063-57e3-4466-9198-32e0d19d9bd2")
+	)
 	(wire
 		(pts
 			(xy 83.82 57.15) (xy 83.82 49.53)
@@ -2094,16 +2124,6 @@
 		)
 		(uuid "9e1590c3-9f62-4951-93db-2ca161105b84")
 	)
-	(wire
-		(pts
-			(xy 144.78 60.96) (xy 165.1 60.96)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "aee8a7f8-9480-485c-9967-4731042258ee")
-	)
 	(wire
 		(pts
 			(xy 93.98 49.53) (xy 104.14 49.53)
@@ -2114,16 +2134,6 @@
 		)
 		(uuid "b2e01e5e-8065-4bec-b110-0e94621a1ff7")
 	)
-	(wire
-		(pts
-			(xy 144.78 91.44) (xy 165.1 91.44)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "b3ce72ad-3027-4788-a45c-a4c160eb2cee")
-	)
 	(wire
 		(pts
 			(xy 106.68 76.2) (xy 105.41 76.2)
@@ -2144,16 +2154,6 @@
 		)
 		(uuid "c99f389b-bc10-4ace-bf9c-d66a90637cdb")
 	)
-	(wire
-		(pts
-			(xy 144.78 55.88) (xy 165.1 55.88)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "cd2a2a4e-9e37-4b66-9f82-bc4018e8586e")
-	)
 	(wire
 		(pts
 			(xy 129.54 35.56) (xy 129.54 31.75)
@@ -2204,6 +2204,16 @@
 		)
 		(uuid "e3fd75bb-226b-4fe9-807d-1d292034600e")
 	)
+	(wire
+		(pts
+			(xy 144.78 96.52) (xy 165.1 96.52)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "e6e5c86e-26ae-4d52-aa49-6a470371fbb6")
+	)
 	(wire
 		(pts
 			(xy 104.14 31.75) (xy 127 31.75)
@@ -2214,16 +2224,6 @@
 		)
 		(uuid "e89ce075-a65e-4e63-9e54-ea11ec3b9651")
 	)
-	(wire
-		(pts
-			(xy 144.78 58.42) (xy 165.1 58.42)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "f0ea97c7-7a0d-4795-92f3-3874214765bb")
-	)
 	(wire
 		(pts
 			(xy 83.82 49.53) (xy 86.36 49.53)
@@ -2278,9 +2278,9 @@
 		)
 		(uuid "c4588acd-4a1f-4529-805a-cfc8254fda15")
 	)
-	(global_label "KEY_ROW_4"
+	(global_label "KEY_COL_3"
 		(shape input)
-		(at 165.1 83.82 0)
+		(at 165.1 76.2 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2288,9 +2288,31 @@
 			)
 			(justify left)
 		)
-		(uuid "081a0625-23f6-43b8-9b83-0035c76bc541")
+		(uuid "09711f3d-ab81-4161-8c87-6e9ca6c1d524")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.7894 83.82 0)
+			(at 178.3661 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "KEY_ROW_4"
+		(shape input)
+		(at 165.1 53.34 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "2b5c32ee-e3ac-4685-9aef-133ee56a506a")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 178.7894 53.34 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2310,7 +2332,7 @@
 			)
 			(justify left)
 		)
-		(uuid "559ed41b-97dc-4213-9aed-a4ed3b92c125")
+		(uuid "4b90f2e3-7d8f-4d3e-93a3-86807119a04d")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
 			(at 177.0356 66.04 0)
 			(effects
@@ -2322,50 +2344,6 @@
 			)
 		)
 	)
-	(global_label "KEY_COL_4"
-		(shape input)
-		(at 165.1 53.34 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "7add0efe-993d-4e03-8e76-05148b3c65ba")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.3661 53.34 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "KEY_ROW_3"
-		(shape input)
-		(at 165.1 86.36 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "82cd7d70-70d7-423a-a72b-60d557bd2fb5")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.7894 86.36 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-	)
 	(global_label "USB_D_N"
 		(shape input)
 		(at 82.55 71.12 180)
@@ -2388,6 +2366,50 @@
 			)
 		)
 	)
+	(global_label "KEY_COL_4"
+		(shape input)
+		(at 165.1 73.66 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "8f9b2a23-58e0-4311-9196-dac14d9a579f")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 178.3661 73.66 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "KEY_COL_1"
+		(shape input)
+		(at 165.1 81.28 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "9fbb5526-9677-42d2-a600-ddd51c96560e")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 178.3661 81.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
 	(global_label "USB_D_P"
 		(shape input)
 		(at 82.55 68.58 180)
@@ -2410,9 +2432,9 @@
 			)
 		)
 	)
-	(global_label "KEY_COL_1"
+	(global_label "KEY_COL_2"
 		(shape input)
-		(at 165.1 60.96 0)
+		(at 165.1 78.74 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2420,9 +2442,9 @@
 			)
 			(justify left)
 		)
-		(uuid "c40b085c-d6a5-448f-8dfa-623d0f4115cc")
+		(uuid "ddba36f3-0dbc-4668-8fd8-ce1a278cc8b3")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.3661 60.96 0)
+			(at 178.3661 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2434,7 +2456,7 @@
 	)
 	(global_label "KEY_ROW_2"
 		(shape input)
-		(at 165.1 88.9 0)
+		(at 165.1 58.42 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2442,9 +2464,31 @@
 			)
 			(justify left)
 		)
-		(uuid "d1aa99d7-e4f2-4332-a5ea-c3c79de0eba8")
+		(uuid "e07e72c0-3fdf-4168-a6e7-605875e8fee9")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.7894 88.9 0)
+			(at 178.7894 58.42 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "KEY_ROW_3"
+		(shape input)
+		(at 165.1 55.88 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "e7cd5cc0-c0f2-4587-8428-4fdd2373fc9a")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 178.7894 55.88 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2456,7 +2500,7 @@
 	)
 	(global_label "KEY_ROW_1"
 		(shape input)
-		(at 165.1 91.44 0)
+		(at 165.1 96.52 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -2464,53 +2508,9 @@
 			)
 			(justify left)
 		)
-		(uuid "d42d4c39-4453-4851-843f-a98c5d3d6a1b")
+		(uuid "fd7fcf43-e372-4d4d-813a-9c7af4107070")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.7894 91.44 0)
+			(at 178.7894 96.52 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "KEY_COL_2"
-		(shape input)
-		(at 165.1 58.42 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "f8404f1f-2670-4284-a65b-b87f7a33761b")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.3661 58.42 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-	)
-	(global_label "KEY_COL_3"
-		(shape input)
-		(at 165.1 55.88 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "fb928c1b-90fc-4820-856f-fc75e728b80a")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 178.3661 55.88 0)
 			(effects
 				(font
 					(size 1.27 1.27)

Hardware/Rev. 2/MacroPad/MacroPad.kicad_prl

@@ -1,6 +1,6 @@
 {
   "board": {
-    "active_layer": 36,
+    "active_layer": 44,
     "active_layer_preset": "All Layers",
     "auto_track_width": true,
     "hidden_netclasses": [],