diff --git a/Hardware/keyboard_controller/battery.kicad_sch b/Hardware/keyboard_controller/battery.kicad_sch
index e615245..df503e6 100644
--- a/Hardware/keyboard_controller/battery.kicad_sch
+++ b/Hardware/keyboard_controller/battery.kicad_sch
@@ -3069,7 +3069,7 @@
 	)
 	(text "Battery monitor"
 		(exclude_from_sim no)
-		(at 182.118 92.202 0)
+		(at 248.666 92.202 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -3089,7 +3089,7 @@
 	)
 	(text "Reused from USB protection"
 		(exclude_from_sim no)
-		(at 369.57 84.328 0)
+		(at 358.394 83.566 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -3099,7 +3099,7 @@
 	)
 	(text "Ideal diode\nRequires well matched BJTs\n\nAlternative: DMMT5401, BC857B is cheaper\n\nNotes on blog https://www.microfarad.de/blog/the-ideal-diode/\nare pertinent wrt soft startup. May be fixable with gate drive?"
 		(exclude_from_sim no)
-		(at 368.3 154.94 0)
+		(at 367.03 177.8 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -3120,13 +3120,13 @@
 	)
 	(text "Place as close to battery as possible"
 		(exclude_from_sim no)
-		(at 294.64 43.688 0)
+		(at 183.642 42.926 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 		)
-		(uuid "d90e0267-bc99-4d6a-bb4b-02f10aa523f3")
+		(uuid "bed63211-f85e-4a88-ac0e-966bcb73fe37")
 	)
 	(text "Battery Management Conceptual Operation"
 		(exclude_from_sim no)
@@ -3143,7 +3143,7 @@
 	)
 	(text "On resistance of FET controls current threshold. \nShould be 25 mOhm\n\nBody diode direction is important! Think about it!"
 		(exclude_from_sim no)
-		(at 225.044 93.726 0)
+		(at 291.592 93.726 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -3440,61 +3440,37 @@
 		(uuid "eea269fe-a4c5-4ba4-9a69-c5364c0bc65c")
 	)
 	(junction
-		(at 337.82 110.49)
+		(at 336.55 133.35)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "047ef59f-e1c7-4ed5-b184-f60ff37bbdb1")
 	)
 	(junction
-		(at 176.53 81.28)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "05c92bd4-61ea-4b30-9732-977671bd6431")
-	)
-	(junction
-		(at 308.61 146.05)
+		(at 307.34 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "07afe803-dd97-4d89-83a4-977a5ec1c730")
 	)
 	(junction
-		(at 250.19 146.05)
+		(at 175.26 63.5)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "0f3c2146-4d11-4c75-8192-620c49b2a3b8")
+	)
+	(junction
+		(at 248.92 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "15614976-3295-4dda-a875-015899f35001")
 	)
 	(junction
-		(at 297.18 81.28)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "160a759d-e27c-4933-b589-b1830617aeaf")
-	)
-	(junction
-		(at 308.61 45.72)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "1a38c6b0-cb2c-49b1-9e24-455c3120032f")
-	)
-	(junction
-		(at 184.15 45.72)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "1d2b2bd4-0237-40ab-83e2-60ac53bd16b1")
-	)
-	(junction
-		(at 262.89 146.05)
+		(at 261.62 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "1fb6d6bc-d528-4e21-86a0-98c6de30d797")
 	)
 	(junction
-		(at 189.23 81.28)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "20f25301-831e-4f51-9aea-92740df6fc9d")
-	)
-	(junction
-		(at 243.84 55.88)
+		(at 311.15 55.88)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "2732cdfc-3993-474e-8b16-2b3ea825614f")
@@ -3506,7 +3482,13 @@
 		(uuid "280a3d14-bf1e-4106-95e1-e0befe9fbc35")
 	)
 	(junction
-		(at 236.22 146.05)
+		(at 158.75 81.28)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "2b7573ce-594f-47aa-835f-4ffa7b269ae7")
+	)
+	(junction
+		(at 234.95 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "2ddc4f3a-a996-465b-86fa-70c9d97dc0ea")
@@ -3518,13 +3500,7 @@
 		(uuid "301d1792-bdb1-49eb-98a6-239bb5b6a46c")
 	)
 	(junction
-		(at 280.67 63.5)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "330e363c-0822-4d56-a8a8-5d4cb326a9ef")
-	)
-	(junction
-		(at 250.19 110.49)
+		(at 248.92 133.35)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "35855a14-1085-4035-8bce-92ff20c7cf40")
@@ -3536,19 +3512,31 @@
 		(uuid "3dc84ea4-bd04-45cc-8a82-5699b793dae3")
 	)
 	(junction
-		(at 156.21 81.28)
+		(at 251.46 45.72)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "41679822-0e61-4d5a-96db-4198545c9276")
+		(uuid "3f1d86ae-0566-467e-bb63-a46b1cea46ef")
 	)
 	(junction
-		(at 350.52 45.72)
+		(at 311.15 81.28)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "4443e2cd-46ca-4dbb-9078-d84da1454d0e")
+	)
+	(junction
+		(at 356.87 45.72)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "49babf51-1045-42b4-8cea-a813fa7549d8")
 	)
 	(junction
-		(at 350.52 63.5)
+		(at 278.13 81.28)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "503635fb-aae3-4e27-8e2d-d0dfeed30ca9")
+	)
+	(junction
+		(at 356.87 63.5)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "51fdd222-bcbf-4234-9487-a8b1add9ed34")
@@ -3559,12 +3547,6 @@
 		(color 0 0 0 0)
 		(uuid "522bd9df-deb3-42d7-8b30-3fdb9c180e91")
 	)
-	(junction
-		(at 243.84 45.72)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "583db0dc-3152-47ae-9881-b86dbbb7a3ea")
-	)
 	(junction
 		(at 243.84 81.28)
 		(diameter 0)
@@ -3572,59 +3554,59 @@
 		(uuid "5a3b402d-5e79-40f8-ad2e-884869d8e0ba")
 	)
 	(junction
-		(at 280.67 81.28)
+		(at 256.54 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "609742bc-d611-41f3-9732-29f322b7a3e4")
+		(uuid "62d6b717-f9d3-4d5a-bb49-441c34514d9d")
 	)
 	(junction
-		(at 325.12 110.49)
+		(at 323.85 133.35)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "64589bbe-a7a7-4132-84f1-c2a46923e679")
 	)
 	(junction
-		(at 289.56 146.05)
+		(at 288.29 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "675e4c67-e3e4-4185-8f42-3e3eddb94651")
 	)
 	(junction
-		(at 308.61 120.65)
+		(at 175.26 81.28)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "69e0be4a-b784-4951-81c3-468179b28afe")
+	)
+	(junction
+		(at 307.34 143.51)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "7e4a8eb4-e1ab-46dd-9212-b762f94ed1ac")
 	)
 	(junction
-		(at 236.22 81.28)
+		(at 223.52 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "8c2ad6b7-4a84-40d9-a39b-3c1f25240dd5")
+		(uuid "87fe2064-130e-4b90-98b6-8adc95d8d7bd")
 	)
 	(junction
-		(at 250.19 113.03)
+		(at 158.75 45.72)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "8c537361-99e4-4fb3-8fc5-1c3f2635f657")
+	)
+	(junction
+		(at 248.92 135.89)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "8d4d1b5f-3f26-4d40-8986-e34708fcb57b")
 	)
 	(junction
-		(at 210.82 81.28)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "8f0b3d48-fb91-43a3-9324-580a5320a084")
-	)
-	(junction
-		(at 350.52 81.28)
+		(at 356.87 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "9c4bd28b-d121-42cd-ad12-ddb7a32a30bf")
 	)
-	(junction
-		(at 308.61 81.28)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "a1fcc75e-218b-4bcf-ba6a-6eceda4d027e")
-	)
 	(junction
 		(at 328.93 81.28)
 		(diameter 0)
@@ -3632,7 +3614,7 @@
 		(uuid "a4fa4b2f-348e-4722-b167-7f8fabfc9340")
 	)
 	(junction
-		(at 156.21 55.88)
+		(at 223.52 55.88)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "ac940774-44bb-401f-a378-a755d313957e")
@@ -3650,47 +3632,41 @@
 		(uuid "b2a7a66b-c3cb-4056-b42a-fc4761926102")
 	)
 	(junction
-		(at 280.67 45.72)
+		(at 254 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "b3250d15-20d2-4780-bd0d-e4df69d65e7e")
+		(uuid "b3e38b8a-4111-475a-9616-f448d2fba994")
 	)
 	(junction
-		(at 337.82 146.05)
+		(at 336.55 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "bbd55858-9c30-4b9f-94fb-9717658db05b")
 	)
 	(junction
-		(at 287.02 146.05)
+		(at 285.75 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "c042f47d-8269-4dca-aa22-53c7d74213af")
 	)
 	(junction
-		(at 297.18 63.5)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "c0c82da2-dacc-4285-a2cd-1edc9101dbac")
-	)
-	(junction
-		(at 325.12 146.05)
+		(at 323.85 168.91)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "c1931bf5-850a-4d3b-bfd7-9667478cc401")
 	)
+	(junction
+		(at 158.75 63.5)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "c6618792-4dc1-43a3-b5bc-88345b86e337")
+	)
 	(junction
 		(at 114.3 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "c6a11345-8a95-4f6f-827c-e3e679fb3075")
 	)
-	(junction
-		(at 308.61 63.5)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "cb1dc8b9-a5d0-47f3-94cd-1efc0d84ccf0")
-	)
 	(junction
 		(at 88.9 24.13)
 		(diameter 0)
@@ -3698,31 +3674,55 @@
 		(uuid "ccf39fd3-f692-45dd-98f5-660dab761dab")
 	)
 	(junction
-		(at 156.21 45.72)
+		(at 303.53 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "d121f7fd-8e63-4167-a2ea-1603fcfdd34f")
+		(uuid "d1cc4e6f-4cd8-4296-a0ec-718ebaede61f")
 	)
 	(junction
-		(at 308.61 110.49)
+		(at 311.15 45.72)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "d91b41c2-9247-4f9b-971c-3274fff7dff8")
+	)
+	(junction
+		(at 307.34 133.35)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "db8fd775-2855-4be4-86b9-72e586f3cd28")
 	)
 	(junction
-		(at 236.22 110.49)
+		(at 186.69 63.5)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "dca8bfa6-d95b-4a31-b335-583a97412f86")
+	)
+	(junction
+		(at 186.69 45.72)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "e432c8b3-4597-492b-9335-5e6ede66c973")
+	)
+	(junction
+		(at 234.95 133.35)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "ea335185-274b-4581-8448-a925949d39e9")
 	)
+	(junction
+		(at 223.52 45.72)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "eb25a1f2-1c89-4074-a918-8dadecafe7df")
+	)
 	(junction
 		(at 186.69 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "ffa096cf-d681-40ee-b75b-23fec96743f7")
+		(uuid "f48b6dde-c302-456b-835a-117f74c63ffe")
 	)
 	(no_connect
-		(at 194.31 62.23)
+		(at 261.62 62.23)
 		(uuid "16f493e2-2002-433d-ac2a-fdf35e437e1b")
 	)
 	(polyline
@@ -3747,7 +3747,7 @@
 	)
 	(wire
 		(pts
-			(xy 243.84 55.88) (xy 243.84 60.96)
+			(xy 311.15 55.88) (xy 311.15 60.96)
 		)
 		(stroke
 			(width 0)
@@ -3777,7 +3777,7 @@
 	)
 	(wire
 		(pts
-			(xy 156.21 45.72) (xy 156.21 46.99)
+			(xy 223.52 45.72) (xy 223.52 46.99)
 		)
 		(stroke
 			(width 0)
@@ -3787,7 +3787,7 @@
 	)
 	(wire
 		(pts
-			(xy 325.12 116.84) (xy 325.12 110.49)
+			(xy 323.85 139.7) (xy 323.85 133.35)
 		)
 		(stroke
 			(width 0)
@@ -3797,7 +3797,7 @@
 	)
 	(wire
 		(pts
-			(xy 287.02 135.89) (xy 287.02 146.05)
+			(xy 285.75 158.75) (xy 285.75 168.91)
 		)
 		(stroke
 			(width 0)
@@ -3807,7 +3807,17 @@
 	)
 	(wire
 		(pts
-			(xy 250.19 110.49) (xy 279.4 110.49)
+			(xy 175.26 73.66) (xy 175.26 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0375ae74-39fa-46ae-a54e-b01ba4ac583a")
+	)
+	(wire
+		(pts
+			(xy 248.92 133.35) (xy 278.13 133.35)
 		)
 		(stroke
 			(width 0)
@@ -3827,7 +3837,7 @@
 	)
 	(wire
 		(pts
-			(xy 227.33 110.49) (xy 236.22 110.49)
+			(xy 226.06 133.35) (xy 234.95 133.35)
 		)
 		(stroke
 			(width 0)
@@ -3837,7 +3847,7 @@
 	)
 	(wire
 		(pts
-			(xy 350.52 45.72) (xy 350.52 54.61)
+			(xy 356.87 45.72) (xy 356.87 54.61)
 		)
 		(stroke
 			(width 0)
@@ -3847,7 +3857,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 110.49) (xy 299.72 110.49)
+			(xy 307.34 133.35) (xy 298.45 133.35)
 		)
 		(stroke
 			(width 0)
@@ -3867,7 +3877,7 @@
 	)
 	(wire
 		(pts
-			(xy 271.78 120.65) (xy 279.4 120.65)
+			(xy 270.51 143.51) (xy 278.13 143.51)
 		)
 		(stroke
 			(width 0)
@@ -3877,7 +3887,7 @@
 	)
 	(wire
 		(pts
-			(xy 186.69 74.93) (xy 186.69 81.28)
+			(xy 254 74.93) (xy 254 81.28)
 		)
 		(stroke
 			(width 0)
@@ -3897,7 +3907,7 @@
 	)
 	(wire
 		(pts
-			(xy 223.52 57.15) (xy 223.52 55.88)
+			(xy 290.83 57.15) (xy 290.83 55.88)
 		)
 		(stroke
 			(width 0)
@@ -3907,7 +3917,7 @@
 	)
 	(wire
 		(pts
-			(xy 210.82 80.01) (xy 210.82 81.28)
+			(xy 278.13 80.01) (xy 278.13 81.28)
 		)
 		(stroke
 			(width 0)
@@ -3937,7 +3947,7 @@
 	)
 	(wire
 		(pts
-			(xy 337.82 124.46) (xy 337.82 146.05)
+			(xy 336.55 147.32) (xy 336.55 168.91)
 		)
 		(stroke
 			(width 0)
@@ -3967,7 +3977,7 @@
 	)
 	(wire
 		(pts
-			(xy 325.12 124.46) (xy 325.12 146.05)
+			(xy 323.85 147.32) (xy 323.85 168.91)
 		)
 		(stroke
 			(width 0)
@@ -3977,7 +3987,7 @@
 	)
 	(wire
 		(pts
-			(xy 250.19 113.03) (xy 279.4 113.03)
+			(xy 248.92 135.89) (xy 278.13 135.89)
 		)
 		(stroke
 			(width 0)
@@ -3997,7 +4007,7 @@
 	)
 	(wire
 		(pts
-			(xy 181.61 57.15) (xy 181.61 55.88)
+			(xy 248.92 57.15) (xy 248.92 55.88)
 		)
 		(stroke
 			(width 0)
@@ -4027,7 +4037,7 @@
 	)
 	(wire
 		(pts
-			(xy 176.53 74.93) (xy 176.53 81.28)
+			(xy 243.84 74.93) (xy 243.84 81.28)
 		)
 		(stroke
 			(width 0)
@@ -4037,7 +4047,7 @@
 	)
 	(wire
 		(pts
-			(xy 271.78 130.81) (xy 279.4 130.81)
+			(xy 270.51 153.67) (xy 278.13 153.67)
 		)
 		(stroke
 			(width 0)
@@ -4057,7 +4067,7 @@
 	)
 	(wire
 		(pts
-			(xy 250.19 124.46) (xy 250.19 146.05)
+			(xy 248.92 147.32) (xy 248.92 168.91)
 		)
 		(stroke
 			(width 0)
@@ -4097,7 +4107,7 @@
 	)
 	(wire
 		(pts
-			(xy 303.53 120.65) (xy 303.53 118.11)
+			(xy 302.26 143.51) (xy 302.26 140.97)
 		)
 		(stroke
 			(width 0)
@@ -4137,7 +4147,7 @@
 	)
 	(wire
 		(pts
-			(xy 250.19 110.49) (xy 250.19 113.03)
+			(xy 248.92 133.35) (xy 248.92 135.89)
 		)
 		(stroke
 			(width 0)
@@ -4147,17 +4157,7 @@
 	)
 	(wire
 		(pts
-			(xy 297.18 73.66) (xy 297.18 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "2fc704f4-d6cb-4aa4-bd0c-ae5808e9dcf2")
-	)
-	(wire
-		(pts
-			(xy 325.12 110.49) (xy 308.61 110.49)
+			(xy 323.85 133.35) (xy 307.34 133.35)
 		)
 		(stroke
 			(width 0)
@@ -4167,17 +4167,7 @@
 	)
 	(wire
 		(pts
-			(xy 290.83 63.5) (xy 297.18 63.5)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "308e46af-8c76-4abd-9348-7f4af90e2095")
-	)
-	(wire
-		(pts
-			(xy 189.23 74.93) (xy 189.23 81.28)
+			(xy 256.54 74.93) (xy 256.54 81.28)
 		)
 		(stroke
 			(width 0)
@@ -4215,6 +4205,16 @@
 		)
 		(uuid "38f70392-4bc8-4ec6-8b93-48a890095bc1")
 	)
+	(wire
+		(pts
+			(xy 278.13 81.28) (xy 256.54 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "39849d6f-4dad-427f-a497-f0dedce1dd89")
+	)
 	(wire
 		(pts
 			(xy 101.6 24.13) (xy 101.6 38.1)
@@ -4247,7 +4247,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 120.65) (xy 308.61 121.92)
+			(xy 307.34 143.51) (xy 307.34 144.78)
 		)
 		(stroke
 			(width 0)
@@ -4265,6 +4265,26 @@
 		)
 		(uuid "41e2286d-c962-4bad-9d29-8090e164ee8a")
 	)
+	(wire
+		(pts
+			(xy 158.75 63.5) (xy 158.75 66.04)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "427a2c4c-3094-4644-8004-33f9d0eb0a57")
+	)
+	(wire
+		(pts
+			(xy 223.52 45.72) (xy 251.46 45.72)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "4303b6af-24e7-4eb5-a0a3-24870f6435f9")
+	)
 	(polyline
 		(pts
 			(xy 139.7 245.11) (xy 140.97 243.84)
@@ -4295,6 +4315,16 @@
 		)
 		(uuid "45759e05-9267-42e8-9841-ccbfdd8801cc")
 	)
+	(wire
+		(pts
+			(xy 158.75 81.28) (xy 175.26 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "45d00353-6459-4504-8378-bf732b904abc")
+	)
 	(polyline
 		(pts
 			(xy 55.88 238.76) (xy 57.15 240.03)
@@ -4317,17 +4347,7 @@
 	)
 	(wire
 		(pts
-			(xy 185.42 81.28) (xy 186.69 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "4b015611-9cc4-4942-b567-f089abc2c785")
-	)
-	(wire
-		(pts
-			(xy 287.02 146.05) (xy 289.56 146.05)
+			(xy 285.75 168.91) (xy 288.29 168.91)
 		)
 		(stroke
 			(width 0)
@@ -4337,7 +4357,7 @@
 	)
 	(wire
 		(pts
-			(xy 325.12 146.05) (xy 308.61 146.05)
+			(xy 323.85 168.91) (xy 307.34 168.91)
 		)
 		(stroke
 			(width 0)
@@ -4347,7 +4367,7 @@
 	)
 	(wire
 		(pts
-			(xy 223.52 55.88) (xy 243.84 55.88)
+			(xy 290.83 55.88) (xy 311.15 55.88)
 		)
 		(stroke
 			(width 0)
@@ -4367,7 +4387,7 @@
 	)
 	(wire
 		(pts
-			(xy 363.22 64.77) (xy 363.22 81.28)
+			(xy 369.57 64.77) (xy 369.57 81.28)
 		)
 		(stroke
 			(width 0)
@@ -4377,17 +4397,7 @@
 	)
 	(wire
 		(pts
-			(xy 243.84 81.28) (xy 280.67 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "4d97ffd2-8691-4e99-ae3a-75d22a7a8394")
-	)
-	(wire
-		(pts
-			(xy 262.89 130.81) (xy 262.89 118.11)
+			(xy 261.62 153.67) (xy 261.62 140.97)
 		)
 		(stroke
 			(width 0)
@@ -4397,17 +4407,7 @@
 	)
 	(wire
 		(pts
-			(xy 297.18 66.04) (xy 297.18 63.5)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "4e5a2465-d625-40b4-adcd-5653a379e8f1")
-	)
-	(wire
-		(pts
-			(xy 156.21 55.88) (xy 156.21 60.96)
+			(xy 223.52 55.88) (xy 223.52 60.96)
 		)
 		(stroke
 			(width 0)
@@ -4417,17 +4417,7 @@
 	)
 	(wire
 		(pts
-			(xy 184.15 45.72) (xy 243.84 45.72)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "513d59f0-7003-4060-a280-4747dae2fd14")
-	)
-	(wire
-		(pts
-			(xy 328.93 81.28) (xy 350.52 81.28)
+			(xy 328.93 81.28) (xy 356.87 81.28)
 		)
 		(stroke
 			(width 0)
@@ -4445,6 +4435,16 @@
 		)
 		(uuid "51cddfdf-1657-470f-9351-767962e3b740")
 	)
+	(wire
+		(pts
+			(xy 303.53 81.28) (xy 311.15 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "523f3074-13d8-4fe6-ab33-12511f08de14")
+	)
 	(wire
 		(pts
 			(xy 101.6 81.28) (xy 114.3 81.28)
@@ -4475,6 +4475,16 @@
 		)
 		(uuid "5350df46-00db-4ae7-a13e-3acb5bfc62ea")
 	)
+	(wire
+		(pts
+			(xy 300.99 81.28) (xy 303.53 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "544dda23-f93d-4173-baea-30f751cad7a9")
+	)
 	(polyline
 		(pts
 			(xy 212.09 237.49) (xy 210.82 238.76)
@@ -4495,16 +4505,6 @@
 		)
 		(uuid "57c0b791-a40b-4437-ac2f-fa8c69ae0761")
 	)
-	(wire
-		(pts
-			(xy 156.21 45.72) (xy 184.15 45.72)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "599bd5c0-983e-413b-b429-2b591ce78625")
-	)
 	(wire
 		(pts
 			(xy 114.3 73.66) (xy 114.3 81.28)
@@ -4517,7 +4517,17 @@
 	)
 	(wire
 		(pts
-			(xy 289.56 146.05) (xy 289.56 135.89)
+			(xy 186.69 45.72) (xy 186.69 53.34)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "5c2e32c6-6e71-4c23-a16c-6a0f82d3ecf3")
+	)
+	(wire
+		(pts
+			(xy 288.29 168.91) (xy 288.29 158.75)
 		)
 		(stroke
 			(width 0)
@@ -4527,7 +4537,7 @@
 	)
 	(wire
 		(pts
-			(xy 337.82 110.49) (xy 325.12 110.49)
+			(xy 336.55 133.35) (xy 323.85 133.35)
 		)
 		(stroke
 			(width 0)
@@ -4537,7 +4547,7 @@
 	)
 	(wire
 		(pts
-			(xy 363.22 62.23) (xy 382.27 62.23)
+			(xy 369.57 62.23) (xy 388.62 62.23)
 		)
 		(stroke
 			(width 0)
@@ -4557,7 +4567,7 @@
 	)
 	(wire
 		(pts
-			(xy 345.44 63.5) (xy 345.44 64.77)
+			(xy 351.79 63.5) (xy 351.79 64.77)
 		)
 		(stroke
 			(width 0)
@@ -4567,7 +4577,7 @@
 	)
 	(wire
 		(pts
-			(xy 111.76 45.72) (xy 156.21 45.72)
+			(xy 111.76 45.72) (xy 158.75 45.72)
 		)
 		(stroke
 			(width 0)
@@ -4585,26 +4595,6 @@
 		)
 		(uuid "623c46e2-58d5-4adf-b26e-8fcc90a65e4c")
 	)
-	(wire
-		(pts
-			(xy 308.61 45.72) (xy 308.61 53.34)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "6266faab-fcbc-44b0-9f4c-c8a4a7c4102d")
-	)
-	(wire
-		(pts
-			(xy 280.67 60.96) (xy 280.67 63.5)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "62840c61-03ad-4184-af6d-b922a1940a91")
-	)
 	(polyline
 		(pts
 			(xy 217.17 237.49) (xy 217.17 240.03)
@@ -4617,7 +4607,7 @@
 	)
 	(wire
 		(pts
-			(xy 337.82 146.05) (xy 365.76 146.05)
+			(xy 336.55 168.91) (xy 364.49 168.91)
 		)
 		(stroke
 			(width 0)
@@ -4627,7 +4617,7 @@
 	)
 	(wire
 		(pts
-			(xy 337.82 110.49) (xy 353.06 110.49)
+			(xy 336.55 133.35) (xy 351.79 133.35)
 		)
 		(stroke
 			(width 0)
@@ -4655,16 +4645,6 @@
 		)
 		(uuid "67a38c5a-2ea3-482f-898e-df6254d64903")
 	)
-	(wire
-		(pts
-			(xy 280.67 63.5) (xy 280.67 66.04)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "67ffef5a-cd33-439f-ad57-236f32dc0b03")
-	)
 	(polyline
 		(pts
 			(xy 63.5 237.49) (xy 63.5 240.03)
@@ -4677,7 +4657,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 146.05) (xy 289.56 146.05)
+			(xy 307.34 168.91) (xy 288.29 168.91)
 		)
 		(stroke
 			(width 0)
@@ -4685,6 +4665,16 @@
 		)
 		(uuid "6c8d78d6-e34c-4afb-9a7f-e39e1e4d02d7")
 	)
+	(wire
+		(pts
+			(xy 158.75 60.96) (xy 158.75 63.5)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "6cb4f95f-6332-447a-8d0f-6c012e815816")
+	)
 	(polyline
 		(pts
 			(xy 139.7 242.57) (xy 139.7 245.11)
@@ -4727,7 +4717,7 @@
 	)
 	(wire
 		(pts
-			(xy 243.84 45.72) (xy 243.84 46.99)
+			(xy 311.15 45.72) (xy 311.15 46.99)
 		)
 		(stroke
 			(width 0)
@@ -4755,26 +4745,6 @@
 		)
 		(uuid "7212bbef-6571-447f-830b-ed2d999f1701")
 	)
-	(wire
-		(pts
-			(xy 189.23 81.28) (xy 210.82 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "7269f66b-76c4-45d6-b514-c5e645b561ef")
-	)
-	(wire
-		(pts
-			(xy 280.67 45.72) (xy 280.67 53.34)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "73391d8c-d7ee-4eca-ac7d-78291c56b284")
-	)
 	(polyline
 		(pts
 			(xy 222.25 238.76) (xy 228.6 236.22)
@@ -4787,7 +4757,17 @@
 	)
 	(wire
 		(pts
-			(xy 262.89 118.11) (xy 279.4 118.11)
+			(xy 186.69 73.66) (xy 186.69 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "7463ba85-5bd3-48c4-ad11-c3767a2cda04")
+	)
+	(wire
+		(pts
+			(xy 261.62 140.97) (xy 278.13 140.97)
 		)
 		(stroke
 			(width 0)
@@ -4797,7 +4777,7 @@
 	)
 	(wire
 		(pts
-			(xy 218.44 72.39) (xy 218.44 73.66)
+			(xy 285.75 72.39) (xy 285.75 73.66)
 		)
 		(stroke
 			(width 0)
@@ -4807,7 +4787,7 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 110.49) (xy 250.19 110.49)
+			(xy 234.95 133.35) (xy 248.92 133.35)
 		)
 		(stroke
 			(width 0)
@@ -4817,17 +4797,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 73.66) (xy 308.61 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "7b578caa-b8b3-48c3-8d5c-f4f63c969f77")
-	)
-	(wire
-		(pts
-			(xy 363.22 62.23) (xy 363.22 45.72)
+			(xy 369.57 62.23) (xy 369.57 45.72)
 		)
 		(stroke
 			(width 0)
@@ -4855,26 +4825,6 @@
 		)
 		(uuid "7e130ebd-ec8b-41d9-b513-947ff8a86eca")
 	)
-	(wire
-		(pts
-			(xy 278.13 63.5) (xy 280.67 63.5)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "7fd07a97-b1fa-4515-b5a5-e0b493b006ce")
-	)
-	(wire
-		(pts
-			(xy 233.68 81.28) (xy 236.22 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "81e30324-a02a-4bb7-8566-17e637379dfc")
-	)
 	(polyline
 		(pts
 			(xy 137.16 234.95) (xy 137.16 238.76)
@@ -4885,16 +4835,6 @@
 		)
 		(uuid "824ca386-a155-4dc8-8ed3-b0814369b3bd")
 	)
-	(wire
-		(pts
-			(xy 186.69 81.28) (xy 189.23 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "833acbac-daec-410f-b29d-f8973380b443")
-	)
 	(polyline
 		(pts
 			(xy 207.01 238.76) (xy 222.25 238.76)
@@ -4917,7 +4857,7 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 146.05) (xy 236.22 147.32)
+			(xy 234.95 168.91) (xy 234.95 170.18)
 		)
 		(stroke
 			(width 0)
@@ -4937,7 +4877,17 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 146.05) (xy 250.19 146.05)
+			(xy 186.69 66.04) (xy 186.69 63.5)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "891b226a-0eb2-4ca1-ad74-2aff239c2982")
+	)
+	(wire
+		(pts
+			(xy 234.95 168.91) (xy 248.92 168.91)
 		)
 		(stroke
 			(width 0)
@@ -4955,6 +4905,16 @@
 		)
 		(uuid "8f09ba55-aadd-4d2b-9c57-99bf8d87bc11")
 	)
+	(wire
+		(pts
+			(xy 175.26 63.5) (xy 186.69 63.5)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "910520ce-8711-4dc7-969c-a364dcde5c0c")
+	)
 	(wire
 		(pts
 			(xy 55.88 53.34) (xy 91.44 53.34)
@@ -4997,17 +4957,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 45.72) (xy 323.85 45.72)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "9739bc8d-e50f-4ea8-b0e2-90294c6865c6")
-	)
-	(wire
-		(pts
-			(xy 156.21 54.61) (xy 156.21 55.88)
+			(xy 223.52 54.61) (xy 223.52 55.88)
 		)
 		(stroke
 			(width 0)
@@ -5027,7 +4977,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 129.54) (xy 308.61 146.05)
+			(xy 307.34 152.4) (xy 307.34 168.91)
 		)
 		(stroke
 			(width 0)
@@ -5037,17 +4987,17 @@
 	)
 	(wire
 		(pts
-			(xy 297.18 63.5) (xy 308.61 63.5)
+			(xy 254 81.28) (xy 252.73 81.28)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "9f292d23-5d94-46ee-bb61-b889e7d78b50")
+		(uuid "9e0bcb19-c789-4a66-b79a-ad5b597a9d44")
 	)
 	(wire
 		(pts
-			(xy 114.3 81.28) (xy 156.21 81.28)
+			(xy 114.3 81.28) (xy 158.75 81.28)
 		)
 		(stroke
 			(width 0)
@@ -5057,7 +5007,7 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 72.39) (xy 236.22 81.28)
+			(xy 303.53 72.39) (xy 303.53 81.28)
 		)
 		(stroke
 			(width 0)
@@ -5087,13 +5037,23 @@
 	)
 	(wire
 		(pts
-			(xy 243.84 45.72) (xy 280.67 45.72)
+			(xy 245.11 81.28) (xy 243.84 81.28)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "a7800417-3d53-44f4-8feb-1dc6d04f3d72")
+		(uuid "a6d71e38-4015-4d8d-8218-fcbb55c40ac3")
+	)
+	(wire
+		(pts
+			(xy 186.69 60.96) (xy 186.69 63.5)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "a97b7788-eac0-483e-a874-d2a8446ccb72")
 	)
 	(polyline
 		(pts
@@ -5107,7 +5067,7 @@
 	)
 	(wire
 		(pts
-			(xy 350.52 62.23) (xy 350.52 63.5)
+			(xy 356.87 62.23) (xy 356.87 63.5)
 		)
 		(stroke
 			(width 0)
@@ -5117,17 +5077,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 81.28) (xy 297.18 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ab72cff0-7377-4bec-8054-45efa73021b3")
-	)
-	(wire
-		(pts
-			(xy 262.89 146.05) (xy 287.02 146.05)
+			(xy 261.62 168.91) (xy 285.75 168.91)
 		)
 		(stroke
 			(width 0)
@@ -5147,7 +5097,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 120.65) (xy 303.53 120.65)
+			(xy 307.34 143.51) (xy 302.26 143.51)
 		)
 		(stroke
 			(width 0)
@@ -5157,7 +5107,7 @@
 	)
 	(wire
 		(pts
-			(xy 350.52 72.39) (xy 350.52 81.28)
+			(xy 356.87 72.39) (xy 356.87 81.28)
 		)
 		(stroke
 			(width 0)
@@ -5167,13 +5117,33 @@
 	)
 	(wire
 		(pts
-			(xy 156.21 81.28) (xy 176.53 81.28)
+			(xy 175.26 66.04) (xy 175.26 63.5)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "b04262a1-38d0-4d98-93a0-4f478e69e961")
+		(uuid "ad5b5286-99e1-4c31-b8b5-b1aa590c892c")
+	)
+	(wire
+		(pts
+			(xy 168.91 63.5) (xy 175.26 63.5)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "adf4067d-4abc-4c80-9c0e-1ab2c02af7dc")
+	)
+	(wire
+		(pts
+			(xy 311.15 45.72) (xy 323.85 45.72)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "afbb2454-7465-4f32-84ce-3588394469e7")
 	)
 	(wire
 		(pts
@@ -5197,7 +5167,7 @@
 	)
 	(wire
 		(pts
-			(xy 250.19 146.05) (xy 262.89 146.05)
+			(xy 248.92 168.91) (xy 261.62 168.91)
 		)
 		(stroke
 			(width 0)
@@ -5205,6 +5175,16 @@
 		)
 		(uuid "b22f647c-ce86-4416-af43-ba5e412823f1")
 	)
+	(wire
+		(pts
+			(xy 158.75 45.72) (xy 186.69 45.72)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b23ae2d1-4a84-4e43-8952-6b7ca932fbc3")
+	)
 	(polyline
 		(pts
 			(xy 52.07 238.76) (xy 67.31 238.76)
@@ -5217,7 +5197,7 @@
 	)
 	(wire
 		(pts
-			(xy 243.84 54.61) (xy 243.84 55.88)
+			(xy 311.15 54.61) (xy 311.15 55.88)
 		)
 		(stroke
 			(width 0)
@@ -5237,7 +5217,7 @@
 	)
 	(wire
 		(pts
-			(xy 271.78 129.54) (xy 271.78 130.81)
+			(xy 270.51 152.4) (xy 270.51 153.67)
 		)
 		(stroke
 			(width 0)
@@ -5257,17 +5237,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 66.04) (xy 308.61 63.5)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "b7ee7819-02c6-4bb3-a82f-c26bc6313d28")
-	)
-	(wire
-		(pts
-			(xy 262.89 115.57) (xy 279.4 115.57)
+			(xy 261.62 138.43) (xy 278.13 138.43)
 		)
 		(stroke
 			(width 0)
@@ -5275,6 +5245,16 @@
 		)
 		(uuid "b80ec700-b97e-4842-b25f-93534b784eb7")
 	)
+	(wire
+		(pts
+			(xy 175.26 81.28) (xy 186.69 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b9671ca9-0b9d-49f5-b375-56a1baa64844")
+	)
 	(polyline
 		(pts
 			(xy 118.11 238.76) (xy 121.92 238.76)
@@ -5325,16 +5305,6 @@
 		)
 		(uuid "be0d64a0-5f8a-4bf6-b8da-1b64a6004c02")
 	)
-	(wire
-		(pts
-			(xy 210.82 81.28) (xy 213.36 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "bf777c6a-e916-4225-9ae9-2901a6605585")
-	)
 	(polyline
 		(pts
 			(xy 59.69 234.95) (xy 59.69 238.76)
@@ -5347,7 +5317,7 @@
 	)
 	(wire
 		(pts
-			(xy 184.15 57.15) (xy 184.15 54.61)
+			(xy 251.46 57.15) (xy 251.46 54.61)
 		)
 		(stroke
 			(width 0)
@@ -5367,7 +5337,7 @@
 	)
 	(wire
 		(pts
-			(xy 345.44 63.5) (xy 350.52 63.5)
+			(xy 351.79 63.5) (xy 356.87 63.5)
 		)
 		(stroke
 			(width 0)
@@ -5377,7 +5347,7 @@
 	)
 	(wire
 		(pts
-			(xy 350.52 45.72) (xy 353.06 45.72)
+			(xy 356.87 45.72) (xy 359.41 45.72)
 		)
 		(stroke
 			(width 0)
@@ -5387,7 +5357,7 @@
 	)
 	(wire
 		(pts
-			(xy 365.76 120.65) (xy 365.76 146.05)
+			(xy 364.49 143.51) (xy 364.49 168.91)
 		)
 		(stroke
 			(width 0)
@@ -5397,17 +5367,27 @@
 	)
 	(wire
 		(pts
-			(xy 280.67 45.72) (xy 308.61 45.72)
+			(xy 311.15 45.72) (xy 251.46 45.72)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c5bc83fe-995e-4cc3-a58a-68702667f3d8")
+		(uuid "c588b27b-4cdf-4dc4-adc6-3e6e0c9480d3")
 	)
 	(wire
 		(pts
-			(xy 243.84 68.58) (xy 243.84 81.28)
+			(xy 186.69 81.28) (xy 223.52 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "c681ca0d-bad8-4817-8c2f-ffc77ec5d0b5")
+	)
+	(wire
+		(pts
+			(xy 311.15 68.58) (xy 311.15 81.28)
 		)
 		(stroke
 			(width 0)
@@ -5417,7 +5397,7 @@
 	)
 	(wire
 		(pts
-			(xy 181.61 55.88) (xy 156.21 55.88)
+			(xy 248.92 55.88) (xy 223.52 55.88)
 		)
 		(stroke
 			(width 0)
@@ -5427,7 +5407,7 @@
 	)
 	(wire
 		(pts
-			(xy 337.82 116.84) (xy 337.82 110.49)
+			(xy 336.55 139.7) (xy 336.55 133.35)
 		)
 		(stroke
 			(width 0)
@@ -5437,7 +5417,7 @@
 	)
 	(wire
 		(pts
-			(xy 363.22 64.77) (xy 382.27 64.77)
+			(xy 369.57 64.77) (xy 388.62 64.77)
 		)
 		(stroke
 			(width 0)
@@ -5447,23 +5427,13 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 81.28) (xy 243.84 81.28)
+			(xy 311.15 81.28) (xy 328.93 81.28)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ca057696-a378-4f54-aaed-f017b4caa8af")
-	)
-	(wire
-		(pts
-			(xy 176.53 81.28) (xy 177.8 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ccce7897-6534-4123-9269-897b19d3246e")
+		(uuid "caa06551-e11f-4376-b485-5364ab426915")
 	)
 	(wire
 		(pts
@@ -5477,7 +5447,17 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 111.76) (xy 308.61 110.49)
+			(xy 256.54 81.28) (xy 254 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "ce0f33d2-aefd-482c-a4c5-f09aac21fed9")
+	)
+	(wire
+		(pts
+			(xy 307.34 134.62) (xy 307.34 133.35)
 		)
 		(stroke
 			(width 0)
@@ -5487,7 +5467,7 @@
 	)
 	(wire
 		(pts
-			(xy 360.68 45.72) (xy 363.22 45.72)
+			(xy 367.03 45.72) (xy 369.57 45.72)
 		)
 		(stroke
 			(width 0)
@@ -5507,7 +5487,7 @@
 	)
 	(wire
 		(pts
-			(xy 250.19 116.84) (xy 250.19 113.03)
+			(xy 248.92 139.7) (xy 248.92 135.89)
 		)
 		(stroke
 			(width 0)
@@ -5525,16 +5505,6 @@
 		)
 		(uuid "d177e8b4-b45c-4df3-a229-cc0c5103cdaa")
 	)
-	(wire
-		(pts
-			(xy 308.61 60.96) (xy 308.61 63.5)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "d4eba1c0-3173-4926-9201-9a60503d4024")
-	)
 	(polyline
 		(pts
 			(xy 34.29 247.65) (xy 34.29 248.92)
@@ -5547,7 +5517,7 @@
 	)
 	(wire
 		(pts
-			(xy 303.53 118.11) (xy 299.72 118.11)
+			(xy 302.26 140.97) (xy 298.45 140.97)
 		)
 		(stroke
 			(width 0)
@@ -5557,7 +5527,7 @@
 	)
 	(wire
 		(pts
-			(xy 334.01 45.72) (xy 350.52 45.72)
+			(xy 334.01 45.72) (xy 356.87 45.72)
 		)
 		(stroke
 			(width 0)
@@ -5587,7 +5557,7 @@
 	)
 	(wire
 		(pts
-			(xy 337.82 146.05) (xy 325.12 146.05)
+			(xy 336.55 168.91) (xy 323.85 168.91)
 		)
 		(stroke
 			(width 0)
@@ -5617,7 +5587,7 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 124.46) (xy 236.22 146.05)
+			(xy 234.95 147.32) (xy 234.95 168.91)
 		)
 		(stroke
 			(width 0)
@@ -5627,7 +5597,7 @@
 	)
 	(wire
 		(pts
-			(xy 350.52 81.28) (xy 363.22 81.28)
+			(xy 356.87 81.28) (xy 369.57 81.28)
 		)
 		(stroke
 			(width 0)
@@ -5647,7 +5617,7 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 119.38) (xy 308.61 120.65)
+			(xy 307.34 142.24) (xy 307.34 143.51)
 		)
 		(stroke
 			(width 0)
@@ -5677,7 +5647,7 @@
 	)
 	(wire
 		(pts
-			(xy 228.6 72.39) (xy 228.6 73.66)
+			(xy 295.91 72.39) (xy 295.91 73.66)
 		)
 		(stroke
 			(width 0)
@@ -5685,6 +5655,16 @@
 		)
 		(uuid "e3a8e610-dd66-4f07-8d08-3fa68e0790c4")
 	)
+	(wire
+		(pts
+			(xy 280.67 81.28) (xy 278.13 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "e440832e-e05b-4021-ba1d-bd7eb634a150")
+	)
 	(polyline
 		(pts
 			(xy 62.23 245.11) (xy 63.5 243.84)
@@ -5695,16 +5675,6 @@
 		)
 		(uuid "e5c5e7ac-6d6c-4a65-b0cc-2a51965dc586")
 	)
-	(wire
-		(pts
-			(xy 280.67 73.66) (xy 280.67 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "e6a3d80f-c02e-4dca-891a-8e4389898149")
-	)
 	(polyline
 		(pts
 			(xy 195.58 243.84) (xy 199.39 243.84)
@@ -5727,13 +5697,13 @@
 	)
 	(wire
 		(pts
-			(xy 308.61 81.28) (xy 328.93 81.28)
+			(xy 158.75 73.66) (xy 158.75 81.28)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ee1e382b-6405-4844-9410-54eebc03dc4f")
+		(uuid "ec61f162-bb48-4dbe-8f66-078630431672")
 	)
 	(polyline
 		(pts
@@ -5747,7 +5717,7 @@
 	)
 	(wire
 		(pts
-			(xy 350.52 63.5) (xy 350.52 64.77)
+			(xy 356.87 63.5) (xy 356.87 64.77)
 		)
 		(stroke
 			(width 0)
@@ -5757,7 +5727,7 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 110.49) (xy 236.22 116.84)
+			(xy 234.95 133.35) (xy 234.95 139.7)
 		)
 		(stroke
 			(width 0)
@@ -5767,7 +5737,7 @@
 	)
 	(wire
 		(pts
-			(xy 156.21 68.58) (xy 156.21 81.28)
+			(xy 223.52 68.58) (xy 223.52 81.28)
 		)
 		(stroke
 			(width 0)
@@ -5777,7 +5747,7 @@
 	)
 	(wire
 		(pts
-			(xy 184.15 46.99) (xy 184.15 45.72)
+			(xy 251.46 46.99) (xy 251.46 45.72)
 		)
 		(stroke
 			(width 0)
@@ -5787,13 +5757,13 @@
 	)
 	(wire
 		(pts
-			(xy 280.67 81.28) (xy 297.18 81.28)
+			(xy 158.75 45.72) (xy 158.75 53.34)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "f51c36de-31a8-41ba-90e7-f09f08206059")
+		(uuid "f59e0c19-eacd-4ef5-aab4-4281b356705e")
 	)
 	(wire
 		(pts
@@ -5827,7 +5797,7 @@
 	)
 	(wire
 		(pts
-			(xy 271.78 121.92) (xy 271.78 120.65)
+			(xy 270.51 144.78) (xy 270.51 143.51)
 		)
 		(stroke
 			(width 0)
@@ -5837,7 +5807,7 @@
 	)
 	(wire
 		(pts
-			(xy 378.46 110.49) (xy 382.27 110.49)
+			(xy 377.19 133.35) (xy 381 133.35)
 		)
 		(stroke
 			(width 0)
@@ -5845,6 +5815,16 @@
 		)
 		(uuid "f90d396e-86a8-4ae7-9a6d-73c485ad41e1")
 	)
+	(wire
+		(pts
+			(xy 186.69 45.72) (xy 223.52 45.72)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fa708b25-6793-4836-bdfd-33f914548b45")
+	)
 	(wire
 		(pts
 			(xy 114.3 66.04) (xy 114.3 53.34)
@@ -5857,7 +5837,7 @@
 	)
 	(wire
 		(pts
-			(xy 262.89 138.43) (xy 262.89 146.05)
+			(xy 261.62 161.29) (xy 261.62 168.91)
 		)
 		(stroke
 			(width 0)
@@ -5865,8 +5845,28 @@
 		)
 		(uuid "fb045d0f-43b5-4ac5-8998-e557b151cf00")
 	)
+	(wire
+		(pts
+			(xy 223.52 81.28) (xy 243.84 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fc5000ae-182e-4139-a968-3513478ffcda")
+	)
+	(wire
+		(pts
+			(xy 156.21 63.5) (xy 158.75 63.5)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fd12aafe-a528-4deb-a513-3016707dc285")
+	)
 	(label "PWR_BATT"
-		(at 227.33 110.49 0)
+		(at 226.06 133.35 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5875,18 +5875,8 @@
 		)
 		(uuid "0a033b53-6954-4b63-ae73-834cdbe527e0")
 	)
-	(label "SNS_BATT_TEMP"
-		(at 290.83 63.5 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "0b980f78-143e-42a3-93db-e31d255a42e8")
-	)
 	(label "BATT_BOOST_EN"
-		(at 262.89 115.57 0)
+		(at 261.62 138.43 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5897,7 +5887,7 @@
 		(uuid "15b089d0-ccc9-43aa-9340-d29c45771b5e")
 	)
 	(label "PWR_EXT_BATT_N"
-		(at 365.76 64.77 0)
+		(at 372.11 64.77 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5916,6 +5906,16 @@
 		)
 		(uuid "2bc80067-0672-4d97-8893-4a7454c83b4a")
 	)
+	(label "PWR_EXT_BATT_FUSED"
+		(at 335.28 45.72 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "2d1bde92-c3b4-439b-8f97-bc0002f9b2eb")
+	)
 	(label "SNS_~{STANDBY}"
 		(at 69.85 53.34 0)
 		(effects
@@ -5937,7 +5937,7 @@
 		(uuid "64316dfd-b9c7-4b46-909a-10a8739b196a")
 	)
 	(label "PWR_EXT_BATT_P"
-		(at 365.76 62.23 0)
+		(at 372.11 62.23 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5998,7 +5998,7 @@
 		(uuid "cc64ca71-7c2f-43cc-b4f6-d8a6cbbeb1dd")
 	)
 	(label "BATT_BOOST_PS"
-		(at 262.89 118.11 0)
+		(at 261.62 140.97 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -6028,7 +6028,7 @@
 		(uuid "dea74121-6ebc-423f-b295-be71fa6f3dde")
 	)
 	(label "PWR_BATT_BOOST"
-		(at 303.53 110.49 0)
+		(at 302.26 133.35 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -6037,6 +6037,16 @@
 		)
 		(uuid "defd848f-e0ca-4859-ae64-d81c50c58727")
 	)
+	(label "SNS_BATT_TEMP"
+		(at 168.91 63.5 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "ec64c993-5461-4397-b931-b83a5270f8ce")
+	)
 	(hierarchical_label "SNS_~{CHARGING}"
 		(shape output)
 		(at 46.99 50.8 180)
@@ -6050,18 +6060,18 @@
 	)
 	(hierarchical_label "SNS_BATT_CONN"
 		(shape output)
-		(at 278.13 63.5 180)
+		(at 156.21 63.5 180)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify right)
 		)
-		(uuid "73931892-b254-49bc-92d5-1357bbcb3425")
+		(uuid "762ac614-3b0b-4c58-a742-7d67afe018a3")
 	)
 	(hierarchical_label "I2C_SDA"
 		(shape bidirectional)
-		(at 171.45 64.77 180)
+		(at 238.76 64.77 180)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -6083,7 +6093,7 @@
 	)
 	(hierarchical_label "PWR_BATT_5V"
 		(shape output)
-		(at 382.27 110.49 0)
+		(at 381 133.35 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -6128,7 +6138,7 @@
 	)
 	(hierarchical_label "I2C_SCL"
 		(shape input)
-		(at 171.45 62.23 180)
+		(at 238.76 62.23 180)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -6139,7 +6149,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 308.61 115.57 0)
+		(at 307.34 138.43 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6148,7 +6158,7 @@
 		(fields_autoplaced yes)
 		(uuid "00ea69d4-af09-4d82-9e15-6394a654c765")
 		(property "Reference" "R47"
-			(at 311.15 114.2999 0)
+			(at 309.88 137.1599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6157,7 +6167,7 @@
 			)
 		)
 		(property "Value" "R"
-			(at 311.15 116.8399 0)
+			(at 309.88 139.6999 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6166,7 +6176,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 306.832 115.57 90)
+			(at 305.562 138.43 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6175,7 +6185,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 308.61 115.57 0)
+			(at 307.34 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6184,7 +6194,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 308.61 115.57 0)
+			(at 307.34 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6209,7 +6219,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 181.61 81.28 270)
+		(at 248.92 81.28 270)
 		(mirror x)
 		(unit 1)
 		(exclude_from_sim no)
@@ -6218,7 +6228,7 @@
 		(dnp no)
 		(uuid "07075e8b-e4d7-430a-b83a-9613d939053b")
 		(property "Reference" "R58"
-			(at 181.61 87.63 90)
+			(at 248.92 87.63 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6226,7 +6236,7 @@
 			)
 		)
 		(property "Value" "R"
-			(at 181.61 85.09 90)
+			(at 248.92 85.09 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6234,7 +6244,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 181.61 83.058 90)
+			(at 248.92 83.058 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6243,7 +6253,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 181.61 81.28 0)
+			(at 248.92 81.28 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6252,7 +6262,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 181.61 81.28 0)
+			(at 248.92 81.28 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6347,7 +6357,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 280.67 57.15 0)
+		(at 158.75 57.15 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6356,7 +6366,7 @@
 		(fields_autoplaced yes)
 		(uuid "0bbec46b-51e2-4143-94a0-6007a3cdcdd7")
 		(property "Reference" "R53"
-			(at 283.21 55.8799 0)
+			(at 161.29 55.8799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6365,7 +6375,7 @@
 			)
 		)
 		(property "Value" "R"
-			(at 283.21 58.4199 0)
+			(at 161.29 58.4199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6374,7 +6384,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 278.892 57.15 90)
+			(at 156.972 57.15 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6383,7 +6393,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 280.67 57.15 0)
+			(at 158.75 57.15 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6392,7 +6402,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 280.67 57.15 0)
+			(at 158.75 57.15 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6417,7 +6427,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 337.82 120.65 0)
+		(at 336.55 143.51 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6426,7 +6436,7 @@
 		(fields_autoplaced yes)
 		(uuid "0f02c06e-3640-46d0-ba57-c9d95a57d104")
 		(property "Reference" "C44"
-			(at 341.63 119.3799 0)
+			(at 340.36 142.2399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6435,7 +6445,7 @@
 			)
 		)
 		(property "Value" "10u"
-			(at 341.63 121.9199 0)
+			(at 340.36 144.7799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6444,7 +6454,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 338.7852 124.46 0)
+			(at 337.5152 147.32 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6453,7 +6463,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 337.82 120.65 0)
+			(at 336.55 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6462,7 +6472,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 337.82 120.65 0)
+			(at 336.55 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6554,7 +6564,7 @@
 	)
 	(symbol
 		(lib_id "Device:L")
-		(at 271.78 125.73 0)
+		(at 270.51 148.59 0)
 		(mirror x)
 		(unit 1)
 		(exclude_from_sim no)
@@ -6564,7 +6574,7 @@
 		(fields_autoplaced yes)
 		(uuid "1b6b48a7-8b86-46cd-9f3e-4c65cd96c704")
 		(property "Reference" "L1"
-			(at 270.51 124.4599 0)
+			(at 269.24 147.3199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6573,7 +6583,7 @@
 			)
 		)
 		(property "Value" "L"
-			(at 270.51 126.9999 0)
+			(at 269.24 149.8599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6582,7 +6592,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 271.78 125.73 0)
+			(at 270.51 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6591,7 +6601,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 271.78 125.73 0)
+			(at 270.51 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6600,7 +6610,7 @@
 			)
 		)
 		(property "Description" "Inductor"
-			(at 271.78 125.73 0)
+			(at 270.51 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6625,7 +6635,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 243.84 64.77 0)
+		(at 311.15 64.77 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6634,7 +6644,7 @@
 		(fields_autoplaced yes)
 		(uuid "1b895ff0-d493-4762-82d9-366fa7fb6e88")
 		(property "Reference" "C40"
-			(at 247.65 63.4999 0)
+			(at 314.96 63.4999 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6643,7 +6653,7 @@
 			)
 		)
 		(property "Value" "100n"
-			(at 247.65 66.0399 0)
+			(at 314.96 66.0399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6652,7 +6662,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 244.8052 68.58 0)
+			(at 312.1152 68.58 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6661,7 +6671,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 243.84 64.77 0)
+			(at 311.15 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6670,7 +6680,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 243.84 64.77 0)
+			(at 311.15 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6762,7 +6772,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 262.89 134.62 0)
+		(at 261.62 157.48 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6771,7 +6781,7 @@
 		(fields_autoplaced yes)
 		(uuid "29cfee6b-1238-4743-9734-9f672292353b")
 		(property "Reference" "R49"
-			(at 265.43 133.3499 0)
+			(at 264.16 156.2099 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6780,7 +6790,7 @@
 			)
 		)
 		(property "Value" "0R"
-			(at 265.43 135.8899 0)
+			(at 264.16 158.7499 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6789,7 +6799,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 261.112 134.62 90)
+			(at 259.842 157.48 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6798,7 +6808,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 262.89 134.62 0)
+			(at 261.62 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6807,7 +6817,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 262.89 134.62 0)
+			(at 261.62 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6832,7 +6842,7 @@
 	)
 	(symbol
 		(lib_id "Device:Polyfuse")
-		(at 356.87 45.72 90)
+		(at 363.22 45.72 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6841,7 +6851,7 @@
 		(fields_autoplaced yes)
 		(uuid "2a3b46b4-e68e-4206-9fff-0084663c1946")
 		(property "Reference" "F2"
-			(at 356.87 39.37 90)
+			(at 363.22 39.37 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6849,7 +6859,7 @@
 			)
 		)
 		(property "Value" "Polyfuse"
-			(at 356.87 41.91 90)
+			(at 363.22 41.91 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6857,7 +6867,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 361.95 44.45 0)
+			(at 368.3 44.45 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6867,7 +6877,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 356.87 45.72 0)
+			(at 363.22 45.72 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6876,7 +6886,7 @@
 			)
 		)
 		(property "Description" "Resettable fuse, polymeric positive temperature coefficient"
-			(at 356.87 45.72 0)
+			(at 363.22 45.72 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6901,7 +6911,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 156.21 64.77 0)
+		(at 223.52 64.77 0)
 		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
@@ -6911,7 +6921,7 @@
 		(fields_autoplaced yes)
 		(uuid "342eac7e-8bea-49ed-b366-e94281aa7bd4")
 		(property "Reference" "C45"
-			(at 152.4 63.4999 0)
+			(at 219.71 63.4999 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6920,7 +6930,7 @@
 			)
 		)
 		(property "Value" "100n"
-			(at 152.4 66.0399 0)
+			(at 219.71 66.0399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6929,7 +6939,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 155.2448 68.58 0)
+			(at 222.5548 68.58 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6938,7 +6948,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 156.21 64.77 0)
+			(at 223.52 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6947,7 +6957,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 156.21 64.77 0)
+			(at 223.52 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6972,7 +6982,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 243.84 50.8 0)
+		(at 311.15 50.8 0)
 		(mirror x)
 		(unit 1)
 		(exclude_from_sim no)
@@ -6981,7 +6991,7 @@
 		(dnp no)
 		(uuid "35f1b7f4-7e8a-48d1-995c-5690e1f123f1")
 		(property "Reference" "R41"
-			(at 241.3 49.5299 0)
+			(at 308.61 49.5299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6990,7 +7000,7 @@
 			)
 		)
 		(property "Value" "100R"
-			(at 241.3 52.0699 0)
+			(at 308.61 52.0699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6999,7 +7009,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 242.062 50.8 90)
+			(at 309.372 50.8 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7008,7 +7018,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 243.84 50.8 0)
+			(at 311.15 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7017,7 +7027,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 243.84 50.8 0)
+			(at 311.15 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7042,7 +7052,7 @@
 	)
 	(symbol
 		(lib_id "Device:D_Zener")
-		(at 280.67 69.85 270)
+		(at 158.75 69.85 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7051,7 +7061,7 @@
 		(fields_autoplaced yes)
 		(uuid "39f50537-adcd-4ec3-b7f2-8e06e6165187")
 		(property "Reference" "D12"
-			(at 283.21 68.5799 90)
+			(at 161.29 68.5799 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7060,7 +7070,7 @@
 			)
 		)
 		(property "Value" "2V8"
-			(at 283.21 71.1199 90)
+			(at 161.29 71.1199 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7069,7 +7079,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 280.67 69.85 0)
+			(at 158.75 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7078,7 +7088,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 280.67 69.85 0)
+			(at 158.75 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7087,7 +7097,7 @@
 			)
 		)
 		(property "Description" "Zener diode"
-			(at 280.67 69.85 0)
+			(at 158.75 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7112,7 +7122,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 236.22 120.65 0)
+		(at 234.95 143.51 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7121,7 +7131,7 @@
 		(fields_autoplaced yes)
 		(uuid "3a984004-2ff9-4ef0-b7f4-d341e8c0a9c3")
 		(property "Reference" "C43"
-			(at 240.03 119.3799 0)
+			(at 238.76 142.2399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7130,7 +7140,7 @@
 			)
 		)
 		(property "Value" "10u"
-			(at 240.03 121.9199 0)
+			(at 238.76 144.7799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7139,7 +7149,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 237.1852 124.46 0)
+			(at 235.9152 147.32 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7148,7 +7158,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 236.22 120.65 0)
+			(at 234.95 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7157,7 +7167,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 236.22 120.65 0)
+			(at 234.95 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7182,7 +7192,7 @@
 	)
 	(symbol
 		(lib_id "Regulator_Switching:TPS63000")
-		(at 289.56 120.65 0)
+		(at 288.29 143.51 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7191,7 +7201,7 @@
 		(fields_autoplaced yes)
 		(uuid "40f6880c-37e8-4218-903b-f2cf0939307c")
 		(property "Reference" "U12"
-			(at 289.56 102.87 0)
+			(at 288.29 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7199,7 +7209,7 @@
 			)
 		)
 		(property "Value" "TPS63000"
-			(at 289.56 105.41 0)
+			(at 288.29 128.27 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7207,7 +7217,7 @@
 			)
 		)
 		(property "Footprint" "Package_SON:Texas_DRC0010J_ThermalVias"
-			(at 311.15 134.62 0)
+			(at 309.88 157.48 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7216,7 +7226,7 @@
 			)
 		)
 		(property "Datasheet" "http://www.ti.com/lit/ds/symlink/tps63000.pdf"
-			(at 281.94 106.68 0)
+			(at 280.67 129.54 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7225,7 +7235,7 @@
 			)
 		)
 		(property "Description" "Buck-Boost Converter, 1.8-5.5V Input Voltage, 1.8A Switch Current, Adjustable 1.2-5.5V Output Voltage, VSON-10"
-			(at 289.56 120.65 0)
+			(at 288.29 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7277,7 +7287,7 @@
 	)
 	(symbol
 		(lib_id "Connector_Generic:Conn_01x02")
-		(at 387.35 62.23 0)
+		(at 393.7 62.23 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7286,7 +7296,7 @@
 		(fields_autoplaced yes)
 		(uuid "480d9e4e-06db-43c4-b2ac-fbfaa588955b")
 		(property "Reference" "J5"
-			(at 389.89 62.2299 0)
+			(at 396.24 62.2299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7295,7 +7305,7 @@
 			)
 		)
 		(property "Value" "Conn_01x02"
-			(at 389.89 64.7699 0)
+			(at 396.24 64.7699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7304,7 +7314,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 387.35 62.23 0)
+			(at 393.7 62.23 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7313,7 +7323,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 387.35 62.23 0)
+			(at 393.7 62.23 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7322,7 +7332,7 @@
 			)
 		)
 		(property "Description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)"
-			(at 387.35 62.23 0)
+			(at 393.7 62.23 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7347,7 +7357,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 297.18 69.85 0)
+		(at 175.26 69.85 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7356,7 +7366,7 @@
 		(fields_autoplaced yes)
 		(uuid "634310ce-5e91-4c5e-b7ca-a2745b4a172d")
 		(property "Reference" "R43"
-			(at 299.72 68.5799 0)
+			(at 177.8 68.5799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7365,7 +7375,7 @@
 			)
 		)
 		(property "Value" "R"
-			(at 299.72 71.1199 0)
+			(at 177.8 71.1199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7374,7 +7384,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 295.402 69.85 90)
+			(at 173.482 69.85 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7383,7 +7393,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 297.18 69.85 0)
+			(at 175.26 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7392,7 +7402,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 297.18 69.85 0)
+			(at 175.26 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7417,7 +7427,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 156.21 50.8 0)
+		(at 223.52 50.8 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7425,7 +7435,7 @@
 		(dnp no)
 		(uuid "680e6d42-4643-4805-b5ee-7348c6f9249a")
 		(property "Reference" "R60"
-			(at 158.75 49.5299 0)
+			(at 226.06 49.5299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7434,7 +7444,7 @@
 			)
 		)
 		(property "Value" "100R"
-			(at 158.75 52.0699 0)
+			(at 226.06 52.0699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7443,7 +7453,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 154.432 50.8 90)
+			(at 221.742 50.8 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7452,7 +7462,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 156.21 50.8 0)
+			(at 223.52 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7461,7 +7471,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 156.21 50.8 0)
+			(at 223.52 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7486,7 +7496,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 308.61 57.15 0)
+		(at 186.69 57.15 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7495,7 +7505,7 @@
 		(fields_autoplaced yes)
 		(uuid "6ae537c0-4ee5-4a00-bf21-146548b61ad8")
 		(property "Reference" "R44"
-			(at 311.15 55.8799 0)
+			(at 189.23 55.8799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7504,7 +7514,7 @@
 			)
 		)
 		(property "Value" "R"
-			(at 311.15 58.4199 0)
+			(at 189.23 58.4199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7513,7 +7523,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 306.832 57.15 90)
+			(at 184.912 57.15 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7522,7 +7532,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 308.61 57.15 0)
+			(at 186.69 57.15 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7531,7 +7541,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 308.61 57.15 0)
+			(at 186.69 57.15 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7556,7 +7566,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 184.15 50.8 0)
+		(at 251.46 50.8 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7564,7 +7574,7 @@
 		(dnp no)
 		(uuid "76f4628e-5161-4fe2-8160-b39d7e05321a")
 		(property "Reference" "R59"
-			(at 186.69 49.5299 0)
+			(at 254 49.5299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7573,7 +7583,7 @@
 			)
 		)
 		(property "Value" "1k"
-			(at 186.69 52.0699 0)
+			(at 254 52.0699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7582,7 +7592,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 182.372 50.8 90)
+			(at 249.682 50.8 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7591,7 +7601,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 184.15 50.8 0)
+			(at 251.46 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7600,7 +7610,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 184.15 50.8 0)
+			(at 251.46 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7625,7 +7635,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 308.61 125.73 0)
+		(at 307.34 148.59 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7634,7 +7644,7 @@
 		(fields_autoplaced yes)
 		(uuid "78bff6ac-f1b6-4ee2-ba7c-adbe178c73cb")
 		(property "Reference" "R48"
-			(at 311.15 124.4599 0)
+			(at 309.88 147.3199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7643,7 +7653,7 @@
 			)
 		)
 		(property "Value" "R"
-			(at 311.15 126.9999 0)
+			(at 309.88 149.8599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7652,7 +7662,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 306.832 125.73 90)
+			(at 305.562 148.59 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7661,7 +7671,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 308.61 125.73 0)
+			(at 307.34 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7670,7 +7680,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 308.61 125.73 0)
+			(at 307.34 148.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7765,7 +7775,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 210.82 76.2 0)
+		(at 278.13 76.2 0)
 		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
@@ -7774,7 +7784,7 @@
 		(dnp no)
 		(uuid "7f0893da-7f49-4e3b-b433-ea746459e957")
 		(property "Reference" "R42"
-			(at 208.28 74.9299 0)
+			(at 275.59 74.9299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7783,7 +7793,7 @@
 			)
 		)
 		(property "Value" "1k"
-			(at 208.28 77.4699 0)
+			(at 275.59 77.4699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7792,7 +7802,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 212.598 76.2 90)
+			(at 279.908 76.2 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7801,7 +7811,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 210.82 76.2 0)
+			(at 278.13 76.2 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7810,7 +7820,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 210.82 76.2 0)
+			(at 278.13 76.2 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7835,7 +7845,7 @@
 	)
 	(symbol
 		(lib_id "Battery_Management:DS2745U")
-		(at 181.61 64.77 0)
+		(at 248.92 64.77 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7843,7 +7853,7 @@
 		(dnp no)
 		(uuid "847bf7d0-c83d-4a02-b734-c73254827639")
 		(property "Reference" "U6"
-			(at 186.69 55.118 0)
+			(at 254 55.118 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7852,7 +7862,7 @@
 			)
 		)
 		(property "Value" "DS2745U"
-			(at 186.69 57.658 0)
+			(at 254 57.658 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7861,7 +7871,7 @@
 			)
 		)
 		(property "Footprint" "Package_SO:TSSOP-8_3x3mm_P0.65mm"
-			(at 181.61 77.47 0)
+			(at 248.92 77.47 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7870,7 +7880,7 @@
 			)
 		)
 		(property "Datasheet" "https://datasheets.maximintegrated.com/en/ds/DS2745.pdf"
-			(at 184.15 74.93 0)
+			(at 251.46 74.93 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7879,7 +7889,7 @@
 			)
 		)
 		(property "Description" "Current-flow, voltage and temperature measurement to support battery capacity monitoring, 2.5V to 4.5V VDD, -40 to +85 degree Celsius, TSSOP-8"
-			(at 181.61 64.77 0)
+			(at 248.92 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7922,7 +7932,7 @@
 	)
 	(symbol
 		(lib_id "Simulation_SPICE:NMOS")
-		(at 228.6 78.74 90)
+		(at 295.91 78.74 90)
 		(mirror x)
 		(unit 1)
 		(exclude_from_sim no)
@@ -7932,7 +7942,7 @@
 		(fields_autoplaced yes)
 		(uuid "89356b33-68e4-4c9b-972a-448c687a0530")
 		(property "Reference" "Q5"
-			(at 228.6 85.09 90)
+			(at 295.91 85.09 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7940,7 +7950,7 @@
 			)
 		)
 		(property "Value" "NMOS"
-			(at 228.6 87.63 90)
+			(at 295.91 87.63 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7948,7 +7958,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 226.06 83.82 0)
+			(at 293.37 83.82 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7957,7 +7967,7 @@
 			)
 		)
 		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#cha_MOSFETs"
-			(at 241.3 78.74 0)
+			(at 308.61 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7966,7 +7976,7 @@
 			)
 		)
 		(property "Description" "N-MOSFET transistor, drain/source/gate"
-			(at 228.6 78.74 0)
+			(at 295.91 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7975,7 +7985,7 @@
 			)
 		)
 		(property "Sim.Device" "NMOS"
-			(at 245.745 78.74 0)
+			(at 313.055 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7984,7 +7994,7 @@
 			)
 		)
 		(property "Sim.Type" "VDMOS"
-			(at 247.65 78.74 0)
+			(at 314.96 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7993,7 +8003,7 @@
 			)
 		)
 		(property "Sim.Pins" "1=D 2=G 3=S"
-			(at 243.84 78.74 0)
+			(at 311.15 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8119,7 +8129,7 @@
 	)
 	(symbol
 		(lib_id "Simulation_SPICE:NMOS")
-		(at 218.44 78.74 270)
+		(at 285.75 78.74 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8127,7 +8137,7 @@
 		(dnp no)
 		(uuid "93d95525-1d31-4fbf-832a-c859d17306ed")
 		(property "Reference" "Q6"
-			(at 218.44 85.09 90)
+			(at 285.75 85.09 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8135,7 +8145,7 @@
 			)
 		)
 		(property "Value" "NMOS"
-			(at 218.44 87.63 90)
+			(at 285.75 87.63 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8143,7 +8153,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 220.98 83.82 0)
+			(at 288.29 83.82 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8152,7 +8162,7 @@
 			)
 		)
 		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#cha_MOSFETs"
-			(at 205.74 78.74 0)
+			(at 273.05 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8161,7 +8171,7 @@
 			)
 		)
 		(property "Description" "N-MOSFET transistor, drain/source/gate"
-			(at 218.44 78.74 0)
+			(at 285.75 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8170,7 +8180,7 @@
 			)
 		)
 		(property "Sim.Device" "NMOS"
-			(at 201.295 78.74 0)
+			(at 268.605 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8179,7 +8189,7 @@
 			)
 		)
 		(property "Sim.Type" "VDMOS"
-			(at 199.39 78.74 0)
+			(at 266.7 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8188,7 +8198,7 @@
 			)
 		)
 		(property "Sim.Pins" "1=D 2=G 3=S"
-			(at 203.2 78.74 0)
+			(at 270.51 78.74 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8216,7 +8226,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 325.12 120.65 0)
+		(at 323.85 143.51 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8225,7 +8235,7 @@
 		(fields_autoplaced yes)
 		(uuid "9a64254d-777c-4179-872c-ddd0c117d941")
 		(property "Reference" "C41"
-			(at 328.93 119.3799 0)
+			(at 327.66 142.2399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8234,7 +8244,7 @@
 			)
 		)
 		(property "Value" "10u"
-			(at 328.93 121.9199 0)
+			(at 327.66 144.7799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8243,7 +8253,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 326.0852 124.46 0)
+			(at 324.8152 147.32 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8252,7 +8262,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 325.12 120.65 0)
+			(at 323.85 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8261,7 +8271,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 325.12 120.65 0)
+			(at 323.85 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8286,7 +8296,7 @@
 	)
 	(symbol
 		(lib_id "Device:D_Zener")
-		(at 350.52 58.42 270)
+		(at 356.87 58.42 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8295,7 +8305,7 @@
 		(fields_autoplaced yes)
 		(uuid "9fa2001a-e518-4527-9682-6cf6e82d22a8")
 		(property "Reference" "D10"
-			(at 353.06 57.1499 90)
+			(at 359.41 57.1499 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8304,7 +8314,7 @@
 			)
 		)
 		(property "Value" "ESD441"
-			(at 353.06 59.6899 90)
+			(at 359.41 59.6899 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8313,7 +8323,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 350.52 58.42 0)
+			(at 356.87 58.42 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8322,7 +8332,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 350.52 58.42 0)
+			(at 356.87 58.42 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8331,7 +8341,7 @@
 			)
 		)
 		(property "Description" "Zener diode"
-			(at 350.52 58.42 0)
+			(at 356.87 58.42 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8356,7 +8366,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 250.19 120.65 0)
+		(at 248.92 143.51 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8365,7 +8375,7 @@
 		(fields_autoplaced yes)
 		(uuid "a46e47ac-d680-4251-b543-9a8f875ea87a")
 		(property "Reference" "C42"
-			(at 254 119.3799 0)
+			(at 252.73 142.2399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8374,7 +8384,7 @@
 			)
 		)
 		(property "Value" "100n"
-			(at 254 121.9199 0)
+			(at 252.73 144.7799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8383,7 +8393,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 251.1552 124.46 0)
+			(at 249.8852 147.32 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8392,7 +8402,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 250.19 120.65 0)
+			(at 248.92 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8401,7 +8411,7 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 250.19 120.65 0)
+			(at 248.92 143.51 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8496,7 +8506,7 @@
 	)
 	(symbol
 		(lib_id "Battery_Management:DW01A")
-		(at 223.52 64.77 0)
+		(at 290.83 64.77 0)
 		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
@@ -8505,7 +8515,7 @@
 		(dnp no)
 		(uuid "b5b9d506-51dc-4cc5-9586-c4ec179cba5e")
 		(property "Reference" "U10"
-			(at 214.63 55.372 0)
+			(at 281.94 55.372 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8513,7 +8523,7 @@
 			)
 		)
 		(property "Value" "DW01A"
-			(at 214.63 57.912 0)
+			(at 281.94 57.912 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8521,7 +8531,7 @@
 			)
 		)
 		(property "Footprint" "Package_TO_SOT_SMD:SOT-23-6"
-			(at 223.52 64.77 0)
+			(at 290.83 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8530,7 +8540,7 @@
 			)
 		)
 		(property "Datasheet" "https://hmsemi.com/downfile/DW01A.PDF"
-			(at 223.52 64.77 0)
+			(at 290.83 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8539,7 +8549,7 @@
 			)
 		)
 		(property "Description" "Overcharge, overcurrent and overdischarge protection IC for single cell lithium-ion/polymer battery"
-			(at 223.266 63.246 0)
+			(at 290.576 63.246 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8646,7 +8656,7 @@
 	)
 	(symbol
 		(lib_id "power:GND")
-		(at 236.22 147.32 0)
+		(at 234.95 170.18 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8655,7 +8665,7 @@
 		(fields_autoplaced yes)
 		(uuid "c30afc7f-5b6e-41c0-a59f-18b51c65095a")
 		(property "Reference" "#PWR055"
-			(at 236.22 153.67 0)
+			(at 234.95 176.53 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8664,7 +8674,7 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 236.22 152.4 0)
+			(at 234.95 175.26 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8673,7 +8683,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 236.22 147.32 0)
+			(at 234.95 170.18 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8682,7 +8692,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 236.22 147.32 0)
+			(at 234.95 170.18 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8691,7 +8701,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 236.22 147.32 0)
+			(at 234.95 170.18 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8713,7 +8723,7 @@
 	)
 	(symbol
 		(lib_id "Device:Thermistor_NTC")
-		(at 308.61 69.85 0)
+		(at 186.69 69.85 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8722,7 +8732,7 @@
 		(fields_autoplaced yes)
 		(uuid "de80c6e3-ed9d-4dce-8f09-905a5cb699ae")
 		(property "Reference" "TH1"
-			(at 311.15 68.8974 0)
+			(at 189.23 68.8974 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8731,7 +8741,7 @@
 			)
 		)
 		(property "Value" "Thermistor_NTC"
-			(at 311.15 71.4374 0)
+			(at 189.23 71.4374 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8740,7 +8750,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 308.61 68.58 0)
+			(at 186.69 68.58 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8749,7 +8759,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 308.61 68.58 0)
+			(at 186.69 68.58 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8758,7 +8768,7 @@
 			)
 		)
 		(property "Description" "Temperature dependent resistor, negative temperature coefficient"
-			(at 308.61 69.85 0)
+			(at 186.69 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8783,7 +8793,7 @@
 	)
 	(symbol
 		(lib_id "power:GND")
-		(at 345.44 64.77 0)
+		(at 351.79 64.77 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8792,7 +8802,7 @@
 		(fields_autoplaced yes)
 		(uuid "dea3d8f7-91ee-4637-be17-a11dbcb4741f")
 		(property "Reference" "#PWR015"
-			(at 345.44 71.12 0)
+			(at 351.79 71.12 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8801,7 +8811,7 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 345.44 69.85 0)
+			(at 351.79 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8810,7 +8820,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 345.44 64.77 0)
+			(at 351.79 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8819,7 +8829,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 345.44 64.77 0)
+			(at 351.79 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8828,7 +8838,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 345.44 64.77 0)
+			(at 351.79 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9011,7 +9021,7 @@
 	)
 	(symbol
 		(lib_id "Device:D_Zener")
-		(at 350.52 68.58 90)
+		(at 356.87 68.58 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -9020,7 +9030,7 @@
 		(fields_autoplaced yes)
 		(uuid "fb17bcfe-0764-4f32-a0a6-f275152fdc0c")
 		(property "Reference" "D11"
-			(at 353.06 67.3099 90)
+			(at 359.41 67.3099 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9029,7 +9039,7 @@
 			)
 		)
 		(property "Value" "ESD441"
-			(at 353.06 69.8499 90)
+			(at 359.41 69.8499 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9038,7 +9048,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 350.52 68.58 0)
+			(at 356.87 68.58 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9047,7 +9057,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 350.52 68.58 0)
+			(at 356.87 68.58 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9056,7 +9066,7 @@
 			)
 		)
 		(property "Description" "Zener diode"
-			(at 350.52 68.58 0)
+			(at 356.87 68.58 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9172,7 +9182,7 @@
 		)
 	)
 	(sheet
-		(at 353.06 107.95)
+		(at 351.79 130.81)
 		(size 25.4 12.7)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -9188,7 +9198,7 @@
 		)
 		(uuid "efdabaa1-4e6c-4b02-8574-dea8c0bb89ea")
 		(property "Sheetname" "Ideal diode"
-			(at 353.06 107.2384 0)
+			(at 351.79 130.0984 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9197,7 +9207,7 @@
 			)
 		)
 		(property "Sheetfile" "block/ideal_diode.kicad_sch"
-			(at 353.06 121.2346 0)
+			(at 351.79 144.0946 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9206,7 +9216,7 @@
 			)
 		)
 		(pin "INPUT" input
-			(at 353.06 110.49 180)
+			(at 351.79 133.35 180)
 			(uuid "6efc13cf-a8bb-451e-95f9-09f8d96ef974")
 			(effects
 				(font
@@ -9216,7 +9226,7 @@
 			)
 		)
 		(pin "GND" passive
-			(at 365.76 120.65 270)
+			(at 364.49 143.51 270)
 			(uuid "0b0ab1bb-13ac-4278-9b2b-01511e4cb6c9")
 			(effects
 				(font
@@ -9226,7 +9236,7 @@
 			)
 		)
 		(pin "OUT" output
-			(at 378.46 110.49 0)
+			(at 377.19 133.35 0)
 			(uuid "08fe77d8-71e8-4600-b71a-b7bd34510937")
 			(effects
 				(font
diff --git a/Hardware/keyboard_controller/block/battery_control.kicad_sch b/Hardware/keyboard_controller/block/battery_control.kicad_sch
index e2a1618..9887f77 100644
--- a/Hardware/keyboard_controller/block/battery_control.kicad_sch
+++ b/Hardware/keyboard_controller/block/battery_control.kicad_sch
@@ -279,18 +279,15 @@
 			)
 			(embedded_fonts no)
 		)
-		(symbol "Simulation_SPICE:NMOS"
-			(pin_numbers
-				(hide yes)
-			)
+		(symbol "Transistor_FET:2N7002"
 			(pin_names
-				(offset 0)
+				(hide yes)
 			)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
 			(property "Reference" "Q"
-				(at 5.08 1.27 0)
+				(at 5.08 1.905 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -298,8 +295,8 @@
 					(justify left)
 				)
 			)
-			(property "Value" "NMOS"
-				(at 5.08 -1.27 0)
+			(property "Value" "2N7002"
+				(at 5.08 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -307,25 +304,28 @@
 					(justify left)
 				)
 			)
-			(property "Footprint" ""
-				(at 5.08 2.54 0)
+			(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+				(at 5.08 -1.905 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+						(italic yes)
+					)
+					(justify left)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "https://www.onsemi.com/pub/Collateral/NDS7002A-D.PDF"
+				(at 5.08 -3.81 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 					(hide yes)
 				)
 			)
-			(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#cha_MOSFETs"
-				(at 0 -12.7 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "N-MOSFET transistor, drain/source/gate"
+			(property "Description" "0.115A Id, 60V Vds, N-Channel MOSFET, SOT-23"
 				(at 0 0 0)
 				(effects
 					(font
@@ -334,34 +334,7 @@
 					(hide yes)
 				)
 			)
-			(property "Sim.Device" "NMOS"
-				(at 0 -17.145 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Sim.Type" "VDMOS"
-				(at 0 -19.05 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Sim.Pins" "1=D 2=G 3=S"
-				(at 0 -15.24 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "transistor NMOS N-MOS N-MOSFET simulation"
+			(property "ki_keywords" "N-Channel Switching MOSFET"
 				(at 0 0 0)
 				(effects
 					(font
@@ -370,7 +343,16 @@
 					(hide yes)
 				)
 			)
-			(symbol "NMOS_0_1"
+			(property "ki_fp_filters" "SOT?23*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "2N7002_0_1"
 				(polyline
 					(pts
 						(xy 0.254 1.905) (xy 0.254 -1.905)
@@ -537,7 +519,7 @@
 					)
 				)
 			)
-			(symbol "NMOS_1_1"
+			(symbol "2N7002_1_1"
 				(pin input line
 					(at -5.08 0 0)
 					(length 2.54)
@@ -548,7 +530,7 @@
 							)
 						)
 					)
-					(number "2"
+					(number "1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -566,7 +548,7 @@
 							)
 						)
 					)
-					(number "1"
+					(number "3"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -584,7 +566,7 @@
 							)
 						)
 					)
-					(number "3"
+					(number "2"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -595,18 +577,15 @@
 			)
 			(embedded_fonts no)
 		)
-		(symbol "Simulation_SPICE:PMOS"
-			(pin_numbers
-				(hide yes)
-			)
+		(symbol "Transistor_FET:BSS84"
 			(pin_names
-				(offset 0)
+				(hide yes)
 			)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
 			(property "Reference" "Q"
-				(at 5.08 1.27 0)
+				(at 5.08 1.905 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -614,8 +593,8 @@
 					(justify left)
 				)
 			)
-			(property "Value" "PMOS"
-				(at 5.08 -1.27 0)
+			(property "Value" "BSS84"
+				(at 5.08 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -623,25 +602,28 @@
 					(justify left)
 				)
 			)
-			(property "Footprint" ""
-				(at 5.08 2.54 0)
+			(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+				(at 5.08 -1.905 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+						(italic yes)
+					)
+					(justify left)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "http://assets.nexperia.com/documents/data-sheet/BSS84.pdf"
+				(at 5.08 -3.81 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 					(hide yes)
 				)
 			)
-			(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#cha_MOSFETs"
-				(at 0 -12.7 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "P-MOSFET transistor, drain/source/gate"
+			(property "Description" "-0.13A Id, -50V Vds, P-Channel MOSFET, SOT-23"
 				(at 0 0 0)
 				(effects
 					(font
@@ -650,34 +632,7 @@
 					(hide yes)
 				)
 			)
-			(property "Sim.Device" "PMOS"
-				(at 0 -17.145 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Sim.Type" "VDMOS"
-				(at 0 -19.05 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Sim.Pins" "1=D 2=G 3=S"
-				(at 0 -15.24 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "transistor PMOS P-MOS P-MOSFET simulation"
+			(property "ki_keywords" "P-Channel MOSFET"
 				(at 0 0 0)
 				(effects
 					(font
@@ -686,7 +641,16 @@
 					(hide yes)
 				)
 			)
-			(symbol "PMOS_0_1"
+			(property "ki_fp_filters" "SOT?23*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "BSS84_0_1"
 				(polyline
 					(pts
 						(xy 0.254 1.905) (xy 0.254 -1.905)
@@ -853,7 +817,7 @@
 					)
 				)
 			)
-			(symbol "PMOS_1_1"
+			(symbol "BSS84_1_1"
 				(pin input line
 					(at -5.08 0 0)
 					(length 2.54)
@@ -864,7 +828,7 @@
 							)
 						)
 					)
-					(number "2"
+					(number "1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -882,7 +846,7 @@
 							)
 						)
 					)
-					(number "1"
+					(number "3"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -900,7 +864,7 @@
 							)
 						)
 					)
-					(number "3"
+					(number "2"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -1161,7 +1125,7 @@
 			(width 0)
 			(type default)
 		)
-		(uuid "446e9cf5-9731-4e49-a348-38b7be3af14a")
+		(uuid "4c36f145-4652-4c00-9daf-7a66ccb143f9")
 	)
 	(wire
 		(pts
@@ -1409,7 +1373,7 @@
 		(uuid "d192d4f5-118b-475e-a313-1f36eeadf14d")
 	)
 	(symbol
-		(lib_id "Simulation_SPICE:NMOS")
+		(lib_id "Transistor_FET:2N7002")
 		(at 78.74 76.2 0)
 		(unit 1)
 		(exclude_from_sim no)
@@ -1417,8 +1381,8 @@
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "babcaa4b-b503-4b40-9291-76d24e683551")
-		(property "Reference" "Q14"
+		(uuid "b5a6d8e4-104e-4671-b940-28fcc733232a")
+		(property "Reference" "Q11"
 			(at 85.09 74.9299 0)
 			(effects
 				(font
@@ -1427,7 +1391,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "NMOS"
+		(property "Value" "2N7002"
 			(at 85.09 77.4699 0)
 			(effects
 				(font
@@ -1436,25 +1400,28 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 83.82 73.66 0)
+		(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+			(at 83.82 78.105 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+					(italic yes)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/NDS7002A-D.PDF"
+			(at 83.82 80.01 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#cha_MOSFETs"
-			(at 78.74 88.9 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "N-MOSFET transistor, drain/source/gate"
+		(property "Description" "0.115A Id, 60V Vds, N-Channel MOSFET, SOT-23"
 			(at 78.74 76.2 0)
 			(effects
 				(font
@@ -1463,8 +1430,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Device" "NMOS"
-			(at 78.74 93.345 0)
+		(property "Sim.Library" "model/2N7002.lib"
+			(at 78.74 76.2 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1472,8 +1439,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "VDMOS"
-			(at 78.74 95.25 0)
+		(property "Sim.Name" "N7002"
+			(at 78.74 76.2 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1481,8 +1448,17 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=D 2=G 3=S"
-			(at 78.74 91.44 0)
+		(property "Sim.Device" "SUBCKT"
+			(at 78.74 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=20 2=30 3=10"
+			(at 78.74 76.2 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1491,22 +1467,138 @@
 			)
 		)
 		(pin "3"
-			(uuid "bf57b6a1-1fa4-44dd-9a48-bd3234b56459")
-		)
-		(pin "1"
-			(uuid "f8756db2-9355-4b62-8dcb-46ef8d2b7e46")
+			(uuid "370923f0-9cad-44e7-891a-d667278386e4")
 		)
 		(pin "2"
-			(uuid "e1bced50-b647-4cb4-8e94-6ffde1bec718")
+			(uuid "7f82e317-524c-4a38-9f20-77ab7f7dcf07")
+		)
+		(pin "1"
+			(uuid "8624f745-2887-44d1-a848-42d7a56879fb")
 		)
 		(instances
 			(project "keyboard_controller"
 				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
+					(reference "Q11")
+					(unit 1)
+				)
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
 					(reference "Q14")
 					(unit 1)
 				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "Q17")
+			)
+		)
+	)
+	(symbol
+		(lib_id "Transistor_FET:2N7002")
+		(at 78.74 57.15 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "bc6dd992-d26f-486f-a956-4cc83a9f90a6")
+		(property "Reference" "Q12"
+			(at 85.09 55.8799 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "2N7002"
+			(at 85.09 58.4199 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+			(at 83.82 59.055 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+					(italic yes)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/NDS7002A-D.PDF"
+			(at 83.82 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+		(property "Description" "0.115A Id, 60V Vds, N-Channel MOSFET, SOT-23"
+			(at 78.74 57.15 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Library" "model/2N7002.lib"
+			(at 78.74 57.15 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "N7002"
+			(at 78.74 57.15 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "SUBCKT"
+			(at 78.74 57.15 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=20 2=30 3=10"
+			(at 78.74 57.15 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "3"
+			(uuid "aef49599-8ab5-4dc0-bd43-5c14213b7ba2")
+		)
+		(pin "2"
+			(uuid "a13c9f43-3a9c-42b0-a8e5-3f2c71d128d1")
+		)
+		(pin "1"
+			(uuid "6a917120-4258-4a4e-ad95-a97c26958cc4")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
+					(reference "Q12")
+					(unit 1)
+				)
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "Q13")
 					(unit 1)
 				)
 			)
@@ -1568,10 +1660,10 @@
 			)
 		)
 		(pin "2"
-			(uuid "a979316c-d7b1-429c-ae54-8239df4e5694")
+			(uuid "92891d20-9d35-4627-8c41-030dcd90b24b")
 		)
 		(pin "1"
-			(uuid "63e46c7d-7e9c-48c6-9fa4-3e8c2f07506a")
+			(uuid "1211b8a5-8ffb-47f7-a585-88b86d9e939f")
 		)
 		(instances
 			(project "keyboard_controller"
@@ -1579,8 +1671,8 @@
 					(reference "R79")
 					(unit 1)
 				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "R84")
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "R74")
 					(unit 1)
 				)
 			)
@@ -1605,7 +1697,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "10k"
+		(property "Value" "47k"
 			(at 68.58 63.4999 0)
 			(effects
 				(font
@@ -1642,10 +1734,10 @@
 			)
 		)
 		(pin "2"
-			(uuid "3724677b-2cff-4a93-91c4-52e360db36e8")
+			(uuid "ed763710-ba3e-43c6-9c87-06fa13f06508")
 		)
 		(pin "1"
-			(uuid "89405980-aae0-4657-b1fa-16c80af311ea")
+			(uuid "b56bdc4f-6677-4655-9ded-68cc2dec097d")
 		)
 		(instances
 			(project "keyboard_controller"
@@ -1653,224 +1745,8 @@
 					(reference "R75")
 					(unit 1)
 				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "R83")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "power:GND")
-		(at 99.06 40.64 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "e08c7d8c-10e2-4f5c-8af5-6484e0fb2f18")
-		(property "Reference" "#PWR058"
-			(at 99.06 46.99 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Value" "GND"
-			(at 99.06 45.72 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Footprint" ""
-			(at 99.06 40.64 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" ""
-			(at 99.06 40.64 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 99.06 40.64 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "1ae19f1d-ebb6-46f3-a7b0-f74795d9f994")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "#PWR058")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "#PWR062")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R")
-		(at 66.04 36.83 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "e541b9a1-8acd-4257-b76a-3edcb2ee6780")
-		(property "Reference" "R61"
-			(at 68.58 35.5599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "47k"
-			(at 68.58 38.0999 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at 64.262 36.83 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 66.04 36.83 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor"
-			(at 66.04 36.83 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "929537b4-608e-4b18-a4eb-a9966f3686f4")
-		)
-		(pin "1"
-			(uuid "dda1a785-de9d-41c3-a52f-012f704e07c9")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "R61")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "R82")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "power:GND")
-		(at 66.04 87.63 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "e5e4ed02-1336-49dd-b091-87e38d1182f7")
-		(property "Reference" "#PWR057"
-			(at 66.04 93.98 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Value" "GND"
-			(at 66.04 92.71 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Footprint" ""
-			(at 66.04 87.63 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" ""
-			(at 66.04 87.63 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 66.04 87.63 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "d153a4d8-2d94-4995-be34-03a26bc261d5")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "#PWR057")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "#PWR061")
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "R72")
 					(unit 1)
 				)
 			)
@@ -1885,8 +1761,8 @@
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "e6807c16-93d3-4230-ac5b-a88332d2b203")
-		(property "Reference" "D13"
+		(uuid "d7986eaa-d6b7-4903-a367-ebfd775cd947")
+		(property "Reference" "D14"
 			(at 83.82 46.0374 90)
 			(effects
 				(font
@@ -1950,26 +1826,242 @@
 			)
 		)
 		(pin "2"
-			(uuid "c710b228-9dad-4277-b97e-69f6b9e12bc5")
+			(uuid "162ba35f-9a68-4705-8a43-a4737ffc0b5a")
 		)
 		(pin "1"
-			(uuid "6d90f9a0-e2c0-474b-988e-c1398db2b6a5")
+			(uuid "203e5c90-789e-4845-abc3-8a8a2690b22c")
 		)
 		(instances
-			(project ""
+			(project "keyboard_controller"
 				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "D13")
+					(reference "D14")
 					(unit 1)
 				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "D14")
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "D15")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Simulation_SPICE:PMOS")
+		(lib_id "power:GND")
+		(at 99.06 40.64 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "e08c7d8c-10e2-4f5c-8af5-6484e0fb2f18")
+		(property "Reference" "#PWR058"
+			(at 99.06 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 99.06 45.72 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" ""
+			(at 99.06 40.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 99.06 40.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 99.06 40.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "585208eb-c551-4020-989b-de57882bbe72")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
+					(reference "#PWR058")
+					(unit 1)
+				)
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "#PWR056")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Device:R")
+		(at 66.04 36.83 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "e541b9a1-8acd-4257-b76a-3edcb2ee6780")
+		(property "Reference" "R61"
+			(at 68.58 35.5599 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "47k"
+			(at 68.58 38.0999 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" ""
+			(at 64.262 36.83 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 66.04 36.83 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 66.04 36.83 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "12d38b60-e8c6-4b60-b35b-024b25716949")
+		)
+		(pin "1"
+			(uuid "693acade-2a16-4063-90d0-1ca1023c11ee")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
+					(reference "R61")
+					(unit 1)
+				)
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "R56")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at 66.04 87.63 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "e5e4ed02-1336-49dd-b091-87e38d1182f7")
+		(property "Reference" "#PWR057"
+			(at 66.04 93.98 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 66.04 92.71 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" ""
+			(at 66.04 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 66.04 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 66.04 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "5bd10ef0-ce64-459f-983a-55718d59ad38")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
+					(reference "#PWR057")
+					(unit 1)
+				)
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "#PWR024")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Transistor_FET:BSS84")
 		(at 81.28 34.29 270)
 		(mirror x)
 		(unit 1)
@@ -1978,8 +2070,8 @@
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "f8b3d1b4-a079-4efe-b330-f2756507161e")
-		(property "Reference" "Q15"
+		(uuid "f0e787f9-5959-45d3-89b4-2cb1f439d3e2")
+		(property "Reference" "Q16"
 			(at 81.28 25.4 90)
 			(effects
 				(font
@@ -1987,7 +2079,7 @@
 				)
 			)
 		)
-		(property "Value" "PMOS"
+		(property "Value" "BSS84"
 			(at 81.28 27.94 90)
 			(effects
 				(font
@@ -1995,25 +2087,28 @@
 				)
 			)
 		)
-		(property "Footprint" ""
-			(at 83.82 29.21 0)
+		(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+			(at 79.375 29.21 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+					(italic yes)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "http://assets.nexperia.com/documents/data-sheet/BSS84.pdf"
+			(at 77.47 29.21 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#cha_MOSFETs"
-			(at 68.58 34.29 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "P-MOSFET transistor, drain/source/gate"
+		(property "Description" "-0.13A Id, -50V Vds, P-Channel MOSFET, SOT-23"
 			(at 81.28 34.29 0)
 			(effects
 				(font
@@ -2022,8 +2117,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Device" "PMOS"
-			(at 64.135 34.29 0)
+		(property "Sim.Library" "model/BSS84.lib"
+			(at 81.28 34.29 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2031,8 +2126,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "VDMOS"
-			(at 62.23 34.29 0)
+		(property "Sim.Name" "BSS84"
+			(at 81.28 34.29 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2040,8 +2135,17 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=D 2=G 3=S"
-			(at 66.04 34.29 0)
+		(property "Sim.Device" "SUBCKT"
+			(at 81.28 34.29 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=4 2=5 3=3"
+			(at 81.28 34.29 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2050,22 +2154,22 @@
 			)
 		)
 		(pin "3"
-			(uuid "df6d5dd9-e15b-4552-a27a-4e7b358a7930")
-		)
-		(pin "2"
-			(uuid "097d3ed0-846a-43b4-bd0e-ea5490d20668")
+			(uuid "3e894033-dffa-4430-9e41-6fa3de4feef0")
 		)
 		(pin "1"
-			(uuid "1848a703-5b48-4094-b1ee-5a6882aee0e9")
+			(uuid "a525d3af-33c1-442f-a1ce-7cd730d5e951")
+		)
+		(pin "2"
+			(uuid "4f45ae07-f1ef-4691-9146-2e882d274857")
 		)
 		(instances
 			(project "keyboard_controller"
 				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "Q15")
+					(reference "Q16")
 					(unit 1)
 				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "Q18")
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "Q17")
 					(unit 1)
 				)
 			)
@@ -2127,10 +2231,10 @@
 			)
 		)
 		(pin "2"
-			(uuid "8d28c21b-b77a-4d41-9feb-c234588fbef3")
+			(uuid "025d06c4-fc47-46aa-9c40-de0a335c4f40")
 		)
 		(pin "1"
-			(uuid "2ef3eba1-43e4-49d3-9d4b-ea55fa31027d")
+			(uuid "68405fb9-b9eb-4534-8ba1-f85e2533f968")
 		)
 		(instances
 			(project "keyboard_controller"
@@ -2138,112 +2242,8 @@
 					(reference "R80")
 					(unit 1)
 				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "R85")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Simulation_SPICE:NMOS")
-		(at 78.74 57.15 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "fdb337dd-85b1-4cea-96c1-5bcd4533b0c4")
-		(property "Reference" "Q13"
-			(at 85.09 55.8799 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "NMOS"
-			(at 85.09 58.4199 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at 83.82 54.61 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#cha_MOSFETs"
-			(at 78.74 69.85 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "N-MOSFET transistor, drain/source/gate"
-			(at 78.74 57.15 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NMOS"
-			(at 78.74 74.295 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "VDMOS"
-			(at 78.74 76.2 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=D 2=G 3=S"
-			(at 78.74 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "3"
-			(uuid "180b81ba-5a4c-446e-8ba8-f115d0cb315d")
-		)
-		(pin "1"
-			(uuid "84a91040-7048-4bb0-ab1c-357147e86757")
-		)
-		(pin "2"
-			(uuid "c4013ac4-4b14-437c-bf40-ba0370c16269")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "Q13")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7fd36229-4776-4797-8f6d-d4ae4045346d"
-					(reference "Q16")
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
+					(reference "R81")
 					(unit 1)
 				)
 			)
diff --git a/Hardware/keyboard_controller/block/ideal_diode.kicad_sch b/Hardware/keyboard_controller/block/ideal_diode.kicad_sch
index 2bf44f4..8423cb7 100644
--- a/Hardware/keyboard_controller/block/ideal_diode.kicad_sch
+++ b/Hardware/keyboard_controller/block/ideal_diode.kicad_sch
@@ -1226,22 +1226,22 @@
 			)
 		)
 		(pin "3"
-			(uuid "8943e3e5-5171-4f5a-9c87-4c3ad53a29ef")
+			(uuid "8943e3e5-5171-4f5a-9c87-4c3ad53a29f0")
 		)
 		(pin "2"
-			(uuid "44850ec9-8de9-44c4-b0ff-ae8afbc7bb08")
+			(uuid "44850ec9-8de9-44c4-b0ff-ae8afbc7bb09")
 		)
 		(pin "6"
-			(uuid "caa22a55-e331-47c0-9744-6e0f6378be94")
+			(uuid "caa22a55-e331-47c0-9744-6e0f6378be95")
 		)
 		(pin "4"
-			(uuid "29985eda-8500-4ba4-a210-6d6b1992dc69")
+			(uuid "29985eda-8500-4ba4-a210-6d6b1992dc6a")
 		)
 		(pin "1"
-			(uuid "a373da5e-d15a-4879-ad7a-ffaaf30e5bc4")
+			(uuid "a373da5e-d15a-4879-ad7a-ffaaf30e5bc5")
 		)
 		(pin "5"
-			(uuid "b2c73db4-4c11-4655-bac8-4c4fa5211dfa")
+			(uuid "b2c73db4-4c11-4655-bac8-4c4fa5211dfb")
 		)
 		(instances
 			(project ""
diff --git a/Hardware/keyboard_controller/model/2N7002.lib b/Hardware/keyboard_controller/model/2N7002.lib
new file mode 100644
index 0000000..b08674b
--- /dev/null
+++ b/Hardware/keyboard_controller/model/2N7002.lib
@@ -0,0 +1,41 @@
+* DIODES INCORPORATED AND ITS AFFILIATED COMPANIES AND SUBSIDIARIES (COLLECTIVELY, "DIODES") 
+* PROVIDE THESE SPICE MODELS AND DATA (COLLECTIVELY, THE "SM DATA") "AS IS" AND WITHOUT ANY 
+* REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING ANY WARRANTY OF MERCHANTABILITY 
+* OR FITNESS FOR A PARTICULAR PURPOSE, ANY WARRANTY ARISING FROM COURSE OF DEALING OR COURSE OF 
+* PERFORMANCE, OR ANY WARRANTY THAT ACCESS TO OR OPERATION OF THE SM DATA WILL BE UNINTERRUPTED, 
+* OR THAT THE SM DATA OR ANY SIMULATION USING THE SM DATA WILL BE ERROR FREE. TO THE MAXIMUM 
+* EXTENT PERMITTED BY LAW, IN NO EVENT WILL DIODES BE LIABLE FOR ANY DIRECT OR INDIRECT, 
+* SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION WITH 
+* THE PRODUCTION OR USE OF SM DATA, HOWEVER CAUSED AND UNDER WHATEVER CAUSE OF ACTION OR THEORY 
+* OF LIABILITY BROUGHT (INCLUDING, WITHOUT LIMITATION, UNDER ANY CONTRACT, NEGLIGENCE OR OTHER 
+* TORT THEORY OF LIABILITY), EVEN IF DIODES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, 
+* AND DIODES' TOTAL LIABILITY (WHETHER IN CONTRACT, TORT OR OTHERWISE) WITH REGARD TO THE SM 
+* DATA WILL NOT, IN THE AGGREGATE, EXCEED ANY SUMS PAID BY YOU TO DIODES FOR THE SM DATA.
+
+
+
+*---------- 2N7002 Spice Model ----------
+.SUBCKT N7002 10 20 30 
+*     TERMINALS:  D  G  S
+M1 1 2 3 3 NMOS L = 1E-006 W = 1E-006 
+RD 10 1 0.976 
+RS 30 3 0.001 
+RG 20 2 160.6 
+CGS 2 3 2E-011 
+EGD 12 0 2 1 1 
+VFB 14 0 0 
+FFB 2 1 VFB 1 
+CGD 13 14 5.9E-011 
+R1 13 0 1 
+D1 12 13 DLIM 
+DDG 15 14 DCGD 
+R2 12 15 1 
+D2 15 0 DLIM 
+DSD 3 10 DSUB 
+.MODEL NMOS NMOS LEVEL = 3 VMAX = 1E+006 ETA = 0 VTO = 2.154 
++ TOX = 6E-008 NSUB = 1E+016 KP = 0.4654 KAPPA = 1E-015 U0 = 400 
+.MODEL DCGD D CJO = 1.2E-011 VJ = 0.6 M = 0.6 
+.MODEL DSUB D IS = 6.808E-010 N = 1.576 RS = 0.1408 BV = 72 CJO = 8E-012 VJ = 0.8 M = 0.6474 
+.MODEL DLIM D IS = 0.0001 
+.ENDS
+*Diodes N7002 Spice Model v0 Last Revised 2017/2/9
\ No newline at end of file
diff --git a/Hardware/keyboard_controller/model/BSS84.lib b/Hardware/keyboard_controller/model/BSS84.lib
new file mode 100644
index 0000000..828dc3b
--- /dev/null
+++ b/Hardware/keyboard_controller/model/BSS84.lib
@@ -0,0 +1,34 @@
+* DIODES INCORPORATED AND ITS AFFILIATED COMPANIES AND SUBSIDIARIES (COLLECTIVELY, "DIODES") 
+* PROVIDE THESE SPICE MODELS AND DATA (COLLECTIVELY, THE "SM DATA") "AS IS" AND WITHOUT ANY 
+* REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING ANY WARRANTY OF MERCHANTABILITY 
+* OR FITNESS FOR A PARTICULAR PURPOSE, ANY WARRANTY ARISING FROM COURSE OF DEALING OR COURSE OF 
+* PERFORMANCE, OR ANY WARRANTY THAT ACCESS TO OR OPERATION OF THE SM DATA WILL BE UNINTERRUPTED, 
+* OR THAT THE SM DATA OR ANY SIMULATION USING THE SM DATA WILL BE ERROR FREE. TO THE MAXIMUM 
+* EXTENT PERMITTED BY LAW, IN NO EVENT WILL DIODES BE LIABLE FOR ANY DIRECT OR INDIRECT, 
+* SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION WITH 
+* THE PRODUCTION OR USE OF SM DATA, HOWEVER CAUSED AND UNDER WHATEVER CAUSE OF ACTION OR THEORY 
+* OF LIABILITY BROUGHT (INCLUDING, WITHOUT LIMITATION, UNDER ANY CONTRACT, NEGLIGENCE OR OTHER 
+* TORT THEORY OF LIABILITY), EVEN IF DIODES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, 
+* AND DIODES' TOTAL LIABILITY (WHETHER IN CONTRACT, TORT OR OTHERWISE) WITH REGARD TO THE SM 
+* DATA WILL NOT, IN THE AGGREGATE, EXCEED ANY SUMS PAID BY YOU TO DIODES FOR THE SM DATA.
+
+
+
+*ZETEX BSS84 Spice Model v1.1 Last Revised 3/5/00
+    *              
+    .SUBCKT BSS84 3 4 5
+    * NODES: DRAIN GATE SOURCE
+    M1 3 2 5 5 MOD1
+    RG 4 2 167
+    RL 3 5 50E6
+    C1 2 5 26P
+    C2 3 2 4P 
+    D1 3 5 DIODE1
+    *
+    .MODEL MOD1 PMOS VTO=-1.709 RS=3.091 RD=0.979 IS=1E-15 KP=0.146
+    +CBD=12P PB=1
+    .MODEL DIODE1 D IS=1.072E-13 RS=0.527 N=1.077
+    .ENDS BSS84
+    *
+    *$
+    *
\ No newline at end of file
diff --git a/Hardware/keyboard_controller/testbench/battery_control.kicad_sch b/Hardware/keyboard_controller/testbench/battery_control.kicad_sch
index fffbd35..3848875 100644
--- a/Hardware/keyboard_controller/testbench/battery_control.kicad_sch
+++ b/Hardware/keyboard_controller/testbench/battery_control.kicad_sch
@@ -1471,7 +1471,7 @@
 		(fill
 			(color 0 0 0 0.0000)
 		)
-		(uuid "7fd36229-4776-4797-8f6d-d4ae4045346d")
+		(uuid "7181fa6b-855a-471b-8c8b-dec603900d3d")
 		(property "Sheetname" "Battery Control"
 			(at 135.89 81.8384 0)
 			(effects
@@ -1481,7 +1481,7 @@
 				(justify left bottom)
 			)
 		)
-		(property "Sheetfile" "block/battery_control.kicad_sch"
+		(property "Sheetfile" "../block/battery_control.kicad_sch"
 			(at 135.89 98.3746 0)
 			(effects
 				(font
@@ -1492,7 +1492,7 @@
 		)
 		(pin "CHARGER_EN" output
 			(at 173.99 86.36 0)
-			(uuid "89b39f14-2aa4-44cf-8339-1cf969965ce7")
+			(uuid "a50de9c3-4a41-40a4-aa95-07e1e01bda06")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1502,7 +1502,7 @@
 		)
 		(pin "BATT_BOOST_EN" output
 			(at 173.99 90.17 0)
-			(uuid "917ca3c7-cceb-465d-876e-396c3399973c")
+			(uuid "5a9b20a0-e184-4b8f-8e0c-6cac8edc2f2f")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1512,7 +1512,7 @@
 		)
 		(pin "CTR_CHARGER_EN" input
 			(at 135.89 86.36 180)
-			(uuid "17066dec-9ac1-4c70-80c9-7ec8174eb896")
+			(uuid "99032f4e-b0a4-4ac8-b07c-9f879873a70a")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1522,7 +1522,7 @@
 		)
 		(pin "SNS_USB_CONN" input
 			(at 135.89 93.98 180)
-			(uuid "6e7baf1b-d392-4a03-86fd-99d5296806c6")
+			(uuid "2ce735be-fd3c-4fad-9f0f-1437775a74ff")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1532,7 +1532,7 @@
 		)
 		(pin "SNS_BATT_CONN" input
 			(at 135.89 90.17 180)
-			(uuid "500ca1c3-faf6-4b24-9ffc-687c7734b4ef")
+			(uuid "8a430cc5-abfa-4868-b6e2-0704123c392c")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -1543,7 +1543,7 @@
 		(instances
 			(project "keyboard_controller"
 				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39"
-					(page "13")
+					(page "12")
 				)
 			)
 		)
diff --git a/Hardware/keyboard_controller/testbench/battery_control.wbk b/Hardware/keyboard_controller/testbench/battery_control.wbk
index 5c8ca64..76e0dd8 100644
--- a/Hardware/keyboard_controller/testbench/battery_control.wbk
+++ b/Hardware/keyboard_controller/testbench/battery_control.wbk
@@ -19,13 +19,7 @@
       },
       "measurements": [],
       "showGrid": true,
-      "traces": [
-        {
-          "color": "rgb(228, 26, 28)",
-          "signal": "V(/Battery_Control_Testbench/BATT_BOOST_EN)",
-          "trace_type": 257
-        }
-      ]
+      "traces": []
     }
   ],
   "user_defined_signals": [],