diff --git a/electrical/ARC-DemoSch/ARC-DemoSch-cache.lib b/electrical/ARC-DemoSch/ARC-DemoSch-cache.lib
index fa2eb77..ce97978 100644
--- a/electrical/ARC-DemoSch/ARC-DemoSch-cache.lib
+++ b/electrical/ARC-DemoSch/ARC-DemoSch-cache.lib
@@ -133,22 +133,36 @@ X A0 9 500 0 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# Switch_SW_Push_SPDT
-#
-DEF Switch_SW_Push_SPDT SW 0 0 Y N 1 F N
-F0 "SW" 0 170 50 H V C CNN
-F1 "Switch_SW_Push_SPDT" 0 -200 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+# dk_Pushbutton-Switches_KS-01Q-01_Obsolete
+#
+DEF dk_Pushbutton-Switches_KS-01Q-01_Obsolete S 0 40 Y Y 1 F N
+F0 "S" 0 200 50 H V C CNN
+F1 "dk_Pushbutton-Switches_KS-01Q-01_Obsolete" 0 -175 50 H V C CNN
+F2 "digikey-footprints:PushButton_Round_D12mm_THT_KS-01Q-01" 200 200 50 H I L CNN
+F3 "http://spec_sheets.e-switch.com/specs/29-KS01Q01.pdf" 200 300 60 H I L CNN
+F4 "EG4791-ND" 200 400 60 H I L CNN "Digi-Key_PN"
+F5 "KS-01Q-01" 200 500 60 H I L CNN "MPN"
+F6 "Switches" 200 600 60 H I L CNN "Category"
+F7 "Pushbutton Switches" 200 700 60 H I L CNN "Family"
+F8 "http://spec_sheets.e-switch.com/specs/29-KS01Q01.pdf" 200 800 60 H I L CNN "DK_Datasheet_Link"
+F9 "/product-detail/en/e-switch/KS-01Q-01/EG4791-ND/2116270" 200 900 60 H I L CNN "DK_Detail_Page"
+F10 "SWITCH PUSH SPST-NO 0.01A 35V" 200 1000 60 H I L CNN "Description"
+F11 "E-Switch" 200 1100 60 H I L CNN "Manufacturer"
+F12 "Obsolete NonStock" 200 1200 60 H I L CNN "Status"
 DRAW
-C -80 0 20 0 0 0 N
-C 80 -100 20 0 0 0 N
-C 80 100 20 0 1 0 N
-P 2 0 0 0 0 40 0 120 N
-P 2 0 1 0 -60 10 100 80 N
-X A 1 200 100 100 L 50 50 1 1 P
-X B 2 -200 0 100 R 50 50 1 1 P
-X C 3 200 -100 100 L 50 50 1 1 P
+C -60 0 10 0 1 0 N
+C 60 0 10 0 1 0 N
+P 2 0 1 0 -100 100 -100 -100 N
+P 2 0 1 0 -70 0 -100 0 N
+P 2 0 1 0 -70 50 70 50 N
+P 2 0 1 0 100 -100 100 100 N
+P 2 0 1 0 100 0 70 0 N
+P 2 1 1 0 -40 110 35 110 N
+P 2 1 1 0 0 110 0 50 N
+X ~ 1 -200 100 100 R 50 50 1 1 P
+X ~ 2 200 100 100 L 50 50 1 1 P
+X ~ 3 -200 -100 100 R 50 50 1 1 P
+X ~ 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/electrical/ARC-DemoSch/ARC-DemoSch.pro b/electrical/ARC-DemoSch/ARC-DemoSch.pro
index ef6f65d..50a5c5d 100644
--- a/electrical/ARC-DemoSch/ARC-DemoSch.pro
+++ b/electrical/ARC-DemoSch/ARC-DemoSch.pro
@@ -1,4 +1,4 @@
-update=Thu 01 Oct 2020 01:09:55 PM CDT
+update=Thu 01 Oct 2020 01:45:24 PM CDT
 version=1
 last_client=kicad
 [general]
diff --git a/electrical/ARC-DemoSch/ARC-DemoSch.sch b/electrical/ARC-DemoSch/ARC-DemoSch.sch
index 2e0cf82..8ee43f7 100644
--- a/electrical/ARC-DemoSch/ARC-DemoSch.sch
+++ b/electrical/ARC-DemoSch/ARC-DemoSch.sch
@@ -224,61 +224,6 @@ Wire Notes Line
 	6300 5650 3700 5650
 Wire Notes Line
 	3700 5650 3700 7750
-$Comp
-L Switch:SW_Push_SPDT SW1
-U 1 1 5F7FE289
-P 7600 4150
-F 0 "SW1" H 7600 4435 50  0000 C CNN
-F 1 "FWD_BTN" H 7600 4344 50  0000 C CNN
-F 2 "" H 7600 4150 50  0001 C CNN
-F 3 "~" H 7600 4150 50  0001 C CNN
-	1    7600 4150
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7400 4150 7200 4150
-Wire Wire Line
-	7200 4150 7200 3950
-$Comp
-L power:+5V #PWR010
-U 1 1 5F80186A
-P 7200 3950
-F 0 "#PWR010" H 7200 3800 50  0001 C CNN
-F 1 "+5V" H 7215 4123 50  0000 C CNN
-F 2 "" H 7200 3950 50  0001 C CNN
-F 3 "" H 7200 3950 50  0001 C CNN
-	1    7200 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R_Small R1
-U 1 1 5F80353E
-P 7800 4700
-F 0 "R1" H 7859 4746 50  0000 L CNN
-F 1 "4.7k" H 7859 4655 50  0000 L CNN
-F 2 "" H 7800 4700 50  0001 C CNN
-F 3 "~" H 7800 4700 50  0001 C CNN
-	1    7800 4700
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7800 4800 7800 4950
-Wire Wire Line
-	7800 4250 7800 4600
-$Comp
-L power:GND #PWR012
-U 1 1 5F805551
-P 7800 4950
-F 0 "#PWR012" H 7800 4700 50  0001 C CNN
-F 1 "GND" H 7805 4777 50  0000 C CNN
-F 2 "" H 7800 4950 50  0001 C CNN
-F 3 "" H 7800 4950 50  0001 C CNN
-	1    7800 4950
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7800 4250 8050 4250
-Connection ~ 7800 4250
 Wire Wire Line
 	1600 3450 1500 3450
 Text Label 1350 3350 2    50   ~ 0
@@ -295,19 +240,6 @@ Wire Wire Line
 	1500 3650 1350 3650
 Text Label 1350 3650 2    50   ~ 0
 REV_BTN_INT
-Text Label 8050 4250 0    50   ~ 0
-FWD_BTN_INT
-$Comp
-L Switch:SW_Push_SPDT SW2
-U 1 1 5F814DB1
-P 7650 6550
-F 0 "SW2" H 7650 6835 50  0000 C CNN
-F 1 "REV_BTN" H 7650 6744 50  0000 C CNN
-F 2 "" H 7650 6550 50  0001 C CNN
-F 3 "~" H 7650 6550 50  0001 C CNN
-	1    7650 6550
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	7450 6550 7250 6550
 Wire Wire Line
@@ -336,8 +268,6 @@ F 3 "~" H 7850 7100 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	7850 7200 7850 7350
-Wire Wire Line
-	7850 6650 7850 7000
 $Comp
 L power:GND #PWR013
 U 1 1 5F814DD3
@@ -349,10 +279,7 @@ F 3 "" H 7850 7350 50  0001 C CNN
 	1    7850 7350
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7850 6650 8100 6650
-Connection ~ 7850 6650
-Text Label 8100 6650 0    50   ~ 0
+Text Label 8100 6750 0    50   ~ 0
 REV_BTN_INT
 Wire Notes Line
 	9950 4700 13050 4700
@@ -567,6 +494,99 @@ Wire Notes Line
 	9650 2950 6450 2950
 Wire Notes Line
 	6450 2950 6450 5350
-NoConn ~ 7800 4050
-NoConn ~ 7850 6450
+$Comp
+L dk_Pushbutton-Switches:KS-01Q-01_Obsolete S?
+U 1 1 5F92193C
+P 7650 6650
+F 0 "S?" H 7650 6975 50  0000 C CNN
+F 1 "REV_BTN" H 7650 6884 50  0000 C CNN
+F 2 "digikey-footprints:PushButton_Round_D12mm_THT_KS-01Q-01" H 7850 6850 50  0001 L CNN
+F 3 "http://spec_sheets.e-switch.com/specs/29-KS01Q01.pdf" H 7850 6950 60  0001 L CNN
+F 4 "EG4791-ND" H 7850 7050 60  0001 L CNN "Digi-Key_PN"
+F 5 "KS-01Q-01" H 7850 7150 60  0001 L CNN "MPN"
+F 6 "Switches" H 7850 7250 60  0001 L CNN "Category"
+F 7 "Pushbutton Switches" H 7850 7350 60  0001 L CNN "Family"
+F 8 "http://spec_sheets.e-switch.com/specs/29-KS01Q01.pdf" H 7850 7450 60  0001 L CNN "DK_Datasheet_Link"
+F 9 "/product-detail/en/e-switch/KS-01Q-01/EG4791-ND/2116270" H 7850 7550 60  0001 L CNN "DK_Detail_Page"
+F 10 "SWITCH PUSH SPST-NO 0.01A 35V" H 7850 7650 60  0001 L CNN "Description"
+F 11 "E-Switch" H 7850 7750 60  0001 L CNN "Manufacturer"
+F 12 "Obsolete NonStock" H 7850 7850 60  0001 L CNN "Status"
+	1    7650 6650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7850 6750 7850 7000
+NoConn ~ 7450 6750
+NoConn ~ 7850 6550
+Wire Wire Line
+	7850 6750 8100 6750
+Connection ~ 7850 6750
+Wire Wire Line
+	7750 4150 7550 4150
+Wire Wire Line
+	7550 4150 7550 3950
+$Comp
+L power:+5V #PWR?
+U 1 1 5F92F449
+P 7550 3950
+F 0 "#PWR?" H 7550 3800 50  0001 C CNN
+F 1 "+5V" H 7565 4123 50  0000 C CNN
+F 2 "" H 7550 3950 50  0001 C CNN
+F 3 "" H 7550 3950 50  0001 C CNN
+	1    7550 3950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R_Small R?
+U 1 1 5F92F453
+P 8150 4700
+F 0 "R?" H 8209 4746 50  0000 L CNN
+F 1 "4.7k" H 8209 4655 50  0000 L CNN
+F 2 "" H 8150 4700 50  0001 C CNN
+F 3 "~" H 8150 4700 50  0001 C CNN
+	1    8150 4700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8150 4800 8150 4950
+$Comp
+L power:GND #PWR?
+U 1 1 5F92F45E
+P 8150 4950
+F 0 "#PWR?" H 8150 4700 50  0001 C CNN
+F 1 "GND" H 8155 4777 50  0000 C CNN
+F 2 "" H 8150 4950 50  0001 C CNN
+F 3 "" H 8150 4950 50  0001 C CNN
+	1    8150 4950
+	1    0    0    -1  
+$EndComp
+Text Label 8400 4350 0    50   ~ 0
+FWD_BTN_INT
+$Comp
+L dk_Pushbutton-Switches:KS-01Q-01_Obsolete S?
+U 1 1 5F92F472
+P 7950 4250
+F 0 "S?" H 7950 4575 50  0000 C CNN
+F 1 "FWD_BTN" H 7950 4484 50  0000 C CNN
+F 2 "digikey-footprints:PushButton_Round_D12mm_THT_KS-01Q-01" H 8150 4450 50  0001 L CNN
+F 3 "http://spec_sheets.e-switch.com/specs/29-KS01Q01.pdf" H 8150 4550 60  0001 L CNN
+F 4 "EG4791-ND" H 8150 4650 60  0001 L CNN "Digi-Key_PN"
+F 5 "KS-01Q-01" H 8150 4750 60  0001 L CNN "MPN"
+F 6 "Switches" H 8150 4850 60  0001 L CNN "Category"
+F 7 "Pushbutton Switches" H 8150 4950 60  0001 L CNN "Family"
+F 8 "http://spec_sheets.e-switch.com/specs/29-KS01Q01.pdf" H 8150 5050 60  0001 L CNN "DK_Datasheet_Link"
+F 9 "/product-detail/en/e-switch/KS-01Q-01/EG4791-ND/2116270" H 8150 5150 60  0001 L CNN "DK_Detail_Page"
+F 10 "SWITCH PUSH SPST-NO 0.01A 35V" H 8150 5250 60  0001 L CNN "Description"
+F 11 "E-Switch" H 8150 5350 60  0001 L CNN "Manufacturer"
+F 12 "Obsolete NonStock" H 8150 5450 60  0001 L CNN "Status"
+	1    7950 4250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8150 4350 8150 4600
+NoConn ~ 7750 4350
+NoConn ~ 8150 4150
+Wire Wire Line
+	8150 4350 8400 4350
+Connection ~ 8150 4350
 $EndSCHEMATC
diff --git a/electrical/ARC-DemoSch/ARC-DemoSch.sch-bak b/electrical/ARC-DemoSch/ARC-DemoSch.sch-bak
index 8299f01..2e0cf82 100644
--- a/electrical/ARC-DemoSch/ARC-DemoSch.sch-bak
+++ b/electrical/ARC-DemoSch/ARC-DemoSch.sch-bak
@@ -124,7 +124,7 @@ L Device:R_POT RV2
 U 1 1 5F7616BC
 P 4850 6700
 F 0 "RV2" H 4781 6746 50  0000 R CNN
-F 1 "10k - POT_1" H 4781 6655 50  0000 R CNN
+F 1 "10k - REV_POT" H 4781 6655 50  0000 R CNN
 F 2 "" H 4850 6700 50  0001 C CNN
 F 3 "~" H 4850 6700 50  0001 C CNN
 	1    4850 6700
@@ -201,11 +201,11 @@ F 3 "" H 4850 6950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Notes 900  6150 0    50   ~ 0
-POT_0 -- 50k potentiometer used to modulate our\nPWM (Pulse Width Modulation) signal for our forward speed.
+FWD_POT -- 50k potentiometer used to modulate our\nPWM (Pulse Width Modulation) signal for our forward speed.
 Text Notes 800  7600 0    50   ~ 0
 Pin 1 is +5V, and Pin 3 is GND. Pin 2 is our output voltage.\nThe voltage our potentiometer outputs will be proportionate\nto how fast we want our motor to go forward.\nVLow = 0V\nVHigh = 5V
 Text Notes 3800 6150 0    50   ~ 0
-POT_1  -- 10k potentiometer used to modulate our\nPWM (Pulse Width Modulation) signal for our reverse speed.
+REV_POT  -- 10k potentiometer used to modulate our\nPWM (Pulse Width Modulation) signal for our reverse speed.
 Text Notes 3800 7600 0    50   ~ 0
 Pin 1 is +5V, and Pin 3 is GND. Pin 2 is our output voltage.\nThe voltage our potentiometer outputs will be proportionate\nto how fast we want our motor to go forward.\nVLow = 0V\nVHigh = 5V
 Wire Notes Line
@@ -426,7 +426,7 @@ L Device:R_POT RV1
 U 1 1 5F761304
 P 2100 6700
 F 0 "RV1" H 2030 6746 50  0000 R CNN
-F 1 "50k - POT_0" H 2030 6655 50  0000 R CNN
+F 1 "50k - FWD_POT" H 2030 6655 50  0000 R CNN
 F 2 "" H 2100 6700 50  0001 C CNN
 F 3 "~" H 2100 6700 50  0001 C CNN
 	1    2100 6700
diff --git a/electrical/ARC-DemoSch/doc/ARC-DemoSch.pdf b/electrical/ARC-DemoSch/doc/ARC-DemoSch.pdf
index b4f3eb6..0f93da1 100644
Binary files a/electrical/ARC-DemoSch/doc/ARC-DemoSch.pdf and b/electrical/ARC-DemoSch/doc/ARC-DemoSch.pdf differ