diff --git a/BATConcho/BATConcho.kicad_sch b/BATConcho/BATConcho.kicad_sch
index 843bd76..b9298a5 100644
--- a/BATConcho/BATConcho.kicad_sch
+++ b/BATConcho/BATConcho.kicad_sch
@@ -1093,117 +1093,88 @@
         )
       )
     )
-    (symbol "Switch:SW_DPDT_x2" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "SW" (id 0) (at 0 4.318 0)
-        (effects (font (size 1.27 1.27)))
+    (symbol "Switch:SW_Push" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "SW" (id 0) (at 1.27 2.54 0)
+        (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "SW_DPDT_x2" (id 1) (at 0 -5.08 0)
+      (property "Value" "SW_Push" (id 1) (at 0 -1.524 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Footprint" "" (id 2) (at 0 5.08 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "switch dual-pole double-throw DPDT spdt ON-ON" (id 4) (at 0 0 0)
+      (property "Datasheet" "~" (id 3) (at 0 5.08 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Switch, dual pole double throw, separate symbols" (id 5) (at 0 0 0)
+      (property "ki_keywords" "switch normally-open pushbutton push-button" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "SW*DPDT*" (id 6) (at 0 0 0)
+      (property "ki_description" "Push button switch, generic, two pins" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "SW_DPDT_x2_0_0"
+      (symbol "SW_Push_0_1"
         (circle (center -2.032 0) (radius 0.508)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (circle (center 2.032 -2.54) (radius 0.508)
+        (polyline
+          (pts
+            (xy 0 1.27)
+            (xy 0 3.048)
+          )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-      )
-      (symbol "SW_DPDT_x2_0_1"
         (polyline
           (pts
-            (xy -1.524 0.254)
-            (xy 1.651 2.286)
+            (xy 2.54 1.27)
+            (xy -2.54 1.27)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (circle (center 2.032 2.54) (radius 0.508)
+        (circle (center 2.032 0) (radius 0.508)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-      )
-      (symbol "SW_DPDT_x2_1_1"
-        (pin passive line (at 5.08 2.54 180) (length 2.54)
-          (name "A" (effects (font (size 1.27 1.27))))
+        (pin passive line (at -5.08 0 0) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -5.08 0 0) (length 2.54)
-          (name "B" (effects (font (size 1.27 1.27))))
+        (pin passive line (at 5.08 0 180) (length 2.54)
+          (name "2" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 5.08 -2.54 180) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-      (symbol "SW_DPDT_x2_2_1"
-        (pin passive line (at 5.08 2.54 180) (length 2.54)
-          (name "A" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 0 0) (length 2.54)
-          (name "B" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 5.08 -2.54 180) (length 2.54)
-          (name "C" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
       )
     )
-    (symbol "Switch:SW_Push" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "SW" (id 0) (at 1.27 2.54 0)
-        (effects (font (size 1.27 1.27)) (justify left))
+    (symbol "Switch:SW_SPST" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "SW" (id 0) (at 0 3.175 0)
+        (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "SW_Push" (id 1) (at 0 -1.524 0)
+      (property "Value" "SW_SPST" (id 1) (at 0 -2.54 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 5.08 0)
+      (property "Footprint" "" (id 2) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 5.08 0)
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "switch normally-open pushbutton push-button" (id 4) (at 0 0 0)
+      (property "ki_keywords" "switch lever" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Push button switch, generic, two pins" (id 5) (at 0 0 0)
+      (property "ki_description" "Single Pole Single Throw (SPST) switch" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "SW_Push_0_1"
+      (symbol "SW_SPST_0_0"
         (circle (center -2.032 0) (radius 0.508)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 0 1.27)
-            (xy 0 3.048)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 1.27)
-            (xy -2.54 1.27)
+            (xy -1.524 0.254)
+            (xy 1.524 1.778)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
@@ -1212,12 +1183,14 @@
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
+      )
+      (symbol "SW_SPST_1_1"
         (pin passive line (at -5.08 0 0) (length 2.54)
-          (name "1" (effects (font (size 1.27 1.27))))
+          (name "A" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 5.08 0 180) (length 2.54)
-          (name "2" (effects (font (size 1.27 1.27))))
+          (name "B" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
       )
@@ -1604,7 +1577,6 @@
     (uuid feb00bea-558b-4e75-a69c-8aa3ef6098a6)
   )
 
-  (no_connect (at 229.87 36.83) (uuid cb873c6f-6a23-436e-b26e-d24d0494e4d6))
   (no_connect (at 43.18 46.99) (uuid d181157c-7812-47e5-a0cf-9580c905fc86))
   (no_connect (at 208.28 139.7) (uuid f25a8968-f585-4a79-aa38-de170dd5caef))
 
@@ -1956,7 +1928,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 84ce350c-b0c1-4e69-9ab2-f7ec7b8bb312)
   )
-  (wire (pts (xy 214.63 40.64) (xy 214.63 34.29))
+  (wire (pts (xy 214.63 40.64) (xy 214.63 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 85eaad10-d9fa-4cff-8de8-e4c31de4112a)
   )
@@ -2233,7 +2205,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid e9bdd59b-3252-4c44-a357-6fa1af0c210c)
   )
-  (wire (pts (xy 214.63 34.29) (xy 219.71 34.29))
+  (wire (pts (xy 214.63 31.75) (xy 219.71 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eabb4b74-f3f5-4f5a-9d01-d6b1ea928896)
   )
@@ -2708,6 +2680,21 @@
     (pin "1" (uuid 77a63206-3ed7-4ef0-9db1-532932055fda))
   )
 
+  (symbol (lib_id "Switch:SW_SPST") (at 224.79 31.75 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 18900726-0f3e-4ca3-baab-d458e77f58f8)
+    (property "Reference" "SW3" (id 0) (at 224.79 25.4 0))
+    (property "Value" "SW_SPST" (id 1) (at 224.79 27.94 0))
+    (property "Footprint" "" (id 2) (at 224.79 31.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 224.79 31.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 210a7eb6-f961-4cb1-959e-ee1ff53fd179))
+    (pin "2" (uuid dead48e8-ba13-4149-90fc-3658125c5d36))
+  )
+
   (symbol (lib_id "Switch:SW_Push") (at 119.38 125.73 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1a554bf5-ab1c-432f-afa7-241da88036bc)
@@ -2803,7 +2790,7 @@
     (property "Value" "R" (id 1) (at 271.78 149.8599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 267.462 148.59 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 267.462 148.59 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 269.24 148.59 0)
@@ -2837,7 +2824,7 @@
     (property "Value" "R" (id 1) (at 248.92 149.8599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 244.602 148.59 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 244.602 148.59 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 246.38 148.59 0)
@@ -2909,7 +2896,7 @@
     (property "Value" "Yellow" (id 1) (at 261.62 141.2874 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 257.81 138.43 0)
+    (property "Footprint" "LED_THT:LED_D5.0mm" (id 2) (at 257.81 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 257.81 138.43 0)
@@ -2953,25 +2940,6 @@
     (pin "2" (uuid d07fc32c-29fb-4bb7-96ce-d6634f5d2ef8))
   )
 
-  (symbol (lib_id "Switch:SW_DPDT_x2") (at 224.79 34.29 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 556eaa8c-6449-4c4b-8d7d-d7b1b1dc43f7)
-    (property "Reference" "SW3" (id 0) (at 224.79 26.67 0))
-    (property "Value" "SW_DPDT_x2" (id 1) (at 224.79 29.21 0))
-    (property "Footprint" "" (id 2) (at 224.79 34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 224.79 34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 75ced335-098e-490d-88bb-057f087fd234))
-    (pin "2" (uuid 69f094ca-c824-4804-8668-697fe0a0bc63))
-    (pin "3" (uuid 53af4a82-f207-4b04-bc8e-2c3728a89688))
-    (pin "4" (uuid 1fab740b-efea-46bb-800b-73861a8028ff))
-    (pin "5" (uuid 3e510ff7-bbf8-43e5-b84c-ca3babca0539))
-    (pin "6" (uuid 9b87ee61-1342-4ce4-a1cf-d30c43bf4892))
-  )
-
   (symbol (lib_id "Jumper:Jumper_2_Bridged") (at 248.92 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5dc00e5b-5efb-4e1d-a4f7-a350783684e5)
@@ -3028,7 +2996,7 @@
     (property "Value" "R" (id 1) (at 260.35 149.8599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 256.032 148.59 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 256.032 148.59 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 257.81 148.59 0)
@@ -3112,7 +3080,7 @@
     (property "Value" "C" (id 1) (at 175.26 58.4199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 172.4152 60.96 0)
+    (property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 172.4152 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 171.45 57.15 0)
@@ -3226,7 +3194,7 @@
     (property "Value" "R" (id 1) (at 121.92 140.9699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 117.602 139.7 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 117.602 139.7 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 119.38 139.7 0)
@@ -3261,7 +3229,7 @@
     (property "Value" "Green" (id 1) (at 273.05 141.2874 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 269.24 138.43 0)
+    (property "Footprint" "LED_THT:LED_D5.0mm" (id 2) (at 269.24 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 269.24 138.43 0)
@@ -3295,7 +3263,7 @@
     (property "Value" "Red" (id 1) (at 250.19 141.2874 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 246.38 138.43 0)
+    (property "Footprint" "LED_THT:LED_D5.0mm" (id 2) (at 246.38 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 246.38 138.43 0)
@@ -3330,7 +3298,7 @@
     (property "Value" "C" (id 1) (at 175.26 45.7199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 172.4152 48.26 0)
+    (property "Footprint" "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm" (id 2) (at 172.4152 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 171.45 44.45 0)
@@ -3449,7 +3417,7 @@
     (property "Value" "R" (id 1) (at 107.95 140.9699 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 103.632 139.7 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 103.632 139.7 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 105.41 139.7 0)
@@ -3567,7 +3535,7 @@
     (property "Value" "R" (id 1) (at 20.32 143.5099 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 16.002 142.24 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 16.002 142.24 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 17.78 142.24 0)
@@ -3734,22 +3702,22 @@
       (reference "BZ1") (unit 1) (value "Buzzer") (footprint "bl_kicad:Buzzer_11.45x8RM7")
     )
     (path "/ad16240a-b98f-48cb-b5a4-5d5605ecc6a1"
-      (reference "C1") (unit 1) (value "C") (footprint "")
+      (reference "C1") (unit 1) (value "C") (footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
     )
     (path "/7c4d8833-8a85-42ac-aa2f-2952aed751bd"
-      (reference "C2") (unit 1) (value "C") (footprint "")
+      (reference "C2") (unit 1) (value "C") (footprint "Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm")
     )
     (path "/b5464d94-3aec-4297-b538-38a0a75c88b7"
       (reference "D1") (unit 1) (value "NeoPixel_THT") (footprint "")
     )
     (path "/aa4c03e6-bdff-4937-b8be-3897d0d57da6"
-      (reference "D2") (unit 1) (value "Red") (footprint "")
+      (reference "D2") (unit 1) (value "Red") (footprint "LED_THT:LED_D5.0mm")
     )
     (path "/4d5cb1ce-2cda-46ab-8d62-a66ce3e413c0"
-      (reference "D3") (unit 1) (value "Yellow") (footprint "")
+      (reference "D3") (unit 1) (value "Yellow") (footprint "LED_THT:LED_D5.0mm")
     )
     (path "/a02c2a0a-cf76-4348-aa58-df1f3b4b1967"
-      (reference "D4") (unit 1) (value "Green") (footprint "")
+      (reference "D4") (unit 1) (value "Green") (footprint "LED_THT:LED_D5.0mm")
     )
     (path "/535b9f62-b072-48f2-b4c4-eb91af319c13"
       (reference "F1") (unit 1) (value "Polyfuse") (footprint "Fuse:Fuse_BelFuse_0ZRE0005FF_L8.3mm_W3.8mm")
@@ -3806,22 +3774,22 @@
       (reference "R1") (unit 1) (value "R_Photo") (footprint "")
     )
     (path "/e4a2caba-bcb1-4222-8e4c-8a24afacb4c3"
-      (reference "R2") (unit 1) (value "R") (footprint "")
+      (reference "R2") (unit 1) (value "R") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal")
     )
     (path "/cf2b79a8-c53e-4222-9419-789605b50406"
-      (reference "R3") (unit 1) (value "R") (footprint "")
+      (reference "R3") (unit 1) (value "R") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal")
     )
     (path "/98a30a7b-37d0-4190-87b6-a166a66ae0ce"
-      (reference "R4") (unit 1) (value "R") (footprint "")
+      (reference "R4") (unit 1) (value "R") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal")
     )
     (path "/417c4e01-de8a-451e-8eb4-f4d238233ff6"
-      (reference "R5") (unit 1) (value "R") (footprint "")
+      (reference "R5") (unit 1) (value "R") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal")
     )
     (path "/71a3f25c-ef79-469b-9dc1-af39f9e8ccf1"
-      (reference "R6") (unit 1) (value "R") (footprint "")
+      (reference "R6") (unit 1) (value "R") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal")
     )
     (path "/3881cf2a-4f85-4db7-8051-133f9a42cac0"
-      (reference "R7") (unit 1) (value "R") (footprint "")
+      (reference "R7") (unit 1) (value "R") (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal")
     )
     (path "/f7bad936-de91-4fdd-9a56-8a2ff343fe0a"
       (reference "RV1") (unit 1) (value "Pot_A") (footprint "")
@@ -3835,8 +3803,8 @@
     (path "/1a554bf5-ab1c-432f-afa7-241da88036bc"
       (reference "SW2") (unit 1) (value "BUTTON_A") (footprint "")
     )
-    (path "/556eaa8c-6449-4c4b-8d7d-d7b1b1dc43f7"
-      (reference "SW3") (unit 1) (value "SW_DPDT_x2") (footprint "")
+    (path "/18900726-0f3e-4ca3-baab-d458e77f58f8"
+      (reference "SW3") (unit 1) (value "SW_SPST") (footprint "")
     )
     (path "/dd099e08-1257-4748-b8fa-0f1865cf01ce"
       (reference "U1") (unit 1) (value "TB6612FNG_BREAKOUT") (footprint "")