diff --git a/Hardware/keyboard_controller/MCU.kicad_sch b/Hardware/keyboard_controller/MCU.kicad_sch
index f9aa061..1fd1470 100644
--- a/Hardware/keyboard_controller/MCU.kicad_sch
+++ b/Hardware/keyboard_controller/MCU.kicad_sch
@@ -6648,7 +6648,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "4k7"
+		(property "Value" "10k"
 			(at 178.054 50.8 0)
 			(effects
 				(font
@@ -7963,7 +7963,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "4k7"
+		(property "Value" "10k"
 			(at 185.674 50.8 0)
 			(effects
 				(font
@@ -9975,7 +9975,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "4k7"
+		(property "Value" "10k"
 			(at 155.194 50.8 0)
 			(effects
 				(font
diff --git a/Hardware/keyboard_controller/PWR.kicad_sch b/Hardware/keyboard_controller/PWR.kicad_sch
index 6124703..7a4696f 100644
--- a/Hardware/keyboard_controller/PWR.kicad_sch
+++ b/Hardware/keyboard_controller/PWR.kicad_sch
@@ -1939,7 +1939,7 @@
 					)
 				)
 				(pin open_collector line
-					(at 21.59 24.13 180)
+					(at 22.86 24.13 180)
 					(length 2.54)
 					(name "VBUS_EN_SNK"
 						(effects
@@ -1957,7 +1957,7 @@
 					)
 				)
 				(pin bidirectional line
-					(at 21.59 21.59 180)
+					(at 22.86 21.59 180)
 					(length 2.54)
 					(name "DISCH"
 						(effects
@@ -3145,11 +3145,12 @@
 	)
 	(text "24V (WV)"
 		(exclude_from_sim no)
-		(at 92.964 56.134 0)
+		(at 87.63 56.134 0)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
+			(justify left)
 		)
 		(uuid "2bcc0bc7-c71b-4ffe-9e39-f3d9751e120a")
 	)
@@ -3206,6 +3207,12 @@
 		(color 0 0 0 0)
 		(uuid "3742b0d5-8344-4d5f-8029-0703680d4694")
 	)
+	(junction
+		(at 222.25 54.61)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "577273d0-a8dc-46c5-983b-860c86e7b7f1")
+	)
 	(junction
 		(at 55.88 104.14)
 		(diameter 0)
@@ -3224,6 +3231,12 @@
 		(color 0 0 0 0)
 		(uuid "5a12df73-ad66-4906-839a-ba5c09159536")
 	)
+	(junction
+		(at 222.25 52.07)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "72381a90-3e0f-4cc3-8d51-fe04834ba1c3")
+	)
 	(junction
 		(at 71.12 120.65)
 		(diameter 0)
@@ -3236,12 +3249,6 @@
 		(color 0 0 0 0)
 		(uuid "8ee9de43-95e6-4114-9c4a-e5e8d6213c7f")
 	)
-	(junction
-		(at 222.25 49.53)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "92af8606-b7b0-4014-9788-b7a240a71c59")
-	)
 	(junction
 		(at 180.34 41.91)
 		(diameter 0)
@@ -3254,6 +3261,12 @@
 		(color 0 0 0 0)
 		(uuid "9e1c0c00-b472-49f5-898c-9222d2bd1b7b")
 	)
+	(junction
+		(at 190.5 60.96)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "a2ad1c39-5c67-40c8-a942-48bc231c4fe1")
+	)
 	(junction
 		(at 170.18 41.91)
 		(diameter 0)
@@ -3372,6 +3385,16 @@
 		)
 		(uuid "0053f8a4-a9cd-4da2-a7b9-ff3bcbc47d25")
 	)
+	(wire
+		(pts
+			(xy 190.5 60.96) (xy 190.5 64.77)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0065286b-d14a-4d74-8322-8f93df7bf65c")
+	)
 	(wire
 		(pts
 			(xy 209.55 100.33) (xy 240.03 100.33)
@@ -3414,7 +3437,7 @@
 	)
 	(wire
 		(pts
-			(xy 222.25 78.74) (xy 222.25 57.15)
+			(xy 222.25 78.74) (xy 222.25 72.39)
 		)
 		(stroke
 			(width 0)
@@ -3442,6 +3465,26 @@
 		)
 		(uuid "072345f6-b50d-485a-9056-28c2c961bb9a")
 	)
+	(wire
+		(pts
+			(xy 234.95 43.18) (xy 234.95 41.91)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "08094c4d-e704-44f9-95fd-6c4a9da02843")
+	)
+	(wire
+		(pts
+			(xy 209.55 78.74) (xy 222.25 78.74)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0847ce08-3f5c-4d53-9418-8d767df289f8")
+	)
 	(wire
 		(pts
 			(xy 185.42 44.45) (xy 185.42 41.91)
@@ -3472,6 +3515,16 @@
 		)
 		(uuid "0bc8e966-69b9-48e9-bfe4-1d5c964d452c")
 	)
+	(wire
+		(pts
+			(xy 209.55 81.28) (xy 247.65 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0c65120a-ae27-447f-bcdf-f924d67595cd")
+	)
 	(wire
 		(pts
 			(xy 158.75 41.91) (xy 158.75 43.18)
@@ -3482,6 +3535,16 @@
 		)
 		(uuid "0fb19e81-1db9-4a19-b193-5a070bb2ec97")
 	)
+	(wire
+		(pts
+			(xy 212.09 52.07) (xy 222.25 52.07)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "17a30bc7-2fba-4ac7-9788-e02bdc7a8070")
+	)
 	(wire
 		(pts
 			(xy 165.1 80.01) (xy 165.1 68.58)
@@ -3492,6 +3555,16 @@
 		)
 		(uuid "21149f9a-7a67-490d-a811-0e17656ef8d4")
 	)
+	(wire
+		(pts
+			(xy 190.5 60.96) (xy 194.31 60.96)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "2160174d-460e-42b0-becc-065e8825d745")
+	)
 	(wire
 		(pts
 			(xy 71.12 106.68) (xy 71.12 111.76)
@@ -3504,7 +3577,7 @@
 	)
 	(wire
 		(pts
-			(xy 190.5 58.42) (xy 190.5 64.77)
+			(xy 190.5 58.42) (xy 190.5 60.96)
 		)
 		(stroke
 			(width 0)
@@ -3632,6 +3705,16 @@
 		)
 		(uuid "3d309dc7-bdae-49ea-987f-5ee58ff3ba35")
 	)
+	(wire
+		(pts
+			(xy 247.65 57.15) (xy 247.65 41.91)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "4170d22a-e1b9-415f-9907-dda92f9c6486")
+	)
 	(wire
 		(pts
 			(xy 166.37 115.57) (xy 171.45 115.57)
@@ -3714,7 +3797,7 @@
 	)
 	(wire
 		(pts
-			(xy 247.65 49.53) (xy 247.65 81.28)
+			(xy 247.65 64.77) (xy 247.65 81.28)
 		)
 		(stroke
 			(width 0)
@@ -3722,6 +3805,16 @@
 		)
 		(uuid "55c3bbd6-0935-44f1-a9b4-2a1013a32ec7")
 	)
+	(wire
+		(pts
+			(xy 222.25 57.15) (xy 222.25 54.61)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "56f7a42e-c13c-423f-9659-9b50732ceec3")
+	)
 	(wire
 		(pts
 			(xy 209.55 120.65) (xy 215.9 120.65)
@@ -3884,13 +3977,13 @@
 	)
 	(wire
 		(pts
-			(xy 208.28 81.28) (xy 247.65 81.28)
+			(xy 201.93 60.96) (xy 204.47 60.96)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "6ee2651d-7e3f-4aa8-b34d-e54e5b442a10")
+		(uuid "71874973-778c-4895-a98b-e25e981df4f4")
 	)
 	(wire
 		(pts
@@ -3922,6 +4015,16 @@
 		)
 		(uuid "778b96f7-553f-4d2e-b414-a14da117ddce")
 	)
+	(wire
+		(pts
+			(xy 222.25 52.07) (xy 222.25 54.61)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "77a20201-6c53-455b-9c68-2ae19efdb6f7")
+	)
 	(wire
 		(pts
 			(xy 170.18 50.8) (xy 170.18 62.23)
@@ -4072,6 +4175,16 @@
 		)
 		(uuid "a3709cd4-e1b4-420b-aa3e-b3d78f679304")
 	)
+	(wire
+		(pts
+			(xy 212.09 50.8) (xy 212.09 52.07)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "a7bf41b1-fef7-4af3-a9b2-6374e56962e9")
+	)
 	(wire
 		(pts
 			(xy 101.6 52.07) (xy 106.68 52.07)
@@ -4214,13 +4327,13 @@
 	)
 	(wire
 		(pts
-			(xy 212.09 49.53) (xy 222.25 49.53)
+			(xy 215.9 121.92) (xy 215.9 120.65)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d780abcd-500d-4f16-b281-dfb941c57567")
+		(uuid "d6e12d49-4778-4188-a1ee-8fbcf1e4d776")
 	)
 	(wire
 		(pts
@@ -4232,6 +4345,16 @@
 		)
 		(uuid "d8f1affa-bf31-451d-9ef2-6eb0caa75a80")
 	)
+	(wire
+		(pts
+			(xy 234.95 54.61) (xy 234.95 50.8)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d9801a23-05ae-4412-a792-055cf66b483f")
+	)
 	(wire
 		(pts
 			(xy 171.45 92.71) (xy 171.45 90.17)
@@ -4244,7 +4367,7 @@
 	)
 	(wire
 		(pts
-			(xy 222.25 49.53) (xy 224.79 49.53)
+			(xy 222.25 54.61) (xy 224.79 54.61)
 		)
 		(stroke
 			(width 0)
@@ -4252,16 +4375,6 @@
 		)
 		(uuid "dca75793-f06b-4fdc-90f3-4a7e793ad60f")
 	)
-	(wire
-		(pts
-			(xy 208.28 78.74) (xy 222.25 78.74)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ddf6966d-a3fc-40ec-b9dd-5f6aff5f1baf")
-	)
 	(wire
 		(pts
 			(xy 234.95 41.91) (xy 247.65 41.91)
@@ -4274,7 +4387,7 @@
 	)
 	(wire
 		(pts
-			(xy 232.41 49.53) (xy 234.95 49.53)
+			(xy 232.41 54.61) (xy 234.95 54.61)
 		)
 		(stroke
 			(width 0)
@@ -4282,6 +4395,16 @@
 		)
 		(uuid "e3d4731f-3fbc-4eb9-9c21-28c8c8e2968c")
 	)
+	(wire
+		(pts
+			(xy 222.25 49.53) (xy 222.25 52.07)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "eb50b474-6890-42c2-91d3-d31879a94d0b")
+	)
 	(wire
 		(pts
 			(xy 146.05 160.02) (xy 154.94 160.02)
@@ -4342,6 +4465,16 @@
 		)
 		(uuid "fbfe998a-ed1b-4539-aec3-6cda9064101d")
 	)
+	(wire
+		(pts
+			(xy 212.09 43.18) (xy 212.09 41.91)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "fc44d746-8887-41e1-960d-43a828bab564")
+	)
 	(wire
 		(pts
 			(xy 101.6 62.23) (xy 139.7 62.23)
@@ -4537,7 +4670,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 140.462 151.13 90)
 			(effects
 				(font
@@ -4564,6 +4697,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 142.24 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AF0603FR-13100KL"
+			(at 142.24 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 142.24 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AF0603FR-13100KL?qs=sGAEpiMZZMtlubZbdhIBIAA5Rg%252BBqQHD6JBGym85xFc%3D"
+			(at 142.24 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AF0603FR-13100KL"
+			(at 142.24 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "e489ddbd-4082-40e9-bba8-66bf9b82d3ca")
 		)
@@ -4607,7 +4785,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 250.952 87.63 90)
 			(effects
 				(font
@@ -4634,6 +4812,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 252.73 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603FR-101KL"
+			(at 252.73 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 252.73 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/RC0603FR-101KL?qs=sGAEpiMZZMtlubZbdhIBIHvQf5egq9lv5WuapZo15J4%3D"
+			(at 252.73 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-RC0603FR-101KL"
+			(at 252.73 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "3a765f07-797d-4def-9037-fcc81d3d49c1")
 		)
@@ -4651,7 +4874,7 @@
 	)
 	(symbol
 		(lib_id "power:GND")
-		(at 215.9 128.27 0)
+		(at 215.9 129.54 0)
 		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
@@ -4660,7 +4883,7 @@
 		(dnp no)
 		(uuid "0bc06229-ab81-4048-aa9e-2ad1b9bb14be")
 		(property "Reference" "#PWR017"
-			(at 215.9 134.62 0)
+			(at 215.9 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4669,7 +4892,7 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 215.9 132.842 0)
+			(at 215.9 134.112 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4677,7 +4900,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 215.9 128.27 0)
+			(at 215.9 129.54 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4686,7 +4909,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 215.9 128.27 0)
+			(at 215.9 129.54 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4695,7 +4918,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 215.9 128.27 0)
+			(at 215.9 129.54 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4717,17 +4940,15 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 222.25 53.34 0)
-		(mirror x)
+		(at 222.25 60.96 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
 		(uuid "0cd3494b-2b3a-445d-ae7a-c5b456f7a1e2")
 		(property "Reference" "R28"
-			(at 219.71 52.0699 0)
+			(at 224.79 59.6899 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4735,8 +4956,8 @@
 				(justify right)
 			)
 		)
-		(property "Value" "22k"
-			(at 219.71 54.6099 0)
+		(property "Value" "10k"
+			(at 224.79 62.2299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4744,8 +4965,8 @@
 				(justify right)
 			)
 		)
-		(property "Footprint" ""
-			(at 220.472 53.34 90)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 224.028 60.96 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4754,7 +4975,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 222.25 53.34 0)
+			(at 222.25 60.96 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4763,7 +4984,52 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 222.25 53.34 0)
+			(at 222.25 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 222.25 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 222.25 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 222.25 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 222.25 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 222.25 60.96 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4881,7 +5147,7 @@
 				)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 36.83 132.588 90)
 			(effects
 				(font
@@ -4908,6 +5174,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 36.83 130.81 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603JR-070RL"
+			(at 36.83 130.81 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 36.83 130.81 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/ProductDetail/YAGEO/RC0603JR-070RL?qs=2cAdsCoAWRGWyPcuXgGiXQ%3D%3D"
+			(at 36.83 130.81 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" " 603-RC0603JR-070RL "
+			(at 36.83 130.81 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "6645a8bb-4baf-4d44-a5f4-cd3ab83abd32")
 		)
@@ -5064,7 +5375,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 247.65 45.72 0)
+		(at 247.65 60.96 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5073,7 +5384,7 @@
 		(fields_autoplaced yes)
 		(uuid "1786d62c-73ef-4649-8990-9ae7a1705c34")
 		(property "Reference" "R29"
-			(at 250.19 44.4499 0)
+			(at 250.19 59.6899 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5082,7 +5393,7 @@
 			)
 		)
 		(property "Value" "1k"
-			(at 250.19 46.9899 0)
+			(at 250.19 62.2299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5090,8 +5401,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 245.872 45.72 90)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 245.872 60.96 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5100,7 +5411,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 247.65 45.72 0)
+			(at 247.65 60.96 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5109,7 +5420,52 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 247.65 45.72 0)
+			(at 247.65 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 247.65 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603FR-101KL"
+			(at 247.65 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 247.65 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/RC0603FR-101KL?qs=sGAEpiMZZMtlubZbdhIBIHvQf5egq9lv5WuapZo15J4%3D"
+			(at 247.65 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-RC0603FR-101KL"
+			(at 247.65 60.96 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5364,7 +5720,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 183.642 48.26 90)
 			(effects
 				(font
@@ -5391,6 +5747,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 185.42 48.26 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603FR-101KL"
+			(at 185.42 48.26 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 185.42 48.26 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/RC0603FR-101KL?qs=sGAEpiMZZMtlubZbdhIBIHvQf5egq9lv5WuapZo15J4%3D"
+			(at 185.42 48.26 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-RC0603FR-101KL"
+			(at 185.42 48.26 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "27d49f96-f429-4a13-be80-74242d0ad812")
 		)
@@ -5500,7 +5901,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 140.462 124.46 90)
 			(effects
 				(font
@@ -5527,6 +5928,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 142.24 124.46 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AF0603FR-13100KL"
+			(at 142.24 124.46 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 142.24 124.46 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AF0603FR-13100KL?qs=sGAEpiMZZMtlubZbdhIBIAA5Rg%252BBqQHD6JBGym85xFc%3D"
+			(at 142.24 124.46 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AF0603FR-13100KL"
+			(at 142.24 124.46 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "c68f8add-c5de-4e17-95f0-b244086300c7")
 		)
@@ -5702,7 +6148,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0805_2012Metric"
 			(at 159.7152 50.8 0)
 			(effects
 				(font
@@ -5729,6 +6175,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "5V"
+			(at 158.75 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 158.75 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GRM21BZ71C106KE15L "
+			(at 158.75 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 158.75 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GRM21BZ71C106KE15L?qs=Ey7%2FXF42M3eA%252BEoaJUUJjg%3D%3D"
+			(at 158.75 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GRM21BZ71C106KE5L "
+			(at 158.75 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "831a7dc0-aaf0-4743-8e03-51b3a1a2a8bf")
 		)
@@ -6257,7 +6757,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
 			(at 147.0152 80.01 0)
 			(effects
 				(font
@@ -6284,6 +6784,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "1V2"
+			(at 146.05 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 146.05 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GRM188R61C105KA12J "
+			(at 146.05 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 146.05 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GRM188R61C105KA12J?qs=giATsht9l5zorjRVstolWw%3D%3D"
+			(at 146.05 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GRM188R61C105KA2J "
+			(at 146.05 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "ea0e62f5-e6f3-419e-9175-d3f36639b73b")
 		)
@@ -6380,7 +6934,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 228.6 49.53 90)
+		(at 228.6 54.61 90)
 		(mirror x)
 		(unit 1)
 		(exclude_from_sim no)
@@ -6390,23 +6944,23 @@
 		(fields_autoplaced yes)
 		(uuid "82db21e8-8dd7-4ee8-8c5e-44bc75f1d336")
 		(property "Reference" "R27"
-			(at 228.6 43.18 90)
+			(at 228.6 48.26 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Value" "100"
-			(at 228.6 45.72 90)
+		(property "Value" "100R"
+			(at 228.6 50.8 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" ""
-			(at 228.6 47.752 90)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 228.6 52.832 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6415,7 +6969,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 228.6 49.53 0)
+			(at 228.6 54.61 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6424,7 +6978,7 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 228.6 49.53 0)
+			(at 228.6 54.61 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6662,6 +7216,120 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:R")
+		(at 222.25 68.58 180)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "94f332b5-2a96-41ca-9240-d8a5ef5d3d1d")
+		(property "Reference" "R54"
+			(at 224.79 67.3099 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Value" "10k"
+			(at 224.79 69.8499 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 224.028 68.58 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 222.25 68.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 222.25 68.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 222.25 68.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 222.25 68.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 222.25 68.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 222.25 68.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 222.25 68.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "a35a446b-310e-4bf2-a34b-aa6c73aa6f77")
+		)
+		(pin "2"
+			(uuid "85b22f92-20c3-4731-9ea7-51be9b5e243e")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/81f7f138-c870-483b-b965-9895c9eb889f"
+					(reference "R54")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 135.89 80.01 0)
@@ -6757,7 +7425,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 238.252 87.63 90)
 			(effects
 				(font
@@ -6784,6 +7452,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 240.03 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603FR-101KL"
+			(at 240.03 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 240.03 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/RC0603FR-101KL?qs=sGAEpiMZZMtlubZbdhIBIHvQf5egq9lv5WuapZo15J4%3D"
+			(at 240.03 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-RC0603FR-101KL"
+			(at 240.03 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "38e771b1-f61f-4499-9716-7ea67dc9127c")
 		)
@@ -6940,7 +7653,7 @@
 	)
 	(symbol
 		(lib_id "Device:C")
-		(at 234.95 45.72 0)
+		(at 234.95 46.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6949,7 +7662,7 @@
 		(fields_autoplaced yes)
 		(uuid "ad48be9d-b240-4701-9780-1d31b7ec3fef")
 		(property "Reference" "C13"
-			(at 238.76 44.4499 0)
+			(at 238.76 45.7199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6958,7 +7671,7 @@
 			)
 		)
 		(property "Value" "100n"
-			(at 238.76 46.9899 0)
+			(at 238.76 48.2599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6966,8 +7679,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 235.9152 49.53 0)
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
+			(at 235.9152 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6976,7 +7689,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 234.95 45.72 0)
+			(at 234.95 46.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6985,7 +7698,61 @@
 			)
 		)
 		(property "Description" "Unpolarized capacitor"
-			(at 234.95 45.72 0)
+			(at 234.95 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Max DC Bias" "5V"
+			(at 234.95 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 234.95 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GCJ188R71C104KA01D"
+			(at 234.95 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 234.95 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GCJ188R71C104KA01D?qs=zThidflJDvZxFByCB3VmpA%3D%3D"
+			(at 234.95 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GCJ188R71C104KA1D"
+			(at 234.95 46.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7010,7 +7777,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 215.9 124.46 0)
+		(at 215.9 125.73 0)
 		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
@@ -7020,7 +7787,7 @@
 		(fields_autoplaced yes)
 		(uuid "b77b16a2-c8c6-48e2-85d7-6beaed643549")
 		(property "Reference" "R2"
-			(at 213.36 123.1899 0)
+			(at 213.36 124.4599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7029,7 +7796,7 @@
 			)
 		)
 		(property "Value" "100k"
-			(at 213.36 125.7299 0)
+			(at 213.36 126.9999 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7037,8 +7804,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 217.678 124.46 90)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 217.678 125.73 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7047,7 +7814,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 215.9 124.46 0)
+			(at 215.9 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7056,7 +7823,52 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 215.9 124.46 0)
+			(at 215.9 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 215.9 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AF0603FR-13100KL"
+			(at 215.9 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 215.9 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AF0603FR-13100KL?qs=sGAEpiMZZMtlubZbdhIBIAA5Rg%252BBqQHD6JBGym85xFc%3D"
+			(at 215.9 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AF0603FR-13100KL"
+			(at 215.9 125.73 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7107,7 +7919,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 262.382 87.63 90)
 			(effects
 				(font
@@ -7134,6 +7946,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 264.16 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603FR-101KL"
+			(at 264.16 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 264.16 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/RC0603FR-101KL?qs=sGAEpiMZZMtlubZbdhIBIHvQf5egq9lv5WuapZo15J4%3D"
+			(at 264.16 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-RC0603FR-101KL"
+			(at 264.16 87.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "4e4cdf65-5a2c-41de-a668-5fd163de4b7e")
 		)
@@ -7417,7 +8274,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
 			(at 136.8552 80.01 0)
 			(effects
 				(font
@@ -7444,6 +8301,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "2V7"
+			(at 135.89 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 135.89 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GRM188R61C105KA12J "
+			(at 135.89 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 135.89 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GRM188R61C105KA12J?qs=giATsht9l5zorjRVstolWw%3D%3D"
+			(at 135.89 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GRM188R61C105KA2J "
+			(at 135.89 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "b8545274-79c6-43e2-b7f7-a86b842bbb73")
 		)
@@ -7597,7 +8508,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 212.09 45.72 0)
+		(at 212.09 46.99 0)
 		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
@@ -7607,7 +8518,7 @@
 		(fields_autoplaced yes)
 		(uuid "e424bf47-68db-4f6c-b8c1-ff113959d688")
 		(property "Reference" "R26"
-			(at 209.55 44.4499 0)
+			(at 209.55 45.7199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7616,7 +8527,7 @@
 			)
 		)
 		(property "Value" "100k"
-			(at 209.55 46.9899 0)
+			(at 209.55 48.2599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7624,8 +8535,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 213.868 45.72 90)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 213.868 46.99 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7634,7 +8545,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 212.09 45.72 0)
+			(at 212.09 46.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7643,7 +8554,52 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 212.09 45.72 0)
+			(at 212.09 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 212.09 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AF0603FR-13100KL"
+			(at 212.09 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 212.09 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AF0603FR-13100KL?qs=sGAEpiMZZMtlubZbdhIBIAA5Rg%252BBqQHD6JBGym85xFc%3D"
+			(at 212.09 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AF0603FR-13100KL"
+			(at 212.09 46.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7739,6 +8695,72 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at 204.47 60.96 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "ea4e3154-bca3-4575-a130-94992ec1a13a")
+		(property "Reference" "#PWR024"
+			(at 204.47 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 204.47 66.04 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 204.47 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 204.47 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 204.47 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "7f090a52-90e7-4e05-9338-521d6721a265")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/81f7f138-c870-483b-b965-9895c9eb889f"
+					(reference "#PWR024")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 186.69 125.73 0)
@@ -7911,6 +8933,128 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:C")
+		(at 198.12 60.96 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "f3596c9e-ba32-4015-b674-20a1ad4cc6fd")
+		(property "Reference" "C70"
+			(at 198.12 53.34 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "100n"
+			(at 198.12 55.88 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
+			(at 201.93 59.9948 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 198.12 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Unpolarized capacitor"
+			(at 198.12 60.96 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 198.12 60.96 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GCJ188R71C104KA01D"
+			(at 198.12 60.96 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Max DC Bias" "5V"
+			(at 198.12 60.96 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 198.12 60.96 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GCJ188R71C104KA01D?qs=zThidflJDvZxFByCB3VmpA%3D%3D"
+			(at 198.12 60.96 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GCJ188R71C104KA1D"
+			(at 198.12 60.96 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "b0c6663b-f8fb-4fff-a9d3-068c4ac1ad46")
+		)
+		(pin "1"
+			(uuid "5c8496e5-ca02-4562-a61a-e184d0fd5b67")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/81f7f138-c870-483b-b965-9895c9eb889f"
+					(reference "C70")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:C")
 		(at 170.18 46.99 0)
@@ -7939,7 +9083,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
 			(at 171.1452 50.8 0)
 			(effects
 				(font
@@ -7966,6 +9110,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "5V"
+			(at 170.18 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 170.18 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GRM188R61C105KA12J "
+			(at 170.18 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 170.18 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GRM188R61C105KA12J?qs=giATsht9l5zorjRVstolWw%3D%3D"
+			(at 170.18 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GRM188R61C105KA2J "
+			(at 170.18 46.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "7299d25f-9e2a-47bc-b1df-4d96319534f3")
 		)
diff --git a/Hardware/keyboard_controller/battery.kicad_sch b/Hardware/keyboard_controller/battery.kicad_sch
index df503e6..b53b1f7 100644
--- a/Hardware/keyboard_controller/battery.kicad_sch
+++ b/Hardware/keyboard_controller/battery.kicad_sch
@@ -949,6 +949,156 @@
 			)
 			(embedded_fonts no)
 		)
+		(symbol "Device:D_Schottky"
+			(pin_numbers
+				(hide yes)
+			)
+			(pin_names
+				(offset 1.016)
+				(hide yes)
+			)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "D"
+				(at 0 2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "D_Schottky"
+				(at 0 -2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Schottky diode"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "diode Schottky"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "D_Schottky_0_1"
+				(polyline
+					(pts
+						(xy -1.905 0.635) (xy -1.905 1.27) (xy -1.27 1.27) (xy -1.27 -1.27) (xy -0.635 -1.27) (xy -0.635 -0.635)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 1.27) (xy 1.27 -1.27) (xy -1.27 0) (xy 1.27 1.27)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 0) (xy -1.27 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "D_Schottky_1_1"
+				(pin passive line
+					(at -3.81 0 0)
+					(length 2.54)
+					(name "K"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 3.81 0 180)
+					(length 2.54)
+					(name "A"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+			(embedded_fonts no)
+		)
 		(symbol "Device:D_Zener"
 			(pin_numbers
 				(hide yes)
@@ -2705,6 +2855,602 @@
 			)
 			(embedded_fonts no)
 		)
+		(symbol "Transistor_FET:2N7002"
+			(pin_names
+				(hide yes)
+			)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "Q"
+				(at 5.08 1.905 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(property "Value" "2N7002"
+				(at 5.08 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(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 "Description" "0.115A Id, 60V Vds, N-Channel MOSFET, SOT-23"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "N-Channel Switching MOSFET"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(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)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.254 0) (xy -2.54 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 2.286) (xy 0.762 1.27)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 0.508) (xy 0.762 -0.508)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 -1.27) (xy 0.762 -2.286)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 -1.778) (xy 3.302 -1.778) (xy 3.302 1.778) (xy 0.762 1.778)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.016 0) (xy 2.032 0.381) (xy 2.032 -0.381) (xy 1.016 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(circle
+					(center 1.651 0)
+					(radius 2.794)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.54 2.54) (xy 2.54 1.778)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 2.54 1.778)
+					(radius 0.254)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(circle
+					(center 2.54 -1.778)
+					(radius 0.254)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.54 -2.54) (xy 2.54 0) (xy 0.762 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.794 0.508) (xy 2.921 0.381) (xy 3.683 0.381) (xy 3.81 0.254)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 3.302 0.381) (xy 2.921 -0.254) (xy 3.683 -0.254) (xy 3.302 0.381)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "2N7002_1_1"
+				(pin input line
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "G"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 2.54 5.08 270)
+					(length 2.54)
+					(name "D"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 2.54 -5.08 90)
+					(length 2.54)
+					(name "S"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+			(embedded_fonts no)
+		)
+		(symbol "Transistor_FET:BSS84"
+			(pin_names
+				(hide yes)
+			)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "Q"
+				(at 5.08 1.905 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(property "Value" "BSS84"
+				(at 5.08 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(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 "Description" "-0.13A Id, -50V Vds, P-Channel MOSFET, SOT-23"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "P-Channel MOSFET"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(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)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.254 0) (xy -2.54 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 2.286) (xy 0.762 1.27)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 1.778) (xy 3.302 1.778) (xy 3.302 -1.778) (xy 0.762 -1.778)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 0.508) (xy 0.762 -0.508)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.762 -1.27) (xy 0.762 -2.286)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 1.651 0)
+					(radius 2.794)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.286 0) (xy 1.27 0.381) (xy 1.27 -0.381) (xy 2.286 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.54 2.54) (xy 2.54 1.778)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 2.54 1.778)
+					(radius 0.254)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(circle
+					(center 2.54 -1.778)
+					(radius 0.254)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.54 -2.54) (xy 2.54 0) (xy 0.762 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.794 -0.508) (xy 2.921 -0.381) (xy 3.683 -0.381) (xy 3.81 -0.254)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 3.302 -0.381) (xy 2.921 0.254) (xy 3.683 0.254) (xy 3.302 -0.381)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "BSS84_1_1"
+				(pin input line
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "G"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 2.54 5.08 270)
+					(length 2.54)
+					(name "D"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 2.54 -5.08 90)
+					(length 2.54)
+					(name "S"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+			(embedded_fonts no)
+		)
 		(symbol "power:GND"
 			(power)
 			(pin_numbers
@@ -3023,6 +3769,17 @@
 		)
 		(uuid ff1d10e8-4983-42d2-b4ca-1214714ff659)
 	)
+	(text "Charger is only enabled if all conditions are true"
+		(exclude_from_sim no)
+		(at 135.128 120.142 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "05136f84-620b-4f4a-b822-3894984658ee")
+	)
 	(text "3.0 to 4.2 V"
 		(exclude_from_sim no)
 		(at 128.016 48.006 0)
@@ -3036,7 +3793,7 @@
 	)
 	(text "Hardware interlock for charger en\nBatt output must be disabled (low) AND\nBatt must be connected (high) to enable charger"
 		(exclude_from_sim no)
-		(at 112.522 170.434 0)
+		(at 112.522 189.23 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -3056,7 +3813,7 @@
 		)
 		(uuid "1d2c02cb-c344-4130-b0d7-dcf0e86ffbaf")
 	)
-	(text "Determines\ncharge curr."
+	(text "Determines\ncharge current"
 		(exclude_from_sim no)
 		(at 115.316 76.454 0)
 		(effects
@@ -3097,6 +3854,17 @@
 		)
 		(uuid "6dd2b68c-a78f-44e4-bde7-ba8f42203ae4")
 	)
+	(text "Enabled only when battery connected and USB disconnected"
+		(exclude_from_sim no)
+		(at 135.128 158.242 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "845b8a7b-ac14-4fb2-a48d-264ddde53dba")
+	)
 	(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 367.03 177.8 0)
@@ -3439,6 +4207,12 @@
 		)
 		(uuid "eea269fe-a4c5-4ba4-9a69-c5364c0bc65c")
 	)
+	(junction
+		(at 102.87 130.81)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "02f82147-e24f-40e2-adf9-27bc378520d3")
+	)
 	(junction
 		(at 336.55 133.35)
 		(diameter 0)
@@ -3451,6 +4225,12 @@
 		(color 0 0 0 0)
 		(uuid "07afe803-dd97-4d89-83a4-977a5ec1c730")
 	)
+	(junction
+		(at 87.63 146.05)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "0a6b47e9-e89f-4359-86df-8a4d12bbd472")
+	)
 	(junction
 		(at 175.26 63.5)
 		(diameter 0)
@@ -3475,12 +4255,6 @@
 		(color 0 0 0 0)
 		(uuid "2732cdfc-3993-474e-8b16-2b3ea825614f")
 	)
-	(junction
-		(at 55.88 53.34)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "280a3d14-bf1e-4106-95e1-e0befe9fbc35")
-	)
 	(junction
 		(at 158.75 81.28)
 		(diameter 0)
@@ -3523,6 +4297,18 @@
 		(color 0 0 0 0)
 		(uuid "4443e2cd-46ca-4dbb-9078-d84da1454d0e")
 	)
+	(junction
+		(at 87.63 165.1)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "44d651ae-7547-48cf-9401-530114884b51")
+	)
+	(junction
+		(at 102.87 158.75)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "4525ee59-0fdc-4409-9799-94a8a3cc78cf")
+	)
 	(junction
 		(at 356.87 45.72)
 		(diameter 0)
@@ -3541,12 +4327,6 @@
 		(color 0 0 0 0)
 		(uuid "51fdd222-bcbf-4234-9487-a8b1add9ed34")
 	)
-	(junction
-		(at 55.88 24.13)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "522bd9df-deb3-42d7-8b30-3fdb9c180e91")
-	)
 	(junction
 		(at 243.84 81.28)
 		(diameter 0)
@@ -3577,12 +4357,30 @@
 		(color 0 0 0 0)
 		(uuid "69e0be4a-b784-4951-81c3-468179b28afe")
 	)
+	(junction
+		(at 102.87 156.21)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "6f95b2ce-e9e6-433e-85ca-4b8e6431b225")
+	)
+	(junction
+		(at 87.63 175.26)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "711cbc18-77de-4186-9ea6-c66ce0bf9f16")
+	)
 	(junction
 		(at 307.34 143.51)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "7e4a8eb4-e1ab-46dd-9212-b762f94ed1ac")
 	)
+	(junction
+		(at 53.34 24.13)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "85e0dc9f-3503-455c-88c2-dc63ec1c587e")
+	)
 	(junction
 		(at 223.52 81.28)
 		(diameter 0)
@@ -3619,6 +4417,12 @@
 		(color 0 0 0 0)
 		(uuid "ac940774-44bb-401f-a378-a755d313957e")
 	)
+	(junction
+		(at 53.34 53.34)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "b06c3f40-c9cf-4ff3-81c7-fc920484b538")
+	)
 	(junction
 		(at 64.77 50.8)
 		(diameter 0)
@@ -3685,6 +4489,12 @@
 		(color 0 0 0 0)
 		(uuid "d91b41c2-9247-4f9b-971c-3274fff7dff8")
 	)
+	(junction
+		(at 87.63 120.65)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "d98693da-a077-4f69-9514-02e7fba69585")
+	)
 	(junction
 		(at 307.34 133.35)
 		(diameter 0)
@@ -3721,6 +4531,12 @@
 		(color 0 0 0 0)
 		(uuid "f48b6dde-c302-456b-835a-117f74c63ffe")
 	)
+	(junction
+		(at 120.65 120.65)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "f8936267-fa30-4938-a892-f3b22184a849")
+	)
 	(no_connect
 		(at 261.62 62.23)
 		(uuid "16f493e2-2002-433d-ac2a-fdf35e437e1b")
@@ -3737,7 +4553,7 @@
 	)
 	(wire
 		(pts
-			(xy 55.88 24.13) (xy 55.88 29.21)
+			(xy 53.34 24.13) (xy 53.34 29.21)
 		)
 		(stroke
 			(width 0)
@@ -3825,6 +4641,16 @@
 		)
 		(uuid "049dda82-c864-4cf2-9e90-8dbcef8aeae7")
 	)
+	(wire
+		(pts
+			(xy 68.58 165.1) (xy 87.63 165.1)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0544c776-678b-4acc-8671-41fdea2d52ba")
+	)
 	(polyline
 		(pts
 			(xy 62.23 242.57) (xy 63.5 243.84)
@@ -3865,16 +4691,6 @@
 		)
 		(uuid "09606d9e-d5d7-4ddc-8a9a-ee312f3a77f1")
 	)
-	(wire
-		(pts
-			(xy 132.08 189.23) (xy 151.13 189.23)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "099393eb-97ce-42f3-b2a9-77a928912f03")
-	)
 	(wire
 		(pts
 			(xy 270.51 143.51) (xy 278.13 143.51)
@@ -3927,13 +4743,13 @@
 	)
 	(wire
 		(pts
-			(xy 73.66 193.04) (xy 93.98 193.04)
+			(xy 102.87 156.21) (xy 102.87 158.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "15e1bd39-0686-485d-8bed-3d131fb59347")
+		(uuid "176b04cb-bf5f-44b2-8667-5c8ac87ae36f")
 	)
 	(polyline
 		(pts
@@ -4015,6 +4831,16 @@
 		)
 		(uuid "1b882a7f-8483-49ce-8174-888fb4b40cd2")
 	)
+	(wire
+		(pts
+			(xy 87.63 165.1) (xy 87.63 166.37)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "1cbfba7c-d8a3-49d2-b72b-4757c9aca41f")
+	)
 	(polyline
 		(pts
 			(xy 129.54 238.76) (xy 144.78 238.76)
@@ -4127,7 +4953,7 @@
 	)
 	(wire
 		(pts
-			(xy 46.99 53.34) (xy 55.88 53.34)
+			(xy 46.99 53.34) (xy 53.34 53.34)
 		)
 		(stroke
 			(width 0)
@@ -4185,26 +5011,6 @@
 		)
 		(uuid "3384cbd6-89ff-4c18-b762-a68c74494c55")
 	)
-	(wire
-		(pts
-			(xy 132.08 193.04) (xy 151.13 193.04)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "35e98af9-b178-4bdc-ad2b-aa7afd8e5d96")
-	)
-	(wire
-		(pts
-			(xy 55.88 24.13) (xy 64.77 24.13)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "38f70392-4bc8-4ec6-8b93-48a890095bc1")
-	)
 	(wire
 		(pts
 			(xy 278.13 81.28) (xy 256.54 81.28)
@@ -4235,16 +5041,6 @@
 		)
 		(uuid "3ac9cee1-5aaa-4c03-a9c4-ce80937ab690")
 	)
-	(wire
-		(pts
-			(xy 72.39 189.23) (xy 93.98 189.23)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "3c5d31ca-83a0-465d-9cd9-3ba5ca5aedce")
-	)
 	(wire
 		(pts
 			(xy 307.34 143.51) (xy 307.34 144.78)
@@ -4495,6 +5291,16 @@
 		)
 		(uuid "5643bf98-0a70-43ba-be94-e8e675d44a99")
 	)
+	(wire
+		(pts
+			(xy 102.87 151.13) (xy 102.87 156.21)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "57b998a5-b813-45ab-98fb-a30373effbc2")
+	)
 	(polyline
 		(pts
 			(xy 217.17 240.03) (xy 218.44 238.76)
@@ -4505,6 +5311,16 @@
 		)
 		(uuid "57c0b791-a40b-4437-ac2f-fa8c69ae0761")
 	)
+	(wire
+		(pts
+			(xy 53.34 24.13) (xy 64.77 24.13)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "59de6491-18d9-4edf-b8de-bf13e2105dc1")
+	)
 	(wire
 		(pts
 			(xy 114.3 73.66) (xy 114.3 81.28)
@@ -4605,6 +5421,26 @@
 		)
 		(uuid "62e9e265-2119-438d-b413-b1dc4ca5417d")
 	)
+	(wire
+		(pts
+			(xy 87.63 120.65) (xy 87.63 121.92)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "6383eedf-bd5f-4c14-9996-6fccc4ed632e")
+	)
+	(wire
+		(pts
+			(xy 120.65 120.65) (xy 120.65 121.92)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "66224f95-f2d2-477e-8c92-c7571c712353")
+	)
 	(wire
 		(pts
 			(xy 336.55 168.91) (xy 364.49 168.91)
@@ -4625,6 +5461,16 @@
 		)
 		(uuid "66b9f7b3-7feb-458e-9016-60dc725ed559")
 	)
+	(wire
+		(pts
+			(xy 87.63 129.54) (xy 87.63 130.81)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "66c889fb-c285-49b9-8ad0-3eef50ff5e92")
+	)
 	(polyline
 		(pts
 			(xy 44.45 238.76) (xy 50.8 236.22)
@@ -4697,7 +5543,7 @@
 	)
 	(wire
 		(pts
-			(xy 55.88 36.83) (xy 55.88 53.34)
+			(xy 53.34 36.83) (xy 53.34 53.34)
 		)
 		(stroke
 			(width 0)
@@ -4705,6 +5551,16 @@
 		)
 		(uuid "6e5d1111-37b1-4a00-968a-021d57593616")
 	)
+	(wire
+		(pts
+			(xy 87.63 146.05) (xy 87.63 147.32)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "6ec5df10-c8c0-4617-b75a-624f714f6c89")
+	)
 	(polyline
 		(pts
 			(xy 217.17 242.57) (xy 217.17 245.11)
@@ -4755,6 +5611,16 @@
 		)
 		(uuid "73cbc5de-d169-430b-84c9-ed9c23a47cd0")
 	)
+	(wire
+		(pts
+			(xy 102.87 175.26) (xy 102.87 170.18)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "743b8ecb-05e8-40a0-ac65-a532e19e33ae")
+	)
 	(wire
 		(pts
 			(xy 186.69 73.66) (xy 186.69 81.28)
@@ -4775,6 +5641,16 @@
 		)
 		(uuid "758ebf63-a885-4b94-ba5b-ae80a0b40901")
 	)
+	(wire
+		(pts
+			(xy 102.87 139.7) (xy 102.87 140.97)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "766ad6aa-65a6-43a4-884e-ff82c49b7f10")
+	)
 	(wire
 		(pts
 			(xy 285.75 72.39) (xy 285.75 73.66)
@@ -4795,6 +5671,26 @@
 		)
 		(uuid "7afe9b5b-a9be-40c6-9f85-dabf32c73162")
 	)
+	(wire
+		(pts
+			(xy 53.34 53.34) (xy 91.44 53.34)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "7b335e7d-89e0-45f7-a141-0e94ccefe485")
+	)
+	(wire
+		(pts
+			(xy 87.63 165.1) (xy 95.25 165.1)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "7c0955e6-6d4c-49a0-89dd-bda876ea39e8")
+	)
 	(wire
 		(pts
 			(xy 369.57 62.23) (xy 369.57 45.72)
@@ -4817,7 +5713,7 @@
 	)
 	(wire
 		(pts
-			(xy 46.99 24.13) (xy 55.88 24.13)
+			(xy 46.99 24.13) (xy 53.34 24.13)
 		)
 		(stroke
 			(width 0)
@@ -4855,6 +5751,16 @@
 		)
 		(uuid "84cc3e53-33a5-4b48-b60f-4b4f3e32efc5")
 	)
+	(wire
+		(pts
+			(xy 87.63 175.26) (xy 102.87 175.26)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "85d024b2-9996-4a6e-8fe7-2fef5ea7e83b")
+	)
 	(wire
 		(pts
 			(xy 234.95 168.91) (xy 234.95 170.18)
@@ -4905,6 +5811,26 @@
 		)
 		(uuid "8f09ba55-aadd-4d2b-9c57-99bf8d87bc11")
 	)
+	(wire
+		(pts
+			(xy 102.87 128.27) (xy 102.87 130.81)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "8f9205ff-38df-4a58-93e5-14ff47153f0a")
+	)
+	(wire
+		(pts
+			(xy 102.87 158.75) (xy 133.35 158.75)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "90ca9c5c-bb44-48e3-b998-6fbdbc23b098")
+	)
 	(wire
 		(pts
 			(xy 175.26 63.5) (xy 186.69 63.5)
@@ -4915,16 +5841,6 @@
 		)
 		(uuid "910520ce-8711-4dc7-969c-a364dcde5c0c")
 	)
-	(wire
-		(pts
-			(xy 55.88 53.34) (xy 91.44 53.34)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "91c29812-ba5b-4f74-9f05-90d165b6b698")
-	)
 	(wire
 		(pts
 			(xy 111.76 50.8) (xy 128.27 50.8)
@@ -5055,6 +5971,16 @@
 		)
 		(uuid "a97b7788-eac0-483e-a874-d2a8446ccb72")
 	)
+	(wire
+		(pts
+			(xy 102.87 158.75) (xy 102.87 160.02)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "a9a10339-a717-4b4d-a740-c2266a9a0a08")
+	)
 	(polyline
 		(pts
 			(xy 210.82 237.49) (xy 210.82 240.03)
@@ -5205,6 +6131,16 @@
 		)
 		(uuid "b5f2572e-2bf9-4f6c-9076-7f569a457e0d")
 	)
+	(wire
+		(pts
+			(xy 87.63 175.26) (xy 87.63 173.99)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b62c6e3d-b2d0-464c-b42f-8471bde9ea3a")
+	)
 	(polyline
 		(pts
 			(xy 199.39 243.84) (xy 205.74 241.3)
@@ -5235,6 +6171,16 @@
 		)
 		(uuid "b78dbaec-bcf7-4c2a-a732-fa0e161937bb")
 	)
+	(wire
+		(pts
+			(xy 102.87 130.81) (xy 102.87 132.08)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b7b5ac6d-0a14-40e0-9b68-21454b39e1cd")
+	)
 	(wire
 		(pts
 			(xy 261.62 138.43) (xy 278.13 138.43)
@@ -5245,6 +6191,16 @@
 		)
 		(uuid "b80ec700-b97e-4842-b25f-93534b784eb7")
 	)
+	(wire
+		(pts
+			(xy 68.58 120.65) (xy 87.63 120.65)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "b8ec4ba8-60d7-48c6-9fef-cef17ff8d399")
+	)
 	(wire
 		(pts
 			(xy 175.26 81.28) (xy 186.69 81.28)
@@ -5295,6 +6251,16 @@
 		)
 		(uuid "bcd8fb54-ef76-4a3b-a240-be482c3bbe95")
 	)
+	(wire
+		(pts
+			(xy 87.63 146.05) (xy 95.25 146.05)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "bda308f6-39f0-4bf2-9706-1027e4963869")
+	)
 	(polyline
 		(pts
 			(xy 111.76 247.65) (xy 111.76 248.92)
@@ -5315,6 +6281,16 @@
 		)
 		(uuid "c056450c-1c5b-4e29-9cd2-9fdd1c865ff2")
 	)
+	(wire
+		(pts
+			(xy 87.63 130.81) (xy 102.87 130.81)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "c2d54d86-f430-40f0-bf2d-f7517b44b0af")
+	)
 	(wire
 		(pts
 			(xy 251.46 57.15) (xy 251.46 54.61)
@@ -5325,6 +6301,16 @@
 		)
 		(uuid "c3cde316-40cf-4d05-9d22-35e1640ed873")
 	)
+	(wire
+		(pts
+			(xy 87.63 176.53) (xy 87.63 175.26)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "c40af2bd-e177-46a9-b734-596557b37fd2")
+	)
 	(polyline
 		(pts
 			(xy 74.93 238.76) (xy 85.09 238.76)
@@ -5375,6 +6361,16 @@
 		)
 		(uuid "c588b27b-4cdf-4dc4-adc6-3e6e0c9480d3")
 	)
+	(wire
+		(pts
+			(xy 87.63 156.21) (xy 102.87 156.21)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "c5ad0489-0a1a-4db7-9c63-3c35ab56193e")
+	)
 	(wire
 		(pts
 			(xy 186.69 81.28) (xy 223.52 81.28)
@@ -5505,6 +6501,26 @@
 		)
 		(uuid "d177e8b4-b45c-4df3-a229-cc0c5103cdaa")
 	)
+	(wire
+		(pts
+			(xy 87.63 120.65) (xy 97.79 120.65)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d2a4b2d2-8a27-46b1-80b5-1593b41d4cec")
+	)
+	(wire
+		(pts
+			(xy 107.95 120.65) (xy 120.65 120.65)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d5b8341b-44cd-438a-a94e-060d01583c6e")
+	)
 	(polyline
 		(pts
 			(xy 34.29 247.65) (xy 34.29 248.92)
@@ -5545,6 +6561,16 @@
 		)
 		(uuid "d93dadcc-6417-43ad-91a1-9ebdb0f244eb")
 	)
+	(wire
+		(pts
+			(xy 68.58 146.05) (xy 87.63 146.05)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d95dcc7a-965d-40f6-914c-e0a9b47f9c91")
+	)
 	(polyline
 		(pts
 			(xy 85.09 248.92) (xy 85.09 238.76)
@@ -5625,6 +6651,16 @@
 		)
 		(uuid "ddd8e5ad-58d3-41ac-972a-7f685346aaaa")
 	)
+	(wire
+		(pts
+			(xy 87.63 154.94) (xy 87.63 156.21)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "defe4af7-840e-44f4-9a30-dbb6981eea2e")
+	)
 	(polyline
 		(pts
 			(xy 210.82 238.76) (xy 212.09 240.03)
@@ -5765,16 +6801,6 @@
 		)
 		(uuid "f59e0c19-eacd-4ef5-aab4-4281b356705e")
 	)
-	(wire
-		(pts
-			(xy 72.39 196.85) (xy 93.98 196.85)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "f6245722-5330-45b3-83af-87a552b4a8cc")
-	)
 	(wire
 		(pts
 			(xy 64.77 24.13) (xy 88.9 24.13)
@@ -5785,6 +6811,16 @@
 		)
 		(uuid "f6aed187-3b23-4cd6-9e23-45938688ab9a")
 	)
+	(wire
+		(pts
+			(xy 120.65 120.65) (xy 133.35 120.65)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "f6ba7bff-507e-4719-991f-684bd5356741")
+	)
 	(polyline
 		(pts
 			(xy 218.44 237.49) (xy 218.44 240.03)
@@ -5897,7 +6933,7 @@
 		(uuid "180552c9-6267-4439-8e6e-5b19e5e18a65")
 	)
 	(label "SNS_USB_CONN"
-		(at 73.66 196.85 0)
+		(at 68.58 165.1 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5947,7 +6983,7 @@
 		(uuid "6d9f70f4-fa9f-4f09-b6aa-0531bbce2bb9")
 	)
 	(label "SNS_BATT_CONN"
-		(at 73.66 193.04 0)
+		(at 68.58 146.05 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5957,7 +6993,7 @@
 		(uuid "756883b8-2ebd-464e-9fe8-3702d7ee6204")
 	)
 	(label "BATT_BOOST_EN"
-		(at 151.13 193.04 180)
+		(at 133.35 158.75 180)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -5978,7 +7014,7 @@
 		(uuid "99815023-fe13-4b92-885d-c497d473a60e")
 	)
 	(label "CHARGER_EN"
-		(at 151.13 189.23 180)
+		(at 133.35 120.65 180)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -6018,7 +7054,7 @@
 		(uuid "d7e6a8fa-df30-4b38-8fa3-c72691e518a8")
 	)
 	(label "CTR_CHARGER_EN"
-		(at 73.66 189.23 0)
+		(at 68.58 120.65 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -6080,17 +7116,6 @@
 		)
 		(uuid "8e2b4340-0b58-4980-8ad4-5a1f610693cb")
 	)
-	(hierarchical_label "SNS_USB_CONN"
-		(shape input)
-		(at 72.39 196.85 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "8f9b68a2-1af8-4483-ab10-59563adec00e")
-	)
 	(hierarchical_label "PWR_BATT_5V"
 		(shape output)
 		(at 381 133.35 0)
@@ -6114,17 +7139,6 @@
 		)
 		(uuid "c80fbffc-2d19-4ec8-9be4-8b7a9b7a39bc")
 	)
-	(hierarchical_label "CTR_CHARGER_EN"
-		(shape input)
-		(at 72.39 189.23 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "ef1186cc-1c81-4296-b113-84b9287dfbe9")
-	)
 	(hierarchical_label "SNS_~{STANDBY}"
 		(shape output)
 		(at 46.99 53.34 180)
@@ -6217,6 +7231,121 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:R")
+		(at 87.63 151.13 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "01c1e797-8c2d-4c77-ba39-7f3f1c66560f")
+		(property "Reference" "R56"
+			(at 90.17 149.8599 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "10k"
+			(at 90.17 152.3999 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 85.852 151.13 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 87.63 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 87.63 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 87.63 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 87.63 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 87.63 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 87.63 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 87.63 151.13 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "ede6a05f-8047-47f6-b0fc-ed0c79dc3cae")
+		)
+		(pin "1"
+			(uuid "33a1ba14-4c7a-42a2-9d32-4c00d3945d0e")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "R56")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:R")
 		(at 248.92 81.28 270)
@@ -6304,7 +7433,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "47k"
+		(property "Value" "100k"
 			(at 67.31 34.2899 0)
 			(effects
 				(font
@@ -6313,7 +7442,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 62.992 33.02 90)
 			(effects
 				(font
@@ -6340,6 +7469,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 64.77 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AF0603FR-13100KL"
+			(at 64.77 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 64.77 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AF0603FR-13100KL?qs=sGAEpiMZZMtlubZbdhIBIAA5Rg%252BBqQHD6JBGym85xFc%3D"
+			(at 64.77 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AF0603FR-13100KL"
+			(at 64.77 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "35b82080-7f84-4ed4-9f6b-5fad8c1bc0bb")
 		)
@@ -6453,7 +7627,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0805_2012Metric"
 			(at 337.5152 147.32 0)
 			(effects
 				(font
@@ -6480,6 +7654,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "5V"
+			(at 336.55 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 336.55 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GRM21BZ71C106KE15L "
+			(at 336.55 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 336.55 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GRM21BZ71C106KE15L?qs=Ey7%2FXF42M3eA%252BEoaJUUJjg%3D%3D"
+			(at 336.55 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GRM21BZ71C106KE5L "
+			(at 336.55 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "7944c0c1-0eab-4f37-83b8-39e0f4679d74")
 		)
@@ -6495,6 +7723,94 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:D_Schottky")
+		(at 102.87 135.89 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "0f6e7018-76cd-4164-a74c-0eac5e01739e")
+		(property "Reference" "D13"
+			(at 105.41 134.9374 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Value" "D"
+			(at 105.41 137.4774 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Footprint" ""
+			(at 102.87 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 102.87 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Schottky diode"
+			(at 102.87 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "D"
+			(at 102.87 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=K 2=A"
+			(at 102.87 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "42d37a61-cbd9-45f6-a90d-a57a503cce7b")
+		)
+		(pin "1"
+			(uuid "200d775c-bad8-4bf8-bdb8-8a1f3f2b4a93")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "D13")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 46.99 82.55 0)
@@ -6564,17 +7880,15 @@
 	)
 	(symbol
 		(lib_id "Device:L")
-		(at 270.51 148.59 0)
-		(mirror x)
+		(at 270.51 148.59 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
 		(uuid "1b6b48a7-8b86-46cd-9f3e-4c65cd96c704")
 		(property "Reference" "L1"
-			(at 269.24 147.3199 0)
+			(at 271.78 147.3199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6583,7 +7897,7 @@
 			)
 		)
 		(property "Value" "L"
-			(at 269.24 149.8599 0)
+			(at 271.78 149.8599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6661,7 +7975,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
 			(at 312.1152 68.58 0)
 			(effects
 				(font
@@ -6688,6 +8002,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "4V2"
+			(at 311.15 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 311.15 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GCJ188R71C104KA01D"
+			(at 311.15 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 311.15 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GCJ188R71C104KA01D?qs=zThidflJDvZxFByCB3VmpA%3D%3D"
+			(at 311.15 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GCJ188R71C104KA1D"
+			(at 311.15 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "665c0f92-ecc7-4371-8e46-21b6b205b30d")
 		)
@@ -6798,7 +8166,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 259.842 157.48 90)
 			(effects
 				(font
@@ -6825,6 +8193,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 261.62 157.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603JR-070RL"
+			(at 261.62 157.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 261.62 157.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/ProductDetail/YAGEO/RC0603JR-070RL?qs=2cAdsCoAWRGWyPcuXgGiXQ%3D%3D"
+			(at 261.62 157.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" " 603-RC0603JR-070RL "
+			(at 261.62 157.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "6ca1ea2a-d3a1-40e0-98da-0cf33912e925")
 		)
@@ -6909,6 +8322,121 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:R")
+		(at 120.65 125.73 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "2cd39e2c-d4ea-4e3d-96f9-5dacff75dfb1")
+		(property "Reference" "R77"
+			(at 123.19 124.4599 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "10k"
+			(at 123.19 126.9999 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 118.872 125.73 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 120.65 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 120.65 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 120.65 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 120.65 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 120.65 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 120.65 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 120.65 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "082d8f63-6a13-4208-a1d4-621d8b01433b")
+		)
+		(pin "1"
+			(uuid "23088a9f-4341-4c32-a5c0-b83e35382332")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "R77")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:C")
 		(at 223.52 64.77 0)
@@ -6938,7 +8466,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
 			(at 222.5548 68.58 0)
 			(effects
 				(font
@@ -6965,6 +8493,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "4V2"
+			(at 223.52 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 223.52 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GCJ188R71C104KA01D"
+			(at 223.52 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 223.52 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GCJ188R71C104KA01D?qs=zThidflJDvZxFByCB3VmpA%3D%3D"
+			(at 223.52 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GCJ188R71C104KA1D"
+			(at 223.52 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "7a1541e9-08e1-4a92-9a28-3ad11f4eede9")
 		)
@@ -7008,7 +8590,7 @@
 				(justify right)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 309.372 50.8 90)
 			(effects
 				(font
@@ -7148,7 +8730,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0805_2012Metric"
 			(at 235.9152 147.32 0)
 			(effects
 				(font
@@ -7175,6 +8757,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "4V2"
+			(at 234.95 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 234.95 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GRM21BZ71C106KE15L "
+			(at 234.95 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 234.95 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GRM21BZ71C106KE15L?qs=Ey7%2FXF42M3eA%252BEoaJUUJjg%3D%3D"
+			(at 234.95 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GRM21BZ71C106KE5L "
+			(at 234.95 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "79479614-af29-4561-9fc6-a561b21ffdaa")
 		)
@@ -7452,7 +9088,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 221.742 50.8 90)
 			(effects
 				(font
@@ -7564,6 +9200,117 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Transistor_FET:BSS84")
+		(at 102.87 123.19 270)
+		(mirror x)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "7453c95c-538d-4995-b843-a8bdd514f344")
+		(property "Reference" "Q15"
+			(at 102.87 114.3 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "BSS84"
+			(at 102.87 116.84 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+			(at 100.965 118.11 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 99.06 118.11 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+		(property "Description" "-0.13A Id, -50V Vds, P-Channel MOSFET, SOT-23"
+			(at 102.87 123.19 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Library" "model/BSS84.lib"
+			(at 102.87 123.19 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "BSS84"
+			(at 102.87 123.19 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "SUBCKT"
+			(at 102.87 123.19 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=4 2=5 3=3"
+			(at 102.87 123.19 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "3"
+			(uuid "2a2b239f-58a0-487d-9608-db77a9849800")
+		)
+		(pin "1"
+			(uuid "b90098f7-ab5a-408c-b739-0d5d4a66b4f7")
+		)
+		(pin "2"
+			(uuid "be759f51-2317-4018-810c-b9bc49289566")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "Q15")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:R")
 		(at 251.46 50.8 0)
@@ -7591,7 +9338,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 249.682 50.8 90)
 			(effects
 				(font
@@ -7618,6 +9365,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 251.46 50.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603FR-101KL"
+			(at 251.46 50.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 251.46 50.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/RC0603FR-101KL?qs=sGAEpiMZZMtlubZbdhIBIHvQf5egq9lv5WuapZo15J4%3D"
+			(at 251.46 50.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-RC0603FR-101KL"
+			(at 251.46 50.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "8ccf25ab-09d9-4a43-8d41-7e9c933c7c7a")
 		)
@@ -7801,7 +9593,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 279.908 76.2 90)
 			(effects
 				(font
@@ -7828,6 +9620,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 278.13 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "RC0603FR-101KL"
+			(at 278.13 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 278.13 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/RC0603FR-101KL?qs=sGAEpiMZZMtlubZbdhIBIHvQf5egq9lv5WuapZo15J4%3D"
+			(at 278.13 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-RC0603FR-101KL"
+			(at 278.13 76.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "887b4079-8de9-4c4b-aa70-4e30413c5519")
 		)
@@ -8252,7 +10089,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0805_2012Metric"
 			(at 324.8152 147.32 0)
 			(effects
 				(font
@@ -8279,6 +10116,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "5V"
+			(at 323.85 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 323.85 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GRM21BZ71C106KE15L "
+			(at 323.85 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 323.85 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GRM21BZ71C106KE15L?qs=Ey7%2FXF42M3eA%252BEoaJUUJjg%3D%3D"
+			(at 323.85 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GRM21BZ71C106KE5L "
+			(at 323.85 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "df4bde5d-d738-41a6-95e5-fbeaf8caf40e")
 		)
@@ -8392,7 +10283,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
 			(at 249.8852 147.32 0)
 			(effects
 				(font
@@ -8419,6 +10310,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "4V2"
+			(at 248.92 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 248.92 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GCJ188R71C104KA01D"
+			(at 248.92 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 248.92 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GCJ188R71C104KA01D?qs=zThidflJDvZxFByCB3VmpA%3D%3D"
+			(at 248.92 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GCJ188R71C104KA1D"
+			(at 248.92 143.51 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "b7812223-2354-4c09-9a5d-f0e60219b32f")
 		)
@@ -8434,6 +10379,118 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Transistor_FET:2N7002")
+		(at 100.33 165.1 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "a568191b-948f-41fc-b96d-2ebcd33bebdd")
+		(property "Reference" "Q14"
+			(at 106.68 163.8299 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "2N7002"
+			(at 106.68 166.3699 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+			(at 105.41 167.005 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 105.41 168.91 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 100.33 165.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Library" "model/2N7002.lib"
+			(at 100.33 165.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "N7002"
+			(at 100.33 165.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "SUBCKT"
+			(at 100.33 165.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=20 2=30 3=10"
+			(at 100.33 165.1 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "3"
+			(uuid "48d98ee7-f03d-43e1-8604-53738e46c733")
+		)
+		(pin "2"
+			(uuid "0b0766c5-af69-4bd6-b4f8-891dee1f9ff4")
+		)
+		(pin "1"
+			(uuid "99d2204c-325f-4bf2-a8bf-3468fa4aa468")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "Q14")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:C")
 		(at 88.9 30.48 0)
@@ -8462,7 +10519,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0603_1608Metric"
 			(at 89.8652 34.29 0)
 			(effects
 				(font
@@ -8489,6 +10546,60 @@
 				(hide yes)
 			)
 		)
+		(property "Max DC Bias" "5V"
+			(at 88.9 30.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "Murata"
+			(at 88.9 30.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "GCJ188R71C104KA01D"
+			(at 88.9 30.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 88.9 30.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/Murata-Electronics/GCJ188R71C104KA01D?qs=zThidflJDvZxFByCB3VmpA%3D%3D"
+			(at 88.9 30.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "81-GCJ188R71C104KA1D"
+			(at 88.9 30.48 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "7072e54c-c17a-4abf-95ca-3965a8f06418")
 		)
@@ -8654,6 +10765,118 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Transistor_FET:2N7002")
+		(at 100.33 146.05 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "bb883a97-1dbe-4aa5-874e-9391d46948bf")
+		(property "Reference" "Q13"
+			(at 106.68 144.7799 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "2N7002"
+			(at 106.68 147.3199 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Package_TO_SOT_SMD:SOT-23"
+			(at 105.41 147.955 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 105.41 149.86 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 100.33 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Library" "model/2N7002.lib"
+			(at 100.33 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "N7002"
+			(at 100.33 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "SUBCKT"
+			(at 100.33 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=20 2=30 3=10"
+			(at 100.33 146.05 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "3"
+			(uuid "7f38c649-1d36-4436-8ca8-8a5b39724fce")
+		)
+		(pin "2"
+			(uuid "55cd940e-238c-40b0-bdd1-12eabd29caca")
+		)
+		(pin "1"
+			(uuid "19ea9f0e-44b3-46da-870a-e8a60ece38cd")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "Q13")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 234.95 170.18 0)
@@ -8721,6 +10944,188 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:R")
+		(at 87.63 125.73 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "c852c51b-73ed-43d7-95f6-4bac6735bbf9")
+		(property "Reference" "R55"
+			(at 90.17 124.4599 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "10k"
+			(at 90.17 126.9999 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 85.852 125.73 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 87.63 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 87.63 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 87.63 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 87.63 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 87.63 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 87.63 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 87.63 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "8662cfb1-114a-43ef-b65c-e14fe9210d30")
+		)
+		(pin "1"
+			(uuid "d4745ec0-b76f-4624-ade5-41d5f356ad35")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "R55")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at 120.65 129.54 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "ce9674bc-e9b4-4ec3-86df-6a920c65cf66")
+		(property "Reference" "#PWR0112"
+			(at 120.65 135.89 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 120.65 134.62 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Footprint" ""
+			(at 120.65 129.54 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 120.65 129.54 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 120.65 129.54 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "791365c7-1c81-4d7c-9dc0-8a2ae25a2ea6")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "#PWR0112")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:Thermistor_NTC")
 		(at 186.69 69.85 0)
@@ -8858,6 +11263,121 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:R")
+		(at 87.63 170.18 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "e014224f-7bf3-4470-9eba-255defd59b68")
+		(property "Reference" "R76"
+			(at 90.17 168.9099 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "10k"
+			(at 90.17 171.4499 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 85.852 170.18 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 87.63 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 87.63 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 87.63 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 87.63 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 87.63 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 87.63 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 87.63 170.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "7b60b8fc-0df1-4168-8dc8-96c8ceaefa62")
+		)
+		(pin "1"
+			(uuid "d9f2fccb-432d-4eed-b2e4-63d8595616cd")
+		)
+		(instances
+			(project "keyboard_controller"
+				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
+					(reference "R76")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Battery_Management:TP4056-42-ESOP8")
 		(at 101.6 50.8 0)
@@ -8951,7 +11471,7 @@
 	)
 	(symbol
 		(lib_id "Device:R")
-		(at 55.88 33.02 0)
+		(at 53.34 33.02 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8960,7 +11480,7 @@
 		(fields_autoplaced yes)
 		(uuid "f3c6433e-ce9c-45bd-affa-048cb262d06e")
 		(property "Reference" "R46"
-			(at 58.42 31.7499 0)
+			(at 55.88 31.7499 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8968,8 +11488,8 @@
 				(justify left)
 			)
 		)
-		(property "Value" "47k"
-			(at 58.42 34.2899 0)
+		(property "Value" "100k"
+			(at 55.88 34.2899 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8977,8 +11497,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 54.102 33.02 90)
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
+			(at 51.562 33.02 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8987,7 +11507,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 55.88 33.02 0)
+			(at 53.34 33.02 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8996,7 +11516,52 @@
 			)
 		)
 		(property "Description" "Resistor"
-			(at 55.88 33.02 0)
+			(at 53.34 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer" "YAGEO"
+			(at 53.34 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AF0603FR-13100KL"
+			(at 53.34 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 53.34 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AF0603FR-13100KL?qs=sGAEpiMZZMtlubZbdhIBIAA5Rg%252BBqQHD6JBGym85xFc%3D"
+			(at 53.34 33.02 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AF0603FR-13100KL"
+			(at 53.34 33.02 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9089,94 +11654,69 @@
 			)
 		)
 	)
-	(sheet
-		(at 93.98 185.42)
-		(size 38.1 15.24)
+	(symbol
+		(lib_id "power:GND")
+		(at 87.63 176.53 0)
+		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(stroke
-			(width 0.1524)
-			(type solid)
-		)
-		(fill
-			(color 0 0 0 0.0000)
-		)
-		(uuid "63e3e399-8f11-45d4-96da-ee05abfc7bfc")
-		(property "Sheetname" "Battery Control"
-			(at 93.98 184.7084 0)
+		(uuid "fc6d83cf-ab65-454c-8ee3-8e6f0dfad942")
+		(property "Reference" "#PWR026"
+			(at 87.63 182.88 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left bottom)
+				(hide yes)
 			)
 		)
-		(property "Sheetfile" "block/battery_control.kicad_sch"
-			(at 93.98 201.2446 0)
+		(property "Value" "GND"
+			(at 87.63 181.61 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left top)
+				(hide yes)
 			)
 		)
-		(pin "CHARGER_EN" output
-			(at 132.08 189.23 0)
-			(uuid "0bfad531-934f-4066-aae5-d6c4486cdc38")
+		(property "Footprint" ""
+			(at 87.63 176.53 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
+				(hide yes)
 			)
 		)
-		(pin "BATT_BOOST_EN" output
-			(at 132.08 193.04 0)
-			(uuid "652bc4a0-549f-4b90-8a7d-a099b8ba5103")
+		(property "Datasheet" ""
+			(at 87.63 176.53 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
+				(hide yes)
 			)
 		)
-		(pin "CTR_CHARGER_EN" input
-			(at 93.98 189.23 180)
-			(uuid "0406f61f-bc59-4a59-b0d2-5d3b4c15e4d4")
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 87.63 176.53 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(hide yes)
 			)
 		)
-		(pin "SNS_USB_CONN" input
-			(at 93.98 196.85 180)
-			(uuid "7abb23aa-5584-4b2e-8bd8-3816a5582c03")
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(pin "SNS_BATT_CONN" input
-			(at 93.98 193.04 180)
-			(uuid "7933d7ba-3dfc-4093-af0b-b8d50790f9c1")
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
+		(pin "1"
+			(uuid "6c69471b-9844-4577-84f6-e4189b18a187")
 		)
 		(instances
 			(project "keyboard_controller"
 				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5"
-					(page "10")
+					(reference "#PWR026")
+					(unit 1)
 				)
 			)
 		)
diff --git a/Hardware/keyboard_controller/block/battery_control.kicad_sch b/Hardware/keyboard_controller/block/battery_control.kicad_sch
deleted file mode 100644
index 9887f77..0000000
--- a/Hardware/keyboard_controller/block/battery_control.kicad_sch
+++ /dev/null
@@ -1,2252 +0,0 @@
-(kicad_sch
-	(version 20250114)
-	(generator "eeschema")
-	(generator_version "9.0")
-	(uuid "6c16a6d2-9e17-403b-9f7c-9f978d8b224e")
-	(paper "A5")
-	(lib_symbols
-		(symbol "Device:D_Schottky"
-			(pin_numbers
-				(hide yes)
-			)
-			(pin_names
-				(offset 1.016)
-				(hide yes)
-			)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "D"
-				(at 0 2.54 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Value" "D_Schottky"
-				(at 0 -2.54 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" "~"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Schottky diode"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "diode Schottky"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "D_Schottky_0_1"
-				(polyline
-					(pts
-						(xy -1.905 0.635) (xy -1.905 1.27) (xy -1.27 1.27) (xy -1.27 -1.27) (xy -0.635 -1.27) (xy -0.635 -0.635)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 1.27 1.27) (xy 1.27 -1.27) (xy -1.27 0) (xy 1.27 1.27)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 1.27 0) (xy -1.27 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "D_Schottky_1_1"
-				(pin passive line
-					(at -3.81 0 0)
-					(length 2.54)
-					(name "K"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 3.81 0 180)
-					(length 2.54)
-					(name "A"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-			(embedded_fonts no)
-		)
-		(symbol "Device:R"
-			(pin_numbers
-				(hide yes)
-			)
-			(pin_names
-				(offset 0)
-			)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "R"
-				(at 2.032 0 90)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Value" "R"
-				(at 0 0 90)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at -1.778 0 90)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" "~"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Resistor"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "R res resistor"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_fp_filters" "R_*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "R_0_1"
-				(rectangle
-					(start -1.016 -2.54)
-					(end 1.016 2.54)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "R_1_1"
-				(pin passive line
-					(at 0 3.81 270)
-					(length 1.27)
-					(name "~"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 0 -3.81 90)
-					(length 1.27)
-					(name "~"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-			(embedded_fonts no)
-		)
-		(symbol "Transistor_FET:2N7002"
-			(pin_names
-				(hide yes)
-			)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "Q"
-				(at 5.08 1.905 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(justify left)
-				)
-			)
-			(property "Value" "2N7002"
-				(at 5.08 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(justify left)
-				)
-			)
-			(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 "Description" "0.115A Id, 60V Vds, N-Channel MOSFET, SOT-23"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "N-Channel Switching MOSFET"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(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)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.254 0) (xy -2.54 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 2.286) (xy 0.762 1.27)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 0.508) (xy 0.762 -0.508)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 -1.27) (xy 0.762 -2.286)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 -1.778) (xy 3.302 -1.778) (xy 3.302 1.778) (xy 0.762 1.778)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 1.016 0) (xy 2.032 0.381) (xy 2.032 -0.381) (xy 1.016 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(circle
-					(center 1.651 0)
-					(radius 2.794)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 2.54 2.54) (xy 2.54 1.778)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(circle
-					(center 2.54 1.778)
-					(radius 0.254)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(circle
-					(center 2.54 -1.778)
-					(radius 0.254)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(polyline
-					(pts
-						(xy 2.54 -2.54) (xy 2.54 0) (xy 0.762 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 2.794 0.508) (xy 2.921 0.381) (xy 3.683 0.381) (xy 3.81 0.254)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 3.302 0.381) (xy 2.921 -0.254) (xy 3.683 -0.254) (xy 3.302 0.381)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "2N7002_1_1"
-				(pin input line
-					(at -5.08 0 0)
-					(length 2.54)
-					(name "G"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 2.54 5.08 270)
-					(length 2.54)
-					(name "D"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "3"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 2.54 -5.08 90)
-					(length 2.54)
-					(name "S"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-			(embedded_fonts no)
-		)
-		(symbol "Transistor_FET:BSS84"
-			(pin_names
-				(hide yes)
-			)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "Q"
-				(at 5.08 1.905 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(justify left)
-				)
-			)
-			(property "Value" "BSS84"
-				(at 5.08 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(justify left)
-				)
-			)
-			(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 "Description" "-0.13A Id, -50V Vds, P-Channel MOSFET, SOT-23"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "P-Channel MOSFET"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(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)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.254 0) (xy -2.54 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 2.286) (xy 0.762 1.27)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 1.778) (xy 3.302 1.778) (xy 3.302 -1.778) (xy 0.762 -1.778)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 0.508) (xy 0.762 -0.508)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.762 -1.27) (xy 0.762 -2.286)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(circle
-					(center 1.651 0)
-					(radius 2.794)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 2.286 0) (xy 1.27 0.381) (xy 1.27 -0.381) (xy 2.286 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(polyline
-					(pts
-						(xy 2.54 2.54) (xy 2.54 1.778)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(circle
-					(center 2.54 1.778)
-					(radius 0.254)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(circle
-					(center 2.54 -1.778)
-					(radius 0.254)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(polyline
-					(pts
-						(xy 2.54 -2.54) (xy 2.54 0) (xy 0.762 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 2.794 -0.508) (xy 2.921 -0.381) (xy 3.683 -0.381) (xy 3.81 -0.254)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 3.302 -0.381) (xy 2.921 0.254) (xy 3.683 0.254) (xy 3.302 -0.381)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "BSS84_1_1"
-				(pin input line
-					(at -5.08 0 0)
-					(length 2.54)
-					(name "G"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 2.54 5.08 270)
-					(length 2.54)
-					(name "D"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "3"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 2.54 -5.08 90)
-					(length 2.54)
-					(name "S"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-			(embedded_fonts no)
-		)
-		(symbol "power:GND"
-			(power)
-			(pin_numbers
-				(hide yes)
-			)
-			(pin_names
-				(offset 0)
-				(hide yes)
-			)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "#PWR"
-				(at 0 -6.35 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Value" "GND"
-				(at 0 -3.81 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" ""
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "global power"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "GND_0_1"
-				(polyline
-					(pts
-						(xy 0 0) (xy 0 -1.27) (xy 1.27 -1.27) (xy 0 -2.54) (xy -1.27 -1.27) (xy 0 -1.27)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "GND_1_1"
-				(pin power_in line
-					(at 0 0 270)
-					(length 0)
-					(name "~"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-			(embedded_fonts no)
-		)
-	)
-	(text "Enabled only when battery connected and USB disconnected"
-		(exclude_from_sim no)
-		(at 129.794 69.85 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "1d02578b-11c7-410a-8519-6bfcf2d94500")
-	)
-	(text "Charger is only enabled if all conditions are true"
-		(exclude_from_sim no)
-		(at 128.524 31.75 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "b918cdd3-e926-4615-b2e7-04cd4a5c1773")
-	)
-	(junction
-		(at 81.28 67.31)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "1016aa9d-9dff-44c3-bd4f-b5860d15e1d2")
-	)
-	(junction
-		(at 99.06 31.75)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "17994310-2334-469b-ace3-eed5dc6604fc")
-	)
-	(junction
-		(at 66.04 57.15)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "47d27dd5-1abb-413a-98b5-61de9d316e58")
-	)
-	(junction
-		(at 81.28 69.85)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "55a450b3-0c49-4892-8a77-e6bb6dc681af")
-	)
-	(junction
-		(at 66.04 86.36)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "7d546d0d-5612-4069-85fd-ec934552bbbc")
-	)
-	(junction
-		(at 66.04 76.2)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "86752c09-77e6-4c72-84ec-10f2c3200a57")
-	)
-	(junction
-		(at 66.04 31.75)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "8c8e7c21-0c36-4c5f-846f-107e41c622cd")
-	)
-	(junction
-		(at 81.28 41.91)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "f3d221ff-e978-4100-a105-5f0d875e7a7c")
-	)
-	(wire
-		(pts
-			(xy 66.04 76.2) (xy 66.04 77.47)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "0a91b182-7819-40c3-b936-68fce3f9fbd1")
-	)
-	(wire
-		(pts
-			(xy 81.28 86.36) (xy 81.28 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "0bf32ad5-5065-4d42-9b5d-cd7acd4fa590")
-	)
-	(wire
-		(pts
-			(xy 66.04 57.15) (xy 66.04 58.42)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "268d9ad1-1132-4d57-88a0-ec359d8e6ff2")
-	)
-	(wire
-		(pts
-			(xy 60.96 57.15) (xy 66.04 57.15)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "2ff87e14-3107-440f-aca2-2886edb23045")
-	)
-	(wire
-		(pts
-			(xy 66.04 31.75) (xy 76.2 31.75)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "36b9e1ab-3187-4baa-8ee4-f1c2ee9b2a6a")
-	)
-	(wire
-		(pts
-			(xy 60.96 31.75) (xy 66.04 31.75)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "412bd424-e065-4fed-b288-63a0874e88f4")
-	)
-	(wire
-		(pts
-			(xy 66.04 67.31) (xy 81.28 67.31)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "43ed91c4-069b-40be-ba90-217734f5cb92")
-	)
-	(wire
-		(pts
-			(xy 81.28 39.37) (xy 81.28 41.91)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "4c36f145-4652-4c00-9daf-7a66ccb143f9")
-	)
-	(wire
-		(pts
-			(xy 81.28 50.8) (xy 81.28 52.07)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "51c3db64-4f1c-4cc4-9c01-a86b9caffdc7")
-	)
-	(wire
-		(pts
-			(xy 99.06 31.75) (xy 99.06 33.02)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "5df72e26-aaf2-4a44-b624-ef4e47491ee8")
-	)
-	(wire
-		(pts
-			(xy 60.96 76.2) (xy 66.04 76.2)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "72723273-e99f-48f1-bfcb-69cb1efb69eb")
-	)
-	(wire
-		(pts
-			(xy 81.28 69.85) (xy 81.28 71.12)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "72cf5e0e-dfda-456c-93a1-d2285e0a2c2a")
-	)
-	(wire
-		(pts
-			(xy 66.04 87.63) (xy 66.04 86.36)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "75dbfe47-47bf-41b6-b1aa-08dfb4acce1e")
-	)
-	(wire
-		(pts
-			(xy 66.04 40.64) (xy 66.04 41.91)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "7c5cfe0c-c099-45d1-8457-c1f3bfc10d70")
-	)
-	(wire
-		(pts
-			(xy 66.04 41.91) (xy 81.28 41.91)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "84f8b7af-b655-4107-8421-ee833936b58e")
-	)
-	(wire
-		(pts
-			(xy 66.04 66.04) (xy 66.04 67.31)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "86265b9d-cd42-4c56-9435-84cd09b31212")
-	)
-	(wire
-		(pts
-			(xy 66.04 76.2) (xy 73.66 76.2)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "94cd21b4-1deb-4196-8c6e-e11e0c379983")
-	)
-	(wire
-		(pts
-			(xy 81.28 62.23) (xy 81.28 67.31)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "9548e87e-8cdd-4724-994d-9fb57a116ae1")
-	)
-	(wire
-		(pts
-			(xy 86.36 31.75) (xy 99.06 31.75)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "9dcf7bcb-a19d-4855-b913-7aede7e15cf7")
-	)
-	(wire
-		(pts
-			(xy 99.06 31.75) (xy 111.76 31.75)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "adcc51b3-6821-4210-a044-aeb5fdb72cca")
-	)
-	(wire
-		(pts
-			(xy 66.04 86.36) (xy 66.04 85.09)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ae13a7b3-ad91-480f-af20-2054a74dd42f")
-	)
-	(wire
-		(pts
-			(xy 81.28 69.85) (xy 111.76 69.85)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "b8113d55-6049-4446-8bd7-a288ee88bba7")
-	)
-	(wire
-		(pts
-			(xy 66.04 86.36) (xy 81.28 86.36)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "b8998898-e24a-4fa5-837d-f36d770c4d9a")
-	)
-	(wire
-		(pts
-			(xy 66.04 31.75) (xy 66.04 33.02)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "c9036303-92b8-4368-9db3-2b7c73111845")
-	)
-	(wire
-		(pts
-			(xy 81.28 41.91) (xy 81.28 43.18)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "cf79595e-9059-4cde-8b08-4184e80e8419")
-	)
-	(wire
-		(pts
-			(xy 81.28 67.31) (xy 81.28 69.85)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "d453bc68-8b2b-4258-be47-b87f44958ecb")
-	)
-	(wire
-		(pts
-			(xy 66.04 57.15) (xy 73.66 57.15)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "f42eda45-085c-4b8a-a51c-92450c204e71")
-	)
-	(hierarchical_label "SNS_USB_CONN"
-		(shape input)
-		(at 60.96 76.2 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "0886db9c-f5b2-4686-9532-83a03b8f5f05")
-	)
-	(hierarchical_label "BATT_BOOST_EN"
-		(shape output)
-		(at 111.76 69.85 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "2acdd97d-f636-4961-92aa-5de746d39571")
-	)
-	(hierarchical_label "SNS_BATT_CONN"
-		(shape input)
-		(at 60.96 57.15 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "3ac49502-5a83-45a8-afe0-8123a9d921d8")
-	)
-	(hierarchical_label "CTR_CHARGER_EN"
-		(shape input)
-		(at 60.96 31.75 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right)
-		)
-		(uuid "64169b50-f3c7-481f-8bb4-93ded25afd0a")
-	)
-	(hierarchical_label "CHARGER_EN"
-		(shape output)
-		(at 111.76 31.75 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
-		)
-		(uuid "d192d4f5-118b-475e-a313-1f36eeadf14d")
-	)
-	(symbol
-		(lib_id "Transistor_FET:2N7002")
-		(at 78.74 76.2 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "b5a6d8e4-104e-4671-b940-28fcc733232a")
-		(property "Reference" "Q11"
-			(at 85.09 74.9299 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "2N7002"
-			(at 85.09 77.4699 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(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 "Description" "0.115A Id, 60V Vds, N-Channel MOSFET, SOT-23"
-			(at 78.74 76.2 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Library" "model/2N7002.lib"
-			(at 78.74 76.2 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "N7002"
-			(at 78.74 76.2 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(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)
-				)
-				(hide yes)
-			)
-		)
-		(pin "3"
-			(uuid "370923f0-9cad-44e7-891a-d667278386e4")
-		)
-		(pin "2"
-			(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)
-				)
-			)
-		)
-	)
-	(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)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R")
-		(at 66.04 81.28 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "c67f185a-97b0-443a-8210-2d478188e671")
-		(property "Reference" "R79"
-			(at 68.58 80.0099 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "10k"
-			(at 68.58 82.5499 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at 64.262 81.28 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 66.04 81.28 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor"
-			(at 66.04 81.28 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "92891d20-9d35-4627-8c41-030dcd90b24b")
-		)
-		(pin "1"
-			(uuid "1211b8a5-8ffb-47f7-a585-88b86d9e939f")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "R79")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
-					(reference "R74")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R")
-		(at 66.04 62.23 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "caa978cf-2d0f-4a10-832a-ad908d18a35c")
-		(property "Reference" "R75"
-			(at 68.58 60.9599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "47k"
-			(at 68.58 63.4999 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at 64.262 62.23 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 66.04 62.23 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor"
-			(at 66.04 62.23 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "ed763710-ba3e-43c6-9c87-06fa13f06508")
-		)
-		(pin "1"
-			(uuid "b56bdc4f-6677-4655-9ded-68cc2dec097d")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "R75")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
-					(reference "R72")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:D_Schottky")
-		(at 81.28 46.99 90)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "d7986eaa-d6b7-4903-a367-ebfd775cd947")
-		(property "Reference" "D14"
-			(at 83.82 46.0374 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(property "Value" "D"
-			(at 83.82 48.5774 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(property "Footprint" ""
-			(at 81.28 46.99 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 81.28 46.99 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Schottky diode"
-			(at 81.28 46.99 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "D"
-			(at 81.28 46.99 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=K 2=A"
-			(at 81.28 46.99 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "162ba35f-9a68-4705-8a43-a4737ffc0b5a")
-		)
-		(pin "1"
-			(uuid "203e5c90-789e-4845-abc3-8a8a2690b22c")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "D14")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
-					(reference "D15")
-					(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 "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)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "f0e787f9-5959-45d3-89b4-2cb1f439d3e2")
-		(property "Reference" "Q16"
-			(at 81.28 25.4 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "BSS84"
-			(at 81.28 27.94 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(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 "Description" "-0.13A Id, -50V Vds, P-Channel MOSFET, SOT-23"
-			(at 81.28 34.29 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Library" "model/BSS84.lib"
-			(at 81.28 34.29 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "BSS84"
-			(at 81.28 34.29 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(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)
-				)
-				(hide yes)
-			)
-		)
-		(pin "3"
-			(uuid "3e894033-dffa-4430-9e41-6fa3de4feef0")
-		)
-		(pin "1"
-			(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 "Q16")
-					(unit 1)
-				)
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/b142b31d-ecee-4339-a207-bc1b4c6ffd39/7181fa6b-855a-471b-8c8b-dec603900d3d"
-					(reference "Q17")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R")
-		(at 99.06 36.83 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "fc57fcce-812e-4d12-83f0-d57d88ddec48")
-		(property "Reference" "R80"
-			(at 101.6 35.5599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "47k"
-			(at 101.6 38.0999 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at 97.282 36.83 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 99.06 36.83 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor"
-			(at 99.06 36.83 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "2"
-			(uuid "025d06c4-fc47-46aa-9c40-de0a335c4f40")
-		)
-		(pin "1"
-			(uuid "68405fb9-b9eb-4534-8ba1-f85e2533f968")
-		)
-		(instances
-			(project "keyboard_controller"
-				(path "/b230ff6d-d62b-4e9b-b4a9-a03792e35fdd/596f4890-a5ff-4776-a61d-272e3bcbcdd5/63e3e399-8f11-45d4-96da-ee05abfc7bfc"
-					(reference "R80")
-					(unit 1)
-				)
-				(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 8423cb7..bc6f684 100644
--- a/Hardware/keyboard_controller/block/ideal_diode.kicad_sch
+++ b/Hardware/keyboard_controller/block/ideal_diode.kicad_sch
@@ -1039,7 +1039,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 112.522 67.31 90)
 			(effects
 				(font
@@ -1066,6 +1066,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 114.3 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 114.3 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 114.3 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 114.3 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 114.3 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "413fdc40-b7ae-4d83-9063-5cde5e5bdcc1")
 		)
@@ -1284,7 +1329,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 87.122 67.31 90)
 			(effects
 				(font
@@ -1311,6 +1356,51 @@
 				(hide yes)
 			)
 		)
+		(property "Manufacturer" "YAGEO"
+			(at 88.9 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Manufacturer PN" "AC0603FRE0710KL "
+			(at 88.9 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier" "Mouser"
+			(at 88.9 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier Link" "https://nz.mouser.com/en/ProductDetail/YAGEO/AC0603FRE0710KL?qs=sGAEpiMZZMtlubZbdhIBIMMVXX%252Bgggzk9JL1vEGiQ0A%3D"
+			(at 88.9 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Supplier PN" "603-AC0603FRE0710KL "
+			(at 88.9 67.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "2"
 			(uuid "3bd64f74-95c5-4b4e-bd47-1b5f73b9c46c")
 		)
diff --git a/Hardware/keyboard_controller/keyboard_controller.kicad_pro b/Hardware/keyboard_controller/keyboard_controller.kicad_pro
index 8cb4feb..ee3396e 100644
--- a/Hardware/keyboard_controller/keyboard_controller.kicad_pro
+++ b/Hardware/keyboard_controller/keyboard_controller.kicad_pro
@@ -437,6 +437,18 @@
           "label": "#",
           "name": "${ITEM_NUMBER}",
           "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Sim.Name",
+          "name": "Sim.Name",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Sim.Library",
+          "name": "Sim.Library",
+          "show": false
         }
       ],
       "filter_string": "",
@@ -444,7 +456,7 @@
       "include_excluded_from_bom": false,
       "name": "",
       "sort_asc": true,
-      "sort_field": "Reference"
+      "sort_field": "Value"
     },
     "connection_grid_size": 50.0,
     "drawing": {
@@ -513,7 +525,15 @@
     ],
     [
       "596f4890-a5ff-4776-a61d-272e3bcbcdd5",
-      "POWER"
+      "Battery"
+    ],
+    [
+      "efdabaa1-4e6c-4b02-8574-dea8c0bb89ea",
+      "Ideal diode"
+    ],
+    [
+      "14e475fc-3ffe-44c4-b9c9-539e1b0d41cb",
+      "Ideal diode"
     ]
   ],
   "text_variables": {}