diff --git a/twoface/twoface.sch b/twoface/twoface.sch
index 3e0db4adc085ad559817eff445c924b4e3a54fbd..f458805750d074e22589812d6b41554c5951d787 100644
--- a/twoface/twoface.sch
+++ b/twoface/twoface.sch
@@ -68,30 +68,6 @@ Wire Wire Line
 	1000 5000 1000 5100
 Wire Wire Line
 	1000 4600 1000 5000
-Wire Wire Line
-	700  7150 1050 7150
-Wire Wire Line
-	700  7250 1050 7250
-Wire Wire Line
-	700  7350 1050 7350
-Wire Wire Line
-	700  7450 1050 7450
-Wire Wire Line
-	700  7550 1050 7550
-Wire Wire Line
-	700  7650 1050 7650
-Text Label 750  7150 0    50   ~ 0
-+3.3V
-Text Label 750  7250 0    50   ~ 0
-SWDIO
-Text Label 750  7350 0    50   ~ 0
-~RESET
-Text Label 750  7450 0    50   ~ 0
-SWCLK
-Text Label 750  7550 0    50   ~ 0
-GND
-Text Label 750  7650 0    50   ~ 0
-SWO
 $Comp
 L Device:C C?
 U 1 1 5F099DDF
@@ -103,23 +79,9 @@ F 3 "~" H 1350 5000 50  0001 C CNN
 	1    1350 5000
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	3200 5400 2750 5400
 Connection ~ 1000 5000
-Wire Wire Line
-	2750 5500 3200 5500
-Wire Wire Line
-	2750 5600 3200 5600
-Text Label 2800 5600 0    50   ~ 0
-SWDIO
-Text Label 2800 5500 0    50   ~ 0
-SWDCLK
-Text Label 2800 5400 0    50   ~ 0
-~RESET
 NoConn ~ 5000 3300
 NoConn ~ 5000 3400
-Text Label 5100 5100 0    50   ~ 0
-SWO
 $Comp
 L Device:C C?
 U 1 1 5F0F9E07
@@ -261,8 +223,6 @@ NoConn ~ 5000 5400
 NoConn ~ 5000 5500
 NoConn ~ 5000 5600
 NoConn ~ 5000 5900
-Wire Wire Line
-	5000 5100 5650 5100
 $Comp
 L Battery_Management:BQ51050BRHL U?
 U 1 1 5F47B4A2
@@ -518,13 +478,13 @@ VBAT
 $Comp
 L connectors:tag-connect-swd J?
 U 1 1 5F5045C0
-P 1250 7350
-F 0 "J?" H 1200 7800 50  0000 L CNN
-F 1 "SWD" H 1150 7700 50  0000 L CNN
-F 2 "connectors:tag-connect_6pin_nolegs_swd" H 1250 7750 50  0001 C CNN
-F 3 "~" H 1250 7350 50  0001 C CNN
-	1    1250 7350
-	1    0    0    -1  
+P 1100 6550
+F 0 "J?" H 1050 7000 50  0000 L CNN
+F 1 "SWD" H 1000 6900 50  0000 L CNN
+F 2 "connectors:tag-connect_6pin_nolegs_swd" H 1100 6950 50  0001 C CNN
+F 3 "~" H 1100 6550 50  0001 C CNN
+	1    1100 6550
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_01x01 J?
@@ -1176,4 +1136,50 @@ Wire Wire Line
 Connection ~ 6400 5450
 Wire Wire Line
 	6400 5450 6500 5450
+Text GLabel 3050 5500 0    50   Input ~ 0
+SWDCLK
+Text GLabel 3050 5600 0    50   Input ~ 0
+SWDIO
+Wire Wire Line
+	3200 5500 3050 5500
+Wire Wire Line
+	2900 5600 3200 5600
+Wire Wire Line
+	3050 5400 3200 5400
+Text GLabel 5150 5100 2    50   Input ~ 0
+SWO
+Wire Wire Line
+	5150 5100 5000 5100
+$Comp
+L power:+3.3V #PWR?
+U 1 1 5F249B5B
+P 1300 6350
+F 0 "#PWR?" H 1300 6200 50  0001 C CNN
+F 1 "+3.3V" V 1315 6478 50  0000 L CNN
+F 2 "" H 1300 6350 50  0001 C CNN
+F 3 "" H 1300 6350 50  0001 C CNN
+	1    1300 6350
+	0    1    -1   0   
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 5F278F33
+P 1300 6750
+F 0 "#PWR?" H 1300 6500 50  0001 C CNN
+F 1 "GND" V 1305 6622 50  0001 R CNN
+F 2 "" H 1300 6750 50  0001 C CNN
+F 3 "" H 1300 6750 50  0001 C CNN
+	1    1300 6750
+	0    -1   1    0   
+$EndComp
+Text GLabel 1300 6550 2    35   Input ~ 0
+~RESET
+Text GLabel 1300 6650 2    50   Input ~ 0
+SWDCLK
+Text GLabel 1300 6450 2    50   Input ~ 0
+SWDIO
+Text GLabel 1300 6850 2    50   Input ~ 0
+SWO
+Text GLabel 3050 5400 0    35   Input ~ 0
+~RESET
 $EndSCHEMATC
diff --git a/twoface/twoface.sch-bak b/twoface/twoface.sch-bak
index 50f36cebf31fc2e16d755fcccca57be4f2146efe..3e0db4adc085ad559817eff445c924b4e3a54fbd 100644
--- a/twoface/twoface.sch-bak
+++ b/twoface/twoface.sch-bak
@@ -466,63 +466,55 @@ Wire Wire Line
 $Comp
 L Device:C C?
 U 1 1 5F4D5C9B
-P 9600 4900
-F 0 "C?" H 9485 4854 50  0000 R CNN
-F 1 "10u" H 9485 4945 50  0000 R CNN
-F 2 "" H 9638 4750 50  0001 C CNN
-F 3 "~" H 9600 4900 50  0001 C CNN
-	1    9600 4900
+P 9900 4900
+F 0 "C?" H 9785 4854 50  0000 R CNN
+F 1 "10u" H 9785 4945 50  0000 R CNN
+F 2 "" H 9938 4750 50  0001 C CNN
+F 3 "~" H 9900 4900 50  0001 C CNN
+	1    9900 4900
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C?
 U 1 1 5F4D611A
-P 10000 4900
-F 0 "C?" H 9885 4854 50  0000 R CNN
-F 1 "10u" H 9885 4945 50  0000 R CNN
-F 2 "" H 10038 4750 50  0001 C CNN
-F 3 "~" H 10000 4900 50  0001 C CNN
-	1    10000 4900
+P 10300 4900
+F 0 "C?" H 10185 4854 50  0000 R CNN
+F 1 "10u" H 10185 4945 50  0000 R CNN
+F 2 "" H 10338 4750 50  0001 C CNN
+F 3 "~" H 10300 4900 50  0001 C CNN
+	1    10300 4900
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 5F4D6F1F
-P 9600 5050
-F 0 "#PWR?" H 9600 4800 50  0001 C CNN
-F 1 "GND" V 9605 4922 50  0001 R CNN
-F 2 "" H 9600 5050 50  0001 C CNN
-F 3 "" H 9600 5050 50  0001 C CNN
-	1    9600 5050
+P 9900 5050
+F 0 "#PWR?" H 9900 4800 50  0001 C CNN
+F 1 "GND" V 9905 4922 50  0001 R CNN
+F 2 "" H 9900 5050 50  0001 C CNN
+F 3 "" H 9900 5050 50  0001 C CNN
+	1    9900 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 5F4D73F3
-P 10000 5050
-F 0 "#PWR?" H 10000 4800 50  0001 C CNN
-F 1 "GND" V 10005 4922 50  0001 R CNN
-F 2 "" H 10000 5050 50  0001 C CNN
-F 3 "" H 10000 5050 50  0001 C CNN
-	1    10000 5050
+P 10300 5050
+F 0 "#PWR?" H 10300 4800 50  0001 C CNN
+F 1 "GND" V 10305 4922 50  0001 R CNN
+F 2 "" H 10300 5050 50  0001 C CNN
+F 3 "" H 10300 5050 50  0001 C CNN
+	1    10300 5050
 	1    0    0    -1  
 $EndComp
-Connection ~ 9600 4750
+Connection ~ 9900 4750
 Wire Wire Line
-	9600 4750 10000 4750
-Connection ~ 10000 4750
+	9900 4750 10300 4750
+Connection ~ 10300 4750
 Wire Wire Line
-	10000 4750 10400 4750
+	10300 4750 10600 4750
 Text GLabel 10700 4750 2    50   Input ~ 0
 VBAT
-Text GLabel 10700 4600 2    50   Input ~ 0
-~CHARGING
-Wire Wire Line
-	8950 4850 9100 4850
-Wire Wire Line
-	9100 4850 9100 4600
-Wire Wire Line
-	9100 4600 10700 4600
 $Comp
 L connectors:tag-connect-swd J?
 U 1 1 5F5045C0
@@ -537,41 +529,37 @@ $EndComp
 $Comp
 L Connector_Generic:Conn_01x01 J?
 U 1 1 5F530DF3
-P 10400 5100
-F 0 "J?" V 10272 5180 50  0000 L CNN
-F 1 "+" V 10363 5180 50  0000 L CNN
-F 2 "" H 10400 5100 50  0001 C CNN
-F 3 "~" H 10400 5100 50  0001 C CNN
-	1    10400 5100
-	0    1    1    0   
+P 10800 5100
+F 0 "J?" H 10800 5200 50  0000 L CNN
+F 1 "+" H 10900 5150 50  0000 L CNN
+F 2 "" H 10800 5100 50  0001 C CNN
+F 3 "~" H 10800 5100 50  0001 C CNN
+	1    10800 5100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_01x01 J?
 U 1 1 5F5313CB
-P 10400 5300
-F 0 "J?" V 10364 5212 50  0000 R CNN
-F 1 "-" V 10273 5212 50  0000 R CNN
-F 2 "" H 10400 5300 50  0001 C CNN
-F 3 "~" H 10400 5300 50  0001 C CNN
-	1    10400 5300
-	0    -1   -1   0   
+P 10800 5350
+F 0 "J?" H 10900 5250 50  0000 R CNN
+F 1 "-" H 10950 5400 50  0000 R CNN
+F 2 "" H 10800 5350 50  0001 C CNN
+F 3 "~" H 10800 5350 50  0001 C CNN
+	1    10800 5350
+	1    0    0    -1  
 $EndComp
+Connection ~ 10600 4750
 Wire Wire Line
-	8950 4750 9600 4750
-Wire Wire Line
-	10400 4900 10400 4750
-Connection ~ 10400 4750
-Wire Wire Line
-	10400 4750 10700 4750
+	10600 4750 10700 4750
 $Comp
 L power:GND #PWR?
 U 1 1 5F548B6C
-P 10400 5550
-F 0 "#PWR?" H 10400 5300 50  0001 C CNN
-F 1 "GND" V 10405 5422 50  0001 R CNN
-F 2 "" H 10400 5550 50  0001 C CNN
-F 3 "" H 10400 5550 50  0001 C CNN
-	1    10400 5550
+P 10600 5550
+F 0 "#PWR?" H 10600 5300 50  0001 C CNN
+F 1 "GND" V 10605 5422 50  0001 R CNN
+F 2 "" H 10600 5550 50  0001 C CNN
+F 3 "" H 10600 5550 50  0001 C CNN
+	1    10600 5550
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -743,7 +731,7 @@ Connection ~ 6400 5250
 Wire Wire Line
 	6400 5250 6400 5450
 Wire Wire Line
-	6350 5450 6500 5450
+	6350 5450 6400 5450
 Wire Wire Line
 	6800 5450 6950 5450
 Wire Wire Line
@@ -932,21 +920,20 @@ Connection ~ 6950 5450
 Wire Wire Line
 	6950 5450 7100 5450
 Wire Wire Line
-	10400 5500 10450 5500
-Connection ~ 10400 5500
+	10600 5500 10650 5500
 $Comp
 L power:PWR_FLAG #FLG?
 U 1 1 5F1B4702
-P 10450 5500
-F 0 "#FLG?" H 10450 5575 50  0001 C CNN
-F 1 "PWR_FLAG" V 10450 5628 50  0001 L CNN
-F 2 "" H 10450 5500 50  0001 C CNN
-F 3 "~" H 10450 5500 50  0001 C CNN
-	1    10450 5500
+P 10650 5500
+F 0 "#FLG?" H 10650 5575 50  0001 C CNN
+F 1 "PWR_FLAG" V 10650 5628 50  0001 L CNN
+F 2 "" H 10650 5500 50  0001 C CNN
+F 3 "~" H 10650 5500 50  0001 C CNN
+	1    10650 5500
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	10400 5550 10400 5500
+	10600 5550 10600 5500
 Wire Wire Line
 	9800 3500 9900 3500
 Wire Wire Line
@@ -1148,4 +1135,45 @@ Wire Wire Line
 Connection ~ 6350 1250
 Wire Wire Line
 	5900 1050 6100 1050
+$Comp
+L Device:LED D?
+U 1 1 5F1069F4
+P 9550 4850
+F 0 "D?" H 9550 4650 50  0000 C CNN
+F 1 "LED" H 9550 4750 50  0000 C CNN
+F 2 "" H 9550 4850 50  0001 C CNN
+F 3 "~" H 9550 4850 50  0001 C CNN
+	1    9550 4850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5F14695D
+P 9200 4850
+F 0 "R?" V 9300 4850 50  0000 C CNN
+F 1 "1k" V 9200 4850 50  0000 C CNN
+F 2 "" V 9130 4850 50  0001 C CNN
+F 3 "~" H 9200 4850 50  0001 C CNN
+	1    9200 4850
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9050 4850 8950 4850
+Wire Wire Line
+	9400 4850 9350 4850
+Wire Wire Line
+	10600 4750 10600 5100
+Wire Wire Line
+	10600 5350 10600 5500
+Connection ~ 10600 5500
+Wire Wire Line
+	8950 4750 9700 4750
+Wire Wire Line
+	9700 4850 9700 4750
+Connection ~ 9700 4750
+Wire Wire Line
+	9700 4750 9900 4750
+Connection ~ 6400 5450
+Wire Wire Line
+	6400 5450 6500 5450
 $EndSCHEMATC