diff --git a/pcb/abyss.kicad_pcb b/pcb/abyss.kicad_pcb
index 48d2a65..55b92ae 100644
--- a/pcb/abyss.kicad_pcb
+++ b/pcb/abyss.kicad_pcb
@@ -79,36 +79,34 @@
 		)
 	)
 	(net 0 "")
-	(net 1 "C0")
-	(net 2 "pinky_bottom")
-	(net 3 "pinky_home")
-	(net 4 "C1")
-	(net 5 "ring_bottom")
-	(net 6 "ring_home")
-	(net 7 "ring_top")
-	(net 8 "C2")
-	(net 9 "middle_bottom")
-	(net 10 "middle_home")
-	(net 11 "middle_top")
-	(net 12 "C3")
-	(net 13 "index_bottom")
-	(net 14 "index_home")
-	(net 15 "index_top")
-	(net 16 "C4")
-	(net 17 "inner_bottom")
-	(net 18 "inner_home")
-	(net 19 "left_cluster")
-	(net 20 "home_cluster")
-	(net 21 "C5")
-	(net 22 "right_cluster")
-	(net 23 "R2")
-	(net 24 "R1")
-	(net 25 "R0")
-	(net 26 "R3")
-	(net 27 "BAT_P")
-	(net 28 "GND")
-	(net 29 "JST1_1")
-	(net 30 "JST1_2")
+	(net 1 "pinky_bottom")
+	(net 2 "pinky_home")
+	(net 3 "C1")
+	(net 4 "ring_bottom")
+	(net 5 "ring_home")
+	(net 6 "ring_top")
+	(net 7 "C2")
+	(net 8 "middle_bottom")
+	(net 9 "middle_home")
+	(net 10 "middle_top")
+	(net 11 "C3")
+	(net 12 "index_bottom")
+	(net 13 "index_home")
+	(net 14 "index_top")
+	(net 15 "C4")
+	(net 16 "inner_bottom")
+	(net 17 "inner_home")
+	(net 18 "left_cluster")
+	(net 19 "home_cluster")
+	(net 20 "right_cluster")
+	(net 21 "R3")
+	(net 22 "R2")
+	(net 23 "R1")
+	(net 24 "R4")
+	(net 25 "BAT_P")
+	(net 26 "GND")
+	(net 27 "JST1_1")
+	(net 28 "JST1_2")
 	(footprint "PG1350"
 		(layer "F.Cu")
 		(uuid "026c949b-dd25-435c-8726-cd503722817d")
@@ -335,28 +333,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "a236272f-ef2b-4208-a8b7-d541772128cf")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "ea730c77-e9ac-44ee-a697-64c58f4ef047")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 3 "pinky_home")
+			(net 2 "pinky_home")
 			(uuid "65615301-17ca-4c84-983e-ce898df4f16b")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 3 "pinky_home")
+			(net 2 "pinky_home")
 			(uuid "6208f9b4-6570-4647-b22f-b67487977f1d")
 		)
 		(embedded_fonts no)
@@ -560,35 +558,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "44f540ac-e3de-46d5-b4a6-7bd673e6d877")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "c10935c5-39c2-4358-b7a1-efc03b4736f5")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "c4c465c0-5ef3-486a-b965-be84bd9e4070")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 11 "middle_top")
+			(net 10 "middle_top")
 			(uuid "be6184a5-e3f8-43b1-8aed-027b1474ab1c")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 11 "middle_top")
+			(net 10 "middle_top")
 			(uuid "7ed539e0-ada7-40dd-9dcd-d8ca27a655dc")
 		)
 		(pad "2" thru_hole circle
@@ -597,7 +595,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 11 "middle_top")
+			(net 10 "middle_top")
 			(uuid "bbda7bfa-3086-4609-8381-e5a036c3f4b6")
 		)
 		(embedded_fonts no)
@@ -801,35 +799,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "5fb7f401-4ec7-44cf-8eca-9bb56bb1faf3")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "890b0de7-c27a-47d9-9d8d-9f394693eb80")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "0151c3c0-42bc-49e0-aff4-e4c788d13400")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 15 "index_top")
+			(net 14 "index_top")
 			(uuid "80db7695-863e-4645-8a4e-e9a58d874649")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 15 "index_top")
+			(net 14 "index_top")
 			(uuid "04fc131e-fbcd-472a-a913-059a40eaff9d")
 		)
 		(pad "2" thru_hole circle
@@ -838,7 +836,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 15 "index_top")
+			(net 14 "index_top")
 			(uuid "ab043981-f36a-4b1a-9fc6-8b4b2d8f2f4e")
 		)
 		(embedded_fonts no)
@@ -1069,28 +1067,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(uuid "51b7c89f-6670-4ef7-aa97-ba409da8c955")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(uuid "f72fcfc2-eda4-4cfa-87a8-32376328170e")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 18 "inner_home")
+			(net 17 "inner_home")
 			(uuid "bd14a387-487b-461d-83f3-15346af70968")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 18 "inner_home")
+			(net 17 "inner_home")
 			(uuid "d72bf8e6-ccdb-43ad-b99a-d5ee45bce242")
 		)
 		(embedded_fonts no)
@@ -1321,28 +1319,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(uuid "c3770325-8d19-4e16-b2bd-ae8610a16dbe")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(uuid "4938ea61-367a-4dff-81a8-36e8263cc0ea")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 11 "middle_top")
+			(net 10 "middle_top")
 			(uuid "90245924-6b97-4bb6-826a-88ecd78a219c")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 11 "middle_top")
+			(net 10 "middle_top")
 			(uuid "fb3640ca-7c0c-48d8-a612-3c6e4f216c55")
 		)
 		(embedded_fonts no)
@@ -1573,28 +1571,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "d5d1fa8d-1a15-4268-bfb2-4021f97616b7")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "055ce37d-1e16-4530-aac4-7fe396f75c98")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 7 "ring_top")
+			(net 6 "ring_top")
 			(uuid "39f1b1b8-2df5-4f01-b763-8d1b62cac8a8")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 7 "ring_top")
+			(net 6 "ring_top")
 			(uuid "d6059e57-ea3a-41ac-aa32-7de10189df9b")
 		)
 		(embedded_fonts no)
@@ -1825,28 +1823,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(uuid "3f0eb494-42ca-48ac-9da5-7a053ae43eda")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(uuid "58b14baf-825d-4b22-82dc-7e26fdda47f2")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 10 "middle_home")
+			(net 9 "middle_home")
 			(uuid "bc13ada5-cee2-4559-bc8f-80c0cffb3dc7")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 10 "middle_home")
+			(net 9 "middle_home")
 			(uuid "8919005d-d112-41a7-9141-cddb91210914")
 		)
 		(embedded_fonts no)
@@ -2136,35 +2134,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "b0d3cc93-7627-4bfd-bcbe-81c117325b44")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "e28f10d5-73a7-494d-9c0a-8f26a1f932ef")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "bf1e9fb7-d6f5-40cb-88a9-015e3f9461a5")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 6 "ring_home")
+			(net 5 "ring_home")
 			(uuid "c4df0978-9376-4fa3-89ce-1b9e85f1f6bb")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 6 "ring_home")
+			(net 5 "ring_home")
 			(uuid "69667060-b309-4a2f-9c2d-8a6459a04bfb")
 		)
 		(pad "2" thru_hole circle
@@ -2173,7 +2171,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 6 "ring_home")
+			(net 5 "ring_home")
 			(uuid "a9742fcd-6a57-490f-aee1-df861b157b6b")
 		)
 		(embedded_fonts no)
@@ -2827,7 +2825,7 @@
 			(at -8.907962 0.063962 90)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(solder_mask_margin 0.05)
 			(uuid "b3328a64-9be3-4839-8e26-389f31fb7aba")
 		)
@@ -2835,7 +2833,7 @@
 			(at -8.907962 0.063962 90)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(solder_mask_margin 0.05)
 			(uuid "ed673d17-4c8b-4404-b13f-743499e7b199")
 		)
@@ -2843,7 +2841,7 @@
 			(at -8.907962 2.603962 90)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(solder_mask_margin 0.05)
 			(uuid "04bc6241-6a0a-447b-9f32-7497d45a2573")
 		)
@@ -2851,7 +2849,7 @@
 			(at -8.907962 2.603962 90)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(solder_mask_margin 0.05)
 			(uuid "4d35d4aa-b93d-4972-ae92-b8019406d2b6")
 		)
@@ -2859,7 +2857,7 @@
 			(at -8.907962 5.143962 90)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(solder_mask_margin 0.05)
 			(uuid "ab5da683-b200-4311-b9a4-7415be503530")
 		)
@@ -2867,7 +2865,7 @@
 			(at -8.907962 5.143962 90)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(solder_mask_margin 0.05)
 			(uuid "e904ad0d-a775-44ef-ace9-152f6db885b1")
 		)
@@ -2875,7 +2873,7 @@
 			(at -8.907962 7.683962 90)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(solder_mask_margin 0.05)
 			(uuid "3ea6237d-9e5c-4c08-af12-b578a86f6017")
 		)
@@ -2883,7 +2881,7 @@
 			(at -8.907962 7.683962 90)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(solder_mask_margin 0.05)
 			(uuid "cedbe50a-17dc-4802-96cd-d49ee04e33b5")
 		)
@@ -2891,7 +2889,7 @@
 			(at 9.000038 7.683962 270)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 26 "R3")
+			(net 24 "R4")
 			(solder_mask_margin 0.05)
 			(uuid "d36f8364-d12d-420a-bdc7-e02b1e80a481")
 		)
@@ -2899,7 +2897,7 @@
 			(at 9.000038 7.683962 270)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 26 "R3")
+			(net 24 "R4")
 			(solder_mask_margin 0.05)
 			(uuid "8bfc804e-0134-4da3-9e6a-043be840c2e5")
 		)
@@ -2907,7 +2905,7 @@
 			(at 9.000038 5.143962 270)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(solder_mask_margin 0.05)
 			(uuid "64f98bb4-59a5-445c-b4c5-08659ba7c1f8")
 		)
@@ -2915,7 +2913,7 @@
 			(at 9.000038 5.143962 270)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(solder_mask_margin 0.05)
 			(uuid "508d160e-19b9-4f3b-ae17-4b52ab4fbb71")
 		)
@@ -2923,7 +2921,7 @@
 			(at 9.000038 2.603962 270)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(solder_mask_margin 0.05)
 			(uuid "58143f82-dcbe-4c1d-ad1c-f34c0950ed7b")
 		)
@@ -2931,7 +2929,7 @@
 			(at 9.000038 2.603962 270)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(solder_mask_margin 0.05)
 			(uuid "36264974-c326-4b97-8b7b-4dfee52c712b")
 		)
@@ -2939,7 +2937,7 @@
 			(at 9.000038 0.063962 270)
 			(size 1.626 3)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(solder_mask_margin 0.05)
 			(uuid "7a18c114-a6bf-43b2-b16b-094e3514073e")
 		)
@@ -2947,7 +2945,7 @@
 			(at 9.000038 0.063962 270)
 			(size 1.626 3)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(solder_mask_margin 0.05)
 			(uuid "5e5f5fdd-4bb5-4907-8e72-fc5b3494ca96")
 		)
@@ -3330,28 +3328,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "57894a60-e9ac-4b03-999d-1f6a8692a328")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "abd2927d-7f99-4f16-bcd1-d7464bfd197a")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 6 "ring_home")
+			(net 5 "ring_home")
 			(uuid "5d1578df-55a4-42a9-83fd-7ca4754a2a24")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 6 "ring_home")
+			(net 5 "ring_home")
 			(uuid "c28497b8-4d63-462d-b2a8-a7e8aa722cb5")
 		)
 		(embedded_fonts no)
@@ -3738,28 +3736,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "14ab5035-89a3-4768-8f58-07c850a92082")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 4 "C1")
+			(net 3 "C1")
 			(uuid "866cbba4-4659-4d7c-85d3-ac586f524381")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 5 "ring_bottom")
+			(net 4 "ring_bottom")
 			(uuid "637f7ee7-c7bc-4de7-8366-76787f38e41c")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 5 "ring_bottom")
+			(net 4 "ring_bottom")
 			(uuid "bafdd4f8-e756-4620-a3d9-8a4789183dd9")
 		)
 		(embedded_fonts no)
@@ -3963,35 +3961,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "41e85ee8-8319-46b0-a1ec-6bc618cefb27")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "22d40be4-f144-4ea6-80db-e4ba14265b38")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "e75411b6-dcd4-4698-8f9d-8d4f4f7b5c40")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 5 "ring_bottom")
+			(net 4 "ring_bottom")
 			(uuid "b5fc2421-0ff0-4f5b-93a3-81c17563ccaa")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 5 "ring_bottom")
+			(net 4 "ring_bottom")
 			(uuid "d68de18a-5325-413e-88f0-70edb78b890d")
 		)
 		(pad "2" thru_hole circle
@@ -4000,7 +3998,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 5 "ring_bottom")
+			(net 4 "ring_bottom")
 			(uuid "7e9bafb0-6bd7-48cc-a631-ddad95c30de8")
 		)
 		(embedded_fonts no)
@@ -4204,35 +4202,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "36425ee3-058f-436c-951a-14fb828f670b")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "29d18e04-eb62-4b0d-8c2c-48cc619d4b82")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "46d37722-8e8f-4173-96bb-6ca71af03045")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 9 "middle_bottom")
+			(net 8 "middle_bottom")
 			(uuid "4a90907f-acea-4c4b-9ed7-f68a919e7b87")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 9 "middle_bottom")
+			(net 8 "middle_bottom")
 			(uuid "88ffe295-481d-44d0-9218-ff7b604eaa89")
 		)
 		(pad "2" thru_hole circle
@@ -4241,7 +4239,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 9 "middle_bottom")
+			(net 8 "middle_bottom")
 			(uuid "96855366-1ba7-4808-b026-ff210d2af98a")
 		)
 		(embedded_fonts no)
@@ -4472,28 +4470,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(uuid "5208400f-67cf-4d59-8e3a-1a7140e501cf")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 8 "C2")
+			(net 7 "C2")
 			(uuid "9b78988d-6c9d-4316-ba6c-db65513bd9b2")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 9 "middle_bottom")
+			(net 8 "middle_bottom")
 			(uuid "ac8dae91-e14f-4f20-81cd-de0e015197f1")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 9 "middle_bottom")
+			(net 8 "middle_bottom")
 			(uuid "146396e3-d737-4d54-a07c-d971b5b31cb9")
 		)
 		(embedded_fonts no)
@@ -4697,35 +4695,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 26 "R3")
+			(net 24 "R4")
 			(uuid "7fe5ca28-5bfd-4d1b-9f73-4836425e4b1a")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 26 "R3")
+			(net 24 "R4")
 			(uuid "24904acb-8337-4522-ba60-71f9d96e5239")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 26 "R3")
+			(net 24 "R4")
 			(uuid "7efb1690-9af6-4f55-8ebc-dfc89e56b2bc")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 20 "home_cluster")
+			(net 19 "home_cluster")
 			(uuid "5f02e612-b84b-458f-bcea-f2eb092aacdd")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 20 "home_cluster")
+			(net 19 "home_cluster")
 			(uuid "f2f4e271-6411-43c4-a791-5a587c4a63d3")
 		)
 		(pad "2" thru_hole circle
@@ -4734,7 +4732,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 20 "home_cluster")
+			(net 19 "home_cluster")
 			(uuid "4b6de60b-2738-43ea-b440-4724f21f9565")
 		)
 		(embedded_fonts no)
@@ -4965,28 +4963,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(uuid "6f46c7ff-b976-4fe1-8218-ad135adc19d7")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(uuid "ca0b6c23-bd84-4a01-ba0a-0f873a238992")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 17 "inner_bottom")
+			(net 16 "inner_bottom")
 			(uuid "a96f8935-00f3-4bb3-be1f-c3fda42fb617")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 17 "inner_bottom")
+			(net 16 "inner_bottom")
 			(uuid "efee0969-feba-4096-9c4e-a88f9d43aa32")
 		)
 		(embedded_fonts no)
@@ -5190,35 +5188,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "d4a5c76e-35c9-4901-85f9-fb982eeccbc5")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "0919e0a5-ecac-4cfd-95b7-c3fcd2112c03")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 25 "R0")
+			(net 23 "R1")
 			(uuid "38b8ddc6-fcee-42d7-a23a-a0047cf14047")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 7 "ring_top")
+			(net 6 "ring_top")
 			(uuid "3ad106e8-a55e-44bd-9c25-185998ab3899")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 7 "ring_top")
+			(net 6 "ring_top")
 			(uuid "72d97241-db39-42aa-9793-f39561b6108d")
 		)
 		(pad "2" thru_hole circle
@@ -5227,7 +5225,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 7 "ring_top")
+			(net 6 "ring_top")
 			(uuid "2523fe4d-b4ac-44e8-8596-b5d78610fb5c")
 		)
 		(embedded_fonts no)
@@ -5458,28 +5456,28 @@
 			(at -3.275 -5.95 83)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 21 "C5")
+			(net 15 "C4")
 			(uuid "267003e8-bd91-4cbd-b2eb-7ff9e70390a3")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95 83)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 21 "C5")
+			(net 15 "C4")
 			(uuid "40bf5b3c-3c85-48ef-a726-9c3184be7b3d")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75 83)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 22 "right_cluster")
+			(net 20 "right_cluster")
 			(uuid "1f155472-406d-4bd2-bfde-30b4ff5fe05b")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75 83)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 22 "right_cluster")
+			(net 20 "right_cluster")
 			(uuid "7671308a-56bd-4bc9-a8c8-ffb85dcdfdfc")
 		)
 		(embedded_fonts no)
@@ -5710,28 +5708,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "9d2eeea1-61ae-4160-a9b9-8337612171a8")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "b82aa25a-534b-4978-9edb-755417924b8f")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 14 "index_home")
+			(net 13 "index_home")
 			(uuid "d63db02c-97d0-43e7-b289-6e22bd073b82")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 14 "index_home")
+			(net 13 "index_home")
 			(uuid "aef1076c-e5f0-4dc1-b93e-8f02d223ca1b")
 		)
 		(embedded_fonts no)
@@ -5962,28 +5960,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "cfa75920-ceb1-4047-aad3-879d42d7f380")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "52c685fd-0a19-4e76-9e33-3382ea3df6ee")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 15 "index_top")
+			(net 14 "index_top")
 			(uuid "1cb0ca8f-91e5-46c1-bfa9-c5a3d9d02702")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 15 "index_top")
+			(net 14 "index_top")
 			(uuid "1ef1c225-14b1-498f-ad45-29d9f712c602")
 		)
 		(embedded_fonts no)
@@ -6187,35 +6185,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "e74c64fe-952c-4e02-80da-ee1d687e153e")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "10499f36-57c9-4a2d-a6bb-3a6fdd167a1f")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "29defe1e-4b55-4c0e-a333-1b0ce4f71c52")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 14 "index_home")
+			(net 13 "index_home")
 			(uuid "29f6076a-d77f-4fc1-963f-e8d862d702f7")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 14 "index_home")
+			(net 13 "index_home")
 			(uuid "2371cd24-c597-49e0-a30e-7d00c43d6639")
 		)
 		(pad "2" thru_hole circle
@@ -6224,7 +6222,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 14 "index_home")
+			(net 13 "index_home")
 			(uuid "0a7509aa-67cb-4992-bc6e-cca744378337")
 		)
 		(embedded_fonts no)
@@ -6428,35 +6426,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "f9366604-e8da-468d-b569-17c201eed1a2")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "376dc9ae-0e85-40c7-95f5-767dfb6dda84")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 23 "R2")
+			(net 21 "R3")
 			(uuid "27f3c920-b1d2-437b-953a-cd4ad392001e")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 13 "index_bottom")
+			(net 12 "index_bottom")
 			(uuid "5c3c2083-660f-46fe-9bf3-1d6365b20985")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 13 "index_bottom")
+			(net 12 "index_bottom")
 			(uuid "7fd29b64-6186-40f6-8635-cb6f998a32ab")
 		)
 		(pad "2" thru_hole circle
@@ -6465,7 +6463,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 13 "index_bottom")
+			(net 12 "index_bottom")
 			(uuid "01eeb240-9a7e-4b16-9c15-9ec61906eb8f")
 		)
 		(embedded_fonts no)
@@ -6669,35 +6667,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 26 "R3")
+			(net 24 "R4")
 			(uuid "c55c2da2-cea5-4a86-89ee-209ee74314e9")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 26 "R3")
+			(net 24 "R4")
 			(uuid "3f524fa0-67e5-4b7d-bf8f-7bc997be5d2c")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 26 "R3")
+			(net 24 "R4")
 			(uuid "79fe7701-6868-4001-bc6a-29103ba84310")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 19 "left_cluster")
+			(net 18 "left_cluster")
 			(uuid "c37f8ddc-b505-4a46-9f3c-164ebc38979d")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 19 "left_cluster")
+			(net 18 "left_cluster")
 			(uuid "0fb5eb01-92ae-4bdb-b443-49e33d39c45c")
 		)
 		(pad "2" thru_hole circle
@@ -6706,7 +6704,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 19 "left_cluster")
+			(net 18 "left_cluster")
 			(uuid "6e5f55d5-ad30-4d9c-94d5-73b3cd2e6662")
 		)
 		(embedded_fonts no)
@@ -6937,28 +6935,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "327c4348-8e0b-4a85-b6bb-b7b13c2dc5d7")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "6eef2f0d-4f78-4e14-8470-08267a3ebaa6")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 13 "index_bottom")
+			(net 12 "index_bottom")
 			(uuid "7e9e13c3-f4a5-426c-95dc-0e99b5135b85")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 13 "index_bottom")
+			(net 12 "index_bottom")
 			(uuid "f2ebfd9e-23e0-4fe5-9552-a010250d61f2")
 		)
 		(embedded_fonts no)
@@ -7248,35 +7246,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "R2")
+			(net 24 "R4")
 			(uuid "65afcaef-c5a8-46be-8eeb-3ce89701bc57")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "R2")
+			(net 24 "R4")
 			(uuid "500652d7-0724-43f6-91fb-92fdcf41cd69")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 23 "R2")
+			(net 24 "R4")
 			(uuid "5bcc2b92-440c-408b-b875-6a36ace148d9")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 2 "pinky_bottom")
+			(net 1 "pinky_bottom")
 			(uuid "fb4d49ff-29f4-40f4-b477-f78dc34d9ee9")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 2 "pinky_bottom")
+			(net 1 "pinky_bottom")
 			(uuid "9350f13e-9c3f-4917-af4b-446c5bfddbbd")
 		)
 		(pad "2" thru_hole circle
@@ -7285,7 +7283,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 2 "pinky_bottom")
+			(net 1 "pinky_bottom")
 			(uuid "96c4666a-d276-418d-8a90-f54e526e2982")
 		)
 		(embedded_fonts no)
@@ -7727,7 +7725,7 @@
 			(at -1 2.816 90)
 			(size 1.2 0.5)
 			(layers "F.Cu" "F.Mask")
-			(net 27 "BAT_P")
+			(net 25 "BAT_P")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -7749,7 +7747,7 @@
 			(at 1 2.816 90)
 			(size 1.2 0.5)
 			(layers "B.Cu" "B.Mask")
-			(net 27 "BAT_P")
+			(net 25 "BAT_P")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -7771,7 +7769,7 @@
 			(at -1 2.816 90)
 			(size 1.2 0.5)
 			(layers "B.Cu" "B.Mask")
-			(net 28 "GND")
+			(net 26 "GND")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -7793,7 +7791,7 @@
 			(at 1 2.816 90)
 			(size 1.2 0.5)
 			(layers "F.Cu" "F.Mask")
-			(net 28 "GND")
+			(net 26 "GND")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -7817,7 +7815,7 @@
 			(drill 0.75)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 29 "JST1_1")
+			(net 27 "JST1_1")
 			(uuid "af6dabe0-93b7-4b9e-98ac-96a6a91ea27c")
 		)
 		(pad "12" thru_hole oval
@@ -7826,14 +7824,14 @@
 			(drill 0.75)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 30 "JST1_2")
+			(net 28 "JST1_2")
 			(uuid "0cd3dbe2-75ee-4c11-9577-94ed734c9cc6")
 		)
 		(pad "21" smd custom
 			(at -1 1.8 90)
 			(size 0.1 0.1)
 			(layers "F.Cu" "F.Mask")
-			(net 29 "JST1_1")
+			(net 27 "JST1_1")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -7855,7 +7853,7 @@
 			(at 1 1.8 90)
 			(size 0.1 0.1)
 			(layers "F.Cu" "F.Mask")
-			(net 30 "JST1_2")
+			(net 28 "JST1_2")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -7877,7 +7875,7 @@
 			(at -1 1.8 90)
 			(size 0.1 0.1)
 			(layers "B.Cu" "B.Mask")
-			(net 29 "JST1_1")
+			(net 27 "JST1_1")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -7899,7 +7897,7 @@
 			(at 1 1.8 90)
 			(size 0.1 0.1)
 			(layers "B.Cu" "B.Mask")
-			(net 30 "JST1_2")
+			(net 28 "JST1_2")
 			(clearance 0.1)
 			(zone_connect 0)
 			(options
@@ -8145,28 +8143,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(uuid "89439b73-77b1-450a-bd98-9a2d851bd728")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 16 "C4")
+			(net 15 "C4")
 			(uuid "cee5abad-5b60-4f8c-b111-a3912acd4ee1")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 20 "home_cluster")
+			(net 19 "home_cluster")
 			(uuid "3de6c5da-55d1-4a1c-903c-12a9b57de3c2")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 20 "home_cluster")
+			(net 19 "home_cluster")
 			(uuid "0b8c0dff-edde-4ef3-9551-9351d7e4362a")
 		)
 		(embedded_fonts no)
@@ -8370,35 +8368,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "R1")
+			(net 24 "R4")
 			(uuid "d917ec10-7ea2-43f5-a669-7017c749f183")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "R1")
+			(net 24 "R4")
 			(uuid "92748c4d-8c5d-4075-917d-43e39b67bf25")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 24 "R1")
+			(net 24 "R4")
 			(uuid "04671a82-ce07-49e8-a83b-492552aad86b")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 3 "pinky_home")
+			(net 2 "pinky_home")
 			(uuid "03f20f5c-a3d4-4636-b599-324ea8145f15")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 3 "pinky_home")
+			(net 2 "pinky_home")
 			(uuid "13c4b989-14c3-4239-8b6e-8bccc80987eb")
 		)
 		(pad "2" thru_hole circle
@@ -8407,7 +8405,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 3 "pinky_home")
+			(net 2 "pinky_home")
 			(uuid "0f808c6f-f0fc-4912-b490-1a5b52c376f7")
 		)
 		(embedded_fonts no)
@@ -8611,35 +8609,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "R1")
+			(net 23 "R1")
 			(uuid "8d3aabd7-3eeb-499e-9b0d-026d1800fc00")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "R1")
+			(net 23 "R1")
 			(uuid "ad8b63bb-f33e-48f3-ab8a-bc9a245f24c1")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 24 "R1")
+			(net 23 "R1")
 			(uuid "2c9f9296-ee63-4e3b-bd94-799a2203cb9a")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 18 "inner_home")
+			(net 17 "inner_home")
 			(uuid "c822ab1a-9f0d-4a13-aff0-305c0f2c16a6")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 18 "inner_home")
+			(net 17 "inner_home")
 			(uuid "c382e90f-69a7-4026-ad9b-86b2e8f8c67c")
 		)
 		(pad "2" thru_hole circle
@@ -8648,7 +8646,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 18 "inner_home")
+			(net 17 "inner_home")
 			(uuid "7c5bc02b-6698-4fad-9b08-9979170b56f4")
 		)
 		(embedded_fonts no)
@@ -8879,28 +8877,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 1 "C0")
+			(net 7 "C2")
 			(uuid "9aa600aa-0f16-48b1-86bf-237ffeca1f89")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 1 "C0")
+			(net 7 "C2")
 			(uuid "38c77a63-006c-4c7e-8f39-9d624087b3a0")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 2 "pinky_bottom")
+			(net 1 "pinky_bottom")
 			(uuid "b3ff99ad-d198-47c4-b0c6-0d3f90bb6541")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 2 "pinky_bottom")
+			(net 1 "pinky_bottom")
 			(uuid "c711cd1b-3c71-4ad9-8a4c-21727fedb960")
 		)
 		(embedded_fonts no)
@@ -9104,35 +9102,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "cef4dd7f-f51a-4816-80f5-892c869a26db")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "98011621-759e-424c-b664-d0ec0143aab5")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 24 "R1")
+			(net 22 "R2")
 			(uuid "8d8dd247-4fb6-4dc7-8d33-2899ee7a6b7d")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 10 "middle_home")
+			(net 9 "middle_home")
 			(uuid "0c722d67-9a88-4af6-9654-ea98a58f9539")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 10 "middle_home")
+			(net 9 "middle_home")
 			(uuid "76e9ca0c-49e8-4f5b-9ec8-9d4c76ba821a")
 		)
 		(pad "2" thru_hole circle
@@ -9141,7 +9139,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 10 "middle_home")
+			(net 9 "middle_home")
 			(uuid "6a8e137b-7e6d-495d-a240-e79896bbb053")
 		)
 		(embedded_fonts no)
@@ -9372,28 +9370,28 @@
 			(at -3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "e5b8f783-4598-454a-b78b-40aab5ee39ce")
 		)
 		(pad "1" smd rect
 			(at 3.275 -5.95)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 12 "C3")
+			(net 11 "C3")
 			(uuid "97ab216a-6ad2-489e-9c36-1850f62f3530")
 		)
 		(pad "2" smd rect
 			(at -8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 19 "left_cluster")
+			(net 18 "left_cluster")
 			(uuid "5855d03a-5a0d-4d8f-8080-6b4278bee3eb")
 		)
 		(pad "2" smd rect
 			(at 8.275 -3.75)
 			(size 2.6 2.6)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 19 "left_cluster")
+			(net 18 "left_cluster")
 			(uuid "9e6cd710-a852-40e3-a2c3-399e025f26ad")
 		)
 		(embedded_fonts no)
@@ -9597,35 +9595,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 23 "R2")
+			(net 22 "R2")
 			(uuid "9674bf68-1001-4e63-b637-9fb949c66736")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 23 "R2")
+			(net 22 "R2")
 			(uuid "f7a891fb-51d3-408e-bfa1-1f83864e7516")
 		)
 		(pad "1" smd rect
 			(at -1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 23 "R2")
+			(net 22 "R2")
 			(uuid "4b6a04ce-e528-4155-aeb4-8852294c4927")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 17 "inner_bottom")
+			(net 16 "inner_bottom")
 			(uuid "ae283627-233b-41db-81f8-9970095d2db7")
 		)
 		(pad "2" smd rect
 			(at 1.65 0)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 17 "inner_bottom")
+			(net 16 "inner_bottom")
 			(uuid "d2909597-3210-4133-91de-24f20305d781")
 		)
 		(pad "2" thru_hole circle
@@ -9634,7 +9632,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 17 "inner_bottom")
+			(net 16 "inner_bottom")
 			(uuid "d2aa7b1d-e1fa-4197-ba3c-10af1128bf78")
 		)
 		(embedded_fonts no)
@@ -9838,35 +9836,35 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 26 "R3")
+			(net 21 "R3")
 			(uuid "49deb5d4-3d03-4363-b73c-2bece375e298")
 		)
 		(pad "1" smd rect
 			(at -1.65 0 83)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 26 "R3")
+			(net 21 "R3")
 			(uuid "07493403-c37f-4853-a4b8-fe3a8aa0478d")
 		)
 		(pad "1" smd rect
 			(at -1.65 0 83)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 26 "R3")
+			(net 21 "R3")
 			(uuid "53502a09-ab1d-4727-9af0-767d2923a4a3")
 		)
 		(pad "2" smd rect
 			(at 1.65 0 83)
 			(size 0.9 1.2)
 			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 22 "right_cluster")
+			(net 20 "right_cluster")
 			(uuid "e3a5ba96-b150-481e-a121-f9522bb073f6")
 		)
 		(pad "2" smd rect
 			(at 1.65 0 83)
 			(size 0.9 1.2)
 			(layers "B.Cu" "B.Mask" "B.Paste")
-			(net 22 "right_cluster")
+			(net 20 "right_cluster")
 			(uuid "ccf0bc16-ba9f-459b-8520-21cc46b5ebdb")
 		)
 		(pad "2" thru_hole circle
@@ -9875,7 +9873,7 @@
 			(drill 0.9906)
 			(layers "*.Cu" "*.Mask")
 			(remove_unused_layers no)
-			(net 22 "right_cluster")
+			(net 20 "right_cluster")
 			(uuid "79935a1b-cb20-4f56-9b81-9329bb64a65a")
 		)
 		(embedded_fonts no)
@@ -10105,7 +10103,7 @@
 		(end 172 56.5)
 		(width 0.25)
 		(layer "F.Cu")
-		(net 29)
+		(net 27)
 		(uuid "7f3d849f-1fdb-49fc-b281-5b11bb83e19d")
 	)
 	(segment
@@ -10113,7 +10111,7 @@
 		(end 172 56.5)
 		(width 0.25)
 		(layer "B.Cu")
-		(net 29)
+		(net 27)
 		(uuid "f3ae8cc0-aeea-4afb-9ac7-337612b29a1f")
 	)
 	(segment
@@ -10121,7 +10119,7 @@
 		(end 172 58.5)
 		(width 0.25)
 		(layer "F.Cu")
-		(net 30)
+		(net 28)
 		(uuid "6d2219e5-02ce-4be5-b6b9-2bf6ff40f2a2")
 	)
 	(segment
@@ -10129,7 +10127,7 @@
 		(end 172 58.5)
 		(width 0.25)
 		(layer "B.Cu")
-		(net 30)
+		(net 28)
 		(uuid "abf39be7-37c0-4752-85eb-f5e798c28ae2")
 	)
 	(embedded_fonts no)