diff --git a/acid.kicad_pcb b/acid.kicad_pcb
index 9df92a5..906d10d 100644
--- a/acid.kicad_pcb
+++ b/acid.kicad_pcb
@@ -25598,7 +25598,7 @@
 	(footprint "MX_Hotswap:MX-Hotswap-1U"
 		(layer "B.Cu")
 		(uuid "6131fd4e-0a26-438c-8731-a6beb213ee41")
-		(at 149.86 151.13 180)
+		(at 149.86 151.13)
 		(property "Reference" "SW_{4,0}2"
 			(at 0 -3.175 0)
 			(layer "B.Fab")
@@ -25623,7 +25623,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 0 0 0)
+			(at 0 0 180)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -25636,7 +25636,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
+			(at 0 0 180)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -25651,106 +25651,16 @@
 		(path "/73412d5b-accc-4a8f-a9c5-c7f2843efb93/edb236d6-338d-4c3f-99ea-16c2299c4431")
 		(sheetname "/Switch Matrix Right Half/")
 		(sheetfile "matrix_switch.kicad_sch")
-		(attr smd)
+		(attr smd dnp)
 		(fp_line
-			(start 9.525 9.525)
+			(start -9.525 -9.525)
 			(end -9.525 9.525)
 			(stroke
 				(width 0.15)
 				(type solid)
 			)
 			(layer "Dwgs.User")
-			(uuid "0fe7df4f-5308-487c-bb51-1ebd08b6348c")
-		)
-		(fp_line
-			(start 9.525 -9.525)
-			(end 9.525 9.525)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "fc3d1374-75fb-426d-af48-58458c6e0585")
-		)
-		(fp_line
-			(start 9.525 -9.525)
-			(end -9.525 -9.525)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "a540403f-9e7d-465b-b9d7-7bb36e661d74")
-		)
-		(fp_line
-			(start 7 7)
-			(end 5 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "125c07f5-8dc1-41de-bb1d-e785d2547928")
-		)
-		(fp_line
-			(start 7 5)
-			(end 7 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "5cb55c09-d7d3-49ed-a55a-ea5469dd968e")
-		)
-		(fp_line
-			(start 7 -7)
-			(end 7 -5)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "67c2282f-8642-489b-816b-415be3d1e441")
-		)
-		(fp_line
-			(start 5 -7)
-			(end 7 -7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "4c2c323c-fe80-4631-aca6-3c0490285d70")
-		)
-		(fp_line
-			(start -7 7)
-			(end -5 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "1fd4bea0-b30b-4fc8-b730-3381641caf94")
-		)
-		(fp_line
-			(start -7 5)
-			(end -7 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "7c2c1b0f-c8e4-4ece-936e-057183ad7161")
-		)
-		(fp_line
-			(start -7 -5)
-			(end -7 -7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "20416c92-9d4f-40c6-9bf8-eb5281ca8ab9")
+			(uuid "e60d269e-3edd-4e7e-9d51-cc74e73e4472")
 		)
 		(fp_line
 			(start -7 -7)
@@ -25763,124 +25673,114 @@
 			(uuid "fd6e26cd-41e6-4a42-b055-ae8e4e9bbe4a")
 		)
 		(fp_line
-			(start -9.525 -9.525)
+			(start -7 -5)
+			(end -7 -7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "20416c92-9d4f-40c6-9bf8-eb5281ca8ab9")
+		)
+		(fp_line
+			(start -7 5)
+			(end -7 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "7c2c1b0f-c8e4-4ece-936e-057183ad7161")
+		)
+		(fp_line
+			(start -7 7)
+			(end -5 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "1fd4bea0-b30b-4fc8-b730-3381641caf94")
+		)
+		(fp_line
+			(start 5 -7)
+			(end 7 -7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "4c2c323c-fe80-4631-aca6-3c0490285d70")
+		)
+		(fp_line
+			(start 7 -7)
+			(end 7 -5)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "67c2282f-8642-489b-816b-415be3d1e441")
+		)
+		(fp_line
+			(start 7 5)
+			(end 7 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "5cb55c09-d7d3-49ed-a55a-ea5469dd968e")
+		)
+		(fp_line
+			(start 7 7)
+			(end 5 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "125c07f5-8dc1-41de-bb1d-e785d2547928")
+		)
+		(fp_line
+			(start 9.525 -9.525)
+			(end -9.525 -9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "a540403f-9e7d-465b-b9d7-7bb36e661d74")
+		)
+		(fp_line
+			(start 9.525 -9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "fc3d1374-75fb-426d-af48-58458c6e0585")
+		)
+		(fp_line
+			(start 9.525 9.525)
 			(end -9.525 9.525)
 			(stroke
 				(width 0.15)
 				(type solid)
 			)
 			(layer "Dwgs.User")
-			(uuid "e60d269e-3edd-4e7e-9d51-cc74e73e4472")
+			(uuid "0fe7df4f-5308-487c-bb51-1ebd08b6348c")
 		)
 		(fp_line
-			(start 8.45 3.875)
-			(end 6.5 3.875)
+			(start -7.2 3.75)
+			(end -7.2 6.4)
 			(stroke
 				(width 0.127)
 				(type solid)
 			)
 			(layer "B.CrtYd")
-			(uuid "105ef987-9b62-4aa9-a17f-df07a5d7acc6")
-		)
-		(fp_line
-			(start 8.45 1.2)
-			(end 8.45 3.875)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "247a48a7-b3cf-4481-8783-8dd8d4741135")
-		)
-		(fp_line
-			(start 6.5 3.875)
-			(end 6.5 4.5)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "e1778cfa-19a2-4fe5-ab23-577375fafb08")
-		)
-		(fp_line
-			(start 6.5 1.2)
-			(end 8.45 1.2)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "337e6150-32fd-407e-b867-884bb4be2d33")
-		)
-		(fp_line
-			(start 6.5 1.2)
-			(end 6.5 0.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "7cf1a5ff-f480-4873-aa15-682d18023c37")
-		)
-		(fp_line
-			(start 4 7)
-			(end -5.3 7)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "97b47fe0-a939-4636-ac79-8c5988c7c9ae")
-		)
-		(fp_line
-			(start 2.4 0.6)
-			(end 6.5 0.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "f2486c32-e64b-4308-83be-5ca6b9572f74")
-		)
-		(fp_line
-			(start -5.3 6.4)
-			(end -5.3 7)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "c76cf880-3f42-46cf-980b-30a1239eafcc")
-		)
-		(fp_line
-			(start -5.3 3.75)
-			(end -5.3 2.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "0b84bb48-eb0a-4996-bf8e-12fd6e45e164")
-		)
-		(fp_line
-			(start -5.3 3.75)
-			(end -7.2 3.75)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "cecdc826-2c01-4ee0-85bb-5891fa20bb8a")
-		)
-		(fp_line
-			(start -5.3 2.6)
-			(end 0.4 2.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "82b30cda-7847-44b1-aad6-ffb99b35cf1c")
+			(uuid "f4246d0f-2726-494c-a155-7c87621c0078")
 		)
 		(fp_line
 			(start -7.2 6.4)
@@ -25893,25 +25793,114 @@
 			(uuid "b5b9d40f-0b4e-4323-b188-9af798a5f0b5")
 		)
 		(fp_line
-			(start -7.2 3.75)
-			(end -7.2 6.4)
+			(start -5.3 2.6)
+			(end 0.4 2.6)
 			(stroke
 				(width 0.127)
 				(type solid)
 			)
 			(layer "B.CrtYd")
-			(uuid "f4246d0f-2726-494c-a155-7c87621c0078")
+			(uuid "82b30cda-7847-44b1-aad6-ffb99b35cf1c")
 		)
-		(fp_arc
-			(start 6.5 4.5)
-			(mid 5.767767 6.267767)
-			(end 4 7)
+		(fp_line
+			(start -5.3 3.75)
+			(end -7.2 3.75)
 			(stroke
 				(width 0.127)
 				(type solid)
 			)
 			(layer "B.CrtYd")
-			(uuid "d97c34bf-e4e9-4d01-b837-f9e3f9fa437d")
+			(uuid "cecdc826-2c01-4ee0-85bb-5891fa20bb8a")
+		)
+		(fp_line
+			(start -5.3 3.75)
+			(end -5.3 2.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "0b84bb48-eb0a-4996-bf8e-12fd6e45e164")
+		)
+		(fp_line
+			(start -5.3 6.4)
+			(end -5.3 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "c76cf880-3f42-46cf-980b-30a1239eafcc")
+		)
+		(fp_line
+			(start 2.4 0.6)
+			(end 6.5 0.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "f2486c32-e64b-4308-83be-5ca6b9572f74")
+		)
+		(fp_line
+			(start 4 7)
+			(end -5.3 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "97b47fe0-a939-4636-ac79-8c5988c7c9ae")
+		)
+		(fp_line
+			(start 6.5 1.2)
+			(end 6.5 0.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "7cf1a5ff-f480-4873-aa15-682d18023c37")
+		)
+		(fp_line
+			(start 6.5 1.2)
+			(end 8.45 1.2)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "337e6150-32fd-407e-b867-884bb4be2d33")
+		)
+		(fp_line
+			(start 6.5 3.875)
+			(end 6.5 4.5)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "e1778cfa-19a2-4fe5-ab23-577375fafb08")
+		)
+		(fp_line
+			(start 8.45 1.2)
+			(end 8.45 3.875)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "247a48a7-b3cf-4481-8783-8dd8d4741135")
+		)
+		(fp_line
+			(start 8.45 3.875)
+			(end 6.5 3.875)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "105ef987-9b62-4aa9-a17f-df07a5d7acc6")
 		)
 		(fp_arc
 			(start 2.4 0.6)
@@ -25924,43 +25913,54 @@
 			(layer "B.CrtYd")
 			(uuid "e4624028-f2ef-473a-9480-8a15bc76564a")
 		)
+		(fp_arc
+			(start 6.5 4.5)
+			(mid 5.767767 6.267767)
+			(end 4 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "d97c34bf-e4e9-4d01-b837-f9e3f9fa437d")
+		)
 		(pad "" np_thru_hole circle
-			(at -5.08 0 228.099)
+			(at -5.08 0 48.099)
 			(size 1.7018 1.7018)
 			(drill 1.7018)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "16e7133b-120e-4cd2-b1d0-ace02bba9169")
 		)
 		(pad "" np_thru_hole circle
-			(at -2.54 5.08 180)
+			(at -2.54 5.08)
 			(size 3 3)
 			(drill 3)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "f2ad6ed1-3abd-4ba3-8da4-0429963eb51a")
 		)
 		(pad "" np_thru_hole circle
-			(at 0 0 180)
+			(at 0 0)
 			(size 3.9878 3.9878)
 			(drill 3.9878)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "cad4a2af-e8ac-4e5a-8256-d3142dcb5d26")
 		)
 		(pad "" np_thru_hole circle
-			(at 3.81 2.54 180)
+			(at 3.81 2.54)
 			(size 3 3)
 			(drill 3)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "b93ec718-d6d7-47c8-9cf8-9c628655b513")
 		)
 		(pad "" np_thru_hole circle
-			(at 5.08 0 228.099)
+			(at 5.08 0 48.099)
 			(size 1.7018 1.7018)
 			(drill 1.7018)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "d143bf42-787b-402f-882c-17dcafa892ea")
 		)
 		(pad "1" smd roundrect
-			(at 7.085 2.54 180)
+			(at 7.085 2.54)
 			(size 2.55 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.08)
@@ -25970,7 +25970,7 @@
 			(uuid "d321ca81-8aae-4945-9430-ea054da5e012")
 		)
 		(pad "2" smd roundrect
-			(at -5.842 5.08 180)
+			(at -5.842 5.08)
 			(size 2.55 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.08)
@@ -26786,6 +26786,431 @@
 			)
 		)
 	)
+	(footprint "MX_Hotswap:MX-Hotswap-2U"
+		(layer "B.Cu")
+		(uuid "674e5198-1207-4451-9ee8-19aed7d28a60")
+		(at 140.335 151.13 180)
+		(property "Reference" "SW_{SB}1"
+			(at 0 -3.175 0)
+			(layer "B.Fab")
+			(uuid "488f15fd-1245-483e-84f1-382355ee0dce")
+			(effects
+				(font
+					(size 0.8 0.8)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 0 7.9375 0)
+			(layer "Dwgs.User")
+			(uuid "df6f6e35-e3c2-4dd0-bd01-b27c402124ea")
+			(effects
+				(font
+					(size 0.8 0.8)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Datasheet" ""
+			(at 0 0 0)
+			(unlocked yes)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "b1aae2f5-6892-4376-b3d1-bb4a5e9ab9d0")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Description" ""
+			(at 0 0 0)
+			(unlocked yes)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "9fa937f5-1924-4625-8b62-3b673300f9ec")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+			)
+		)
+		(path "/12f18982-a1b4-4fe2-af7f-0c220f032bc8")
+		(sheetname "/")
+		(sheetfile "acid.kicad_sch")
+		(attr smd)
+		(fp_line
+			(start 19.05 9.525)
+			(end -19.05 9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "71a724f4-7293-486b-b795-8e4af3e86745")
+		)
+		(fp_line
+			(start 19.05 -9.525)
+			(end 19.05 9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "ec0bc01d-34c5-4ecd-997a-244a72be0bb5")
+		)
+		(fp_line
+			(start 19.05 -9.525)
+			(end -19.05 -9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "384252ff-abd9-47d9-af35-f08f06aa29e6")
+		)
+		(fp_line
+			(start 7 7)
+			(end 5 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "6c7c0949-de52-4214-aaa5-4374342baa88")
+		)
+		(fp_line
+			(start 7 5)
+			(end 7 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "737b9b33-8800-4399-b8a4-0a23a97a7e3d")
+		)
+		(fp_line
+			(start 7 -7)
+			(end 7 -5)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "d9842c51-4910-445b-a168-c5bf21c18f37")
+		)
+		(fp_line
+			(start 5 -7)
+			(end 7 -7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "3ed61cc1-5498-4a53-af48-9ef079a2e569")
+		)
+		(fp_line
+			(start -7 7)
+			(end -5 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "4b2dba16-4f51-462f-9601-f15b46d2f39a")
+		)
+		(fp_line
+			(start -7 5)
+			(end -7 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "e56e536c-179d-4bc7-9a50-d87e62882770")
+		)
+		(fp_line
+			(start -7 -5)
+			(end -7 -7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "974e6dc1-af89-4f83-9bbb-e0aa60388122")
+		)
+		(fp_line
+			(start -7 -7)
+			(end -5 -7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "408e12bc-81f5-4241-a767-9564a09ddf6f")
+		)
+		(fp_line
+			(start -19.05 -9.525)
+			(end -19.05 9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "cef406e7-6a5c-4c7f-94f9-13200591fc7b")
+		)
+		(fp_line
+			(start 8.45 3.875)
+			(end 6.5 3.875)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "cf75647d-d2c1-4cbb-a602-c53559105da7")
+		)
+		(fp_line
+			(start 8.45 1.2)
+			(end 8.45 3.875)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "104090e4-8893-4b10-baf1-065a1a4a8d7b")
+		)
+		(fp_line
+			(start 6.5 3.875)
+			(end 6.5 4.5)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "310b62aa-2337-44b5-bf0e-02cb8401e9ac")
+		)
+		(fp_line
+			(start 6.5 1.2)
+			(end 8.45 1.2)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "a18c305b-3bde-4f56-a701-8a3fe89fd910")
+		)
+		(fp_line
+			(start 6.5 1.2)
+			(end 6.5 0.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "f74e5604-c918-49b2-ae0e-9966139a313e")
+		)
+		(fp_line
+			(start 4 7)
+			(end -5.3 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "6e146737-d8b9-4466-ab78-266d4cb8985e")
+		)
+		(fp_line
+			(start 2.4 0.6)
+			(end 6.5 0.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "e3fd500a-0ea6-4720-a98d-05cc30753d3e")
+		)
+		(fp_line
+			(start -5.3 6.4)
+			(end -5.3 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "972c1501-8df2-4996-b128-687c1ec399af")
+		)
+		(fp_line
+			(start -5.3 3.75)
+			(end -5.3 2.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "5c5bfd05-d179-44f6-ba4a-765f47fe4d33")
+		)
+		(fp_line
+			(start -5.3 3.75)
+			(end -7.2 3.75)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "ee1cca86-3ca4-4660-9831-534cc8ddd317")
+		)
+		(fp_line
+			(start -5.3 2.6)
+			(end 0.4 2.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "13e07e9f-a833-46f6-9a46-68fe2429a0c8")
+		)
+		(fp_line
+			(start -7.2 6.4)
+			(end -5.3 6.4)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "9671fb0a-501c-4b48-8a1a-cf4f795adcc8")
+		)
+		(fp_line
+			(start -7.2 3.75)
+			(end -7.2 6.4)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "bdac8d4c-5d8e-4f83-a8fe-085f5102f3a7")
+		)
+		(fp_arc
+			(start 6.5 4.5)
+			(mid 5.767767 6.267767)
+			(end 4 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "a166820f-442f-4cad-966d-7e802af6f3f4")
+		)
+		(fp_arc
+			(start 2.4 0.6)
+			(mid 1.814214 2.014214)
+			(end 0.4 2.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "ba92537a-7406-4756-8a47-0a83a56a9c29")
+		)
+		(pad "" np_thru_hole circle
+			(at -11.938 -8.255 180)
+			(size 3.9878 3.9878)
+			(drill 3.9878)
+			(layers "*.Cu" "*.Mask")
+			(uuid "fd4820eb-217e-4b9e-9c31-31662eec768b")
+		)
+		(pad "" np_thru_hole circle
+			(at -11.938 6.985 180)
+			(size 3.048 3.048)
+			(drill 3.048)
+			(layers "*.Cu" "*.Mask")
+			(uuid "e218a510-e478-4943-b294-b200c1bf252c")
+		)
+		(pad "" np_thru_hole circle
+			(at -5.08 0 228.099)
+			(size 1.7018 1.7018)
+			(drill 1.7018)
+			(layers "F&B.Cu" "*.Mask")
+			(uuid "a49910bf-f3fa-4c59-b1e3-9f68b48b2d14")
+		)
+		(pad "" np_thru_hole circle
+			(at -2.54 5.08 180)
+			(size 3 3)
+			(drill 3)
+			(layers "F&B.Cu" "*.Mask")
+			(uuid "ce374cfd-eff0-4af1-9264-41e2276f7cc0")
+		)
+		(pad "" np_thru_hole circle
+			(at 0 0 180)
+			(size 3.9878 3.9878)
+			(drill 3.9878)
+			(layers "F&B.Cu" "*.Mask")
+			(uuid "35ef94e0-bdc8-4f69-a676-b8e4a145c62f")
+		)
+		(pad "" np_thru_hole circle
+			(at 3.81 2.54 180)
+			(size 3 3)
+			(drill 3)
+			(layers "F&B.Cu" "*.Mask")
+			(uuid "7436786c-6bac-433e-acd4-571f80d1a36c")
+		)
+		(pad "" np_thru_hole circle
+			(at 5.08 0 228.099)
+			(size 1.7018 1.7018)
+			(drill 1.7018)
+			(layers "F&B.Cu" "*.Mask")
+			(uuid "45674ecd-6ace-4c38-a3f7-b4ccb9b8ac3b")
+		)
+		(pad "" np_thru_hole circle
+			(at 11.938 -8.255 180)
+			(size 3.9878 3.9878)
+			(drill 3.9878)
+			(layers "*.Cu" "*.Mask")
+			(uuid "28ae6fd0-fb7c-48ef-adde-3ef94c5478d2")
+		)
+		(pad "" np_thru_hole circle
+			(at 11.938 6.985 180)
+			(size 3.048 3.048)
+			(drill 3.048)
+			(layers "*.Cu" "*.Mask")
+			(uuid "53c806f1-507a-4c0b-ad3c-23499e0b2f64")
+		)
+		(pad "1" smd roundrect
+			(at 7.085 2.54 180)
+			(size 2.55 2.5)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.08)
+			(net 44 "/Switch Matrix Left Half/SWPIN_{4,5}")
+			(pinfunction "1")
+			(pintype "passive")
+			(uuid "5e01f889-b741-41a0-9e7e-f564c11d85a5")
+		)
+		(pad "2" smd roundrect
+			(at -5.842 5.08 180)
+			(size 2.55 2.5)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(roundrect_rratio 0.08)
+			(net 80 "GND")
+			(pinfunction "2")
+			(pintype "passive")
+			(uuid "afae45d5-96cc-4196-8bc4-3a205c8ca02d")
+		)
+		(embedded_fonts no)
+		(model "./MX-Hotswap-Socket.step"
+			(offset
+				(xyz -4.815 0.86 0)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 90 0 0)
+			)
+		)
+	)
 	(footprint "MX_Hotswap:MX-Hotswap-1U"
 		(layer "B.Cu")
 		(uuid "6a4f8574-62c7-490e-8d13-7e612ff8fde9")
@@ -36679,7 +37104,7 @@
 	(footprint "MX_Hotswap:MX-Hotswap-1U"
 		(layer "B.Cu")
 		(uuid "ebe930d3-a972-43dd-ab07-f6403484895a")
-		(at 130.81 151.13 180)
+		(at 130.81 151.13)
 		(property "Reference" "SW_{4,5}1"
 			(at 0 -3.175 0)
 			(layer "B.Fab")
@@ -36704,7 +37129,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 0 0 0)
+			(at 0 0 180)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -36717,7 +37142,7 @@
 			)
 		)
 		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
-			(at 0 0 0)
+			(at 0 0 180)
 			(unlocked yes)
 			(layer "F.Fab")
 			(hide yes)
@@ -36732,106 +37157,16 @@
 		(path "/e3c1981a-2a25-484a-9bc5-41b5c193dbd1/8c780816-3035-4c72-b4dc-94a6e034ae56")
 		(sheetname "/Switch Matrix Left Half/")
 		(sheetfile "matrix_switch.kicad_sch")
-		(attr smd)
+		(attr smd dnp)
 		(fp_line
-			(start 9.525 9.525)
+			(start -9.525 -9.525)
 			(end -9.525 9.525)
 			(stroke
 				(width 0.15)
 				(type solid)
 			)
 			(layer "Dwgs.User")
-			(uuid "e8458783-89da-4eac-bb51-63a7ad25d359")
-		)
-		(fp_line
-			(start 9.525 -9.525)
-			(end 9.525 9.525)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "b39131c6-2c18-492f-aba8-6ea2bea80b15")
-		)
-		(fp_line
-			(start 9.525 -9.525)
-			(end -9.525 -9.525)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "a8fd537e-1518-438d-bba4-b873648a6260")
-		)
-		(fp_line
-			(start 7 7)
-			(end 5 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "f6dd0704-c62b-41f0-bcad-d4673f83aa92")
-		)
-		(fp_line
-			(start 7 5)
-			(end 7 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "0a9fd53e-9189-454c-b2cd-caf9adcbac1c")
-		)
-		(fp_line
-			(start 7 -7)
-			(end 7 -5)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "d05fb12b-a369-40ff-94a1-1469aefd6816")
-		)
-		(fp_line
-			(start 5 -7)
-			(end 7 -7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "c578ab37-c33f-4ca1-9a48-bed02bffbbb8")
-		)
-		(fp_line
-			(start -7 7)
-			(end -5 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "669f9286-d9b6-443d-901a-db13fd08e3c7")
-		)
-		(fp_line
-			(start -7 5)
-			(end -7 7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "269e6b69-c43a-450b-af0a-395e02e14594")
-		)
-		(fp_line
-			(start -7 -5)
-			(end -7 -7)
-			(stroke
-				(width 0.15)
-				(type solid)
-			)
-			(layer "Dwgs.User")
-			(uuid "18217ec7-4f1d-46ea-88b8-ad5447deb977")
+			(uuid "4a6fb6c3-7852-4cd6-b769-4757e3ec83aa")
 		)
 		(fp_line
 			(start -7 -7)
@@ -36844,124 +37179,114 @@
 			(uuid "3ba10c1d-4346-401b-875f-59654846e532")
 		)
 		(fp_line
-			(start -9.525 -9.525)
+			(start -7 -5)
+			(end -7 -7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "18217ec7-4f1d-46ea-88b8-ad5447deb977")
+		)
+		(fp_line
+			(start -7 5)
+			(end -7 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "269e6b69-c43a-450b-af0a-395e02e14594")
+		)
+		(fp_line
+			(start -7 7)
+			(end -5 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "669f9286-d9b6-443d-901a-db13fd08e3c7")
+		)
+		(fp_line
+			(start 5 -7)
+			(end 7 -7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "c578ab37-c33f-4ca1-9a48-bed02bffbbb8")
+		)
+		(fp_line
+			(start 7 -7)
+			(end 7 -5)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "d05fb12b-a369-40ff-94a1-1469aefd6816")
+		)
+		(fp_line
+			(start 7 5)
+			(end 7 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "0a9fd53e-9189-454c-b2cd-caf9adcbac1c")
+		)
+		(fp_line
+			(start 7 7)
+			(end 5 7)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "f6dd0704-c62b-41f0-bcad-d4673f83aa92")
+		)
+		(fp_line
+			(start 9.525 -9.525)
+			(end -9.525 -9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "a8fd537e-1518-438d-bba4-b873648a6260")
+		)
+		(fp_line
+			(start 9.525 -9.525)
+			(end 9.525 9.525)
+			(stroke
+				(width 0.15)
+				(type solid)
+			)
+			(layer "Dwgs.User")
+			(uuid "b39131c6-2c18-492f-aba8-6ea2bea80b15")
+		)
+		(fp_line
+			(start 9.525 9.525)
 			(end -9.525 9.525)
 			(stroke
 				(width 0.15)
 				(type solid)
 			)
 			(layer "Dwgs.User")
-			(uuid "4a6fb6c3-7852-4cd6-b769-4757e3ec83aa")
+			(uuid "e8458783-89da-4eac-bb51-63a7ad25d359")
 		)
 		(fp_line
-			(start 8.45 3.875)
-			(end 6.5 3.875)
+			(start -7.2 3.75)
+			(end -7.2 6.4)
 			(stroke
 				(width 0.127)
 				(type solid)
 			)
 			(layer "B.CrtYd")
-			(uuid "699beccd-8546-4c9a-9c2d-6f7573048a71")
-		)
-		(fp_line
-			(start 8.45 1.2)
-			(end 8.45 3.875)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "85eb2442-1410-43ac-8c0b-60fcdd6d82a5")
-		)
-		(fp_line
-			(start 6.5 3.875)
-			(end 6.5 4.5)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "25ec8861-d428-4996-b77b-4d95a27912e4")
-		)
-		(fp_line
-			(start 6.5 1.2)
-			(end 8.45 1.2)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "1030ce9f-94f9-40b1-8536-c030bff2a7b5")
-		)
-		(fp_line
-			(start 6.5 1.2)
-			(end 6.5 0.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "d3f77650-88fe-44f1-9cb8-8703c70ca536")
-		)
-		(fp_line
-			(start 4 7)
-			(end -5.3 7)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "7ad82fa2-f5ee-4cab-9abc-aa5b424d8be5")
-		)
-		(fp_line
-			(start 2.4 0.6)
-			(end 6.5 0.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "52d0d934-e696-43d7-b0d9-40da39883d70")
-		)
-		(fp_line
-			(start -5.3 6.4)
-			(end -5.3 7)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "f3ca25f9-6a8e-4cbb-9eba-ab2434e6b0db")
-		)
-		(fp_line
-			(start -5.3 3.75)
-			(end -5.3 2.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "3ae98836-d4bc-405b-91a2-b687ee1b3af4")
-		)
-		(fp_line
-			(start -5.3 3.75)
-			(end -7.2 3.75)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "9a26b869-7757-4634-a6c7-cc0107d8b4f1")
-		)
-		(fp_line
-			(start -5.3 2.6)
-			(end 0.4 2.6)
-			(stroke
-				(width 0.127)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "7246fe7c-0da2-4654-8f21-209f9b833534")
+			(uuid "770a92fe-ff5c-4a31-984f-50f136b90967")
 		)
 		(fp_line
 			(start -7.2 6.4)
@@ -36974,25 +37299,114 @@
 			(uuid "759bc2a8-9a43-4094-b712-dde721e54eca")
 		)
 		(fp_line
-			(start -7.2 3.75)
-			(end -7.2 6.4)
+			(start -5.3 2.6)
+			(end 0.4 2.6)
 			(stroke
 				(width 0.127)
 				(type solid)
 			)
 			(layer "B.CrtYd")
-			(uuid "770a92fe-ff5c-4a31-984f-50f136b90967")
+			(uuid "7246fe7c-0da2-4654-8f21-209f9b833534")
 		)
-		(fp_arc
-			(start 6.5 4.5)
-			(mid 5.767767 6.267767)
-			(end 4 7)
+		(fp_line
+			(start -5.3 3.75)
+			(end -7.2 3.75)
 			(stroke
 				(width 0.127)
 				(type solid)
 			)
 			(layer "B.CrtYd")
-			(uuid "5fb62906-0bb4-40c8-82aa-37573eaafeda")
+			(uuid "9a26b869-7757-4634-a6c7-cc0107d8b4f1")
+		)
+		(fp_line
+			(start -5.3 3.75)
+			(end -5.3 2.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "3ae98836-d4bc-405b-91a2-b687ee1b3af4")
+		)
+		(fp_line
+			(start -5.3 6.4)
+			(end -5.3 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "f3ca25f9-6a8e-4cbb-9eba-ab2434e6b0db")
+		)
+		(fp_line
+			(start 2.4 0.6)
+			(end 6.5 0.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "52d0d934-e696-43d7-b0d9-40da39883d70")
+		)
+		(fp_line
+			(start 4 7)
+			(end -5.3 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "7ad82fa2-f5ee-4cab-9abc-aa5b424d8be5")
+		)
+		(fp_line
+			(start 6.5 1.2)
+			(end 6.5 0.6)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "d3f77650-88fe-44f1-9cb8-8703c70ca536")
+		)
+		(fp_line
+			(start 6.5 1.2)
+			(end 8.45 1.2)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "1030ce9f-94f9-40b1-8536-c030bff2a7b5")
+		)
+		(fp_line
+			(start 6.5 3.875)
+			(end 6.5 4.5)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "25ec8861-d428-4996-b77b-4d95a27912e4")
+		)
+		(fp_line
+			(start 8.45 1.2)
+			(end 8.45 3.875)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "85eb2442-1410-43ac-8c0b-60fcdd6d82a5")
+		)
+		(fp_line
+			(start 8.45 3.875)
+			(end 6.5 3.875)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "699beccd-8546-4c9a-9c2d-6f7573048a71")
 		)
 		(fp_arc
 			(start 2.4 0.6)
@@ -37005,43 +37419,54 @@
 			(layer "B.CrtYd")
 			(uuid "ea6aaffd-d306-4aa7-9f4f-fb73d3985aae")
 		)
+		(fp_arc
+			(start 6.5 4.5)
+			(mid 5.767767 6.267767)
+			(end 4 7)
+			(stroke
+				(width 0.127)
+				(type solid)
+			)
+			(layer "B.CrtYd")
+			(uuid "5fb62906-0bb4-40c8-82aa-37573eaafeda")
+		)
 		(pad "" np_thru_hole circle
-			(at -5.08 0 228.099)
+			(at -5.08 0 48.099)
 			(size 1.7018 1.7018)
 			(drill 1.7018)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "ea4fd155-35cc-42f7-aff1-c1b6477bc621")
 		)
 		(pad "" np_thru_hole circle
-			(at -2.54 5.08 180)
+			(at -2.54 5.08)
 			(size 3 3)
 			(drill 3)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "26897189-f249-4901-aba1-1cd5063d4381")
 		)
 		(pad "" np_thru_hole circle
-			(at 0 0 180)
+			(at 0 0)
 			(size 3.9878 3.9878)
 			(drill 3.9878)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "06307e8e-4201-46dd-ba4d-53600bf840dd")
 		)
 		(pad "" np_thru_hole circle
-			(at 3.81 2.54 180)
+			(at 3.81 2.54)
 			(size 3 3)
 			(drill 3)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "78b845ae-8b21-4046-b2a5-36e5723b7ca9")
 		)
 		(pad "" np_thru_hole circle
-			(at 5.08 0 228.099)
+			(at 5.08 0 48.099)
 			(size 1.7018 1.7018)
 			(drill 1.7018)
 			(layers "F&B.Cu" "*.Mask")
 			(uuid "d764d5d6-aabc-4cc0-9a43-9cc4460d9e6b")
 		)
 		(pad "1" smd roundrect
-			(at 7.085 2.54 180)
+			(at 7.085 2.54)
 			(size 2.55 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.08)
@@ -37051,7 +37476,7 @@
 			(uuid "2c58a337-0049-4ef3-a02c-7e24e0c4058e")
 		)
 		(pad "2" smd roundrect
-			(at -5.842 5.08 180)
+			(at -5.842 5.08)
 			(size 2.55 2.5)
 			(layers "B.Cu" "B.Mask" "B.Paste")
 			(roundrect_rratio 0.08)
diff --git a/acid.kicad_pro b/acid.kicad_pro
index 01a71b9..599a2ca 100644
--- a/acid.kicad_pro
+++ b/acid.kicad_pro
@@ -261,7 +261,12 @@
     "equivalence_files": []
   },
   "erc": {
-    "erc_exclusions": [],
+    "erc_exclusions": [
+      [
+        "no_connect_connected|774700|1752600|275335b4-84f8-465d-bc79-479fbfc1d970|00000000-0000-0000-0000-000000000000|/ee5b55de-ef61-476c-9896-089acae94cf2|/ee5b55de-ef61-476c-9896-089acae94cf2|",
+        "This hierarchical pin is only used for the left side of the switch matrix"
+      ]
+    ],
     "meta": {
       "version": 0
     },
@@ -524,7 +529,7 @@
       "plot": "",
       "pos_files": "",
       "specctra_dsn": "",
-      "step": "",
+      "step": "target/acid.step",
       "svg": "",
       "vrml": ""
     },
diff --git a/acid.kicad_sch b/acid.kicad_sch
index 2c468e3..0d3fbd9 100644
--- a/acid.kicad_sch
+++ b/acid.kicad_sch
@@ -2895,6 +2895,180 @@
 			)
 			(embedded_fonts no)
 		)
+		(symbol "Switch:SW_Push_45deg"
+			(pin_numbers
+				(hide yes)
+			)
+			(pin_names
+				(offset 1.016)
+				(hide yes)
+			)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "SW"
+				(at 3.048 1.016 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(property "Value" "SW_Push_45deg"
+				(at 0 -3.81 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "switch normally-open pushbutton push-button"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "SW_Push_45deg_0_1"
+				(polyline
+					(pts
+						(xy -2.54 2.54) (xy -1.524 1.524) (xy -1.524 1.524)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center -1.1684 1.1684)
+					(radius 0.508)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy -0.508 2.54) (xy 2.54 -0.508)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.016 1.016) (xy 2.032 2.032)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 1.143 -1.1938)
+					(radius 0.508)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.524 -1.524) (xy 2.54 -2.54) (xy 2.54 -2.54) (xy 2.54 -2.54)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(pin passive line
+					(at -2.54 2.54 0)
+					(length 0)
+					(name "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 2.54 -2.54 180)
+					(length 0)
+					(name "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+			(embedded_fonts no)
+		)
 		(symbol "UnexpectedMaker:ProS3"
 			(exclude_from_sim no)
 			(in_bom yes)
@@ -5097,7 +5271,7 @@
 	)
 	(text "DNP because the GPIO has a\nbuilt-in pull-up resistor."
 		(exclude_from_sim no)
-		(at 71.628 166.116 0)
+		(at 69.088 144.526 0)
 		(effects
 			(font
 				(size 0.8 0.8)
@@ -5108,7 +5282,7 @@
 	)
 	(text "10 uF decoupling capacitors are used\non this board, the smallest trace loops\npossible, as per\nhttps://youtu.be/ARwBwHZESOY"
 		(exclude_from_sim no)
-		(at 17.526 130.81 0)
+		(at 22.606 97.79 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5140,7 +5314,7 @@
 	)
 	(text "I2C Connector for Debugging"
 		(exclude_from_sim no)
-		(at 41.91 147.066 0)
+		(at 46.99 114.046 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5150,7 +5324,7 @@
 	)
 	(text "INT_{LR} = INT_{L} ∨ INT_{R}\nThe INT pins on the IO expander\nare open-drain active low, hence\nwe use a pull-up resistor."
 		(exclude_from_sim no)
-		(at 67.564 188.722 0)
+		(at 65.024 167.132 0)
 		(effects
 			(font
 				(size 0.8 0.8)
@@ -5245,7 +5419,7 @@
 	)
 	(text "LCD config"
 		(exclude_from_sim no)
-		(at 113.538 145.034 0)
+		(at 137.668 117.094 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5380,7 +5554,7 @@
 		(uuid "5dde4005-08fb-45b5-ba08-59994bb4ca92")
 	)
 	(junction
-		(at 127 158.75)
+		(at 151.13 130.81)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "68f2d9ec-7eb1-44ad-b527-87e137f1eba7")
@@ -5392,7 +5566,7 @@
 		(uuid "6a0e5f85-9af0-41df-90c1-1ad94e0c3308")
 	)
 	(junction
-		(at 134.62 138.43)
+		(at 158.75 110.49)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "6a871450-3362-41e5-8fac-29e207f725a2")
@@ -5440,19 +5614,19 @@
 		(uuid "8dddfd78-95e9-4ebc-bec8-6cb027654044")
 	)
 	(junction
-		(at 22.86 156.21)
+		(at 27.94 123.19)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "8efc0ee2-4ad9-48c0-98aa-6b09f5bc0e15")
 	)
 	(junction
-		(at 22.86 151.13)
+		(at 27.94 118.11)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "9450bcdd-c57d-4271-b1eb-77ddf3be14b3")
 	)
 	(junction
-		(at 67.31 180.34)
+		(at 64.77 158.75)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "9539e6ed-91f6-4150-adfa-52f6ec177d89")
@@ -5589,6 +5763,10 @@
 		(color 0 0 0 0)
 		(uuid "fb36f2a0-20c3-4f20-9b05-8f074189954a")
 	)
+	(no_connect
+		(at 77.47 175.26)
+		(uuid "275335b4-84f8-465d-bc79-479fbfc1d970")
+	)
 	(no_connect
 		(at 111.76 38.1)
 		(uuid "7fdcdc30-547c-4d3c-be19-aea0f2a8690b")
@@ -5869,7 +6047,7 @@
 	)
 	(wire
 		(pts
-			(xy 115.57 151.13) (xy 123.19 151.13)
+			(xy 139.7 123.19) (xy 147.32 123.19)
 		)
 		(stroke
 			(width 0)
@@ -5889,7 +6067,7 @@
 	)
 	(wire
 		(pts
-			(xy 149.86 182.88) (xy 147.32 182.88)
+			(xy 147.32 161.29) (xy 144.78 161.29)
 		)
 		(stroke
 			(width 0)
@@ -6009,7 +6187,17 @@
 	)
 	(wire
 		(pts
-			(xy 127 158.75) (xy 134.62 158.75)
+			(xy 78.74 166.37) (xy 77.47 166.37)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "25a9959e-5b74-454f-8161-57fb22d82a51")
+	)
+	(wire
+		(pts
+			(xy 151.13 130.81) (xy 158.75 130.81)
 		)
 		(stroke
 			(width 0)
@@ -6089,7 +6277,17 @@
 	)
 	(wire
 		(pts
-			(xy 17.78 140.97) (xy 22.86 140.97)
+			(xy 52.07 166.37) (xy 52.07 175.26)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "315a650f-13ff-4b46-bcd2-e44e2b6d40c2")
+	)
+	(wire
+		(pts
+			(xy 22.86 107.95) (xy 27.94 107.95)
 		)
 		(stroke
 			(width 0)
@@ -6119,7 +6317,7 @@
 	)
 	(wire
 		(pts
-			(xy 147.32 186.69) (xy 149.86 186.69)
+			(xy 144.78 165.1) (xy 147.32 165.1)
 		)
 		(stroke
 			(width 0)
@@ -6179,7 +6377,7 @@
 	)
 	(wire
 		(pts
-			(xy 134.62 148.59) (xy 134.62 138.43)
+			(xy 158.75 120.65) (xy 158.75 110.49)
 		)
 		(stroke
 			(width 0)
@@ -6329,7 +6527,7 @@
 	)
 	(wire
 		(pts
-			(xy 67.31 180.34) (xy 81.28 180.34)
+			(xy 64.77 158.75) (xy 78.74 158.75)
 		)
 		(stroke
 			(width 0)
@@ -6349,7 +6547,7 @@
 	)
 	(wire
 		(pts
-			(xy 115.57 153.67) (xy 130.81 153.67)
+			(xy 139.7 125.73) (xy 154.94 125.73)
 		)
 		(stroke
 			(width 0)
@@ -6419,7 +6617,7 @@
 	)
 	(wire
 		(pts
-			(xy 53.34 180.34) (xy 67.31 180.34)
+			(xy 50.8 158.75) (xy 64.77 158.75)
 		)
 		(stroke
 			(width 0)
@@ -6449,7 +6647,7 @@
 	)
 	(wire
 		(pts
-			(xy 34.29 158.75) (xy 29.21 158.75)
+			(xy 39.37 125.73) (xy 34.29 125.73)
 		)
 		(stroke
 			(width 0)
@@ -6479,7 +6677,7 @@
 	)
 	(wire
 		(pts
-			(xy 22.86 151.13) (xy 34.29 151.13)
+			(xy 27.94 118.11) (xy 39.37 118.11)
 		)
 		(stroke
 			(width 0)
@@ -6739,7 +6937,7 @@
 	)
 	(wire
 		(pts
-			(xy 22.86 156.21) (xy 34.29 156.21)
+			(xy 27.94 123.19) (xy 39.37 123.19)
 		)
 		(stroke
 			(width 0)
@@ -6899,7 +7097,7 @@
 	)
 	(wire
 		(pts
-			(xy 34.29 151.13) (xy 34.29 153.67)
+			(xy 39.37 118.11) (xy 39.37 120.65)
 		)
 		(stroke
 			(width 0)
@@ -6919,7 +7117,7 @@
 	)
 	(wire
 		(pts
-			(xy 67.31 184.15) (xy 59.69 184.15)
+			(xy 64.77 162.56) (xy 57.15 162.56)
 		)
 		(stroke
 			(width 0)
@@ -6997,6 +7195,16 @@
 		)
 		(uuid "b1f9885b-9fb9-4b07-a0aa-3322ca116aae")
 	)
+	(wire
+		(pts
+			(xy 50.8 166.37) (xy 52.07 166.37)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b2b39b51-6635-491d-a546-95234ba3a690")
+	)
 	(wire
 		(pts
 			(xy 53.34 43.18) (xy 53.34 50.8)
@@ -7119,7 +7327,7 @@
 	)
 	(wire
 		(pts
-			(xy 67.31 180.34) (xy 67.31 184.15)
+			(xy 64.77 158.75) (xy 64.77 162.56)
 		)
 		(stroke
 			(width 0)
@@ -7289,7 +7497,7 @@
 	)
 	(wire
 		(pts
-			(xy 34.29 161.29) (xy 29.21 161.29)
+			(xy 39.37 128.27) (xy 34.29 128.27)
 		)
 		(stroke
 			(width 0)
@@ -7339,7 +7547,7 @@
 	)
 	(wire
 		(pts
-			(xy 67.31 177.8) (xy 67.31 180.34)
+			(xy 64.77 156.21) (xy 64.77 158.75)
 		)
 		(stroke
 			(width 0)
@@ -7369,7 +7577,7 @@
 	)
 	(wire
 		(pts
-			(xy 149.86 179.07) (xy 147.32 179.07)
+			(xy 147.32 157.48) (xy 144.78 157.48)
 		)
 		(stroke
 			(width 0)
@@ -7409,7 +7617,7 @@
 	)
 	(wire
 		(pts
-			(xy 127 148.59) (xy 127 158.75)
+			(xy 151.13 120.65) (xy 151.13 130.81)
 		)
 		(stroke
 			(width 0)
@@ -7457,6 +7665,16 @@
 		)
 		(uuid "ef5f3736-94c7-4b42-83bd-7c399a17a374")
 	)
+	(wire
+		(pts
+			(xy 77.47 166.37) (xy 77.47 175.26)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "f0b48285-74f9-4298-bf48-c247c2a83372")
+	)
 	(wire
 		(pts
 			(xy 185.42 99.06) (xy 200.66 99.06)
@@ -7489,7 +7707,7 @@
 	)
 	(wire
 		(pts
-			(xy 22.86 151.13) (xy 22.86 140.97)
+			(xy 27.94 118.11) (xy 27.94 107.95)
 		)
 		(stroke
 			(width 0)
@@ -7499,7 +7717,7 @@
 	)
 	(wire
 		(pts
-			(xy 123.19 143.51) (xy 123.19 151.13)
+			(xy 147.32 115.57) (xy 147.32 123.19)
 		)
 		(stroke
 			(width 0)
@@ -7509,7 +7727,7 @@
 	)
 	(wire
 		(pts
-			(xy 134.62 138.43) (xy 127 138.43)
+			(xy 158.75 110.49) (xy 151.13 110.49)
 		)
 		(stroke
 			(width 0)
@@ -7559,7 +7777,7 @@
 	)
 	(wire
 		(pts
-			(xy 17.78 156.21) (xy 22.86 156.21)
+			(xy 22.86 123.19) (xy 27.94 123.19)
 		)
 		(stroke
 			(width 0)
@@ -22876,7 +23094,7 @@
 		(uuid "15d0880f-854f-4874-b5e9-d62ef90166e5")
 	)
 	(label "IM0"
-		(at 115.57 151.13 180)
+		(at 139.7 123.19 180)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -22926,7 +23144,7 @@
 		(uuid "30f64923-19aa-440e-83cd-c53eb3a97440")
 	)
 	(label "IM1"
-		(at 115.57 153.67 180)
+		(at 139.7 125.73 180)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -23066,7 +23284,7 @@
 		(uuid "6291495e-10b8-4acd-9e79-f37e61bbc17b")
 	)
 	(label "LEDA_{TFT}"
-		(at 149.86 179.07 0)
+		(at 147.32 157.48 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -23076,7 +23294,7 @@
 		(uuid "658862df-3ba1-4488-be24-b1d33dc07bff")
 	)
 	(label "INT_{LR}"
-		(at 59.69 184.15 0)
+		(at 57.15 162.56 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -23376,7 +23594,7 @@
 		(uuid "c0a04b16-b237-430f-a8c5-88744b610c87")
 	)
 	(label "LEDK_{TFT}"
-		(at 149.86 182.88 0)
+		(at 147.32 161.29 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -23386,7 +23604,7 @@
 		(uuid "c2846a2a-70c1-42fc-8114-fddd87699316")
 	)
 	(label "BGPWM_{TFT}"
-		(at 149.86 186.69 0)
+		(at 147.32 165.1 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -23527,7 +23745,7 @@
 	)
 	(global_label "SDA"
 		(shape bidirectional)
-		(at 29.21 158.75 180)
+		(at 34.29 125.73 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -23537,7 +23755,7 @@
 		)
 		(uuid "2aee63e4-f413-4993-a7fb-0f0efc3249cf")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 21.5454 158.75 0)
+			(at 26.6254 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23681,7 +23899,7 @@
 	)
 	(global_label "SCL"
 		(shape input)
-		(at 29.21 161.29 180)
+		(at 34.29 128.27 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -23691,7 +23909,7 @@
 		)
 		(uuid "f9499447-e2bd-4d08-b6b8-6a21a6b5283b")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 22.7172 161.29 0)
+			(at 27.7972 128.27 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23770,7 +23988,7 @@
 	)
 	(symbol
 		(lib_id "Jumper:SolderJumper_3_Open")
-		(at 134.62 153.67 270)
+		(at 158.75 125.73 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -23779,7 +23997,7 @@
 		(fields_autoplaced yes)
 		(uuid "11430db0-b96e-44a2-a703-2f9b90d4f09e")
 		(property "Reference" "JP6"
-			(at 137.16 152.3999 90)
+			(at 161.29 124.4599 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23788,7 +24006,7 @@
 			)
 		)
 		(property "Value" "IM1"
-			(at 137.16 154.9399 90)
+			(at 161.29 126.9999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23797,7 +24015,7 @@
 			)
 		)
 		(property "Footprint" "Project_Library:SolderJumper-3_P2.0mm_Open_TrianglePad1.0x1.5mm_LTR"
-			(at 134.62 153.67 0)
+			(at 158.75 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23806,7 +24024,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 134.62 153.67 0)
+			(at 158.75 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23815,7 +24033,7 @@
 			)
 		)
 		(property "Description" "Solder Jumper, 3-pole, open"
-			(at 134.62 153.67 0)
+			(at 158.75 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23841,6 +24059,74 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Switch:SW_Push_45deg")
+		(at 54.61 177.8 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "12f18982-a1b4-4fe2-af7f-0c220f032bc8")
+		(property "Reference" "SW_{SB}1"
+			(at 56.388 172.974 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_Push_45deg"
+			(at 54.61 172.72 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" "MX_Hotswap:MX-Hotswap-1U"
+			(at 54.61 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 54.61 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Push button switch, normally open, two pins, 45° tilted"
+			(at 54.61 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "e2637fdd-b116-48ae-953a-2c9a28463f8e")
+		)
+		(pin "2"
+			(uuid "f375ded2-3b90-468a-98c0-6d59e1052059")
+		)
+		(instances
+			(project "acid"
+				(path "/ee5b55de-ef61-476c-9896-089acae94cf2"
+					(reference "SW_{SB}1")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:+3.3V")
 		(at 38.1 38.1 0)
@@ -23974,7 +24260,7 @@
 	)
 	(symbol
 		(lib_id "power:GND")
-		(at 17.78 140.97 0)
+		(at 22.86 107.95 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -23983,7 +24269,7 @@
 		(fields_autoplaced yes)
 		(uuid "48f23d66-984c-431e-a930-5cfa68791b5e")
 		(property "Reference" "#PWR05"
-			(at 17.78 147.32 0)
+			(at 22.86 114.3 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -23992,7 +24278,7 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 17.78 146.05 0)
+			(at 22.86 113.03 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -24000,7 +24286,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 17.78 140.97 0)
+			(at 22.86 107.95 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -24009,7 +24295,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 17.78 140.97 0)
+			(at 22.86 107.95 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -24018,7 +24304,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 17.78 140.97 0)
+			(at 22.86 107.95 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25007,7 +25293,7 @@
 	)
 	(symbol
 		(lib_id "Device:C_Small")
-		(at 22.86 153.67 0)
+		(at 27.94 120.65 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -25016,7 +25302,7 @@
 		(fields_autoplaced yes)
 		(uuid "7a121bcd-9804-4c41-9714-da818ce607e8")
 		(property "Reference" "C5"
-			(at 25.4 152.4062 0)
+			(at 30.48 119.3862 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25025,7 +25311,7 @@
 			)
 		)
 		(property "Value" "10uF"
-			(at 25.4 154.9462 0)
+			(at 30.48 121.9262 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25034,7 +25320,7 @@
 			)
 		)
 		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
-			(at 22.86 153.67 0)
+			(at 27.94 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25043,7 +25329,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 22.86 153.67 0)
+			(at 27.94 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25052,7 +25338,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor, small symbol"
-			(at 22.86 153.67 0)
+			(at 27.94 120.65 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25342,6 +25628,72 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at 57.15 180.34 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "92e7ec54-8461-4104-a0e7-081ba846de0d")
+		(property "Reference" "#PWR0121"
+			(at 57.15 186.69 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 57.15 185.42 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 57.15 180.34 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 57.15 180.34 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 57.15 180.34 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "938bd043-789f-4c79-ab5e-fb7e0b785195")
+		)
+		(instances
+			(project "acid"
+				(path "/ee5b55de-ef61-476c-9896-089acae94cf2"
+					(reference "#PWR0121")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:+3.3V")
 		(at 116.84 66.04 270)
@@ -25409,7 +25761,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 67.31 173.99 0)
+		(at 64.77 152.4 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -25418,7 +25770,7 @@
 		(fields_autoplaced yes)
 		(uuid "9b7124ae-fd41-4e10-bd42-7607c6642ce7")
 		(property "Reference" "R7"
-			(at 69.85 172.7199 0)
+			(at 67.31 151.1299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25427,7 +25779,7 @@
 			)
 		)
 		(property "Value" "10 kOhm"
-			(at 69.85 175.2599 0)
+			(at 67.31 153.6699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25436,7 +25788,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal"
-			(at 65.532 173.99 90)
+			(at 62.992 152.4 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25445,7 +25797,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 67.31 173.99 0)
+			(at 64.77 152.4 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25454,7 +25806,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 67.31 173.99 0)
+			(at 64.77 152.4 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25617,7 +25969,7 @@
 	)
 	(symbol
 		(lib_id "power:+3.3V")
-		(at 67.31 170.18 0)
+		(at 64.77 148.59 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -25626,7 +25978,7 @@
 		(fields_autoplaced yes)
 		(uuid "b6f352fa-0c6b-4292-acbc-09b9d0c7aa26")
 		(property "Reference" "#PWR0113"
-			(at 67.31 173.99 0)
+			(at 64.77 152.4 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25635,7 +25987,7 @@
 			)
 		)
 		(property "Value" "+3.3V"
-			(at 67.31 165.1 0)
+			(at 64.77 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25643,7 +25995,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 67.31 170.18 0)
+			(at 64.77 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25652,7 +26004,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 67.31 170.18 0)
+			(at 64.77 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25661,7 +26013,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"+3.3V\""
-			(at 67.31 170.18 0)
+			(at 64.77 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25683,7 +26035,7 @@
 	)
 	(symbol
 		(lib_id "Jumper:SolderJumper_3_Open")
-		(at 127 143.51 270)
+		(at 151.13 115.57 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -25692,7 +26044,7 @@
 		(fields_autoplaced yes)
 		(uuid "b6fa0044-4084-4e45-a400-0a4f83d90169")
 		(property "Reference" "JP5"
-			(at 129.54 142.2399 90)
+			(at 153.67 114.2999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25701,7 +26053,7 @@
 			)
 		)
 		(property "Value" "IM0"
-			(at 129.54 144.7799 90)
+			(at 153.67 116.8399 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25710,7 +26062,7 @@
 			)
 		)
 		(property "Footprint" "Project_Library:SolderJumper-3_P2.0mm_Open_TrianglePad1.0x1.5mm_LTR"
-			(at 127 143.51 0)
+			(at 151.13 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25719,7 +26071,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 127 143.51 0)
+			(at 151.13 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25728,7 +26080,7 @@
 			)
 		)
 		(property "Description" "Solder Jumper, 3-pole, open"
-			(at 127 143.51 0)
+			(at 151.13 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26052,7 +26404,7 @@
 	)
 	(symbol
 		(lib_id "power:+3.3V")
-		(at 134.62 138.43 0)
+		(at 158.75 110.49 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -26061,7 +26413,7 @@
 		(fields_autoplaced yes)
 		(uuid "c5a0e4bb-89d8-4e87-91e6-ed25065f3f7a")
 		(property "Reference" "#PWR0102"
-			(at 134.62 142.24 0)
+			(at 158.75 114.3 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26070,7 +26422,7 @@
 			)
 		)
 		(property "Value" "+3.3V_{LDO2}"
-			(at 134.62 133.35 0)
+			(at 158.75 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26078,7 +26430,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 134.62 138.43 0)
+			(at 158.75 110.49 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26087,7 +26439,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 134.62 138.43 0)
+			(at 158.75 110.49 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26096,7 +26448,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"+3.3V\""
-			(at 134.62 138.43 0)
+			(at 158.75 110.49 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26118,7 +26470,7 @@
 	)
 	(symbol
 		(lib_id "power:+3.3V")
-		(at 17.78 156.21 0)
+		(at 22.86 123.19 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -26127,7 +26479,7 @@
 		(fields_autoplaced yes)
 		(uuid "c6461996-dbfc-4e81-9fbe-5fb0b38ba024")
 		(property "Reference" "#PWR04"
-			(at 17.78 160.02 0)
+			(at 22.86 127 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26136,7 +26488,7 @@
 			)
 		)
 		(property "Value" "+3.3V"
-			(at 17.78 151.13 0)
+			(at 22.86 118.11 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26144,7 +26496,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 17.78 156.21 0)
+			(at 22.86 123.19 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26153,7 +26505,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 17.78 156.21 0)
+			(at 22.86 123.19 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26162,7 +26514,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"+3.3V\""
-			(at 17.78 156.21 0)
+			(at 22.86 123.19 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26582,16 +26934,15 @@
 	)
 	(symbol
 		(lib_id "easyeda2kicad:B4B-PH-K(LF)(SN)")
-		(at 39.37 156.21 0)
+		(at 44.45 123.19 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
 		(uuid "ec787dec-f5f9-4608-a9b7-b6a4ec2e286d")
 		(property "Reference" "U3"
-			(at 48.26 156.2099 0)
+			(at 53.34 123.1899 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26600,7 +26951,7 @@
 			)
 		)
 		(property "Value" "I2C Connector (4-Pin JST PH)"
-			(at 48.26 158.7499 0)
+			(at 53.34 125.7299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26609,7 +26960,7 @@
 			)
 		)
 		(property "Footprint" "easyeda2kicad:CONN-TH_B4B-PH-K-LF-SN"
-			(at 39.37 168.91 0)
+			(at 44.45 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26618,7 +26969,7 @@
 			)
 		)
 		(property "Datasheet" "https://lcsc.com/product-detail/Others_JST-Sales-America_B4B-PH-K-LF-SN_JST-Sales-America-B4B-PH-K-LF-SN_C265289.html"
-			(at 39.37 171.45 0)
+			(at 44.45 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26627,7 +26978,7 @@
 			)
 		)
 		(property "Description" ""
-			(at 39.37 156.21 0)
+			(at 44.45 123.19 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26636,7 +26987,7 @@
 			)
 		)
 		(property "LCSC Part" "C265289"
-			(at 39.37 173.99 0)
+			(at 44.45 140.97 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26667,7 +27018,7 @@
 	)
 	(symbol
 		(lib_id "power:GND")
-		(at 127 158.75 0)
+		(at 151.13 130.81 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -26676,7 +27027,7 @@
 		(fields_autoplaced yes)
 		(uuid "f2dc4732-2dce-466d-a07f-fab78356e23b")
 		(property "Reference" "#PWR0101"
-			(at 127 165.1 0)
+			(at 151.13 137.16 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26685,7 +27036,7 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 127 163.83 0)
+			(at 151.13 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26693,7 +27044,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 127 158.75 0)
+			(at 151.13 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26702,7 +27053,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 127 158.75 0)
+			(at 151.13 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26711,7 +27062,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 127 158.75 0)
+			(at 151.13 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26863,7 +27214,7 @@
 		)
 	)
 	(sheet
-		(at 116.84 172.72)
+		(at 114.3 151.13)
 		(size 30.48 17.78)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -26879,7 +27230,7 @@
 		)
 		(uuid "628f2de5-a5de-421c-af90-8153f9f7644b")
 		(property "Sheetname" "Backlight Boost Converter"
-			(at 116.84 172.0084 0)
+			(at 114.3 150.4184 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26888,7 +27239,7 @@
 			)
 		)
 		(property "Sheetfile" "backlight_boost_converter.kicad_sch"
-			(at 116.84 191.0846 0)
+			(at 114.3 169.4946 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26897,7 +27248,7 @@
 			)
 		)
 		(pin "LEDA" output
-			(at 147.32 179.07 0)
+			(at 144.78 157.48 0)
 			(uuid "3adc87f6-7360-4f5e-93cc-6799fb663858")
 			(effects
 				(font
@@ -26907,7 +27258,7 @@
 			)
 		)
 		(pin "LEDK" input
-			(at 147.32 182.88 0)
+			(at 144.78 161.29 0)
 			(uuid "8c6b8355-0dee-43d5-a7e0-7428d89bff79")
 			(effects
 				(font
@@ -26917,7 +27268,7 @@
 			)
 		)
 		(pin "PWM" input
-			(at 147.32 186.69 0)
+			(at 144.78 165.1 0)
 			(uuid "d6e544e8-5581-4068-8a42-389af44ad3df")
 			(effects
 				(font
@@ -26935,7 +27286,7 @@
 		)
 	)
 	(sheet
-		(at 81.28 172.72)
+		(at 78.74 151.13)
 		(size 33.02 17.78)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -26951,7 +27302,7 @@
 		)
 		(uuid "73412d5b-accc-4a8f-a9c5-c7f2843efb93")
 		(property "Sheetname" "Switch Matrix Right Half"
-			(at 81.28 172.0084 0)
+			(at 78.74 150.4184 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26960,7 +27311,7 @@
 			)
 		)
 		(property "Sheetfile" "matrix_switch.kicad_sch"
-			(at 81.28 191.0846 0)
+			(at 78.74 169.4946 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -26969,7 +27320,7 @@
 			)
 		)
 		(pin "~{INT}" output
-			(at 81.28 180.34 180)
+			(at 78.74 158.75 180)
 			(uuid "13b83b9c-acc6-439b-8507-5cab14b0eb79")
 			(effects
 				(font
@@ -26978,6 +27329,16 @@
 				(justify left)
 			)
 		)
+		(pin "SWPIN_{4,5}" input
+			(at 78.74 166.37 180)
+			(uuid "dfe3033e-eca2-451d-9dfc-7f4986e48ab2")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
 		(instances
 			(project "acid"
 				(path "/ee5b55de-ef61-476c-9896-089acae94cf2"
@@ -26987,7 +27348,7 @@
 		)
 	)
 	(sheet
-		(at 20.32 172.72)
+		(at 17.78 151.13)
 		(size 33.02 17.78)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -27003,7 +27364,7 @@
 		)
 		(uuid "e3c1981a-2a25-484a-9bc5-41b5c193dbd1")
 		(property "Sheetname" "Switch Matrix Left Half"
-			(at 20.32 172.0084 0)
+			(at 17.78 150.4184 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -27012,7 +27373,7 @@
 			)
 		)
 		(property "Sheetfile" "matrix_switch.kicad_sch"
-			(at 20.32 191.0846 0)
+			(at 17.78 169.4946 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -27021,7 +27382,7 @@
 			)
 		)
 		(pin "~{INT}" output
-			(at 53.34 180.34 0)
+			(at 50.8 158.75 0)
 			(uuid "aee4e475-9df0-4762-900e-1c9f86b9e2a4")
 			(effects
 				(font
@@ -27030,6 +27391,16 @@
 				(justify right)
 			)
 		)
+		(pin "SWPIN_{4,5}" input
+			(at 50.8 166.37 0)
+			(uuid "980d1719-95ee-4086-a22e-e11df6534bf3")
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
 		(instances
 			(project "acid"
 				(path "/ee5b55de-ef61-476c-9896-089acae94cf2"
diff --git a/cad/enclosure.d3ddoc b/cad/enclosure.d3ddoc
new file mode 100644
index 0000000..67990be
--- /dev/null
+++ b/cad/enclosure.d3ddoc
@@ -0,0 +1,566 @@
+{
+    "constraints": {
+        "13c51377-b899-4c11-9990-704c399b9182": {
+            "distance": 91.44,
+            "entity1": {
+                "entity": "3973d0e2-1dda-46ec-bde2-d703f89461b1",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "3973d0e2-1dda-46ec-bde2-d703f89461b1",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "offset": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "type": "point_distance_horizontal",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "27d32989-22ef-46c2-ac00-0f189e377f92": {
+            "entity1": {
+                "entity": "eda19583-b6b3-4565-8193-ee1e6136e53a",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "eda19583-b6b3-4565-8193-ee1e6136e53a",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "horizontal",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "2a30eb3e-5f2d-4e49-8cbd-090eb9f818c2": {
+            "entity1": {
+                "entity": "6035c6a0-f604-4986-b00d-d40917c57c4d",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "6fefd7e4-6c13-4ce6-b8b5-61608d7b3a8a",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "3d0482a0-5961-42ba-bc81-d00d629f011e": {
+            "entity1": {
+                "entity": "cb64f0ae-0133-467e-9cd7-3d35693dc1a8",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "cb64f0ae-0133-467e-9cd7-3d35693dc1a8",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "horizontal",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "4367b69c-252e-4b6c-b538-b5e64f04c129": {
+            "entity1": {
+                "entity": "ead03980-b73f-4697-8557-19185898940b",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "ead03980-b73f-4697-8557-19185898940b",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "horizontal",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "5536ffcf-5281-4fdc-a0b2-7e396d4dcbc7": {
+            "distance": 22.86,
+            "entity1": {
+                "entity": "3973d0e2-1dda-46ec-bde2-d703f89461b1",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "6ba62cb7-ab33-4154-9278-5b6b56f5ed60",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "offset": [
+                10.4393310546875,
+                0.9211177825927734,
+                0.0
+            ],
+            "type": "point_distance",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "5e53a290-9a71-416c-a9eb-a7828699d4a7": {
+            "entity1": {
+                "entity": "3771b54d-ceda-4164-ad43-a3e11b510c76",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "3771b54d-ceda-4164-ad43-a3e11b510c76",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "vertical",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "6582e3ba-bdfe-4435-9cf0-7a6baed9c30a": {
+            "distance": 1.1,
+            "entity1": {
+                "entity": "309dec6c-0d16-4104-8fcf-357d949faa4d",
+                "point": 0
+            },
+            "entity2": {
+                "entity": "ead03980-b73f-4697-8557-19185898940b",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "offset": [
+                0.9211273193359375,
+                -6.243131637573242,
+                0.0
+            ],
+            "type": "point_distance",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "76ba3a9d-8e05-42f0-a1c6-c7a2f3e81812": {
+            "entity1": {
+                "entity": "3973d0e2-1dda-46ec-bde2-d703f89461b1",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "3973d0e2-1dda-46ec-bde2-d703f89461b1",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "horizontal",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "863f0cb5-3bd5-4eb7-ab2d-66244f4ee071": {
+            "entity1": {
+                "entity": "868f6da7-7615-47c6-8a13-35443120f560",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "6035c6a0-f604-4986-b00d-d40917c57c4d",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "87874f81-f6d9-41b7-96dd-20960b0548f3": {
+            "distance": 98.89,
+            "entity1": {
+                "entity": "6035c6a0-f604-4986-b00d-d40917c57c4d",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "6035c6a0-f604-4986-b00d-d40917c57c4d",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "offset": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "type": "point_distance_horizontal",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "8caf0f5a-a272-4dbd-807e-c497c0c71c29": {
+            "entity1": {
+                "entity": "3973d0e2-1dda-46ec-bde2-d703f89461b1",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "3771b54d-ceda-4164-ad43-a3e11b510c76",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "9b22c45a-3c81-4c79-9887-05f994deeadb": {
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "line": "6fefd7e4-6c13-4ce6-b8b5-61608d7b3a8a",
+            "point": {
+                "entity": "ead03980-b73f-4697-8557-19185898940b",
+                "point": 1
+            },
+            "type": "midpoint",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "9eb00d7f-24aa-472c-8a3d-bbeb00fb73fb": {
+            "entity1": {
+                "entity": "cb64f0ae-0133-467e-9cd7-3d35693dc1a8",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "6ba62cb7-ab33-4154-9278-5b6b56f5ed60",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "a1dcc12a-a520-421c-ba8d-c78c4ea28867": {
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "line": "868f6da7-7615-47c6-8a13-35443120f560",
+            "point": {
+                "entity": "ead03980-b73f-4697-8557-19185898940b",
+                "point": 2
+            },
+            "type": "point_on_line",
+            "val": 0.5,
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "a7c58bb3-6d1c-42fb-9f3d-29d3dfb1f5f3": {
+            "entity1": {
+                "entity": "868f6da7-7615-47c6-8a13-35443120f560",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "868f6da7-7615-47c6-8a13-35443120f560",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "vertical",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "a92d47b9-b379-49c3-97d8-be42f1afbf56": {
+            "entity1": {
+                "entity": "6fefd7e4-6c13-4ce6-b8b5-61608d7b3a8a",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "6fefd7e4-6c13-4ce6-b8b5-61608d7b3a8a",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "vertical",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "bb01fb87-3344-4748-9726-1f8b55107a6b": {
+            "entity1": {
+                "entity": "6ba62cb7-ab33-4154-9278-5b6b56f5ed60",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "6ba62cb7-ab33-4154-9278-5b6b56f5ed60",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "vertical",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "bc601711-1f6e-45e9-bdf5-5e0f38731bc3": {
+            "entity1": {
+                "entity": "3771b54d-ceda-4164-ad43-a3e11b510c76",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "cb64f0ae-0133-467e-9cd7-3d35693dc1a8",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "c209d05a-6cde-47ff-bb91-ab950fd875a4": {
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "line": "ead03980-b73f-4697-8557-19185898940b",
+            "point": {
+                "entity": "309dec6c-0d16-4104-8fcf-357d949faa4d",
+                "point": 0
+            },
+            "type": "point_on_line",
+            "val": 0.988876529477197,
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "ce50834b-8d5b-4080-bebc-8a23329b7edd": {
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "line": "6ba62cb7-ab33-4154-9278-5b6b56f5ed60",
+            "point": {
+                "entity": "309dec6c-0d16-4104-8fcf-357d949faa4d",
+                "point": 0
+            },
+            "type": "midpoint",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "cffb785a-30d0-4fc4-ac4f-3e790da18447": {
+            "entity1": {
+                "entity": "6ba62cb7-ab33-4154-9278-5b6b56f5ed60",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "3973d0e2-1dda-46ec-bde2-d703f89461b1",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "d3edae7e-93db-4a5b-8c8f-b4a40fe9be2c": {
+            "entity1": {
+                "entity": "6fefd7e4-6c13-4ce6-b8b5-61608d7b3a8a",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "eda19583-b6b3-4565-8193-ee1e6136e53a",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "d509a53c-071d-4cdc-b9c1-ce1f01a4ccb7": {
+            "entity1": {
+                "entity": "6035c6a0-f604-4986-b00d-d40917c57c4d",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "6035c6a0-f604-4986-b00d-d40917c57c4d",
+                "point": 2
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "horizontal",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "ef852b59-c583-48e5-80ab-4122dbf4ae81": {
+            "distance": 25.3,
+            "entity1": {
+                "entity": "6035c6a0-f604-4986-b00d-d40917c57c4d",
+                "point": 1
+            },
+            "entity2": {
+                "entity": "868f6da7-7615-47c6-8a13-35443120f560",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "offset": [
+                18.01297378540039,
+                -3.172739028930664,
+                0.0
+            ],
+            "type": "point_distance",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "f3dc81b2-89ff-46ef-8467-9d0acfd79163": {
+            "entity1": {
+                "entity": "eda19583-b6b3-4565-8193-ee1e6136e53a",
+                "point": 2
+            },
+            "entity2": {
+                "entity": "868f6da7-7615-47c6-8a13-35443120f560",
+                "point": 1
+            },
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "type": "points_coincident",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        }
+    },
+    "entities": {
+        "22ddd395-fddd-48a4-9a8c-790791ada578": {
+            "anchors": {},
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "include_in_solid_model": false,
+            "name": "",
+            "normal": [
+                0.0,
+                0.0,
+                0.0,
+                1.0
+            ],
+            "origin": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "path": "C:\\Users\\Limeth\\workspace\\kicad\\acid\\target\\acid.step",
+            "type": "step"
+        },
+        "309dec6c-0d16-4104-8fcf-357d949faa4d": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p": [
+                45.233029074127025,
+                -1.3660655522972007
+            ],
+            "type": "point_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "3771b54d-ceda-4164-ad43-a3e11b510c76": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                -46.20697092587297,
+                -12.7960655522972
+            ],
+            "p2": [
+                -46.20697092587297,
+                10.063934447702799
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "3973d0e2-1dda-46ec-bde2-d703f89461b1": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                45.233029074127025,
+                -12.7960655522972
+            ],
+            "p2": [
+                -46.20697092587297,
+                -12.7960655522972
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "6035c6a0-f604-4986-b00d-d40917c57c4d": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                46.333029074127026,
+                -14.016065552297201
+            ],
+            "p2": [
+                -52.556970925872974,
+                -14.016065552297201
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "6ba62cb7-ab33-4154-9278-5b6b56f5ed60": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                45.233029074127025,
+                10.063934447702799
+            ],
+            "p2": [
+                45.233029074127025,
+                -12.7960655522972
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "6fefd7e4-6c13-4ce6-b8b5-61608d7b3a8a": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                -52.556970925872974,
+                -14.016065552297201
+            ],
+            "p2": [
+                -52.556970925872974,
+                11.2839344477028
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "868f6da7-7615-47c6-8a13-35443120f560": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                46.333029074127026,
+                11.2839344477028
+            ],
+            "p2": [
+                46.333029074127026,
+                -14.016065552297201
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "cb64f0ae-0133-467e-9cd7-3d35693dc1a8": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                -46.20697092587297,
+                10.063934447702799
+            ],
+            "p2": [
+                45.233029074127025,
+                10.063934447702799
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "ead03980-b73f-4697-8557-19185898940b": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                -52.556970925872974,
+                -1.3660655522972007
+            ],
+            "p2": [
+                46.333029074127026,
+                -1.3660655522972007
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        },
+        "eda19583-b6b3-4565-8193-ee1e6136e53a": {
+            "construction": false,
+            "group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+            "name": "",
+            "p1": [
+                -52.556970925872974,
+                11.2839344477028
+            ],
+            "p2": [
+                46.333029074127026,
+                11.2839344477028
+            ],
+            "type": "line_2d",
+            "wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e"
+        }
+    },
+    "groups": {
+        "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3": {
+            "active_wrkpl": "49fb2660-71f2-55d2-9685-904c78a4368e",
+            "body": null,
+            "index": 1,
+            "name": "Sketch 1",
+            "type": "sketch"
+        },
+        "cb0b1589-5b6b-42e9-b26f-185ddf71f8d2": {
+            "active_wrkpl": "00000000-0000-0000-0000-000000000000",
+            "body": {
+                "color": null,
+                "name": "Body"
+            },
+            "index": 0,
+            "name": "Reference",
+            "show_xy": true,
+            "show_yz": true,
+            "show_zx": true,
+            "type": "reference",
+            "xy_size": [
+                10.0,
+                10.0
+            ],
+            "yz_size": [
+                10.0,
+                10.0
+            ],
+            "zx_size": [
+                10.0,
+                10.0
+            ]
+        }
+    },
+    "type": "document",
+    "version": 30
+}
\ No newline at end of file
diff --git a/cad/enclosure.d3dwrk b/cad/enclosure.d3dwrk
new file mode 100644
index 0000000..3d8a328
--- /dev/null
+++ b/cad/enclosure.d3dwrk
@@ -0,0 +1,28 @@
+{
+    "workspace_views": {
+        "169c9ec1-2892-4f30-ba8b-59c802557f29": {
+            "cam_distance": 256.2900085449219,
+            "cam_quat": [
+                0.329337477684021,
+                -0.09866141527891159,
+                -0.2694816291332245,
+                0.8995456695556641
+            ],
+            "center": [
+                9.15245246887207,
+                66.14448547363281,
+                6.432847023010254
+            ],
+            "curvature_comb_scale": 0.0,
+            "document": {
+                "body_views": {},
+                "current_group": "b01f2cd4-2ddc-4050-bc0b-fa80be39e7b3",
+                "entity_views": {},
+                "group_views": {},
+                "show_construction_entities_from_previous_groups": false
+            },
+            "name": "",
+            "projection": "ortho"
+        }
+    }
+}
\ No newline at end of file
diff --git a/matrix_switch.kicad_sch b/matrix_switch.kicad_sch
index 99c2bfc..a512d9d 100644
--- a/matrix_switch.kicad_sch
+++ b/matrix_switch.kicad_sch
@@ -2287,6 +2287,12 @@
 		)
 		(uuid "66c646f1-ff16-454f-ace6-947479ee0e7c")
 	)
+	(junction
+		(at 250.19 127)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "13b7d5f9-c0be-45c3-88e5-359993e14cba")
+	)
 	(junction
 		(at 82.55 121.92)
 		(diameter 0)
@@ -2641,6 +2647,16 @@
 		)
 		(uuid "53063594-01eb-49df-a495-d0d00ce768b7")
 	)
+	(wire
+		(pts
+			(xy 250.19 142.24) (xy 259.08 142.24)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "633367ec-63ec-4a64-8e81-7ab505cc10bc")
+	)
 	(wire
 		(pts
 			(xy 226.06 50.8) (xy 228.6 50.8)
@@ -3291,6 +3307,16 @@
 		)
 		(uuid "fce57291-b82b-4227-be67-87e488fae99b")
 	)
+	(wire
+		(pts
+			(xy 250.19 127) (xy 250.19 142.24)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fe60693d-4c61-4f76-82d9-0282f416e7e6")
+	)
 	(wire
 		(pts
 			(xy 92.71 96.52) (xy 87.63 96.52)
@@ -4178,6 +4204,17 @@
 		)
 		(uuid "6ac96654-0b91-4288-843b-d3b4659593b7")
 	)
+	(hierarchical_label "SWPIN_{4,5}"
+		(shape input)
+		(at 259.08 142.24 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "ba28c856-04c8-48a6-986c-da2f31e23e23")
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 212.09 93.98 0)