diff --git a/modules/EPS/Activation_control.kicad_sch b/modules/EPS/Activation_control.kicad_sch
index 22efa44..4f3b2b8 100644
--- a/modules/EPS/Activation_control.kicad_sch
+++ b/modules/EPS/Activation_control.kicad_sch
@@ -425,7 +425,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 101.6 100.33 0)
     (in_bom yes) (on_board yes)
     (uuid 54aff0a7-fa4b-48c1-b3d8-82349b8e510b)
-    (property "Reference" "TP23" (id 0) (at 102.9971 93.77 0)
+    (property "Reference" "TP6" (id 0) (at 102.9971 93.77 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SYS_OUT" (id 1) (at 102.9971 96.5451 0)
@@ -443,7 +443,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 138.43 100.33 0)
     (in_bom yes) (on_board yes)
     (uuid 81c9266f-b07c-48d1-abb1-c2a3e8bd91b7)
-    (property "Reference" "TP24" (id 0) (at 139.8271 93.77 0)
+    (property "Reference" "TP7" (id 0) (at 139.8271 93.77 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SEP_OUT" (id 1) (at 139.8271 96.5451 0)
@@ -461,7 +461,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 177.9026 100.33 0)
     (in_bom yes) (on_board yes)
     (uuid b663a1c4-3bc1-4a0a-8ff8-87ebfc635815)
-    (property "Reference" "TP25" (id 0) (at 179.2997 93.77 0)
+    (property "Reference" "TP8" (id 0) (at 179.2997 93.77 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "RBF_OUT" (id 1) (at 179.2997 96.5451 0)
@@ -479,7 +479,7 @@
   (symbol (lib_id "Device:R") (at 120.65 93.98 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f5ae3793-4c1d-445b-b18c-d145e97e5904)
-    (property "Reference" "R173" (id 0) (at 122.4281 93.0715 0)
+    (property "Reference" "R165" (id 0) (at 122.4281 93.0715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 122.4281 95.8466 0)
@@ -498,7 +498,7 @@
   (symbol (lib_id "Device:R") (at 154.94 93.98 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b1ccc018-1f91-4655-b7fd-554933fe59e3)
-    (property "Reference" "R174" (id 0) (at 156.7181 93.0715 0)
+    (property "Reference" "R166" (id 0) (at 156.7181 93.0715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 156.7181 95.8466 0)
@@ -517,7 +517,7 @@
   (symbol (lib_id "Device:Polyfuse") (at 91.44 90.17 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid dc7d5727-2626-49ff-82cc-4264075bd7c5)
-    (property "Reference" "F5" (id 0) (at 93.5991 89.2615 0)
+    (property "Reference" "F2" (id 0) (at 93.5991 89.2615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "200mA" (id 1) (at 93.5991 92.0366 0)
@@ -536,7 +536,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 129.54 100.33 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a13321a5-f2ea-4169-a91c-d7874035a4ea)
-    (property "Reference" "Q11" (id 0) (at 129.54 104.1166 90)
+    (property "Reference" "Q3" (id 0) (at 129.54 104.1166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 129.54 106.3556 90)
@@ -558,7 +558,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 163.83 100.33 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9d3eb49d-0b41-443c-8d33-9230199460c8)
-    (property "Reference" "Q12" (id 0) (at 163.83 104.1166 90)
+    (property "Reference" "Q4" (id 0) (at 163.83 104.1166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 163.83 106.3556 90)
diff --git a/modules/EPS/Activation_logic.kicad_sch b/modules/EPS/Activation_logic.kicad_sch
index 66db35e..6afb2ef 100644
--- a/modules/EPS/Activation_logic.kicad_sch
+++ b/modules/EPS/Activation_logic.kicad_sch
@@ -2069,8 +2069,8 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "3" (uuid 9f11bf1d-d823-4e5f-b988-e8934ea350c9))
-    (pin "4" (uuid 6b09520d-0410-40f3-931c-24e6bfd4a027))
+    (pin "1" (uuid 54c1d765-843b-43ce-88f5-5f8edcc59cce))
+    (pin "2" (uuid 0864e120-90c0-4efd-b332-1e0082ba6d3b))
   )
 
   (symbol (lib_id "74xx:74LV14") (at 78.74 119.38 0)
@@ -2084,8 +2084,8 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "5" (uuid 3dbc2901-7484-4c99-b027-3ebb07f70b01))
-    (pin "6" (uuid 02b5c750-535f-4997-8f83-47573acc39ca))
+    (pin "1" (uuid fa6a27d1-eed6-48f3-a414-51cb9358496c))
+    (pin "2" (uuid 9ed5b569-af38-45d3-bf32-4f5b11035725))
   )
 
   (symbol (lib_id "74xx:74LV14") (at 78.74 144.78 0)
@@ -2099,8 +2099,8 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "8" (uuid 7939178f-c113-43b1-a7b1-518cf2457e5b))
-    (pin "9" (uuid cae4fd12-4b7f-4a99-9a3a-98ae216efacb))
+    (pin "1" (uuid 78a4c683-4dbe-48bf-80e7-c142e2889dea))
+    (pin "2" (uuid 769cd7dc-0f97-47ec-8003-f3a98fef8bfa))
   )
 
   (symbol (lib_id "74xx:74LV14") (at 78.74 170.18 0)
@@ -2114,8 +2114,8 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 78.74 170.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "10" (uuid 6eb372a6-fd67-40c9-b751-8f2e72f6f88b))
-    (pin "11" (uuid 443f6f34-c59b-459d-b600-ddc363524e51))
+    (pin "1" (uuid 7c68c686-f58c-44d0-b901-4d06aa1c0043))
+    (pin "2" (uuid b98bac33-d4f2-474b-a9aa-7bd7b171bd78))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 106.68 96.52 0)
@@ -2146,10 +2146,10 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 106.68 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "3" (uuid bd69ba1e-c67b-4cd4-a8d2-ca75ad81261b))
-    (pin "4" (uuid ed7b6a3a-cecd-4ce6-b261-6340a97ff1d0))
-    (pin "5" (uuid acd1962f-bcaf-499f-be2c-48f8ac5bdc48))
-    (pin "6" (uuid 759c0edc-ffef-4ebc-82e4-4931285b8469))
+    (pin "1" (uuid e08724a8-17ed-46dc-b53b-c711e5b15988))
+    (pin "12" (uuid 868dc113-5a15-455f-bb85-d9af36b25ffa))
+    (pin "13" (uuid 649ac42f-dab8-4a36-b2ce-ad5884caae29))
+    (pin "2" (uuid 4eff388f-115a-4d49-b21e-a1bf49fcc165))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 106.68 147.32 0)
@@ -2163,10 +2163,10 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 106.68 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "10" (uuid 0a49e714-6711-4079-b855-0e45d75bbef6))
-    (pin "11" (uuid 12caea16-3f4b-4e5d-a003-2364f61e87e1))
-    (pin "8" (uuid 2ebfe5a9-6dfd-4f8e-8343-7a19c35f0b97))
-    (pin "9" (uuid 04de2e88-b03d-41fa-aa3b-dc6953af0f24))
+    (pin "1" (uuid ec2e673b-e0c4-4f04-b02d-fd25cf39a4c4))
+    (pin "12" (uuid 6b3bf47e-7909-4a9d-af3d-a8634909fa6a))
+    (pin "13" (uuid 63d3522c-96a3-46c1-8222-cda808987d91))
+    (pin "2" (uuid a200a017-9ca7-4569-9d0f-b375eb11be3c))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 106.68 172.72 0)
@@ -2186,6 +2186,27 @@
     (pin "2" (uuid 207d8548-9d09-423e-b9b9-3f6a7d1efa7e))
   )
 
+  (symbol (lib_id "74xx:74LS10") (at 124.46 53.34 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 49ab0a9f-ad85-41d0-b5d5-8c42a8c9533c)
+    (property "Reference" "U52" (id 0) (at 130.3021 52.4315 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "74LS10" (id 1) (at 130.3021 55.2066 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 124.46 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 124.46 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid f0d49759-f42e-4ace-b717-ef4ef46632f1))
+    (pin "12" (uuid 3b9d4407-a94d-440b-8717-291ab7e49c79))
+    (pin "13" (uuid 81d5d264-12c7-4ecb-8649-bdfd5195efb7))
+    (pin "2" (uuid 83b8879e-731a-44ea-9060-2de3aa837f84))
+  )
+
   (symbol (lib_id "74xx:74LS10") (at 132.08 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2bc6da0b-00ba-4496-994f-2eec4522aaca)
@@ -2197,10 +2218,10 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 132.08 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "3" (uuid b9bd7d50-1872-4ff8-a36d-cb879fd311a9))
-    (pin "4" (uuid 1ad9fc6e-dcee-4fc6-b241-a874b32ae72c))
-    (pin "5" (uuid 43afef01-f689-4bfc-aa70-cdfdddf36e5c))
-    (pin "6" (uuid a355c46e-3894-4055-9729-e975031deee5))
+    (pin "1" (uuid 7acb6eee-f2ac-4d4f-8e51-a3f9fdd5cbd2))
+    (pin "12" (uuid 6ed097be-b193-4c44-88f6-bf9e488adf72))
+    (pin "13" (uuid bcda9fad-dd8c-4f19-a8f5-f7dca3bcead5))
+    (pin "2" (uuid 3faebfa8-8865-4d25-ad80-1c706ffab58c))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 132.08 172.72 0)
@@ -2220,108 +2241,42 @@
     (pin "2" (uuid ba23ba94-5da3-478f-aeb4-13fcca12886d))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 157.48 121.92 0)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid ba8b9342-d3c9-495d-accb-7a347fd2e393)
-    (property "Reference" "U53" (id 0) (at 157.48 114.1434 0))
-    (property "Value" "74LS10" (id 1) (at 157.48 116.9185 0))
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 157.48 121.92 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 157.48 121.92 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "10" (uuid 74c6d0d5-aed5-40b7-af88-463c8840beca))
-    (pin "11" (uuid 1c46a67d-990d-44c8-af7d-1046148a27ea))
-    (pin "8" (uuid d5ba89af-adfa-4417-9efa-87d0e30c666c))
-    (pin "9" (uuid 0b57cce7-21d7-4b54-8f00-5ff56a2cad42))
-  )
-
-  (symbol (lib_id "74xx:74LS10") (at 182.88 147.32 0)
-    (in_bom yes) (on_board yes)
-    (uuid fa390351-8684-4ce8-a39e-939d28570bd7)
-    (property "Reference" "U54" (id 0) (at 181.61 139.5434 0))
-    (property "Value" "74LS10" (id 1) (at 181.61 142.3185 0))
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 182.88 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 182.88 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "3" (uuid 31c28cf0-a77b-4b7c-b3f3-f16b030a2c71))
-    (pin "4" (uuid 01740962-3a91-48c4-905d-8e302d168ba8))
-    (pin "5" (uuid 01ef50f3-a963-470e-9171-776802f2df4d))
-    (pin "6" (uuid f7a6dff3-c8a3-4a49-8835-6e9981c9fee3))
-  )
-
-  (symbol (lib_id "74xx:74LV14") (at 201.93 147.32 0)
-    (in_bom yes) (on_board yes)
-    (uuid dda1a0ce-6f87-43c7-81e6-260977e57b92)
-    (property "Reference" "U51" (id 0) (at 204.47 140.8134 0))
-    (property "Value" "74LV14" (id 1) (at 204.47 143.5885 0))
-    (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 201.93 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 201.93 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "12" (uuid f3045d13-607b-453b-aa92-5a6400bd2d94))
-    (pin "13" (uuid 4621aaff-6518-4c45-bef9-7577a9a1835b))
-  )
-
-  (symbol (lib_id "74xx:74LS10") (at 265.43 142.24 0)
-    (in_bom yes) (on_board yes)
-    (uuid ff26b4c7-18b2-48da-825e-c1ce7116106e)
-    (property "Reference" "U54" (id 0) (at 278.13 140.8134 0))
-    (property "Value" "74LS10" (id 1) (at 278.13 143.5885 0))
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 265.43 142.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 265.43 142.24 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "10" (uuid d82c6add-2042-4602-bc9d-43fa1699499c))
-    (pin "11" (uuid 26226cc0-06c5-4de1-a833-de41cccf85a3))
-    (pin "8" (uuid 54d3032c-3a76-4981-b909-eb3cc89af2b7))
-    (pin "9" (uuid ef7c73dc-738c-4042-9864-cd1aa7f89be4))
-  )
-
-  (symbol (lib_id "74xx:74LS10") (at 124.46 53.34 0)
+  (symbol (lib_id "74xx:74LS10") (at 146.05 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 49ab0a9f-ad85-41d0-b5d5-8c42a8c9533c)
-    (property "Reference" "U52" (id 0) (at 130.3021 52.4315 0)
+    (uuid b1c72c90-812a-4325-a6a1-254ef840a29b)
+    (property "Reference" "U53" (id 0) (at 151.8921 52.4315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "74LS10" (id 1) (at 130.3021 55.2066 0)
+    (property "Value" "74LS10" (id 1) (at 151.8921 55.2066 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 124.46 53.34 0)
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 146.05 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 124.46 53.34 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 146.05 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "14" (uuid e216658d-1332-49b5-8a6d-8d59d27f4afb))
-    (pin "7" (uuid d5178cfb-7e56-4629-8912-1991a612b0d5))
+    (pin "1" (uuid e12b055a-5d21-4e8d-a0b3-9beb2f170adf))
+    (pin "12" (uuid dd6287e3-6611-42e7-b9b5-8da7e18fa95c))
+    (pin "13" (uuid 1a6dc4fb-9a84-4188-80d2-c29107d062fb))
+    (pin "2" (uuid 785c9e2e-c80e-4f4a-99a5-e1c34f1cb7a1))
   )
 
-  (symbol (lib_id "74xx:74LS10") (at 146.05 53.34 0)
+  (symbol (lib_id "74xx:74LS10") (at 157.48 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid b1c72c90-812a-4325-a6a1-254ef840a29b)
-    (property "Reference" "U53" (id 0) (at 151.8921 52.4315 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "74LS10" (id 1) (at 151.8921 55.2066 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 146.05 53.34 0)
+    (uuid ba8b9342-d3c9-495d-accb-7a347fd2e393)
+    (property "Reference" "U53" (id 0) (at 157.48 114.1434 0))
+    (property "Value" "74LS10" (id 1) (at 157.48 116.9185 0))
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 157.48 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 146.05 53.34 0)
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 157.48 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "14" (uuid 5c9354ab-839b-4daa-9db2-fed6eae63b85))
-    (pin "7" (uuid 5173e836-329f-494a-8b17-18f8ebb54c33))
+    (pin "1" (uuid cc655dee-86e6-4cdb-a06d-745f9c567ae9))
+    (pin "12" (uuid 6eecae73-40f0-4699-a08e-defe923896a2))
+    (pin "13" (uuid 60bcaae5-ef26-4a39-b65e-4a18757bd764))
+    (pin "2" (uuid feae4e94-d557-40db-ab5d-8830c4e2e62a))
   )
 
   (symbol (lib_id "74xx:74LS10") (at 167.64 53.34 0)
@@ -2339,8 +2294,27 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 167.64 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "14" (uuid bb6867ff-3e83-47a5-b173-230114630f82))
-    (pin "7" (uuid 2f14ba65-7d3e-40ea-a3e2-5f6f16119063))
+    (pin "1" (uuid aba1801e-8912-4990-921d-d61b9fc6dd85))
+    (pin "12" (uuid a6b067c7-ab5c-4e87-8385-1b555a0ee8ac))
+    (pin "13" (uuid 0ffbc503-7723-45e6-af9e-35681c46a0c8))
+    (pin "2" (uuid 611bc002-089b-4969-8439-c3ec9baae22c))
+  )
+
+  (symbol (lib_id "74xx:74LS10") (at 182.88 147.32 0)
+    (in_bom yes) (on_board yes)
+    (uuid fa390351-8684-4ce8-a39e-939d28570bd7)
+    (property "Reference" "U54" (id 0) (at 181.61 139.5434 0))
+    (property "Value" "74LS10" (id 1) (at 181.61 142.3185 0))
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 182.88 147.32 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 182.88 147.32 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 84b78834-26bd-42b9-a155-0ab7b8261e20))
+    (pin "12" (uuid e2a14337-dc39-4a27-9f99-d057a6b82ee3))
+    (pin "13" (uuid b1433dd7-6852-4873-b733-62da9f147150))
+    (pin "2" (uuid bfa31da5-9ac5-4b31-89e2-71d16668763b))
   )
 
   (symbol (lib_id "74xx:74LV14") (at 189.23 53.34 0)
@@ -2358,7 +2332,39 @@
     (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 189.23 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "14" (uuid 88586247-9bb9-4f28-ab15-4725faad8397))
-    (pin "7" (uuid aff39190-1959-4b2d-93b4-0fc016ca762b))
+    (pin "1" (uuid 4a8d51d2-6248-40dd-aa1c-de61482f2016))
+    (pin "2" (uuid 3a67ef82-6529-4b51-97d8-92d0153e63e3))
+  )
+
+  (symbol (lib_id "74xx:74LV14") (at 201.93 147.32 0)
+    (in_bom yes) (on_board yes)
+    (uuid dda1a0ce-6f87-43c7-81e6-260977e57b92)
+    (property "Reference" "U51" (id 0) (at 204.47 140.8134 0))
+    (property "Value" "74LV14" (id 1) (at 204.47 143.5885 0))
+    (property "Footprint" "Package_DFN_QFN:Texas_S-PVQFN-N14" (id 2) (at 201.93 147.32 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LV14" (id 3) (at 201.93 147.32 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2fac9448-89a0-48ca-b59a-e223863b76df))
+    (pin "2" (uuid f5fd80c5-d3aa-40bf-abbc-7d1b8120027d))
+  )
+
+  (symbol (lib_id "74xx:74LS10") (at 265.43 142.24 0)
+    (in_bom yes) (on_board yes)
+    (uuid ff26b4c7-18b2-48da-825e-c1ce7116106e)
+    (property "Reference" "U54" (id 0) (at 278.13 140.8134 0))
+    (property "Value" "74LS10" (id 1) (at 278.13 143.5885 0))
+    (property "Footprint" "TCY_IC:Nexperia_DHVQFN-14" (id 2) (at 265.43 142.24 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.ti.com/lit/gpn/sn74LS10" (id 3) (at 265.43 142.24 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 68884e34-a58c-4dcb-b4ec-5f67032a5532))
+    (pin "12" (uuid da6f124a-9689-4634-9de1-1f556480c516))
+    (pin "13" (uuid ffbbe271-9808-4eb0-9182-efab803e930c))
+    (pin "2" (uuid 42b4314e-d908-43c0-bc73-01a3d5a7818e))
   )
 )
diff --git a/modules/EPS/Battery_charger.kicad_sch b/modules/EPS/Battery_charger.kicad_sch
index d2a98a2..e915881 100644
--- a/modules/EPS/Battery_charger.kicad_sch
+++ b/modules/EPS/Battery_charger.kicad_sch
@@ -3022,10 +3022,10 @@
     (property "Datasheet" "https://www.tme.eu/Document/fa3f2aaa37eaef20cf8bb0832a66190d/YJQ3400A.pdf" (id 3) (at 93.98 67.31 0)
       (effects (font (size 1 1)) (justify left) hide)
     )
-    (pin "D2" (uuid 1df2210b-8654-4fb9-ae98-24fce4249d83))
-    (pin "D2" (uuid 1df2210b-8654-4fb9-ae98-24fce4249d83))
-    (pin "G2" (uuid d1fc91fa-d010-45ff-9071-fcd4bd45f5bf))
-    (pin "S2" (uuid 7dd9124e-8284-4ce2-af96-c50e02c4a3d0))
+    (pin "D1" (uuid 082cb3d2-26a2-46f8-8859-24a8bcb392ce))
+    (pin "D1" (uuid 082cb3d2-26a2-46f8-8859-24a8bcb392ce))
+    (pin "G1" (uuid 804e7b1e-1192-4395-b6e1-72fa41f8d513))
+    (pin "S1" (uuid 9404d6c5-22b6-44e0-be4d-ae7e8636eb5f))
   )
 
   (symbol (lib_id "TCY_transistors:AON7804") (at 113.03 68.58 270) (mirror x)
@@ -3043,10 +3043,10 @@
     (property "Datasheet" "https://www.tme.eu/Document/fa3f2aaa37eaef20cf8bb0832a66190d/YJQ3400A.pdf" (id 3) (at 93.98 86.36 0)
       (effects (font (size 1 1)) (justify left) hide)
     )
-    (pin "D2" (uuid 368fe17d-553c-4a4e-b060-b09adf2501e8))
-    (pin "D2" (uuid 368fe17d-553c-4a4e-b060-b09adf2501e8))
-    (pin "G2" (uuid 0869922b-28b5-4039-b063-624199b95bd1))
-    (pin "S2" (uuid 89ba4252-3120-4256-91ba-f1662927a86b))
+    (pin "D1" (uuid 9743bd91-57a0-4211-a3e2-ee54601dba38))
+    (pin "D1" (uuid 9743bd91-57a0-4211-a3e2-ee54601dba38))
+    (pin "G1" (uuid daa1058d-dd7c-4c5f-8d20-021cd39af9ef))
+    (pin "S1" (uuid e76dc770-4641-405d-a0c0-024861145fcf))
   )
 
   (symbol (lib_id "TCY_battery_management:BQ25798") (at 142.24 105.41 0)
diff --git a/modules/EPS/Battery_pack.kicad_sch b/modules/EPS/Battery_pack.kicad_sch
index f28300e..e22054b 100644
--- a/modules/EPS/Battery_pack.kicad_sch
+++ b/modules/EPS/Battery_pack.kicad_sch
@@ -684,7 +684,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 133.35 113.03 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0631cc25-2ba3-4c27-bf77-4d69c7ae8634)
-    (property "Reference" "#FLG022" (id 0) (at 133.35 111.125 0)
+    (property "Reference" "#FLG019" (id 0) (at 133.35 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 133.35 109.4254 0))
@@ -700,7 +700,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 168.91 78.74 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8b2d9cbc-26e3-4621-b9e4-851a2738fb70)
-    (property "Reference" "#FLG023" (id 0) (at 168.91 76.835 0)
+    (property "Reference" "#FLG020" (id 0) (at 168.91 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 168.91 75.1354 0))
@@ -716,7 +716,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 168.91 113.03 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4a4fc04e-d521-4c35-aa9f-6a2b72e92bab)
-    (property "Reference" "#FLG024" (id 0) (at 168.91 111.125 0)
+    (property "Reference" "#FLG021" (id 0) (at 168.91 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 168.91 109.4254 0))
@@ -732,7 +732,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 203.2 85.09 0)
     (in_bom yes) (on_board yes)
     (uuid 99e44a44-a22b-450d-8b6b-53360d5399d2)
-    (property "Reference" "TP37" (id 0) (at 202.0571 75.99 0)
+    (property "Reference" "TP35" (id 0) (at 202.0571 75.99 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT+" (id 1) (at 202.0571 78.7651 0)
@@ -750,7 +750,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 203.2 113.03 270)
     (in_bom yes) (on_board yes)
     (uuid 8af352e4-b87a-48e7-ac60-3ac39a88d2ac)
-    (property "Reference" "TP38" (id 0) (at 208.49 110.6171 90)
+    (property "Reference" "TP36" (id 0) (at 208.49 110.6171 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT-" (id 1) (at 208.2549 113.1571 90)
@@ -768,7 +768,7 @@
   (symbol (lib_id "Device:R") (at 116.84 82.55 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 54ac00c5-8085-4a3c-885d-c574139f6a01)
-    (property "Reference" "R85" (id 0) (at 118.6181 81.6415 0)
+    (property "Reference" "R83" (id 0) (at 118.6181 81.6415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "330R" (id 1) (at 118.6181 84.4166 0)
@@ -787,7 +787,7 @@
   (symbol (lib_id "Device:R") (at 123.19 104.14 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 02f0341e-54b7-46d0-84c1-b57ae6b2f234)
-    (property "Reference" "R86" (id 0) (at 124.9681 103.2315 0)
+    (property "Reference" "R84" (id 0) (at 124.9681 103.2315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "2.2k" (id 1) (at 124.9681 106.0066 0)
@@ -806,7 +806,7 @@
   (symbol (lib_id "Device:C") (at 116.84 104.14 0)
     (in_bom yes) (on_board yes)
     (uuid 1b8352a6-950c-40a2-8cc5-44e898ebc8b3)
-    (property "Reference" "C94" (id 0) (at 109.6011 103.2315 0)
+    (property "Reference" "C93" (id 0) (at 109.6011 103.2315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 108.3311 106.0066 0)
@@ -825,7 +825,7 @@
   (symbol (lib_id "Device:Battery_Cell") (at 203.2 97.79 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 187169a6-ccff-4f29-8db9-3e89fd7b7827)
-    (property "Reference" "U32" (id 0) (at 206.1211 95.6115 0)
+    (property "Reference" "U29" (id 0) (at 206.1211 95.6115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Battery_holder_21700" (id 1) (at 206.1211 98.3866 0)
@@ -844,7 +844,7 @@
   (symbol (lib_id "TCY_transistors:SiSA96DDN") (at 146.05 110.49 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 55005da9-5415-42da-85a9-545ab80afb53)
-    (property "Reference" "Q19" (id 0) (at 146.05 116.8166 90)
+    (property "Reference" "Q17" (id 0) (at 146.05 116.8166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 146.05 119.0556 90)
@@ -866,7 +866,7 @@
   (symbol (lib_id "TCY_transistors:SiSA96DDN") (at 156.21 110.49 90) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1c154170-b720-43dd-a000-a3e4ad64480e)
-    (property "Reference" "Q20" (id 0) (at 156.21 116.8166 90)
+    (property "Reference" "Q18" (id 0) (at 156.21 116.8166 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiSA96DDN" (id 1) (at 156.21 119.0556 90)
@@ -888,7 +888,7 @@
   (symbol (lib_id "Battery_Management:BQ297xy") (at 133.35 91.44 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 018b95b0-edac-4665-8dbf-3eaf6a917f38)
-    (property "Reference" "U30" (id 0) (at 133.35 82.3934 0))
+    (property "Reference" "U27" (id 0) (at 133.35 82.3934 0))
     (property "Value" "BQ29716" (id 1) (at 133.35 85.1685 0))
     (property "Footprint" "Package_SON:WSON-6_1.5x1.5mm_P0.5mm" (id 2) (at 133.35 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -907,7 +907,7 @@
   (symbol (lib_id "TCY_battery_management:MAX17048") (at 184.15 99.06 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 36130603-28fd-41cd-af25-6f9f1987af9c)
-    (property "Reference" "U31" (id 0) (at 184.15 115.4336 0))
+    (property "Reference" "U28" (id 0) (at 184.15 115.4336 0))
     (property "Value" "MAX17048" (id 1) (at 184.15 118.2087 0))
     (property "Footprint" "Package_DFN_QFN:DFN-8-1EP_2x2mm_P0.5mm_EP1.05x1.75mm" (id 2) (at 184.15 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
diff --git a/modules/EPS/MCU.kicad_sch b/modules/EPS/MCU.kicad_sch
index 1125aa3..ab01282 100644
--- a/modules/EPS/MCU.kicad_sch
+++ b/modules/EPS/MCU.kicad_sch
@@ -2797,7 +2797,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 111.76 26.67 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 94dc2b0f-6d71-4b82-a882-ea0e15d96886)
-    (property "Reference" "#FLG016" (id 0) (at 111.76 24.765 0)
+    (property "Reference" "#FLG07" (id 0) (at 111.76 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 111.76 23.0654 0))
@@ -2813,7 +2813,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 160.02 64.77 0)
     (in_bom yes) (on_board yes)
     (uuid 3bc30c7d-d37b-4d7f-ba16-87d0b2e45d34)
-    (property "Reference" "#FLG017" (id 0) (at 160.02 62.865 0)
+    (property "Reference" "#FLG08" (id 0) (at 160.02 62.865 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 158.75 61.1654 0))
@@ -2829,7 +2829,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 168.91 64.77 0)
     (in_bom yes) (on_board yes)
     (uuid be137e6a-bb95-4ce2-8f05-b4da9899ec86)
-    (property "Reference" "#FLG018" (id 0) (at 168.91 62.865 0)
+    (property "Reference" "#FLG09" (id 0) (at 168.91 62.865 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 170.18 61.1654 0))
@@ -2845,7 +2845,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 55.88 41.91 0)
     (in_bom yes) (on_board yes)
     (uuid c4d3dddd-990b-47f0-8070-d59851a46543)
-    (property "Reference" "TP28" (id 0) (at 54.7371 32.81 0)
+    (property "Reference" "TP11" (id 0) (at 54.7371 32.81 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "WDG" (id 1) (at 54.7371 35.5851 0)
@@ -2863,7 +2863,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 109.22 85.09 0)
     (in_bom yes) (on_board yes)
     (uuid fcac67cc-959a-4a10-b916-9d3a6c6d454e)
-    (property "Reference" "TP29" (id 0) (at 108.0771 75.99 0)
+    (property "Reference" "TP12" (id 0) (at 108.0771 75.99 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "NRST" (id 1) (at 108.0771 78.7651 0)
@@ -2881,7 +2881,7 @@
   (symbol (lib_id "power:GND") (at 22.86 147.32 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e30118b9-cb9f-4762-9c0b-5aafb2a5a0be)
-    (property "Reference" "#PWR0162" (id 0) (at 22.86 153.67 0)
+    (property "Reference" "#PWR063" (id 0) (at 22.86 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 22.86 151.8826 0)
@@ -2899,7 +2899,7 @@
   (symbol (lib_id "power:GND") (at 33.02 177.8 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8cb2b1f3-4eee-491f-86e2-6920dcbdbb6c)
-    (property "Reference" "#PWR0163" (id 0) (at 26.67 177.8 0)
+    (property "Reference" "#PWR064" (id 0) (at 26.67 177.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 28.4574 177.8 0)
@@ -2917,7 +2917,7 @@
   (symbol (lib_id "power:GND") (at 38.1 187.96 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f50335c-8075-4108-81ba-fda70ca398a7)
-    (property "Reference" "#PWR0164" (id 0) (at 38.1 194.31 0)
+    (property "Reference" "#PWR065" (id 0) (at 38.1 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 38.1 192.5226 0)
@@ -2935,7 +2935,7 @@
   (symbol (lib_id "power:GND") (at 41.91 109.22 0)
     (in_bom yes) (on_board yes)
     (uuid f041f263-677d-473d-8af6-90312cd1db07)
-    (property "Reference" "#PWR0165" (id 0) (at 41.91 115.57 0)
+    (property "Reference" "#PWR066" (id 0) (at 41.91 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 41.91 113.03 0)
@@ -2953,7 +2953,7 @@
   (symbol (lib_id "power:GND") (at 43.18 50.8 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fd35fc8e-7ea7-4219-a0a1-41663381ce6b)
-    (property "Reference" "#PWR0166" (id 0) (at 43.18 57.15 0)
+    (property "Reference" "#PWR067" (id 0) (at 43.18 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 43.18 55.3626 0)
@@ -2971,7 +2971,7 @@
   (symbol (lib_id "power:GND") (at 48.26 109.22 0)
     (in_bom yes) (on_board yes)
     (uuid c6ff8494-ff2e-40a3-87fe-d42c4ee7ad70)
-    (property "Reference" "#PWR0167" (id 0) (at 48.26 115.57 0)
+    (property "Reference" "#PWR068" (id 0) (at 48.26 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 48.26 113.03 0)
@@ -2989,7 +2989,7 @@
   (symbol (lib_id "power:GND") (at 52.07 156.21 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ba3f5c5e-c094-406a-9d43-1bca558a54d3)
-    (property "Reference" "#PWR0168" (id 0) (at 52.07 162.56 0)
+    (property "Reference" "#PWR069" (id 0) (at 52.07 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 52.07 160.7726 0)
@@ -3007,7 +3007,7 @@
   (symbol (lib_id "power:GND") (at 60.96 177.8 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fcf17e0b-e633-4ea2-acee-ebf56c79748a)
-    (property "Reference" "#PWR0169" (id 0) (at 54.61 177.8 0)
+    (property "Reference" "#PWR070" (id 0) (at 54.61 177.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 56.3974 177.8 0)
@@ -3025,7 +3025,7 @@
   (symbol (lib_id "power:GND") (at 63.5 30.48 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 66dfea64-a568-4e6f-8a42-aed0b9f20176)
-    (property "Reference" "#PWR0170" (id 0) (at 63.5 36.83 0)
+    (property "Reference" "#PWR071" (id 0) (at 63.5 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 63.5 35.0426 0)
@@ -3043,7 +3043,7 @@
   (symbol (lib_id "power:GND") (at 66.04 187.96 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5f779ddd-f24f-4ede-9d83-2aa511098e7d)
-    (property "Reference" "#PWR0171" (id 0) (at 66.04 194.31 0)
+    (property "Reference" "#PWR072" (id 0) (at 66.04 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 66.04 192.5226 0)
@@ -3061,7 +3061,7 @@
   (symbol (lib_id "power:GND") (at 91.44 186.69 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b756cc5b-63f0-4538-a6fe-95b109d06c21)
-    (property "Reference" "#PWR0172" (id 0) (at 91.44 193.04 0)
+    (property "Reference" "#PWR073" (id 0) (at 91.44 193.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 91.44 191.2526 0)
@@ -3079,7 +3079,7 @@
   (symbol (lib_id "power:GND") (at 106.68 49.53 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d6e4c24e-c0ae-4abc-83a2-2fc8d4c66fbf)
-    (property "Reference" "#PWR0173" (id 0) (at 106.68 55.88 0)
+    (property "Reference" "#PWR074" (id 0) (at 106.68 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 106.68 54.0926 0)
@@ -3097,7 +3097,7 @@
   (symbol (lib_id "power:GND") (at 106.68 194.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 94d93049-095e-4b25-9bd6-6513b9d4d1b5)
-    (property "Reference" "#PWR0174" (id 0) (at 106.68 200.66 0)
+    (property "Reference" "#PWR075" (id 0) (at 106.68 200.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 106.68 198.8726 0)
@@ -3115,7 +3115,7 @@
   (symbol (lib_id "power:GND") (at 128.27 158.75 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d0b75ad2-1cd8-47b0-92a5-ee3a4a9ceb88)
-    (property "Reference" "#PWR0175" (id 0) (at 128.27 165.1 0)
+    (property "Reference" "#PWR076" (id 0) (at 128.27 165.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 128.27 163.3126 0)
@@ -3133,7 +3133,7 @@
   (symbol (lib_id "power:GND") (at 139.7 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d4034035-92b1-4edc-9ffb-5f8793d0ba25)
-    (property "Reference" "#PWR0176" (id 0) (at 139.7 53.34 0)
+    (property "Reference" "#PWR077" (id 0) (at 139.7 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 139.7 51.5526 0)
@@ -3151,7 +3151,7 @@
   (symbol (lib_id "power:GND") (at 140.97 186.69 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5135c94e-001f-46d0-aef3-15fd11d83aeb)
-    (property "Reference" "#PWR0177" (id 0) (at 140.97 193.04 0)
+    (property "Reference" "#PWR078" (id 0) (at 140.97 193.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 140.97 191.2526 0)
@@ -3169,7 +3169,7 @@
   (symbol (lib_id "power:GND") (at 151.13 46.99 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 360e8ff3-e700-4d4b-b37f-8a71c6bfe5b4)
-    (property "Reference" "#PWR0178" (id 0) (at 151.13 53.34 0)
+    (property "Reference" "#PWR079" (id 0) (at 151.13 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 151.13 51.5526 0)
@@ -3187,7 +3187,7 @@
   (symbol (lib_id "power:GND") (at 156.21 194.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 519f7b3a-99eb-4821-9627-9eb7713fba31)
-    (property "Reference" "#PWR0179" (id 0) (at 156.21 200.66 0)
+    (property "Reference" "#PWR080" (id 0) (at 156.21 200.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 156.21 198.8726 0)
@@ -3205,7 +3205,7 @@
   (symbol (lib_id "power:GND") (at 191.77 147.32 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9fe4c16e-72fc-4797-80d3-134be605d0bd)
-    (property "Reference" "#PWR0180" (id 0) (at 191.77 153.67 0)
+    (property "Reference" "#PWR081" (id 0) (at 191.77 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 191.77 151.8826 0)
@@ -3223,7 +3223,7 @@
   (symbol (lib_id "power:GND") (at 199.39 161.29 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 97afb644-b320-445b-a03f-5ac752e694df)
-    (property "Reference" "#PWR0181" (id 0) (at 199.39 167.64 0)
+    (property "Reference" "#PWR082" (id 0) (at 199.39 167.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 199.39 165.8526 0)
@@ -3241,7 +3241,7 @@
   (symbol (lib_id "power:GND") (at 213.36 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6f065482-2131-4171-9165-7d9d537484a5)
-    (property "Reference" "#PWR0182" (id 0) (at 213.36 125.73 0)
+    (property "Reference" "#PWR083" (id 0) (at 213.36 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 213.36 123.9426 0)
@@ -3259,7 +3259,7 @@
   (symbol (lib_id "power:GND") (at 219.71 158.75 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a0b8b1fb-f3a3-4b87-873e-a40096b7057d)
-    (property "Reference" "#PWR0183" (id 0) (at 219.71 165.1 0)
+    (property "Reference" "#PWR084" (id 0) (at 219.71 165.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 219.71 163.3126 0)
@@ -3277,7 +3277,7 @@
   (symbol (lib_id "power:GND") (at 220.98 83.82 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fc21e199-bc0f-4656-b0d8-7ce45aad41c2)
-    (property "Reference" "#PWR0184" (id 0) (at 220.98 90.17 0)
+    (property "Reference" "#PWR085" (id 0) (at 220.98 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 220.98 88.3826 0)
@@ -3295,7 +3295,7 @@
   (symbol (lib_id "power:GND") (at 241.3 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid aa07dc01-aa29-4793-b151-6c7126a4b61c)
-    (property "Reference" "#PWR0185" (id 0) (at 241.3 125.73 0)
+    (property "Reference" "#PWR086" (id 0) (at 241.3 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 123.9426 0)
@@ -3313,7 +3313,7 @@
   (symbol (lib_id "power:GND") (at 251.46 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid aba575fa-e1a0-40e7-b97a-10ecdc2c1748)
-    (property "Reference" "#PWR0186" (id 0) (at 251.46 158.75 0)
+    (property "Reference" "#PWR087" (id 0) (at 251.46 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 251.46 156.9626 0)
@@ -3331,7 +3331,7 @@
   (symbol (lib_id "power:GND") (at 261.62 41.91 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c7e3a7f7-4a20-445c-8754-8d10c1b36f33)
-    (property "Reference" "#PWR0187" (id 0) (at 261.62 48.26 0)
+    (property "Reference" "#PWR088" (id 0) (at 261.62 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 261.62 46.4726 0)
@@ -3349,7 +3349,7 @@
   (symbol (lib_id "Device:Fuse") (at 100.33 26.67 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d158f742-f6a9-49bd-b7bd-7e072fc79276)
-    (property "Reference" "F6" (id 0) (at 100.33 21.9414 90))
+    (property "Reference" "F3" (id 0) (at 100.33 21.9414 90))
     (property "Value" "0.5A" (id 1) (at 100.33 24.7165 90))
     (property "Footprint" "Fuse:Fuse_0805_2012Metric" (id 2) (at 100.33 28.448 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -3364,7 +3364,7 @@
   (symbol (lib_id "Device:R") (at 41.91 90.17 0)
     (in_bom yes) (on_board yes)
     (uuid 3141cd55-b0cf-4fb4-8067-552a41393d27)
-    (property "Reference" "R66" (id 0) (at 43.18 88.9 0)
+    (property "Reference" "R25" (id 0) (at 43.18 88.9 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100k" (id 1) (at 43.18 91.44 0)
@@ -3383,7 +3383,7 @@
   (symbol (lib_id "Device:R") (at 54.61 96.52 270)
     (in_bom yes) (on_board yes)
     (uuid a768707f-1a08-4b2b-ad25-cba748eb3474)
-    (property "Reference" "R67" (id 0) (at 51.435 99.06 90)
+    (property "Reference" "R26" (id 0) (at 51.435 99.06 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1k" (id 1) (at 55.245 99.06 90)
@@ -3402,7 +3402,7 @@
   (symbol (lib_id "Device:R") (at 121.92 31.75 90)
     (in_bom yes) (on_board yes)
     (uuid 6ca7fc50-25ee-401f-8b53-eb893c356dde)
-    (property "Reference" "R68" (id 0) (at 120.65 34.3874 90))
+    (property "Reference" "R27" (id 0) (at 120.65 34.3874 90))
     (property "Value" "1M" (id 1) (at 120.65 37.1625 90))
     (property "Footprint" "TCY_passives:R_0603_1608Metric" (id 2) (at 121.92 33.528 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -3417,7 +3417,7 @@
   (symbol (lib_id "Device:R") (at 123.19 73.66 0)
     (in_bom yes) (on_board yes)
     (uuid aef6dac6-34e4-46f1-a1fa-34407cbd03af)
-    (property "Reference" "R69" (id 0) (at 117.3481 72.7515 0)
+    (property "Reference" "R28" (id 0) (at 117.3481 72.7515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "0R" (id 1) (at 117.3481 75.5266 0)
@@ -3436,7 +3436,7 @@
   (symbol (lib_id "Device:R") (at 133.35 73.66 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b3388e33-d1ae-4764-9de4-35c7892fd637)
-    (property "Reference" "R70" (id 0) (at 135.1281 72.7515 0)
+    (property "Reference" "R29" (id 0) (at 135.1281 72.7515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "0R" (id 1) (at 135.1281 75.5266 0)
@@ -3455,7 +3455,7 @@
   (symbol (lib_id "Device:R") (at 151.13 43.18 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a67a2fd2-d63d-43ce-ad4e-39309086dfaa)
-    (property "Reference" "R71" (id 0) (at 152.9081 42.2715 0)
+    (property "Reference" "R30" (id 0) (at 152.9081 42.2715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "0R" (id 1) (at 152.9081 45.0466 0)
@@ -3474,7 +3474,7 @@
   (symbol (lib_id "Device:R") (at 160.02 99.06 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9c8d871f-fd5d-40a3-b64f-d2601b5ec807)
-    (property "Reference" "R72" (id 0) (at 161.7981 98.1515 0)
+    (property "Reference" "R31" (id 0) (at 161.7981 98.1515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "220R" (id 1) (at 161.7981 100.9266 0)
@@ -3493,7 +3493,7 @@
   (symbol (lib_id "Device:R") (at 168.91 99.06 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ea574ce7-c5a8-447c-97ef-57e9e8e548df)
-    (property "Reference" "R73" (id 0) (at 170.6881 98.1515 0)
+    (property "Reference" "R32" (id 0) (at 170.6881 98.1515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "220R" (id 1) (at 170.6881 100.9266 0)
@@ -3512,7 +3512,7 @@
   (symbol (lib_id "Device:R") (at 199.39 157.48 0)
     (in_bom yes) (on_board yes)
     (uuid 38a40d1f-e794-40c2-a847-afdee2189fce)
-    (property "Reference" "R74" (id 0) (at 192.2781 156.5715 0)
+    (property "Reference" "R33" (id 0) (at 192.2781 156.5715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100k" (id 1) (at 192.2781 159.3466 0)
@@ -3531,7 +3531,7 @@
   (symbol (lib_id "Device:R") (at 213.36 90.17 0)
     (in_bom yes) (on_board yes)
     (uuid 0e365fba-fb04-4d77-9691-aac7cb12efa5)
-    (property "Reference" "R75" (id 0) (at 206.2481 87.9915 0)
+    (property "Reference" "R34" (id 0) (at 206.2481 87.9915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100k" (id 1) (at 206.2481 90.7666 0)
@@ -3550,7 +3550,7 @@
   (symbol (lib_id "Device:R") (at 213.36 115.57 0)
     (in_bom yes) (on_board yes)
     (uuid ec4e7484-daa7-46c2-bc25-8da071cf8e54)
-    (property "Reference" "R76" (id 0) (at 206.2481 114.6615 0)
+    (property "Reference" "R35" (id 0) (at 206.2481 114.6615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100k" (id 1) (at 206.2481 117.4366 0)
@@ -3569,7 +3569,7 @@
   (symbol (lib_id "Device:R") (at 259.08 97.79 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 77c0a262-2989-4bc3-b854-4934ca295bfb)
-    (property "Reference" "R77" (id 0) (at 260.8581 96.8815 0)
+    (property "Reference" "R36" (id 0) (at 260.8581 96.8815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "120R" (id 1) (at 260.8581 99.6566 0)
@@ -3588,7 +3588,7 @@
   (symbol (lib_id "Device:R") (at 260.35 144.78 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3e2e5dbf-cf61-40d9-a3d9-a8d6869031be)
-    (property "Reference" "R78" (id 0) (at 262.1281 143.8715 0)
+    (property "Reference" "R37" (id 0) (at 262.1281 143.8715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "60R" (id 1) (at 262.1281 146.6466 0)
@@ -3607,7 +3607,7 @@
   (symbol (lib_id "Device:R") (at 260.35 154.94 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0edca2d2-96bb-4289-a1b3-5f16afee8d48)
-    (property "Reference" "R79" (id 0) (at 262.1281 154.0315 0)
+    (property "Reference" "R38" (id 0) (at 262.1281 154.0315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "60R" (id 1) (at 262.1281 156.8066 0)
@@ -3626,7 +3626,7 @@
   (symbol (lib_id "Jumper:Jumper_2_Open") (at 62.23 41.91 0)
     (in_bom yes) (on_board yes)
     (uuid 6ff92669-49be-40b4-9c7d-717bc0c41c4b)
-    (property "Reference" "JP5" (id 0) (at 62.23 36.2924 0))
+    (property "Reference" "JP2" (id 0) (at 62.23 36.2924 0))
     (property "Value" "WDG" (id 1) (at 62.23 39.0675 0))
     (property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" (id 2) (at 62.23 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -3641,7 +3641,7 @@
   (symbol (lib_id "Jumper:Jumper_2_Open") (at 121.92 40.64 0)
     (in_bom yes) (on_board yes)
     (uuid a6959c8c-2a87-4c81-a4bc-22997a951844)
-    (property "Reference" "JP6" (id 0) (at 120.65 43.9124 0))
+    (property "Reference" "JP3" (id 0) (at 120.65 43.9124 0))
     (property "Value" "PWR_WDG" (id 1) (at 128.27 44.1475 0))
     (property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" (id 2) (at 121.92 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -3656,7 +3656,7 @@
   (symbol (lib_id "Device:LED") (at 160.02 90.17 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e1f57191-9ab1-423b-b990-28f79cf269c6)
-    (property "Reference" "D10" (id 0) (at 162.9411 89.452 90)
+    (property "Reference" "D4" (id 0) (at 162.9411 89.452 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "RED" (id 1) (at 162.9411 92.2271 90)
@@ -3675,7 +3675,7 @@
   (symbol (lib_id "Device:LED") (at 168.91 90.17 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 70c2b893-da3c-4c0f-84dd-7bf4e8f24e84)
-    (property "Reference" "D11" (id 0) (at 171.8311 89.452 90)
+    (property "Reference" "D5" (id 0) (at 171.8311 89.452 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "BLUE" (id 1) (at 171.8311 92.2271 90)
@@ -3694,7 +3694,7 @@
   (symbol (lib_id "Device:C") (at 22.86 143.51 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8f9fd460-5bbd-41ab-9b77-cb4f507809ef)
-    (property "Reference" "C77" (id 0) (at 25.7811 142.6015 0)
+    (property "Reference" "C31" (id 0) (at 25.7811 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 25.7811 145.3766 0)
@@ -3713,7 +3713,7 @@
   (symbol (lib_id "Device:C") (at 41.91 102.87 0)
     (in_bom yes) (on_board yes)
     (uuid 81ec9ec5-3fc8-4606-aac0-9fcb7604c182)
-    (property "Reference" "C78" (id 0) (at 36.195 100.965 0)
+    (property "Reference" "C32" (id 0) (at 36.195 100.965 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 35.56 105.41 0)
@@ -3732,7 +3732,7 @@
   (symbol (lib_id "Device:C") (at 63.5 26.67 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 18e6406d-ba19-48b3-998a-c98257f57ae6)
-    (property "Reference" "C79" (id 0) (at 66.4211 25.7615 0)
+    (property "Reference" "C33" (id 0) (at 66.4211 25.7615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 66.4211 28.5366 0)
@@ -3751,7 +3751,7 @@
   (symbol (lib_id "Device:C") (at 91.44 182.88 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ec6488c8-0700-4ab7-927b-5bd5f0604faa)
-    (property "Reference" "C80" (id 0) (at 94.3611 181.9715 0)
+    (property "Reference" "C34" (id 0) (at 94.3611 181.9715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 94.3611 184.7466 0)
@@ -3770,7 +3770,7 @@
   (symbol (lib_id "Device:C") (at 140.97 182.88 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bcf8bdd5-faaa-43d8-92fb-0b36a24c590d)
-    (property "Reference" "C81" (id 0) (at 143.8911 181.9715 0)
+    (property "Reference" "C35" (id 0) (at 143.8911 181.9715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 143.8911 184.7466 0)
@@ -3789,7 +3789,7 @@
   (symbol (lib_id "Device:C") (at 191.77 143.51 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2ebdb489-0020-4e17-9d52-a5357d310f6e)
-    (property "Reference" "C82" (id 0) (at 194.6911 142.6015 0)
+    (property "Reference" "C36" (id 0) (at 194.6911 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 194.6911 145.3766 0)
@@ -3808,7 +3808,7 @@
   (symbol (lib_id "Device:C") (at 198.12 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid 17816896-84c8-4bf2-891b-d0deea99d5e0)
-    (property "Reference" "C83" (id 0) (at 198.5011 32.1115 0)
+    (property "Reference" "C37" (id 0) (at 198.5011 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "4.7uF" (id 1) (at 198.5011 37.4266 0)
@@ -3827,7 +3827,7 @@
   (symbol (lib_id "Device:C") (at 205.74 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid 64727722-833b-439b-becb-3061a0571209)
-    (property "Reference" "C84" (id 0) (at 206.1211 32.1115 0)
+    (property "Reference" "C38" (id 0) (at 206.1211 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "4.7uF" (id 1) (at 206.1211 37.4266 0)
@@ -3846,7 +3846,7 @@
   (symbol (lib_id "Device:C") (at 215.9 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid 4b336132-d85e-4973-ba28-03329505884f)
-    (property "Reference" "C85" (id 0) (at 216.2811 32.1115 0)
+    (property "Reference" "C39" (id 0) (at 216.2811 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 216.2811 37.4266 0)
@@ -3865,7 +3865,7 @@
   (symbol (lib_id "Device:C") (at 220.98 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ffd75bb7-e919-4630-90d4-0f5c3b6b5ced)
-    (property "Reference" "C86" (id 0) (at 223.9011 79.1015 0)
+    (property "Reference" "C40" (id 0) (at 223.9011 79.1015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 223.9011 81.8766 0)
@@ -3884,7 +3884,7 @@
   (symbol (lib_id "Device:C") (at 223.52 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid 235a87f3-1634-4db9-9a7f-188c48b02023)
-    (property "Reference" "C87" (id 0) (at 223.9011 32.1115 0)
+    (property "Reference" "C41" (id 0) (at 223.9011 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 223.9011 37.4266 0)
@@ -3903,7 +3903,7 @@
   (symbol (lib_id "Device:C") (at 231.14 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid 76586936-cee8-4e12-bc46-6307911fdced)
-    (property "Reference" "C88" (id 0) (at 231.5211 32.1115 0)
+    (property "Reference" "C42" (id 0) (at 231.5211 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 231.5211 37.4266 0)
@@ -3922,7 +3922,7 @@
   (symbol (lib_id "Device:C") (at 238.76 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid 471bf054-7fc0-4197-8c38-fae777d52abc)
-    (property "Reference" "C89" (id 0) (at 239.1411 32.1115 0)
+    (property "Reference" "C43" (id 0) (at 239.1411 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 239.1411 37.4266 0)
@@ -3941,7 +3941,7 @@
   (symbol (lib_id "Device:C") (at 246.38 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid c1cf00ce-2440-4f2b-a322-d4f1df3e3378)
-    (property "Reference" "C90" (id 0) (at 246.7611 32.1115 0)
+    (property "Reference" "C44" (id 0) (at 246.7611 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 246.7611 37.4266 0)
@@ -3960,7 +3960,7 @@
   (symbol (lib_id "Device:C") (at 256.54 34.29 0)
     (in_bom yes) (on_board yes)
     (uuid 76477ea0-9072-4296-80bb-4aa9a2dcdb47)
-    (property "Reference" "C91" (id 0) (at 256.9211 32.1115 0)
+    (property "Reference" "C45" (id 0) (at 256.9211 32.1115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10nF" (id 1) (at 256.9211 37.4266 0)
@@ -3979,7 +3979,7 @@
   (symbol (lib_id "Device:C") (at 256.54 149.86 90)
     (in_bom yes) (on_board yes)
     (uuid 9d08706f-8397-473d-832b-a9ab93539041)
-    (property "Reference" "C92" (id 0) (at 254 143.7344 90))
+    (property "Reference" "C46" (id 0) (at 254 143.7344 90))
     (property "Value" "4.7nF" (id 1) (at 255.27 146.5095 90))
     (property "Footprint" "TCY_passives:C_0603_1608Metric" (id 2) (at 260.35 148.8948 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -3994,7 +3994,7 @@
   (symbol (lib_id "Switch:SW_Push") (at 48.26 104.14 270)
     (in_bom yes) (on_board yes)
     (uuid ba875717-2c26-4f55-9301-b984c8f3dfa8)
-    (property "Reference" "SW2" (id 0) (at 51.435 107.95 0))
+    (property "Reference" "SW1" (id 0) (at 51.435 107.95 0))
     (property "Value" "RST_BTN" (id 1) (at 45.72 104.14 0))
     (property "Footprint" "TCY_buttons_switches:KMT031NGJLHS" (id 2) (at 53.34 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -4009,7 +4009,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x03_MountingPin") (at 38.1 180.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 49644d2a-42d7-4ad2-a10d-9923491c7ac4)
-    (property "Reference" "J20" (id 0) (at 40.1321 181.4635 0)
+    (property "Reference" "J8" (id 0) (at 40.1321 181.4635 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "CLI" (id 1) (at 40.1321 184.2386 0)
@@ -4030,7 +4030,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x03_MountingPin") (at 66.04 180.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ed257f87-4b27-4090-b091-6c8ad6da58cc)
-    (property "Reference" "J21" (id 0) (at 68.0721 181.4635 0)
+    (property "Reference" "J9" (id 0) (at 68.0721 181.4635 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "PROG" (id 1) (at 68.0721 184.2386 0)
@@ -4051,7 +4051,7 @@
   (symbol (lib_id "Power_Protection:NUP2105L") (at 243.84 149.86 90)
     (in_bom yes) (on_board yes)
     (uuid b5e80dbc-f7f9-4cbe-b71b-895d877b642f)
-    (property "Reference" "D12" (id 0) (at 243.84 141.4484 90))
+    (property "Reference" "D6" (id 0) (at 243.84 141.4484 90))
     (property "Value" "NUP2105L" (id 1) (at 245.11 144.2235 90))
     (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 245.11 144.145 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4067,7 +4067,7 @@
   (symbol (lib_id "TCY_ocillators:SiT1552AI") (at 156.21 186.69 0)
     (in_bom yes) (on_board yes)
     (uuid 5ef4a3e4-d5aa-462e-a9e6-c45d9593de5e)
-    (property "Reference" "X4" (id 0) (at 152.908 179.4315 0)
+    (property "Reference" "X2" (id 0) (at 152.908 179.4315 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SiT1552AI" (id 1) (at 168.148 179.6666 0)
@@ -4088,7 +4088,7 @@
   (symbol (lib_id "TCY_ocillators:ECS-TXO-3225") (at 106.68 186.69 0)
     (in_bom yes) (on_board yes)
     (uuid ed30ff57-c912-4a1f-91f4-db1fdf54a859)
-    (property "Reference" "X3" (id 0) (at 103.1239 179.4315 0)
+    (property "Reference" "X1" (id 0) (at 103.1239 179.4315 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "ECS-TXO-3225" (id 1) (at 124.7139 179.6666 0)
@@ -4109,7 +4109,7 @@
   (symbol (lib_id "TCY_IC:STM6822") (at 43.18 48.26 0)
     (in_bom yes) (on_board yes)
     (uuid f77b95cc-36f2-4ccb-a801-2f26b47b85c8)
-    (property "Reference" "U19" (id 0) (at 46.7361 32.7465 0)
+    (property "Reference" "U6" (id 0) (at 46.7361 32.7465 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "STM6822" (id 1) (at 44.1961 35.5216 0)
@@ -4131,7 +4131,7 @@
   (symbol (lib_id "TCY_IC:STM6822") (at 106.68 46.99 0)
     (in_bom yes) (on_board yes)
     (uuid ba5ee903-c2a9-415c-bac9-36e6ca961059)
-    (property "Reference" "U21" (id 0) (at 114.0461 44.1765 0)
+    (property "Reference" "U8" (id 0) (at 114.0461 44.1765 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "STM6822" (id 1) (at 114.0461 46.9516 0)
@@ -4153,7 +4153,7 @@
   (symbol (lib_id "TCY_memory:FM25Lxx") (at 52.07 148.59 0)
     (in_bom yes) (on_board yes)
     (uuid 0c622726-1a7f-4c82-bf43-6f5d5eea0034)
-    (property "Reference" "U20" (id 0) (at 45.72 141.8294 0))
+    (property "Reference" "U7" (id 0) (at 45.72 141.8294 0))
     (property "Value" "FM25Lxx" (id 1) (at 58.42 142.0645 0))
     (property "Footprint" "TCY_IC:DFN-8-1EP_4.5x4mm_P0.95mm_EP3.6x2.6mm" (id 2) (at 52.07 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -4175,7 +4175,7 @@
   (symbol (lib_id "TCY_power_management:AP22653") (at 139.7 29.21 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 24de272e-4355-486f-b5ab-c0ab5af3d613)
-    (property "Reference" "U23" (id 0) (at 139.7 20.1634 0))
+    (property "Reference" "U10" (id 0) (at 139.7 20.1634 0))
     (property "Value" "AP22653A" (id 1) (at 139.7 22.9385 0))
     (property "Footprint" "Package_DFN_QFN:DFN-6-1EP_2x2mm_P0.65mm_EP1x1.6mm" (id 2) (at 137.16 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -4195,7 +4195,7 @@
   (symbol (lib_id "Interface_CAN_LIN:SN65HVD230") (at 219.71 148.59 0)
     (in_bom yes) (on_board yes)
     (uuid 23f0cb1a-e2e7-4edd-b8b7-aac4e405d7fa)
-    (property "Reference" "U24" (id 0) (at 222.25 139.2894 0))
+    (property "Reference" "U11" (id 0) (at 222.25 139.2894 0))
     (property "Value" "SN65HVD230" (id 1) (at 227.33 142.0645 0))
     (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 219.71 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -4216,7 +4216,7 @@
   (symbol (lib_id "TCY_IC:MAX13430ETB+") (at 241.3 99.06 0)
     (in_bom yes) (on_board yes)
     (uuid 016a602a-2056-4b3d-a886-341e3a0fbb09)
-    (property "Reference" "U25" (id 0) (at 247.65 77.3336 0))
+    (property "Reference" "U12" (id 0) (at 247.65 77.3336 0))
     (property "Value" "MAX13430ETB+" (id 1) (at 252.73 80.1087 0))
     (property "Footprint" "Package_DFN_QFN:DFN-10-1EP_3x3mm_P0.5mm_EP1.55x2.48mm" (id 2) (at 241.3 128.27 0)
       (effects (font (size 1.27 1.27) italic) hide)
@@ -4240,7 +4240,7 @@
   (symbol (lib_id "MCU_ST_STM32L4:STM32L452CEUx") (at 128.27 115.57 0)
     (in_bom yes) (on_board yes)
     (uuid ddc25bdb-d68d-4ffd-963d-581dcff07ef5)
-    (property "Reference" "U22" (id 0) (at 128.27 104.9994 0))
+    (property "Reference" "U9" (id 0) (at 128.27 104.9994 0))
     (property "Value" "STM32L452CEUx" (id 1) (at 128.27 107.7745 0))
     (property "Footprint" "Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm" (id 2) (at 115.57 151.13 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
diff --git a/modules/EPS/Power_VBAT.kicad_sch b/modules/EPS/Power_VBAT.kicad_sch
index 30dee48..8d1cc82 100644
--- a/modules/EPS/Power_VBAT.kicad_sch
+++ b/modules/EPS/Power_VBAT.kicad_sch
@@ -700,7 +700,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 198.12 105.41 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c8253c12-cea3-490b-9399-c0ed3af2f13e)
-    (property "Reference" "#FLG032" (id 0) (at 198.12 103.505 0)
+    (property "Reference" "#FLG031" (id 0) (at 198.12 103.505 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 198.12 101.8054 0))
@@ -716,7 +716,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 175.26 87.63 0)
     (in_bom yes) (on_board yes)
     (uuid 628aa029-6b78-45d8-869d-90b825a81328)
-    (property "Reference" "TP59" (id 0) (at 174.1171 81.07 0)
+    (property "Reference" "TP57" (id 0) (at 174.1171 81.07 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT_I" (id 1) (at 176.6571 83.8451 0)
@@ -734,7 +734,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 180.34 105.41 0)
     (in_bom yes) (on_board yes)
     (uuid 9b4ce1c8-3cae-46d6-ba61-5ac61f4a5a0d)
-    (property "Reference" "TP60" (id 0) (at 181.7371 100.12 0)
+    (property "Reference" "TP58" (id 0) (at 181.7371 100.12 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "VBAT_OUT" (id 1) (at 181.7371 102.8951 0)
@@ -752,7 +752,7 @@
   (symbol (lib_id "power:GND") (at 121.92 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ee475694-3da4-4ade-9d58-3b473d12d511)
-    (property "Reference" "#PWR0274" (id 0) (at 121.92 86.36 0)
+    (property "Reference" "#PWR0267" (id 0) (at 121.92 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 121.92 84.5726 0)
@@ -770,7 +770,7 @@
   (symbol (lib_id "power:GND") (at 143.51 86.36 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4373c2a8-a1ca-4c96-9e11-fbb53bbc7fba)
-    (property "Reference" "#PWR0275" (id 0) (at 143.51 92.71 0)
+    (property "Reference" "#PWR0268" (id 0) (at 143.51 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 143.51 90.9226 0)
@@ -788,7 +788,7 @@
   (symbol (lib_id "power:GND") (at 148.59 72.39 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 29977e9b-4a0d-4a9f-9cc6-fb5f61fe96ef)
-    (property "Reference" "#PWR0276" (id 0) (at 148.59 78.74 0)
+    (property "Reference" "#PWR0269" (id 0) (at 148.59 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 148.59 76.9526 0)
@@ -806,7 +806,7 @@
   (symbol (lib_id "power:GND") (at 156.21 123.19 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 22c15bb5-f31e-4dea-aea6-ae0d3261e290)
-    (property "Reference" "#PWR0277" (id 0) (at 156.21 129.54 0)
+    (property "Reference" "#PWR0270" (id 0) (at 156.21 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 156.21 127.7526 0)
@@ -824,7 +824,7 @@
   (symbol (lib_id "power:GND") (at 157.48 96.52 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 46ae66f1-57f5-45d5-838f-3766d3ccf8f6)
-    (property "Reference" "#PWR0278" (id 0) (at 157.48 102.87 0)
+    (property "Reference" "#PWR0271" (id 0) (at 157.48 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 157.48 101.0826 0)
@@ -842,7 +842,7 @@
   (symbol (lib_id "power:GND") (at 166.37 96.52 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 737db744-b62d-49f0-8401-672c12195c89)
-    (property "Reference" "#PWR0279" (id 0) (at 166.37 102.87 0)
+    (property "Reference" "#PWR0272" (id 0) (at 166.37 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 166.37 101.0826 0)
@@ -860,7 +860,7 @@
   (symbol (lib_id "power:GND") (at 175.26 96.52 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0ea567c7-6e39-4188-9b81-5675115b0a6b)
-    (property "Reference" "#PWR0280" (id 0) (at 175.26 102.87 0)
+    (property "Reference" "#PWR0273" (id 0) (at 175.26 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 175.26 101.0826 0)
@@ -878,7 +878,7 @@
   (symbol (lib_id "Device:R") (at 133.35 97.79 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d8168bbf-0fcb-4808-935a-c54dfa015fa5)
-    (property "Reference" "R134" (id 0) (at 133.35 92.8074 90))
+    (property "Reference" "R129" (id 0) (at 133.35 92.8074 90))
     (property "Value" "10mR" (id 1) (at 133.35 95.5825 90))
     (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 133.35 99.568 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -893,7 +893,7 @@
   (symbol (lib_id "Device:R") (at 133.35 105.41 90)
     (in_bom yes) (on_board yes)
     (uuid ecf03018-8e68-41f8-a7bf-7006e1949849)
-    (property "Reference" "R135" (id 0) (at 133.35 100.4274 90))
+    (property "Reference" "R130" (id 0) (at 133.35 100.4274 90))
     (property "Value" "10mR" (id 1) (at 133.35 103.2025 90))
     (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 133.35 107.188 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -908,7 +908,7 @@
   (symbol (lib_id "Device:R") (at 156.21 119.38 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 923f837d-d68b-481b-a676-fdf1f2a319f5)
-    (property "Reference" "R136" (id 0) (at 157.9881 118.4715 0)
+    (property "Reference" "R131" (id 0) (at 157.9881 118.4715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 157.9881 121.2466 0)
@@ -927,7 +927,7 @@
   (symbol (lib_id "Device:R") (at 157.48 82.55 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 39332c72-4269-44ab-a976-7666a5a07a01)
-    (property "Reference" "R137" (id 0) (at 159.2581 81.6415 0)
+    (property "Reference" "R132" (id 0) (at 159.2581 81.6415 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "100k" (id 1) (at 159.2581 84.4166 0)
@@ -946,7 +946,7 @@
   (symbol (lib_id "Device:R") (at 157.48 92.71 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 438130f6-c41c-4438-88d0-b194e1cd102f)
-    (property "Reference" "R138" (id 0) (at 159.2581 91.8015 0)
+    (property "Reference" "R133" (id 0) (at 159.2581 91.8015 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "270k" (id 1) (at 159.2581 94.5766 0)
@@ -965,7 +965,7 @@
   (symbol (lib_id "Device:D_Zener") (at 175.26 92.71 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9135e2df-d381-43ba-ab0c-de88b9a6488d)
-    (property "Reference" "D20" (id 0) (at 177.2667 91.8015 90)
+    (property "Reference" "D19" (id 0) (at 177.2667 91.8015 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "3V3" (id 1) (at 177.2667 94.5766 90)
@@ -984,7 +984,7 @@
   (symbol (lib_id "Device:Polyfuse") (at 171.45 105.41 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a0c9ea8e-9b88-427a-a621-b12ce23cd1f8)
-    (property "Reference" "F14" (id 0) (at 171.45 100.0464 90))
+    (property "Reference" "F13" (id 0) (at 171.45 100.0464 90))
     (property "Value" "5A" (id 1) (at 171.45 102.8215 90))
     (property "Footprint" "Fuse:Fuse_1210_3225Metric" (id 2) (at 176.53 104.14 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -999,7 +999,7 @@
   (symbol (lib_id "Device:C") (at 121.92 76.2 0)
     (in_bom yes) (on_board yes)
     (uuid febe57fa-2c04-4758-af60-8ca1adc6be3e)
-    (property "Reference" "C127" (id 0) (at 113.4111 75.2915 0)
+    (property "Reference" "C125" (id 0) (at 113.4111 75.2915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 113.4111 78.0666 0)
@@ -1018,7 +1018,7 @@
   (symbol (lib_id "Device:C") (at 166.37 92.71 0)
     (in_bom yes) (on_board yes)
     (uuid 1930155e-e85f-47a6-bc9e-d5959778ba35)
-    (property "Reference" "C128" (id 0) (at 169.2911 91.8015 0)
+    (property "Reference" "C126" (id 0) (at 169.2911 91.8015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10nF" (id 1) (at 168.0211 94.5766 0)
@@ -1037,7 +1037,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 156.21 105.41 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4f984924-e775-4f93-861a-4954ba37a68e)
-    (property "Reference" "Q28" (id 0) (at 156.21 100.1388 90)
+    (property "Reference" "Q27" (id 0) (at 156.21 100.1388 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 156.21 102.3778 90)
@@ -1059,7 +1059,7 @@
   (symbol (lib_id "TCY_power_management:INA199") (at 146.05 78.74 0)
     (in_bom yes) (on_board yes)
     (uuid 4bc5bfce-3c4b-49ff-9663-b05430efc8b8)
-    (property "Reference" "U46" (id 0) (at 144.5261 66.4015 0)
+    (property "Reference" "U45" (id 0) (at 144.5261 66.4015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "INA199x2" (id 1) (at 141.9861 69.1766 0)
diff --git a/modules/EPS/Power_supplies.kicad_sch b/modules/EPS/Power_supplies.kicad_sch
index f8af934..805b57e 100644
--- a/modules/EPS/Power_supplies.kicad_sch
+++ b/modules/EPS/Power_supplies.kicad_sch
@@ -217,7 +217,7 @@
   (symbol (lib_id "Mechanical:MountingHole") (at 262.89 158.75 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bcb184fa-cb43-4f8a-880d-f0338c82df5f)
-    (property "Reference" "H8" (id 0) (at 265.4301 157.8415 0)
+    (property "Reference" "H7" (id 0) (at 265.4301 157.8415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "MountingHole" (id 1) (at 265.4301 160.6166 0)
diff --git a/modules/EPS/Power_supply.kicad_sch b/modules/EPS/Power_supply.kicad_sch
index 3045533..e9e5a7a 100644
--- a/modules/EPS/Power_supply.kicad_sch
+++ b/modules/EPS/Power_supply.kicad_sch
@@ -1060,7 +1060,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 111.76 99.06 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c29f3033-9219-4cc1-9291-3040b3e16811)
-    (property "Reference" "#FLG030" (id 0) (at 111.76 100.965 0)
+    (property "Reference" "#FLG029" (id 0) (at 111.76 100.965 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 111.76 103.6226 0))
@@ -1076,7 +1076,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 153.67 88.9 0)
     (in_bom yes) (on_board yes)
     (uuid bd290f96-4ed3-449c-a9a9-5e397d65f6c5)
-    (property "Reference" "TP54" (id 0) (at 152.5271 79.8 0)
+    (property "Reference" "TP51" (id 0) (at 152.5271 79.8 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SOURCE_V" (id 1) (at 152.5271 82.5751 0)
@@ -1094,7 +1094,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 208.28 71.12 0)
     (in_bom yes) (on_board yes)
     (uuid 12219d6e-5aac-42c8-a90c-26e3f83d4257)
-    (property "Reference" "TP55" (id 0) (at 207.1371 62.02 0)
+    (property "Reference" "TP52" (id 0) (at 207.1371 62.02 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SOURCE_I" (id 1) (at 207.1371 64.7951 0)
@@ -1112,7 +1112,7 @@
   (symbol (lib_id "Connector:TestPoint") (at 228.6 88.9 0)
     (in_bom yes) (on_board yes)
     (uuid 8d6509b2-e2f4-43f1-82be-30ba7bf064fe)
-    (property "Reference" "TP56" (id 0) (at 227.4571 79.8 0)
+    (property "Reference" "TP53" (id 0) (at 227.4571 79.8 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "SOURCE_OUT" (id 1) (at 227.4571 82.5751 0)
@@ -1130,7 +1130,7 @@
   (symbol (lib_id "power:GND") (at 90.17 97.79 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ae27e7fe-5c1f-47bc-8e18-5d996ea250c5)
-    (property "Reference" "#PWR0255" (id 0) (at 90.17 104.14 0)
+    (property "Reference" "#PWR0243" (id 0) (at 90.17 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 90.17 102.3526 0)
@@ -1148,7 +1148,7 @@
   (symbol (lib_id "power:GND") (at 102.87 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 13176dad-8f8f-4026-81a4-edf966731f8f)
-    (property "Reference" "#PWR0256" (id 0) (at 102.87 118.11 0)
+    (property "Reference" "#PWR0244" (id 0) (at 102.87 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 102.87 116.3226 0)
@@ -1166,7 +1166,7 @@
   (symbol (lib_id "power:GND") (at 123.19 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c8dfc5fc-322b-4374-9a81-0adf6c5f49db)
-    (property "Reference" "#PWR0257" (id 0) (at 123.19 118.11 0)
+    (property "Reference" "#PWR0245" (id 0) (at 123.19 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 123.19 116.3226 0)
@@ -1184,7 +1184,7 @@
   (symbol (lib_id "power:GND") (at 143.51 118.11 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 03c6fd6d-e0b6-41c3-84fd-b262841cf470)
-    (property "Reference" "#PWR0258" (id 0) (at 143.51 124.46 0)
+    (property "Reference" "#PWR0246" (id 0) (at 143.51 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 143.51 122.6726 0)
@@ -1202,7 +1202,7 @@
   (symbol (lib_id "power:GND") (at 156.21 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 168b2538-a559-4d61-b520-6227a896aa71)
-    (property "Reference" "#PWR0259" (id 0) (at 156.21 107.95 0)
+    (property "Reference" "#PWR0247" (id 0) (at 156.21 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 156.21 106.1626 0)
@@ -1220,7 +1220,7 @@
   (symbol (lib_id "power:GND") (at 165.1 63.5 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5857ebf9-0972-4cec-b1a7-c3422dd19fae)
-    (property "Reference" "#PWR0260" (id 0) (at 165.1 69.85 0)
+    (property "Reference" "#PWR0248" (id 0) (at 165.1 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 165.1 68.0626 0)
@@ -1238,7 +1238,7 @@
   (symbol (lib_id "power:GND") (at 167.64 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4029a05d-d81f-4e7a-a718-eef6a006aa1b)
-    (property "Reference" "#PWR0261" (id 0) (at 167.64 107.95 0)
+    (property "Reference" "#PWR0249" (id 0) (at 167.64 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 167.64 106.1626 0)
@@ -1256,7 +1256,7 @@
   (symbol (lib_id "power:GND") (at 186.69 69.85 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b5e54bb2-fa3d-435a-bcc3-76ad9126fc58)
-    (property "Reference" "#PWR0262" (id 0) (at 186.69 76.2 0)
+    (property "Reference" "#PWR0250" (id 0) (at 186.69 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 186.69 74.4126 0)
@@ -1274,7 +1274,7 @@
   (symbol (lib_id "power:GND") (at 191.77 55.88 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b42b9f2e-10a1-43f0-9fd7-76f7eb60772f)
-    (property "Reference" "#PWR0263" (id 0) (at 191.77 62.23 0)
+    (property "Reference" "#PWR0251" (id 0) (at 191.77 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 191.77 60.4426 0)
@@ -1292,7 +1292,7 @@
   (symbol (lib_id "power:GND") (at 200.66 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 10dc8f48-b5c6-45d8-b350-02acec8a8064)
-    (property "Reference" "#PWR0264" (id 0) (at 200.66 86.36 0)
+    (property "Reference" "#PWR0252" (id 0) (at 200.66 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 200.66 84.5726 0)
@@ -1310,7 +1310,7 @@
   (symbol (lib_id "power:GND") (at 203.2 106.68 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e8ccc65e-c88e-4cb7-830d-b0bbce06b85e)
-    (property "Reference" "#PWR0265" (id 0) (at 203.2 113.03 0)
+    (property "Reference" "#PWR0253" (id 0) (at 203.2 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 203.2 111.2426 0)
@@ -1328,7 +1328,7 @@
   (symbol (lib_id "power:GND") (at 208.28 80.01 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fb832e1c-8fc8-41fa-b2b1-089722e2d582)
-    (property "Reference" "#PWR0266" (id 0) (at 208.28 86.36 0)
+    (property "Reference" "#PWR0254" (id 0) (at 208.28 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 208.28 84.5726 0)
@@ -1346,7 +1346,7 @@
   (symbol (lib_id "Device:L") (at 124.46 74.93 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c61284fb-b235-43b0-b218-8bc6019b60e1)
-    (property "Reference" "L8" (id 0) (at 124.46 70.4554 90))
+    (property "Reference" "L7" (id 0) (at 124.46 70.4554 90))
     (property "Value" "2.2uH" (id 1) (at 124.46 73.2305 90))
     (property "Footprint" "Inductor_SMD:L_Taiyo-Yuden_MD-5050" (id 2) (at 124.46 74.93 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -1361,7 +1361,7 @@
   (symbol (lib_id "Device:R") (at 102.87 93.98 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3089d219-f91c-4780-bdaa-196ebbdedf87)
-    (property "Reference" "R122" (id 0) (at 104.6481 93.0715 0)
+    (property "Reference" "R115" (id 0) (at 104.6481 93.0715 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100R" (id 1) (at 104.6481 95.8466 0)
@@ -1380,7 +1380,7 @@
   (symbol (lib_id "Device:R") (at 143.51 93.98 0)
     (in_bom yes) (on_board yes)
     (uuid 9b169cde-1701-4a15-a018-14af55b54a2b)
-    (property "Reference" "R123" (id 0) (at 145.2881 94.3415 0)
+    (property "Reference" "R116" (id 0) (at 145.2881 94.3415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "520k/1.12M/1.8M" (id 1) (at 145.2881 92.0366 0)
@@ -1399,7 +1399,7 @@
   (symbol (lib_id "Device:R") (at 143.51 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid edb34068-00d6-4168-b744-075735693e81)
-    (property "Reference" "R124" (id 0) (at 145.2881 113.3915 0)
+    (property "Reference" "R117" (id 0) (at 145.2881 113.3915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "200k" (id 1) (at 145.2881 116.1666 0)
@@ -1418,7 +1418,7 @@
   (symbol (lib_id "Device:R") (at 176.53 88.9 90)
     (in_bom yes) (on_board yes)
     (uuid 57ee2ae8-39d7-4647-b4db-5919a1cac11f)
-    (property "Reference" "R125" (id 0) (at 176.53 83.9174 90))
+    (property "Reference" "R118" (id 0) (at 176.53 83.9174 90))
     (property "Value" "20mR" (id 1) (at 176.53 86.6925 90))
     (property "Footprint" "Resistor_SMD:R_2010_5025Metric" (id 2) (at 176.53 90.678 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -1433,7 +1433,7 @@
   (symbol (lib_id "Device:R") (at 200.66 66.04 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4b5d3980-caa6-4341-a4be-95f6ac170448)
-    (property "Reference" "R126" (id 0) (at 202.4381 65.1315 0)
+    (property "Reference" "R119" (id 0) (at 202.4381 65.1315 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "100k" (id 1) (at 202.4381 67.9066 0)
@@ -1452,7 +1452,7 @@
   (symbol (lib_id "Device:R") (at 200.66 76.2 180)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0e8425b5-7118-43f0-9262-10ddb2e80139)
-    (property "Reference" "R127" (id 0) (at 202.4381 75.2915 0)
+    (property "Reference" "R120" (id 0) (at 202.4381 75.2915 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "270k" (id 1) (at 202.4381 78.0666 0)
@@ -1471,7 +1471,7 @@
   (symbol (lib_id "Device:R") (at 203.2 102.87 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 08f809c6-2d77-40c1-b3e6-711475598559)
-    (property "Reference" "R128" (id 0) (at 204.9781 101.9615 0)
+    (property "Reference" "R121" (id 0) (at 204.9781 101.9615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1M" (id 1) (at 204.9781 104.7366 0)
@@ -1490,7 +1490,7 @@
   (symbol (lib_id "Device:D_Zener") (at 208.28 76.2 270)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2c3e2eec-bef4-4877-be07-97d3b7318dc5)
-    (property "Reference" "D18" (id 0) (at 210.2867 75.2915 90)
+    (property "Reference" "D17" (id 0) (at 210.2867 75.2915 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "3V3" (id 1) (at 210.2867 78.0666 90)
@@ -1509,7 +1509,7 @@
   (symbol (lib_id "Device:Polyfuse") (at 217.17 88.9 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8e4adf92-49ad-4b97-a921-787246d814f0)
-    (property "Reference" "F12" (id 0) (at 217.17 83.5364 90))
+    (property "Reference" "F11" (id 0) (at 217.17 83.5364 90))
     (property "Value" "2A" (id 1) (at 217.17 86.3115 90))
     (property "Footprint" "Fuse:Fuse_1206_3216Metric" (id 2) (at 222.25 87.63 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -1524,7 +1524,7 @@
   (symbol (lib_id "Device:C") (at 90.17 93.98 0)
     (in_bom yes) (on_board yes)
     (uuid bf00f5b7-4b03-4b9b-9beb-c16b5285f72d)
-    (property "Reference" "C120" (id 0) (at 93.0911 94.3415 0)
+    (property "Reference" "C115" (id 0) (at 93.0911 94.3415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF (X7R)" (id 1) (at 90.5511 97.1166 0)
@@ -1543,7 +1543,7 @@
   (symbol (lib_id "Device:C") (at 102.87 104.14 0)
     (in_bom yes) (on_board yes)
     (uuid 16350d36-21bf-4cb0-8481-d55787b39d40)
-    (property "Reference" "C121" (id 0) (at 94.3611 104.5015 0)
+    (property "Reference" "C116" (id 0) (at 94.3611 104.5015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF (X7R)" (id 1) (at 89.2811 107.2766 0)
@@ -1562,7 +1562,7 @@
   (symbol (lib_id "Device:C") (at 156.21 97.79 0)
     (in_bom yes) (on_board yes)
     (uuid 8adec100-a1a6-41e4-b4a7-f3f3bc4b2ca1)
-    (property "Reference" "C122" (id 0) (at 159.1311 98.1515 0)
+    (property "Reference" "C117" (id 0) (at 159.1311 98.1515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF (X7R)" (id 1) (at 156.5911 100.9266 0)
@@ -1581,7 +1581,7 @@
   (symbol (lib_id "Device:C") (at 165.1 59.69 0)
     (in_bom yes) (on_board yes)
     (uuid 148c8ecd-04d2-4757-b5c0-9eee95504366)
-    (property "Reference" "C123" (id 0) (at 156.5911 58.7815 0)
+    (property "Reference" "C118" (id 0) (at 156.5911 58.7815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 156.5911 61.5566 0)
@@ -1600,7 +1600,7 @@
   (symbol (lib_id "Device:C") (at 167.64 97.79 0)
     (in_bom yes) (on_board yes)
     (uuid 73f3621e-3d60-498b-a529-65605fa975d8)
-    (property "Reference" "C124" (id 0) (at 170.5611 98.1515 0)
+    (property "Reference" "C119" (id 0) (at 170.5611 98.1515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF (X7R)" (id 1) (at 168.0211 100.9266 0)
@@ -1619,7 +1619,7 @@
   (symbol (lib_id "Device:R_POT") (at 143.51 104.14 0)
     (in_bom yes) (on_board yes)
     (uuid a44da014-6bbf-4eff-aa85-6f77eb7124cc)
-    (property "Reference" "RV6" (id 0) (at 149.352 108.3115 0)
+    (property "Reference" "RV5" (id 0) (at 149.352 108.3115 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "100k" (id 1) (at 151.892 106.0066 0)
@@ -1639,7 +1639,7 @@
   (symbol (lib_id "TCY_transistors:SiS413DN") (at 203.2 88.9 270) (mirror x)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 86ba3151-bbed-4b81-b0fb-078cc537837a)
-    (property "Reference" "Q26" (id 0) (at 203.2 83.6288 90)
+    (property "Reference" "Q25" (id 0) (at 203.2 83.6288 90)
       (effects (font (size 1 1)))
     )
     (property "Value" "SiS413DN" (id 1) (at 203.2 85.8678 90)
@@ -1661,7 +1661,7 @@
   (symbol (lib_id "TCY_power_management:INA199") (at 189.23 62.23 0)
     (in_bom yes) (on_board yes)
     (uuid 4c2ff129-ffc8-4675-931e-6350c72d635e)
-    (property "Reference" "U44" (id 0) (at 186.4361 49.8915 0)
+    (property "Reference" "U42" (id 0) (at 186.4361 49.8915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "INA199x2" (id 1) (at 183.8961 52.6666 0)
@@ -1686,7 +1686,7 @@
   (symbol (lib_id "Regulator_Switching:TPS63000") (at 124.46 93.98 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 74694f0a-ece9-45a0-b17c-3004a870c052)
-    (property "Reference" "U43" (id 0) (at 124.46 77.3134 0))
+    (property "Reference" "U41" (id 0) (at 124.46 77.3134 0))
     (property "Value" "TPS63000" (id 1) (at 124.46 80.0885 0))
     (property "Footprint" "Package_SON:Texas_DRC0010J_ThermalVias" (id 2) (at 146.05 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
diff --git a/modules/EPS/Solar_input.kicad_sch b/modules/EPS/Solar_input.kicad_sch
index a17f72e..dc23094 100644
--- a/modules/EPS/Solar_input.kicad_sch
+++ b/modules/EPS/Solar_input.kicad_sch
@@ -247,7 +247,7 @@
   (symbol (lib_id "power:PWR_FLAG") (at 102.87 49.53 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid afe2dd24-9acf-428c-8603-b260bc75b79c)
-    (property "Reference" "#FLG010" (id 0) (at 102.87 47.625 0)
+    (property "Reference" "#FLG01" (id 0) (at 102.87 47.625 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "PWR_FLAG" (id 1) (at 102.87 45.9254 0))
@@ -263,7 +263,7 @@
   (symbol (lib_id "power:GND") (at 88.9 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6ebe803f-5eb6-49de-94b4-9951fce61f79)
-    (property "Reference" "#PWR0104" (id 0) (at 88.9 63.5 0)
+    (property "Reference" "#PWR05" (id 0) (at 88.9 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 61.7126 0)
@@ -281,7 +281,7 @@
   (symbol (lib_id "power:GND") (at 88.9 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 383420f2-56fd-4a2d-bbf3-76ceb60f62a6)
-    (property "Reference" "#PWR0105" (id 0) (at 88.9 82.55 0)
+    (property "Reference" "#PWR06" (id 0) (at 88.9 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 80.7626 0)
@@ -299,7 +299,7 @@
   (symbol (lib_id "power:GND") (at 88.9 95.25 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 65420468-2b5a-4e8d-8139-4ff930ea4cb4)
-    (property "Reference" "#PWR0106" (id 0) (at 88.9 101.6 0)
+    (property "Reference" "#PWR07" (id 0) (at 88.9 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 99.8126 0)
@@ -317,7 +317,7 @@
   (symbol (lib_id "power:GND") (at 88.9 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 65a61411-1205-40aa-902e-07e546492efb)
-    (property "Reference" "#PWR0107" (id 0) (at 88.9 120.65 0)
+    (property "Reference" "#PWR08" (id 0) (at 88.9 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 118.8626 0)
@@ -335,7 +335,7 @@
   (symbol (lib_id "power:GND") (at 88.9 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e4ccc808-02ca-4386-b889-ffcb5a12309f)
-    (property "Reference" "#PWR0108" (id 0) (at 88.9 139.7 0)
+    (property "Reference" "#PWR09" (id 0) (at 88.9 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 137.9126 0)
@@ -353,7 +353,7 @@
   (symbol (lib_id "power:GND") (at 88.9 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bf5a0034-d362-42b0-a742-3b6168bd38d9)
-    (property "Reference" "#PWR0109" (id 0) (at 88.9 158.75 0)
+    (property "Reference" "#PWR010" (id 0) (at 88.9 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 88.9 156.9626 0)
@@ -371,7 +371,7 @@
   (symbol (lib_id "power:GND") (at 93.98 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a6eb18b5-181c-4f39-88f4-53201523a268)
-    (property "Reference" "#PWR0110" (id 0) (at 93.98 63.5 0)
+    (property "Reference" "#PWR011" (id 0) (at 93.98 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 61.7126 0)
@@ -389,7 +389,7 @@
   (symbol (lib_id "power:GND") (at 93.98 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 131ee275-1b63-49a5-9072-f19d2aa24ff9)
-    (property "Reference" "#PWR0111" (id 0) (at 93.98 82.55 0)
+    (property "Reference" "#PWR012" (id 0) (at 93.98 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 80.7626 0)
@@ -407,7 +407,7 @@
   (symbol (lib_id "power:GND") (at 93.98 95.25 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8a2183dc-0a0d-4feb-8c29-bd745679d7b8)
-    (property "Reference" "#PWR0112" (id 0) (at 93.98 101.6 0)
+    (property "Reference" "#PWR013" (id 0) (at 93.98 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 99.8126 0)
@@ -425,7 +425,7 @@
   (symbol (lib_id "power:GND") (at 93.98 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c32eb7e5-57fe-4d8a-ba99-96b946d7b6e7)
-    (property "Reference" "#PWR0113" (id 0) (at 93.98 120.65 0)
+    (property "Reference" "#PWR014" (id 0) (at 93.98 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 118.8626 0)
@@ -443,7 +443,7 @@
   (symbol (lib_id "power:GND") (at 93.98 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 42fadd57-ec9b-41c1-b934-01ce21b42ca6)
-    (property "Reference" "#PWR0114" (id 0) (at 93.98 139.7 0)
+    (property "Reference" "#PWR015" (id 0) (at 93.98 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 137.9126 0)
@@ -461,7 +461,7 @@
   (symbol (lib_id "power:GND") (at 93.98 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 77e17651-ed39-4d52-85b9-a3878d64988a)
-    (property "Reference" "#PWR0115" (id 0) (at 93.98 158.75 0)
+    (property "Reference" "#PWR016" (id 0) (at 93.98 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 93.98 156.9626 0)
@@ -479,7 +479,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 49.53 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 4c6d1bf1-6b05-46e1-bcde-fe7eaff4737b)
-    (property "Reference" "J13" (id 0) (at 89.662 43.0234 0))
+    (property "Reference" "J1" (id 0) (at 89.662 43.0234 0))
     (property "Value" "Solar_X1" (id 1) (at 89.662 45.7985 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -495,7 +495,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 68.58 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 126d2402-ba66-45fa-9faa-d3f2186094fc)
-    (property "Reference" "J14" (id 0) (at 89.662 62.0734 0))
+    (property "Reference" "J2" (id 0) (at 89.662 62.0734 0))
     (property "Value" "Solar_X2" (id 1) (at 89.662 64.8485 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -511,7 +511,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 87.63 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 0f33af7e-9621-4131-ada6-4e82b8efcc3d)
-    (property "Reference" "J15" (id 0) (at 89.662 81.1234 0))
+    (property "Reference" "J3" (id 0) (at 89.662 81.1234 0))
     (property "Value" "Solar_Y1" (id 1) (at 89.662 83.8985 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -527,7 +527,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 106.68 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid cb7ebcef-6b64-47cc-8b45-da62d01ccabe)
-    (property "Reference" "J16" (id 0) (at 89.662 100.1734 0))
+    (property "Reference" "J4" (id 0) (at 89.662 100.1734 0))
     (property "Value" "Solar_Y2" (id 1) (at 89.662 102.9485 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -543,7 +543,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 125.73 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid fc0f55cf-4820-4bbb-9d16-bdf2b58b514a)
-    (property "Reference" "J17" (id 0) (at 89.662 119.2234 0))
+    (property "Reference" "J5" (id 0) (at 89.662 119.2234 0))
     (property "Value" "Solar_Z1" (id 1) (at 89.662 121.9985 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -559,7 +559,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 144.78 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid e3bcf0a8-5a27-4bdf-a634-030a1252b6fd)
-    (property "Reference" "J18" (id 0) (at 89.662 138.2734 0))
+    (property "Reference" "J6" (id 0) (at 89.662 138.2734 0))
     (property "Value" "Solar_Z2" (id 1) (at 89.662 141.0485 0))
     (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 144.78 0)
       (effects (font (size 1.27 1.27)) hide)