diff --git a/mcu.kicad_sch b/mcu.kicad_sch
index 8c99295..d647c09 100644
--- a/mcu.kicad_sch
+++ b/mcu.kicad_sch
@@ -1742,17 +1742,21 @@
   )
 
   (symbol (lib_id "lsf-kicad:ECS-TXO-2520") (at 85.09 58.42 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a9d66172-b21f-445f-bff6-1303cec8590d)
-    (property "Reference" "U201" (id 0) (at 72.39 50.8 0))
-    (property "Value" "TCXO-2016-26" (id 1) (at 66.04 53.34 0))
-    (property "Footprint" "lsf-kicad-lib:Oscillator_SMD_ECS_TXO-2016-xx-xxx-4Pin_2x1.6mm" (id 2) (at 129.54 66.04 0)
+    (property "Reference" "U201" (id 0) (at 87.1094 45.72 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TCXO 32MHz" (id 1) (at 87.1094 48.26 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "lsf-kicad-lib:Oscillator_SMD_EST_TXO_2520_4PIN_2X2.5mm" (id 2) (at 129.54 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.mouser.com/datasheet/2/905/ndk_08142018_NT2016SA-26.000000MHZ-NBG2-1389008.pdf" (id 3) (at 130.81 62.23 0)
+    (property "Datasheet" "https://ecsxtal.com/store/pdf/ECS-TXO-2520.pdf" (id 3) (at 130.81 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Part Number" "TCXO-2016-26" (id 4) (at 85.09 58.42 0)
+    (property "Part Number" "ECS-TXO-2520MV-320-AY-TR" (id 4) (at 85.09 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 20fac508-78eb-4aa5-add1-1566151feb66))
diff --git a/power.kicad_sch b/power.kicad_sch
index 816a0a0..9c9aacd 100644
--- a/power.kicad_sch
+++ b/power.kicad_sch
@@ -96,6 +96,81 @@
         )
       )
     )
+    (symbol "Battery_Management:BQ24013" (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -7.62 12.7 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "BQ24013" (id 1) (at 7.62 12.7 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "Package_SON:Texas_DRC0010J_ThermalVias" (id 2) (at 0 -17.78 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "http://www.ti.com/lit/ds/symlink/bq24012.pdf" (id 3) (at 0 -5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "Batter Charger Li-Ion" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Single-Chip Li-Ion Charge Management IC, VSON-10" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Texas*DRC0010J*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "BQ24013_0_1"
+        (rectangle (start -7.62 10.16) (end 7.62 -10.16)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+      )
+      (symbol "BQ24013_1_1"
+        (pin power_in line (at -2.54 12.7 270) (length 2.54)
+          (name "IN" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_out line (at 10.16 7.62 180) (length 2.54)
+          (name "OUT" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -12.7 90) (length 2.54) hide
+          (name "VSS" (effects (font (size 1.27 1.27))))
+          (number "11" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 0 12.7 270) (length 2.54)
+          (name "VCC" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin open_collector line (at 10.16 0 180) (length 2.54)
+          (name "STAT1" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin open_collector line (at 10.16 -2.54 180) (length 2.54)
+          (name "STAT2" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 0 -12.7 90) (length 2.54)
+          (name "VSS" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin output line (at 10.16 -7.62 180) (length 2.54)
+          (name "ISET" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 2.54 0) (length 2.54)
+          (name "~{CE}" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -10.16 0 0) (length 2.54)
+          (name "~{TTE}" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 10.16 5.08 180) (length 2.54)
+          (name "BAT" (effects (font (size 1.27 1.27))))
+          (number "9" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
       (property "Reference" "C" (id 0) (at 0.635 2.54 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -445,81 +520,6 @@
         )
       )
     )
-    (symbol "lsf-kicad:BQ24013" (in_bom yes) (on_board yes)
-      (property "Reference" "U401" (id 0) (at -16.51 4.3307 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "BQ24013" (id 1) (at -16.51 1.7907 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "Package_SON:Texas_DRC0010J_ThermalVias" (id 2) (at 0 -17.78 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "http://www.ti.com/lit/ds/symlink/bq24012.pdf" (id 3) (at 0 -5.08 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "Batter Charger Li-Ion" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Single-Chip Li-Ion Charge Management IC" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Texas*DRC0010J*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "BQ24013_0_1"
-        (rectangle (start -10.16 12.7) (end 10.16 -12.7)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-      )
-      (symbol "BQ24013_1_1"
-        (pin power_in line (at -5.08 15.24 270) (length 2.54)
-          (name "IN" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_out line (at 5.08 15.24 270) (length 2.54)
-          (name "OUT" (effects (font (size 1.27 1.27))))
-          (number "10" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 2.54 -15.24 90) (length 2.54)
-          (name "1EP" (effects (font (size 1.27 1.27))))
-          (number "11" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -2.54 15.24 270) (length 2.54)
-          (name "VCC" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin open_collector line (at 12.7 2.54 180) (length 2.54)
-          (name "STAT1" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin open_collector line (at 12.7 0 180) (length 2.54)
-          (name "STAT2" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -2.54 -15.24 90) (length 2.54)
-          (name "VSS" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin output line (at 12.7 -7.62 180) (length 2.54)
-          (name "ISET" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -12.7 0 0) (length 2.54)
-          (name "~{CE}" (effects (font (size 1.27 1.27))))
-          (number "7" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -12.7 -2.54 0) (length 2.54)
-          (name "~{TTE}" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at 2.54 15.24 270) (length 2.54)
-          (name "BAT" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "lsf-kicad:CDBU40-HF" (pin_numbers hide) (pin_names hide) (in_bom yes) (on_board yes)
       (property "Reference" "D" (id 0) (at 0.3175 6.35 0)
         (effects (font (size 1.27 1.27)))
@@ -961,7 +961,9 @@
     )
   )
 
-
+  (junction (at 190.5 101.6) (diameter 0) (color 0 0 0 0)
+    (uuid 0567bb97-6cd8-4492-9d81-e8cea82893bb)
+  )
   (junction (at 64.77 144.78) (diameter 0) (color 0 0 0 0)
     (uuid 08e2eb74-2d67-4608-aa6f-c344bd28ecb4)
   )
@@ -971,6 +973,9 @@
   (junction (at 101.6 22.86) (diameter 0) (color 0 0 0 0)
     (uuid 24f17f5c-cca9-4a0d-a204-a63e5ad79069)
   )
+  (junction (at 177.8 93.98) (diameter 0) (color 0 0 0 0)
+    (uuid 25136e05-c2a3-451f-9a53-f85054acb324)
+  )
   (junction (at 78.74 144.78) (diameter 0) (color 0 0 0 0)
     (uuid 27581dda-332e-41f9-af6e-12247f8e2c3d)
   )
@@ -1019,9 +1024,6 @@
   (junction (at 147.32 22.86) (diameter 0) (color 0 0 0 0)
     (uuid 8d868fc7-70d1-485d-af5c-95f47305a886)
   )
-  (junction (at 175.26 93.98) (diameter 0) (color 0 0 0 0)
-    (uuid 8f150116-01e6-43eb-a92e-e437786dfe20)
-  )
   (junction (at 246.38 40.64) (diameter 0) (color 0 0 0 0)
     (uuid 9b87ac9a-e4b0-4403-9af0-f8991c3fbf0d)
   )
@@ -1058,9 +1060,6 @@
   (junction (at 54.61 144.78) (diameter 0) (color 0 0 0 0)
     (uuid d31f3308-0075-4e65-a1cb-4296dea4c063)
   )
-  (junction (at 185.42 93.98) (diameter 0) (color 0 0 0 0)
-    (uuid da2f4872-154a-4d78-a34c-211f0887a6bc)
-  )
   (junction (at 106.68 72.39) (diameter 0) (color 0 0 0 0)
     (uuid e2d36093-a426-41a7-b6d3-8de60c825afd)
   )
@@ -1076,9 +1075,6 @@
   (junction (at 127 41.91) (diameter 0) (color 0 0 0 0)
     (uuid f70d0fa9-43ab-45fd-900c-7a9f617ed4e2)
   )
-  (junction (at 180.34 124.46) (diameter 0) (color 0 0 0 0)
-    (uuid ff60fd66-e468-4bdc-a513-21efcc70ae12)
-  )
 
   (no_connect (at 86.36 41.91) (uuid cf82c222-0cd5-4850-9ec2-0b79f7520573))
 
@@ -1090,7 +1086,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 03495df6-67f6-4433-b07d-4cbaad30f48d)
   )
-  (wire (pts (xy 207.01 104.14) (xy 207.01 116.84))
+  (wire (pts (xy 207.01 111.76) (xy 207.01 116.84))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0660dbf0-f519-49ba-82ee-8b4a486d5193)
   )
@@ -1110,7 +1106,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0b89440a-f7b8-4e23-924c-c34623809d52)
   )
-  (wire (pts (xy 167.64 93.98) (xy 175.26 93.98))
+  (wire (pts (xy 167.64 93.98) (xy 177.8 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0ee12ce4-bc3d-427a-8a9e-010e684865a7)
   )
@@ -1134,7 +1130,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 18588615-0648-43ed-a90a-81de2bc2076d)
   )
-  (wire (pts (xy 207.01 93.98) (xy 207.01 96.52))
+  (wire (pts (xy 207.01 101.6) (xy 207.01 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 193fc26f-d8bc-4d9b-8021-dd89e34e26a4)
   )
@@ -1190,15 +1186,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2eae9222-8ee7-409d-aaf5-31bdd8ceee16)
   )
-  (wire (pts (xy 185.42 93.98) (xy 207.01 93.98))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 336dc1c2-4813-480e-b801-ebbaa75528d7)
-  )
   (wire (pts (xy 234.95 38.1) (xy 233.68 38.1))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 342890f2-dccf-480a-9ca7-b171fc278034)
   )
-  (wire (pts (xy 207.01 116.84) (xy 193.04 116.84))
+  (wire (pts (xy 207.01 116.84) (xy 190.5 116.84))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 34eb6719-7713-41ef-b8d2-9cc36d38f374)
   )
@@ -1222,7 +1214,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 451a96eb-12c5-4329-8f3a-1625f746c99a)
   )
-  (wire (pts (xy 175.26 93.98) (xy 177.8 93.98))
+  (wire (pts (xy 180.34 93.98) (xy 180.34 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4c1d3988-241f-4018-a15c-c3b9f5336691)
   )
@@ -1230,6 +1222,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4d1e7e07-8562-44f7-9f3d-70c314abf23d)
   )
+  (wire (pts (xy 177.8 93.98) (xy 180.34 93.98))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4ed1dc92-7945-4966-a51f-9dde4f2bb3c1)
+  )
   (wire (pts (xy 91.44 124.46) (xy 91.44 137.16))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4fe63193-5893-4549-95dd-0fa7056c22f1)
@@ -1258,6 +1254,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5a17b1bb-5fd9-4eb8-ba93-60aec549088c)
   )
+  (wire (pts (xy 177.8 93.98) (xy 177.8 96.52))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5a28d5bf-4909-4b16-b832-2bad26f46349)
+  )
   (wire (pts (xy 135.89 22.86) (xy 135.89 39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5a79d9e9-4081-4224-837e-33bac97d1276)
@@ -1314,7 +1314,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 82a91a77-5035-45fb-b074-426edd54644f)
   )
-  (wire (pts (xy 151.13 109.22) (xy 151.13 124.46))
+  (wire (pts (xy 157.48 106.68) (xy 157.48 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83c165ad-3112-428c-bd1c-66c96dc15a09)
   )
@@ -1358,7 +1358,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 97c2f046-dda9-47f4-98f3-3f207a053262)
   )
-  (wire (pts (xy 151.13 109.22) (xy 167.64 109.22))
+  (wire (pts (xy 157.48 106.68) (xy 170.18 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9a4854b8-c3bf-486f-b48a-0aaf068617aa)
   )
@@ -1398,6 +1398,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aaf1594a-26eb-4570-9456-227bc08d09cf)
   )
+  (wire (pts (xy 190.5 101.6) (xy 190.5 104.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b3824ceb-e73f-493f-a410-ee072f7c0dc5)
+  )
   (wire (pts (xy 210.82 35.56) (xy 223.52 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b46f5f03-f363-4723-a54e-04968a46921e)
@@ -1426,15 +1430,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c39022de-0888-4eb5-9d55-ae85ae55a453)
   )
-  (wire (pts (xy 180.34 124.46) (xy 182.88 124.46))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c47cb2a2-7085-4dd2-a0fa-efd72dfef96b)
-  )
   (wire (pts (xy 54.61 124.46) (xy 64.77 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c4937bc2-3c6c-453b-b02a-eea82a162e96)
   )
-  (wire (pts (xy 182.88 93.98) (xy 185.42 93.98))
+  (wire (pts (xy 190.5 101.6) (xy 207.01 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c6ed1b7e-d2da-4f6f-83e2-a9ac283e8c05)
   )
@@ -1506,7 +1506,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid df28e018-29b9-4a48-b858-623f50d01983)
   )
-  (wire (pts (xy 177.8 124.46) (xy 180.34 124.46))
+  (wire (pts (xy 180.34 121.92) (xy 180.34 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e1337ee9-7467-4345-935a-98bcab1c767f)
   )
@@ -1555,10 +1555,6 @@
     (uuid fddbfc29-006b-4414-a833-780df7b9a418)
   )
 
-  (text "Populate for\ncharging cold n dark" (at 128.27 121.92 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 3e93a0f3-64ae-4ace-8112-ca0fdafa3766)
-  )
   (text "Not_used" (at 123.19 49.53 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 6f1541ca-d289-49f7-a3d2-aefb6b3d7bea)
@@ -1585,7 +1581,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 1dbfd938-97b5-4378-811c-010f5a5efc9a)
   )
-  (label "BAT+" (at 207.01 93.98 0)
+  (label "BAT+" (at 207.01 101.6 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 2ed77323-34f2-44cc-b9b0-256fea7e7246)
   )
@@ -1630,7 +1626,7 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 62bf4e28-3682-4796-8aa4-e8069b2fd2e8)
   )
-  (hierarchical_label "~{CHG_TTE}" (shape input) (at 167.64 111.76 180)
+  (hierarchical_label "~{CHG_TTE}" (shape input) (at 170.18 109.22 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 673b6101-2ce6-48b8-afc6-417f05972ea8)
   )
@@ -1650,7 +1646,7 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7b8cb3a1-0e00-42c0-b03a-459e49bec964)
   )
-  (hierarchical_label "CHG" (shape output) (at 193.04 106.68 0)
+  (hierarchical_label "CHG" (shape output) (at 190.5 109.22 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 8f7320f7-8fdb-4e68-b345-a40e837bd78d)
   )
@@ -1658,7 +1654,7 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 9f346983-a21e-4f8b-be21-0b8c7f83b4ce)
   )
-  (hierarchical_label "CHG_CPLT" (shape output) (at 193.04 109.22 0)
+  (hierarchical_label "CHG_CPLT" (shape output) (at 190.5 111.76 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid b13b8c59-1fda-494a-8fb1-b579b0b8184f)
   )
@@ -1848,22 +1844,22 @@
     (pin "2" (uuid de724be1-25e2-4c40-8696-648627fd0a6f))
   )
 
-  (symbol (lib_id "Device:C") (at 207.01 100.33 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 207.01 107.95 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 340d7c2e-4066-4760-9a44-ff271e1cd2c3)
-    (property "Reference" "C406" (id 0) (at 210.82 99.0599 0)
+    (property "Reference" "C406" (id 0) (at 210.82 106.6799 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100nF" (id 1) (at 210.82 101.5999 0)
+    (property "Value" "100nF" (id 1) (at 210.82 109.2199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 207.9752 104.14 0)
+    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 207.9752 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 207.01 100.33 0)
+    (property "Datasheet" "~" (id 3) (at 207.01 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Part Number" "CC0402KRX7R7BB104" (id 4) (at 207.01 100.33 0)
+    (property "Part Number" "CC0402KRX7R7BB104" (id 4) (at 207.01 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1e761ac3-258e-43a7-92a6-8441065af216))
@@ -2505,11 +2501,15 @@
     (pin "2" (uuid c47fd83b-6430-4d21-ab81-13418eff4ed3))
   )
 
-  (symbol (lib_id "lsf-kicad:BQ24013") (at 180.34 109.22 0) (unit 1)
+  (symbol (lib_id "Battery_Management:BQ24013") (at 180.34 109.22 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cf6ec273-dc3a-4eb5-9ff5-f8371f35f598)
-    (property "Reference" "U402" (id 0) (at 163.83 102.6412 0))
-    (property "Value" "BQ24012" (id 1) (at 163.83 105.1812 0))
+    (property "Reference" "U402" (id 0) (at 182.3594 121.92 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "BQ24012" (id 1) (at 182.3594 124.46 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
     (property "Footprint" "Package_SON:Texas_DRC0010J_ThermalVias" (id 2) (at 180.34 127 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -2550,17 +2550,17 @@
     (pin "1" (uuid 5f784e29-b64f-45b5-83bb-aab18f7b845e))
   )
 
-  (symbol (lib_id "power:GND") (at 151.13 124.46 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 157.48 118.11 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d89731e1-6e97-4507-b9f9-b61fcbd186f2)
-    (property "Reference" "#PWR0115" (id 0) (at 151.13 130.81 0)
+    (property "Reference" "#PWR0115" (id 0) (at 157.48 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 151.13 129.54 0))
-    (property "Footprint" "" (id 2) (at 151.13 124.46 0)
+    (property "Value" "GND" (id 1) (at 157.48 123.19 0))
+    (property "Footprint" "" (id 2) (at 157.48 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 151.13 124.46 0)
+    (property "Datasheet" "" (id 3) (at 157.48 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 826f9e8a-32ca-488a-9c0f-ba968f6909c1))