diff --git a/electrical/same54_dev_board/BRAIN.sch b/electrical/same54_dev_board/BRAIN.sch
index fa4ac14c..0bb6d691 100644
--- a/electrical/same54_dev_board/BRAIN.sch
+++ b/electrical/same54_dev_board/BRAIN.sch
@@ -367,7 +367,7 @@ Wire Notes Line
 Wire Notes Line
 	4050 1900 4050 1600
 Text Notes 3200 1800 0    50   ~ 0
-SERCOM2 (SPI)
+SERCOM0 (SPI)
 Wire Wire Line
 	4250 2850 4350 2850
 Wire Wire Line
diff --git a/electrical/same54_dev_board/BRAIN.sch-bak b/electrical/same54_dev_board/BRAIN.sch-bak
index 55cec91c..fa4ac14c 100644
--- a/electrical/same54_dev_board/BRAIN.sch-bak
+++ b/electrical/same54_dev_board/BRAIN.sch-bak
@@ -421,10 +421,10 @@ Wire Wire Line
 	4400 6300 4400 6350
 Connection ~ 4400 6300
 $Comp
-L power:GND #PWR?
+L power:GND #PWR0119
 U 1 1 5EA9AF4B
 P 4400 6350
-F 0 "#PWR?" H 4400 6100 50  0001 C CNN
+F 0 "#PWR0119" H 4400 6100 50  0001 C CNN
 F 1 "GND" H 4405 6177 50  0000 C CNN
 F 2 "" H 4400 6350 50  0001 C CNN
 F 3 "" H 4400 6350 50  0001 C CNN
@@ -442,10 +442,10 @@ MASTER_I2C_SCL
 Text HLabel 1300 4600 0    50   Input ~ 0
 MASTER_I2C_SDA
 $Comp
-L Device:R_Small R?
+L Device:R_Small R4
 U 1 1 5EB11658
 P 1450 4450
-F 0 "R?" H 1509 4496 50  0000 L CNN
+F 0 "R4" H 1509 4496 50  0000 L CNN
 F 1 "4.7k" H 1509 4405 50  0000 L CNN
 F 2 "" H 1450 4450 50  0001 C CNN
 F 3 "~" H 1450 4450 50  0001 C CNN
@@ -457,10 +457,10 @@ Wire Wire Line
 Text Label 1450 4300 0    50   ~ 0
 3v3
 $Comp
-L Device:R_Small R?
+L Device:R_Small R5
 U 1 1 5EB38D15
 P 1450 4900
-F 0 "R?" H 1509 4946 50  0000 L CNN
+F 0 "R5" H 1509 4946 50  0000 L CNN
 F 1 "4.7k" H 1509 4855 50  0000 L CNN
 F 2 "" H 1450 4900 50  0001 C CNN
 F 3 "~" H 1450 4900 50  0001 C CNN
diff --git a/electrical/same54_dev_board/Power.sch b/electrical/same54_dev_board/Power.sch
index 03257a4a..956d777d 100644
--- a/electrical/same54_dev_board/Power.sch
+++ b/electrical/same54_dev_board/Power.sch
@@ -194,9 +194,11 @@ Wire Wire Line
 Wire Wire Line
 	4900 1800 5350 1800
 $Comp
-L NCP349MNAETBG:NCP349MNAETBG U4
+L same54_dev_board-rescue:NCP349MNAETBG-NCP349MNAETBG U4
 U 1 1 5E7F2428
 P 8100 2250
+AR Path="/5E7F2428" Ref="U4"  Part="1" 
+AR Path="/5E7872D3/5E7F2428" Ref="U4"  Part="1" 
 F 0 "U4" H 8100 2665 50  0000 C CNN
 F 1 "NCP349MNAETBG" H 8100 2574 50  0000 C CNN
 F 2 "Package_DFN_QFN:DFN-6-1EP_2x2mm_P0.65mm_EP1x1.6mm" H 8100 2250 50  0001 C CNN
diff --git a/electrical/same54_dev_board/Power.sch-bak b/electrical/same54_dev_board/Power.sch-bak
index ff5084b0..956d777d 100644
--- a/electrical/same54_dev_board/Power.sch-bak
+++ b/electrical/same54_dev_board/Power.sch-bak
@@ -91,7 +91,7 @@ U 1 1 5E88DD8C
 P 950 1500
 F 0 "J4" H 1007 1817 50  0000 C CNN
 F 1 "Barrel_Jack_Switch" H 1007 1726 50  0000 C CNN
-F 2 "" H 1000 1460 50  0001 C CNN
+F 2 "digikey-footprints:Barrel_Jack_5.5mmODx2.1mmID_PJ-102A" H 1000 1460 50  0001 C CNN
 F 3 "~" H 1000 1460 50  0001 C CNN
 	1    950  1500
 	1    0    0    -1  
@@ -194,9 +194,11 @@ Wire Wire Line
 Wire Wire Line
 	4900 1800 5350 1800
 $Comp
-L NCP349MNAETBG:NCP349MNAETBG U4
+L same54_dev_board-rescue:NCP349MNAETBG-NCP349MNAETBG U4
 U 1 1 5E7F2428
 P 8100 2250
+AR Path="/5E7F2428" Ref="U4"  Part="1" 
+AR Path="/5E7872D3/5E7F2428" Ref="U4"  Part="1" 
 F 0 "U4" H 8100 2665 50  0000 C CNN
 F 1 "NCP349MNAETBG" H 8100 2574 50  0000 C CNN
 F 2 "Package_DFN_QFN:DFN-6-1EP_2x2mm_P0.65mm_EP1x1.6mm" H 8100 2250 50  0001 C CNN
diff --git a/electrical/same54_dev_board/SCREEN_INTF-s_SCREEN_INTF.pdf b/electrical/same54_dev_board/SCREEN_INTF-s_SCREEN_INTF.pdf
new file mode 100644
index 00000000..7bfaba95
Binary files /dev/null and b/electrical/same54_dev_board/SCREEN_INTF-s_SCREEN_INTF.pdf differ
diff --git a/electrical/same54_dev_board/USB_INTF.sch-bak b/electrical/same54_dev_board/USB_INTF.sch-bak
index 214d0ef5..540a437d 100644
--- a/electrical/same54_dev_board/USB_INTF.sch-bak
+++ b/electrical/same54_dev_board/USB_INTF.sch-bak
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 5
+Sheet 4 5
 Title ""
 Date ""
 Rev ""
diff --git a/electrical/same54_dev_board/same54_dev_board-cache.lib b/electrical/same54_dev_board/same54_dev_board-cache.lib
index 70b072a9..e22c375d 100644
--- a/electrical/same54_dev_board/same54_dev_board-cache.lib
+++ b/electrical/same54_dev_board/same54_dev_board-cache.lib
@@ -350,24 +350,6 @@ X P8 9 -700 100 200 R 40 40 0 0 B
 ENDDRAW
 ENDDEF
 #
-# NCP349MNAETBG_NCP349MNAETBG
-#
-DEF NCP349MNAETBG_NCP349MNAETBG U 0 40 Y Y 1 F N
-F0 "U" 0 -200 50 H V C CNN
-F1 "NCP349MNAETBG_NCP349MNAETBG" 0 350 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -300 250 300 -150 0 1 0 f
-X VIN 1 -400 150 100 R 50 50 1 1 I
-X GND 2 -400 50 100 R 50 50 1 1 I
-X ~FLAG 3 400 150 100 L 50 50 1 1 I
-X ~EN 4 -400 -50 100 R 50 50 1 1 I
-X OUT 5 400 50 100 L 50 50 1 1 I
-X OUT 6 400 -50 100 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
 # dk_Interface-Controllers_FT232RQ-REEL
 #
 DEF dk_Interface-Controllers_FT232RQ-REEL U 0 40 Y Y 1 F N
@@ -668,4 +650,22 @@ X pwr 1 0 0 0 U 50 50 0 0 w
 ENDDRAW
 ENDDEF
 #
+# same54_dev_board-rescue_NCP349MNAETBG-NCP349MNAETBG
+#
+DEF same54_dev_board-rescue_NCP349MNAETBG-NCP349MNAETBG U 0 40 Y Y 1 F N
+F0 "U" 0 -200 50 H V C CNN
+F1 "same54_dev_board-rescue_NCP349MNAETBG-NCP349MNAETBG" 0 350 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -300 250 300 -150 0 1 0 f
+X VIN 1 -400 150 100 R 50 50 1 1 I
+X GND 2 -400 50 100 R 50 50 1 1 I
+X ~FLAG 3 400 150 100 L 50 50 1 1 I
+X ~EN 4 -400 -50 100 R 50 50 1 1 I
+X OUT 5 400 50 100 L 50 50 1 1 I
+X OUT 6 400 -50 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/electrical/same54_dev_board/same54_dev_board-rescue.dcm b/electrical/same54_dev_board/same54_dev_board-rescue.dcm
index 5f3ed79b..5dd71cb6 100644
--- a/electrical/same54_dev_board/same54_dev_board-rescue.dcm
+++ b/electrical/same54_dev_board/same54_dev_board-rescue.dcm
@@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0
-#
-#End Doc Library
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/electrical/same54_dev_board/same54_dev_board-rescue.lib b/electrical/same54_dev_board/same54_dev_board-rescue.lib
index 63f6930c..78f0f429 100644
--- a/electrical/same54_dev_board/same54_dev_board-rescue.lib
+++ b/electrical/same54_dev_board/same54_dev_board-rescue.lib
@@ -1,153 +1,171 @@
-EESchema-LIBRARY Version 2.4
-#encoding utf-8
-#
-# p_ATSAME54P20A-AU-p_ATSAME54P20A-AU
-#
-DEF p_ATSAME54P20A-AU-p_ATSAME54P20A-AU U 0 40 Y Y 5 L N
-F0 "U" 0 -2600 50 H V C CNN
-F1 "p_ATSAME54P20A-AU-p_ATSAME54P20A-AU" 0 1050 50 H V C CNN
-F2 "" -1200 1250 50 H I C CNN
-F3 "" -1200 1250 50 H I C CNN
-DRAW
-T 0 0 950 50 0 1 0 "Port A" Normal 0 C C
-T 0 0 800 50 0 2 0 "Port B" Normal 0 C C
-T 0 0 750 50 0 3 0 "Port C" Normal 0 C C
-T 0 0 850 50 0 4 0 "Port D" Normal 0 C C
-T 0 50 650 50 0 5 0 "Power Bus" Normal 0 C C
-S -450 1000 400 -2150 1 1 0 f
-S -500 900 500 -2550 2 1 0 f
-S -450 850 450 -2250 3 1 0 f
-S -400 900 400 -150 4 1 0 f
-S -800 750 800 -1450 5 1 0 f
-X XIN32/PA00 1 600 750 200 L 50 50 1 1 B
-X PA03 10 600 450 200 L 50 50 1 1 B
-X PA27 113 600 -1850 200 L 50 50 1 1 B
-X SWCLK/PA30 119 600 -1950 200 L 50 50 1 1 B
-X SWDIO/PA31 120 600 -2050 200 L 50 50 1 1 B
-X XOUT32/PA01 2 600 650 200 L 50 50 1 1 B
-X PA04 21 600 350 200 L 50 50 1 1 B
-X PA05 22 600 250 200 L 50 50 1 1 B
-X PA06 23 600 150 200 L 50 50 1 1 B
-X PA07 24 600 50 200 L 50 50 1 1 B
-X PA08 33 600 -50 200 L 50 50 1 1 B
-X PA09 34 600 -150 200 L 50 50 1 1 B
-X PA10 35 600 -250 200 L 50 50 1 1 B
-X PA11 36 600 -350 200 L 50 50 1 1 B
-X PA12 60 600 -450 200 L 50 50 1 1 B
-X PA13 61 600 -550 200 L 50 50 1 1 B
-X XIN0/PA14 62 600 -650 200 L 50 50 1 1 B
-X XOUT0/PA15 63 600 -750 200 L 50 50 1 1 B
-X PA16 66 600 -850 200 L 50 50 1 1 B
-X PA17 67 600 -950 200 L 50 50 1 1 B
-X PA18 68 600 -1050 200 L 50 50 1 1 B
-X PA19 69 600 -1150 200 L 50 50 1 1 B
-X PA20 88 600 -1250 200 L 50 50 1 1 B
-X PA21 89 600 -1350 200 L 50 50 1 1 B
-X PA02 9 600 550 200 L 50 50 1 1 B
-X PA22 92 600 -1450 200 L 50 50 1 1 B
-X PA23 93 600 -1550 200 L 50 50 1 1 B
-X PA24 94 600 -1650 200 L 50 50 1 1 B
-X PA25 95 600 -1750 200 L 50 50 1 1 B
-X PB24 100 700 -1750 197 L 50 50 2 1 B
-X PB25 101 700 -1850 197 L 50 50 2 1 B
-X PB26 102 700 -1950 197 L 50 50 2 1 B
-X PB27 103 700 -2050 197 L 50 50 2 1 B
-X PB28 104 700 -2150 197 L 50 50 2 1 B
-X PB29 105 700 -2250 197 L 50 50 2 1 B
-X PB04 11 700 250 197 L 50 50 2 1 B
-X PB05 12 700 150 197 L 50 50 2 1 B
-X SWO/PB30 121 700 -2350 197 L 50 50 2 1 B
-X PB31 122 700 -2450 197 L 50 50 2 1 B
-X PB00 125 700 650 197 L 50 50 2 1 B
-X PB01 126 700 550 197 L 50 50 2 1 B
-X PB02 127 700 450 197 L 50 50 2 1 B
-X PB03 128 700 350 197 L 50 50 2 1 B
-X PB06 17 700 50 197 L 50 50 2 1 B
-X PB07 18 700 -50 197 L 50 50 2 1 B
-X PB08 19 700 -150 197 L 50 50 2 1 B
-X PB09 20 700 -250 197 L 50 50 2 1 B
-X PB10 39 700 -350 197 L 50 50 2 1 B
-X PB11 40 700 -450 197 L 50 50 2 1 B
-X PB12 41 700 -550 197 L 50 50 2 1 B
-X PB13 42 700 -650 197 L 50 50 2 1 B
-X PB14 43 700 -750 197 L 50 50 2 1 B
-X PB15 44 700 -850 197 L 50 50 2 1 B
-X PB16 82 700 -950 197 L 50 50 2 1 B
-X PB17 83 700 -1050 197 L 50 50 2 1 B
-X PB18 84 700 -1150 197 L 50 50 2 1 B
-X PB19 85 700 -1250 197 L 50 50 2 1 B
-X PB20 86 700 -1350 197 L 50 50 2 1 B
-X PB21 87 700 -1450 197 L 50 50 2 1 B
-X XIN1/PB22 98 700 -1550 197 L 50 50 2 1 B
-X XOUT1/PB23 99 700 -1650 197 L 50 50 2 1 B
-X PC24 108 650 -1550 197 L 50 50 3 1 B
-X PC25 109 650 -1650 197 L 50 50 3 1 B
-X PC26 110 650 -1750 197 L 50 50 3 1 B
-X PC27 111 650 -1850 197 L 50 50 3 1 B
-X PC28 112 650 -1950 197 L 50 50 3 1 B
-X PC30 123 650 -2050 197 L 50 50 3 1 B
-X PC31 124 650 -2150 197 L 50 50 3 1 B
-X PC04 27 650 250 197 L 50 50 3 1 B
-X PC05 28 650 150 197 L 50 50 3 1 B
-X PC06 29 650 50 197 L 50 50 3 1 B
-X PC00 3 650 650 197 L 50 50 3 1 B
-X PC07 30 650 -50 197 L 50 50 3 1 B
-X PC01 4 650 550 197 L 50 50 3 1 B
-X PC10 52 650 -150 197 L 50 50 3 1 B
-X PC11 55 650 -250 197 L 50 50 3 1 B
-X PC12 56 650 -350 197 L 50 50 3 1 B
-X PC13 57 650 -450 197 L 50 50 3 1 B
-X PC14 58 650 -550 197 L 50 50 3 1 B
-X PC15 59 650 -650 197 L 50 50 3 1 B
-X PC02 7 650 450 197 L 50 50 3 1 B
-X PC16 70 650 -750 197 L 50 50 3 1 B
-X PC17 71 650 -850 197 L 50 50 3 1 B
-X PC18 72 650 -950 197 L 50 50 3 1 B
-X PC19 73 650 -1050 197 L 50 50 3 1 B
-X PC20 74 650 -1150 197 L 50 50 3 1 B
-X PC21 75 650 -1250 197 L 50 50 3 1 B
-X PC22 76 650 -1350 197 L 50 50 3 1 B
-X PC23 77 650 -1450 197 L 50 50 3 1 B
-X PC03 8 650 350 197 L 50 50 3 1 B
-X PD00 13 600 750 197 L 50 50 4 1 B
-X PD01 16 600 650 197 L 50 50 4 1 B
-X PD08 47 600 550 197 L 50 50 4 1 B
-X PD09 48 600 450 197 L 50 50 4 1 B
-X PD10 49 600 350 197 L 50 50 4 1 B
-X PD11 50 600 250 197 L 50 50 4 1 B
-X PD12 51 600 150 197 L 50 50 4 1 B
-X PD20 80 600 50 197 L 50 50 4 1 B
-X PD21 81 600 -50 197 L 50 50 4 1 B
-X VDDIO7 107 -1000 -900 197 R 50 50 5 1 W
-X ~RESET 114 -1000 650 197 R 50 50 5 1 B
-X VDDCORE 115 -1000 -1150 197 R 50 50 5 1 W
-X GNDIO 116 1000 -850 197 L 50 50 5 1 W
-X VSW 117 -1000 -1300 197 R 50 50 5 1 W
-X VDDIO8 118 -1000 -1000 197 R 50 50 5 1 W
-X GNDANA1 14 1000 -500 197 L 50 50 5 1 W
-X VDDANA2 15 -1000 300 197 R 50 50 5 1 B
-X GNDANA2 25 1000 -600 197 L 50 50 5 1 W
-X VDDANA3 26 -1000 200 197 R 50 50 5 1 B
-X VDDIOB1 32 -1000 0 197 R 50 50 5 1 B
-X VDDIOB2 37 -1000 -100 197 R 50 50 5 1 B
-X VDDIO1 46 -1000 -300 197 R 50 50 5 1 W
-X GND1 5 1000 650 197 L 50 50 5 1 W
-X GND10 5 1000 -250 197 L 50 50 5 1 W
-X GND2 5 1000 550 197 L 50 50 5 1 W
-X GND3 5 1000 450 197 L 50 50 5 1 W
-X GND4 5 1000 350 197 L 50 50 5 1 W
-X GND5 5 1000 250 197 L 50 50 5 1 W
-X GND6 5 1000 150 197 L 50 50 5 1 W
-X GND7 5 1000 50 197 L 50 50 5 1 W
-X GND8 5 1000 -50 197 L 50 50 5 1 W
-X GND9 5 1000 -150 197 L 50 50 5 1 W
-X VDDIO2 54 -1000 -400 197 R 50 50 5 1 W
-X VDDANA1 6 -1000 400 197 R 50 50 5 1 B
-X VDDIO3 65 -1000 -500 197 R 50 50 5 1 W
-X VDDIO4 79 -1000 -600 197 R 50 50 5 1 W
-X VDDIO5 91 -1000 -700 197 R 50 50 5 1 W
-X VDDIO6 97 -1000 -800 197 R 50 50 5 1 W
-ENDDRAW
-ENDDEF
-#
-#End Library
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# NCP349MNAETBG-NCP349MNAETBG
+#
+DEF NCP349MNAETBG-NCP349MNAETBG U 0 40 Y Y 1 F N
+F0 "U" 0 -200 50 H V C CNN
+F1 "NCP349MNAETBG-NCP349MNAETBG" 0 350 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -300 250 300 -150 0 1 0 f
+X VIN 1 -400 150 100 R 50 50 1 1 I
+X GND 2 -400 50 100 R 50 50 1 1 I
+X ~FLAG 3 400 150 100 L 50 50 1 1 I
+X ~EN 4 -400 -50 100 R 50 50 1 1 I
+X OUT 5 400 50 100 L 50 50 1 1 I
+X OUT 6 400 -50 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# p_ATSAME54P20A-AU-p_ATSAME54P20A-AU
+#
+DEF p_ATSAME54P20A-AU-p_ATSAME54P20A-AU U 0 40 Y Y 5 L N
+F0 "U" 0 -2600 50 H V C CNN
+F1 "p_ATSAME54P20A-AU-p_ATSAME54P20A-AU" 0 1050 50 H V C CNN
+F2 "" -1200 1250 50 H I C CNN
+F3 "" -1200 1250 50 H I C CNN
+DRAW
+T 0 0 950 50 0 1 0 "Port A" Normal 0 C C
+T 0 0 800 50 0 2 0 "Port B" Normal 0 C C
+T 0 0 750 50 0 3 0 "Port C" Normal 0 C C
+T 0 0 850 50 0 4 0 "Port D" Normal 0 C C
+T 0 50 650 50 0 5 0 "Power Bus" Normal 0 C C
+S -450 1000 400 -2150 1 1 0 f
+S -500 900 500 -2550 2 1 0 f
+S -450 850 450 -2250 3 1 0 f
+S -400 900 400 -150 4 1 0 f
+S -800 750 800 -1450 5 1 0 f
+X XIN32/PA00 1 600 750 200 L 50 50 1 1 B
+X PA03 10 600 450 200 L 50 50 1 1 B
+X PA27 113 600 -1850 200 L 50 50 1 1 B
+X SWCLK/PA30 119 600 -1950 200 L 50 50 1 1 B
+X SWDIO/PA31 120 600 -2050 200 L 50 50 1 1 B
+X XOUT32/PA01 2 600 650 200 L 50 50 1 1 B
+X PA04 21 600 350 200 L 50 50 1 1 B
+X PA05 22 600 250 200 L 50 50 1 1 B
+X PA06 23 600 150 200 L 50 50 1 1 B
+X PA07 24 600 50 200 L 50 50 1 1 B
+X PA08 33 600 -50 200 L 50 50 1 1 B
+X PA09 34 600 -150 200 L 50 50 1 1 B
+X PA10 35 600 -250 200 L 50 50 1 1 B
+X PA11 36 600 -350 200 L 50 50 1 1 B
+X PA12 60 600 -450 200 L 50 50 1 1 B
+X PA13 61 600 -550 200 L 50 50 1 1 B
+X XIN0/PA14 62 600 -650 200 L 50 50 1 1 B
+X XOUT0/PA15 63 600 -750 200 L 50 50 1 1 B
+X PA16 66 600 -850 200 L 50 50 1 1 B
+X PA17 67 600 -950 200 L 50 50 1 1 B
+X PA18 68 600 -1050 200 L 50 50 1 1 B
+X PA19 69 600 -1150 200 L 50 50 1 1 B
+X PA20 88 600 -1250 200 L 50 50 1 1 B
+X PA21 89 600 -1350 200 L 50 50 1 1 B
+X PA02 9 600 550 200 L 50 50 1 1 B
+X PA22 92 600 -1450 200 L 50 50 1 1 B
+X PA23 93 600 -1550 200 L 50 50 1 1 B
+X PA24 94 600 -1650 200 L 50 50 1 1 B
+X PA25 95 600 -1750 200 L 50 50 1 1 B
+X PB24 100 700 -1750 197 L 50 50 2 1 B
+X PB25 101 700 -1850 197 L 50 50 2 1 B
+X PB26 102 700 -1950 197 L 50 50 2 1 B
+X PB27 103 700 -2050 197 L 50 50 2 1 B
+X PB28 104 700 -2150 197 L 50 50 2 1 B
+X PB29 105 700 -2250 197 L 50 50 2 1 B
+X PB04 11 700 250 197 L 50 50 2 1 B
+X PB05 12 700 150 197 L 50 50 2 1 B
+X SWO/PB30 121 700 -2350 197 L 50 50 2 1 B
+X PB31 122 700 -2450 197 L 50 50 2 1 B
+X PB00 125 700 650 197 L 50 50 2 1 B
+X PB01 126 700 550 197 L 50 50 2 1 B
+X PB02 127 700 450 197 L 50 50 2 1 B
+X PB03 128 700 350 197 L 50 50 2 1 B
+X PB06 17 700 50 197 L 50 50 2 1 B
+X PB07 18 700 -50 197 L 50 50 2 1 B
+X PB08 19 700 -150 197 L 50 50 2 1 B
+X PB09 20 700 -250 197 L 50 50 2 1 B
+X PB10 39 700 -350 197 L 50 50 2 1 B
+X PB11 40 700 -450 197 L 50 50 2 1 B
+X PB12 41 700 -550 197 L 50 50 2 1 B
+X PB13 42 700 -650 197 L 50 50 2 1 B
+X PB14 43 700 -750 197 L 50 50 2 1 B
+X PB15 44 700 -850 197 L 50 50 2 1 B
+X PB16 82 700 -950 197 L 50 50 2 1 B
+X PB17 83 700 -1050 197 L 50 50 2 1 B
+X PB18 84 700 -1150 197 L 50 50 2 1 B
+X PB19 85 700 -1250 197 L 50 50 2 1 B
+X PB20 86 700 -1350 197 L 50 50 2 1 B
+X PB21 87 700 -1450 197 L 50 50 2 1 B
+X XIN1/PB22 98 700 -1550 197 L 50 50 2 1 B
+X XOUT1/PB23 99 700 -1650 197 L 50 50 2 1 B
+X PC24 108 650 -1550 197 L 50 50 3 1 B
+X PC25 109 650 -1650 197 L 50 50 3 1 B
+X PC26 110 650 -1750 197 L 50 50 3 1 B
+X PC27 111 650 -1850 197 L 50 50 3 1 B
+X PC28 112 650 -1950 197 L 50 50 3 1 B
+X PC30 123 650 -2050 197 L 50 50 3 1 B
+X PC31 124 650 -2150 197 L 50 50 3 1 B
+X PC04 27 650 250 197 L 50 50 3 1 B
+X PC05 28 650 150 197 L 50 50 3 1 B
+X PC06 29 650 50 197 L 50 50 3 1 B
+X PC00 3 650 650 197 L 50 50 3 1 B
+X PC07 30 650 -50 197 L 50 50 3 1 B
+X PC01 4 650 550 197 L 50 50 3 1 B
+X PC10 52 650 -150 197 L 50 50 3 1 B
+X PC11 55 650 -250 197 L 50 50 3 1 B
+X PC12 56 650 -350 197 L 50 50 3 1 B
+X PC13 57 650 -450 197 L 50 50 3 1 B
+X PC14 58 650 -550 197 L 50 50 3 1 B
+X PC15 59 650 -650 197 L 50 50 3 1 B
+X PC02 7 650 450 197 L 50 50 3 1 B
+X PC16 70 650 -750 197 L 50 50 3 1 B
+X PC17 71 650 -850 197 L 50 50 3 1 B
+X PC18 72 650 -950 197 L 50 50 3 1 B
+X PC19 73 650 -1050 197 L 50 50 3 1 B
+X PC20 74 650 -1150 197 L 50 50 3 1 B
+X PC21 75 650 -1250 197 L 50 50 3 1 B
+X PC22 76 650 -1350 197 L 50 50 3 1 B
+X PC23 77 650 -1450 197 L 50 50 3 1 B
+X PC03 8 650 350 197 L 50 50 3 1 B
+X PD00 13 600 750 197 L 50 50 4 1 B
+X PD01 16 600 650 197 L 50 50 4 1 B
+X PD08 47 600 550 197 L 50 50 4 1 B
+X PD09 48 600 450 197 L 50 50 4 1 B
+X PD10 49 600 350 197 L 50 50 4 1 B
+X PD11 50 600 250 197 L 50 50 4 1 B
+X PD12 51 600 150 197 L 50 50 4 1 B
+X PD20 80 600 50 197 L 50 50 4 1 B
+X PD21 81 600 -50 197 L 50 50 4 1 B
+X VDDIO7 107 -1000 -900 197 R 50 50 5 1 W
+X ~RESET 114 -1000 650 197 R 50 50 5 1 B
+X VDDCORE 115 -1000 -1150 197 R 50 50 5 1 W
+X GNDIO 116 1000 -850 197 L 50 50 5 1 W
+X VSW 117 -1000 -1300 197 R 50 50 5 1 W
+X VDDIO8 118 -1000 -1000 197 R 50 50 5 1 W
+X GNDANA1 14 1000 -500 197 L 50 50 5 1 W
+X VDDANA2 15 -1000 300 197 R 50 50 5 1 B
+X GNDANA2 25 1000 -600 197 L 50 50 5 1 W
+X VDDANA3 26 -1000 200 197 R 50 50 5 1 B
+X VDDIOB1 32 -1000 0 197 R 50 50 5 1 B
+X VDDIOB2 37 -1000 -100 197 R 50 50 5 1 B
+X VDDIO1 46 -1000 -300 197 R 50 50 5 1 W
+X GND1 5 1000 650 197 L 50 50 5 1 W
+X GND10 5 1000 -250 197 L 50 50 5 1 W
+X GND2 5 1000 550 197 L 50 50 5 1 W
+X GND3 5 1000 450 197 L 50 50 5 1 W
+X GND4 5 1000 350 197 L 50 50 5 1 W
+X GND5 5 1000 250 197 L 50 50 5 1 W
+X GND6 5 1000 150 197 L 50 50 5 1 W
+X GND7 5 1000 50 197 L 50 50 5 1 W
+X GND8 5 1000 -50 197 L 50 50 5 1 W
+X GND9 5 1000 -150 197 L 50 50 5 1 W
+X VDDIO2 54 -1000 -400 197 R 50 50 5 1 W
+X VDDANA1 6 -1000 400 197 R 50 50 5 1 B
+X VDDIO3 65 -1000 -500 197 R 50 50 5 1 W
+X VDDIO4 79 -1000 -600 197 R 50 50 5 1 W
+X VDDIO5 91 -1000 -700 197 R 50 50 5 1 W
+X VDDIO6 97 -1000 -800 197 R 50 50 5 1 W
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/electrical/same54_dev_board/same54_dev_board.kicad_pcb b/electrical/same54_dev_board/same54_dev_board.kicad_pcb
index cd656dd3..7191e3f9 100644
--- a/electrical/same54_dev_board/same54_dev_board.kicad_pcb
+++ b/electrical/same54_dev_board/same54_dev_board.kicad_pcb
@@ -839,12 +839,12 @@
   )
 
   (module proj_modules:SOP80P1030X264-36N (layer F.Cu) (tedit 5E702418) (tstamp 5E752FE7)
-    (at 96.52 78.74 90)
+    (at 106.68 77.47)
     (path /5E8589A7/5E86D6D7)
-    (fp_text reference U3 (at -2.415 -8.587 90) (layer F.SilkS)
+    (fp_text reference U3 (at -2.415 -8.587) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.015)))
     )
-    (fp_text value MAX7301AAX+ (at 5.84 8.587 90) (layer F.Fab)
+    (fp_text value MAX7301AAX+ (at 5.84 8.587) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.015)))
     )
     (fp_line (start 5.865 -8.025) (end 5.865 8.025) (layer F.CrtYd) (width 0.05))
@@ -859,77 +859,77 @@
     (fp_line (start -3.8 -7.775) (end 3.8 -7.775) (layer F.Fab) (width 0.127))
     (fp_circle (center -6.51 -7.34) (end -6.41 -7.34) (layer F.Fab) (width 0.2))
     (fp_circle (center -6.51 -7.34) (end -6.41 -7.34) (layer F.SilkS) (width 0.2))
-    (pad 36 smd rect (at 4.72 -6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 36 smd rect (at 4.72 -6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 122 g_3v3))
-    (pad 35 smd rect (at 4.72 -6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 35 smd rect (at 4.72 -6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 167 /s_SCREEN_INTF/~IO_EXPANDER_CS))
-    (pad 34 smd rect (at 4.72 -5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 34 smd rect (at 4.72 -5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 178 /MASTER_SPI_MOSI))
-    (pad 33 smd rect (at 4.72 -4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 33 smd rect (at 4.72 -4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 175 /MASTER_SPI_CLK))
-    (pad 32 smd rect (at 4.72 -3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 32 smd rect (at 4.72 -3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 123 "Net-(U3-Pad32)"))
-    (pad 31 smd rect (at 4.72 -2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 31 smd rect (at 4.72 -2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 124 "Net-(U3-Pad31)"))
-    (pad 30 smd rect (at 4.72 -2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 30 smd rect (at 4.72 -2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 125 "Net-(U3-Pad30)"))
-    (pad 29 smd rect (at 4.72 -1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 29 smd rect (at 4.72 -1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 126 "Net-(U3-Pad29)"))
-    (pad 28 smd rect (at 4.72 -0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 28 smd rect (at 4.72 -0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 137 /s_SCREEN_INTF/D23))
-    (pad 27 smd rect (at 4.72 0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 27 smd rect (at 4.72 0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 138 /s_SCREEN_INTF/D22))
-    (pad 26 smd rect (at 4.72 1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 26 smd rect (at 4.72 1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 139 /s_SCREEN_INTF/D21))
-    (pad 25 smd rect (at 4.72 2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 25 smd rect (at 4.72 2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 140 /s_SCREEN_INTF/D20))
-    (pad 24 smd rect (at 4.72 2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 24 smd rect (at 4.72 2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 141 /s_SCREEN_INTF/D19))
-    (pad 23 smd rect (at 4.72 3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 23 smd rect (at 4.72 3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 142 /s_SCREEN_INTF/D18))
-    (pad 22 smd rect (at 4.72 4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 22 smd rect (at 4.72 4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 143 /s_SCREEN_INTF/D17))
-    (pad 21 smd rect (at 4.72 5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 21 smd rect (at 4.72 5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 144 /s_SCREEN_INTF/D16))
-    (pad 20 smd rect (at 4.72 6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 20 smd rect (at 4.72 6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 145 /s_SCREEN_INTF/D15))
-    (pad 19 smd rect (at 4.72 6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 19 smd rect (at 4.72 6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 146 /s_SCREEN_INTF/D14))
-    (pad 18 smd rect (at -4.72 6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 18 smd rect (at -4.72 6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 147 /s_SCREEN_INTF/D13))
-    (pad 17 smd rect (at -4.72 6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 17 smd rect (at -4.72 6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 148 /s_SCREEN_INTF/D12))
-    (pad 16 smd rect (at -4.72 5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 16 smd rect (at -4.72 5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 149 /s_SCREEN_INTF/D11))
-    (pad 15 smd rect (at -4.72 4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 15 smd rect (at -4.72 4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 150 /s_SCREEN_INTF/D10))
-    (pad 14 smd rect (at -4.72 3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 14 smd rect (at -4.72 3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 151 /s_SCREEN_INTF/D9))
-    (pad 13 smd rect (at -4.72 2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 13 smd rect (at -4.72 2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 152 /s_SCREEN_INTF/D8))
-    (pad 12 smd rect (at -4.72 2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 12 smd rect (at -4.72 2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 153 /s_SCREEN_INTF/D7))
-    (pad 11 smd rect (at -4.72 1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at -4.72 1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 154 /s_SCREEN_INTF/D6))
-    (pad 10 smd rect (at -4.72 0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 10 smd rect (at -4.72 0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 155 /s_SCREEN_INTF/D5))
-    (pad 9 smd rect (at -4.72 -0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 9 smd rect (at -4.72 -0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 156 /s_SCREEN_INTF/D4))
-    (pad 8 smd rect (at -4.72 -1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 8 smd rect (at -4.72 -1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 157 /s_SCREEN_INTF/D3))
-    (pad 7 smd rect (at -4.72 -2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 7 smd rect (at -4.72 -2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 158 /s_SCREEN_INTF/D2))
-    (pad 6 smd rect (at -4.72 -2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 6 smd rect (at -4.72 -2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 159 /s_SCREEN_INTF/D1))
-    (pad 5 smd rect (at -4.72 -3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at -4.72 -3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 160 /s_SCREEN_INTF/D0))
-    (pad 4 smd rect (at -4.72 -4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at -4.72 -4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 174 /MASTER_SPI_MISO))
-    (pad 3 smd rect (at -4.72 -5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at -4.72 -5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 127 GND))
-    (pad 2 smd rect (at -4.72 -6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -4.72 -6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 127 GND))
-    (pad 1 smd rect (at -4.72 -6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -4.72 -6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 128 "Net-(R1-Pad1)"))
   )
 
@@ -1052,7 +1052,7 @@
   )
 
   (module penguin:QFP40P1600X1600X120-128N_ATSAME54P20A (layer F.Cu) (tedit 5E6D9777) (tstamp 5E752F71)
-    (at 86.36 109.22 45)
+    (at 90.17 109.22 45)
     (path /5E7872D3/5E84F3B3)
     (fp_text reference U1 (at -4.500975 -9.803025 45) (layer F.SilkS)
       (effects (font (size 1.001331 1.001331) (thickness 0.015)))
diff --git a/electrical/same54_dev_board/same54_dev_board.kicad_pcb-bak b/electrical/same54_dev_board/same54_dev_board.kicad_pcb-bak
index 8222b0c7..46da2439 100644
--- a/electrical/same54_dev_board/same54_dev_board.kicad_pcb-bak
+++ b/electrical/same54_dev_board/same54_dev_board.kicad_pcb-bak
@@ -839,12 +839,12 @@
   )
 
   (module proj_modules:SOP80P1030X264-36N (layer F.Cu) (tedit 5E702418) (tstamp 5E752FE7)
-    (at 96.52 78.74 90)
+    (at 106.68 77.47)
     (path /5E8589A7/5E86D6D7)
-    (fp_text reference U3 (at -2.415 -8.587 90) (layer F.SilkS)
+    (fp_text reference U3 (at -2.415 -8.587) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.015)))
     )
-    (fp_text value MAX7301AAX+ (at 5.84 8.587 90) (layer F.Fab)
+    (fp_text value MAX7301AAX+ (at 5.84 8.587) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.015)))
     )
     (fp_line (start 5.865 -8.025) (end 5.865 8.025) (layer F.CrtYd) (width 0.05))
@@ -859,77 +859,77 @@
     (fp_line (start -3.8 -7.775) (end 3.8 -7.775) (layer F.Fab) (width 0.127))
     (fp_circle (center -6.51 -7.34) (end -6.41 -7.34) (layer F.Fab) (width 0.2))
     (fp_circle (center -6.51 -7.34) (end -6.41 -7.34) (layer F.SilkS) (width 0.2))
-    (pad 36 smd rect (at 4.72 -6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 36 smd rect (at 4.72 -6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 122 g_3v3))
-    (pad 35 smd rect (at 4.72 -6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 35 smd rect (at 4.72 -6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 167 /s_SCREEN_INTF/~IO_EXPANDER_CS))
-    (pad 34 smd rect (at 4.72 -5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 34 smd rect (at 4.72 -5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 178 /MASTER_SPI_MOSI))
-    (pad 33 smd rect (at 4.72 -4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 33 smd rect (at 4.72 -4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 175 /MASTER_SPI_CLK))
-    (pad 32 smd rect (at 4.72 -3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 32 smd rect (at 4.72 -3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 123 "Net-(U3-Pad32)"))
-    (pad 31 smd rect (at 4.72 -2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 31 smd rect (at 4.72 -2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 124 "Net-(U3-Pad31)"))
-    (pad 30 smd rect (at 4.72 -2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 30 smd rect (at 4.72 -2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 125 "Net-(U3-Pad30)"))
-    (pad 29 smd rect (at 4.72 -1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 29 smd rect (at 4.72 -1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 126 "Net-(U3-Pad29)"))
-    (pad 28 smd rect (at 4.72 -0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 28 smd rect (at 4.72 -0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 137 /s_SCREEN_INTF/D23))
-    (pad 27 smd rect (at 4.72 0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 27 smd rect (at 4.72 0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 138 /s_SCREEN_INTF/D22))
-    (pad 26 smd rect (at 4.72 1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 26 smd rect (at 4.72 1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 139 /s_SCREEN_INTF/D21))
-    (pad 25 smd rect (at 4.72 2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 25 smd rect (at 4.72 2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 140 /s_SCREEN_INTF/D20))
-    (pad 24 smd rect (at 4.72 2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 24 smd rect (at 4.72 2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 141 /s_SCREEN_INTF/D19))
-    (pad 23 smd rect (at 4.72 3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 23 smd rect (at 4.72 3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 142 /s_SCREEN_INTF/D18))
-    (pad 22 smd rect (at 4.72 4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 22 smd rect (at 4.72 4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 143 /s_SCREEN_INTF/D17))
-    (pad 21 smd rect (at 4.72 5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 21 smd rect (at 4.72 5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 144 /s_SCREEN_INTF/D16))
-    (pad 20 smd rect (at 4.72 6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 20 smd rect (at 4.72 6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 145 /s_SCREEN_INTF/D15))
-    (pad 19 smd rect (at 4.72 6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 19 smd rect (at 4.72 6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 146 /s_SCREEN_INTF/D14))
-    (pad 18 smd rect (at -4.72 6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 18 smd rect (at -4.72 6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 147 /s_SCREEN_INTF/D13))
-    (pad 17 smd rect (at -4.72 6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 17 smd rect (at -4.72 6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 148 /s_SCREEN_INTF/D12))
-    (pad 16 smd rect (at -4.72 5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 16 smd rect (at -4.72 5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 149 /s_SCREEN_INTF/D11))
-    (pad 15 smd rect (at -4.72 4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 15 smd rect (at -4.72 4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 150 /s_SCREEN_INTF/D10))
-    (pad 14 smd rect (at -4.72 3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 14 smd rect (at -4.72 3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 151 /s_SCREEN_INTF/D9))
-    (pad 13 smd rect (at -4.72 2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 13 smd rect (at -4.72 2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 152 /s_SCREEN_INTF/D8))
-    (pad 12 smd rect (at -4.72 2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 12 smd rect (at -4.72 2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 153 /s_SCREEN_INTF/D7))
-    (pad 11 smd rect (at -4.72 1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 11 smd rect (at -4.72 1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 154 /s_SCREEN_INTF/D6))
-    (pad 10 smd rect (at -4.72 0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 10 smd rect (at -4.72 0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 155 /s_SCREEN_INTF/D5))
-    (pad 9 smd rect (at -4.72 -0.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 9 smd rect (at -4.72 -0.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 156 /s_SCREEN_INTF/D4))
-    (pad 8 smd rect (at -4.72 -1.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 8 smd rect (at -4.72 -1.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 157 /s_SCREEN_INTF/D3))
-    (pad 7 smd rect (at -4.72 -2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 7 smd rect (at -4.72 -2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 158 /s_SCREEN_INTF/D2))
-    (pad 6 smd rect (at -4.72 -2.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 6 smd rect (at -4.72 -2.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 159 /s_SCREEN_INTF/D1))
-    (pad 5 smd rect (at -4.72 -3.6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at -4.72 -3.6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 160 /s_SCREEN_INTF/D0))
-    (pad 4 smd rect (at -4.72 -4.4 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at -4.72 -4.4) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 174 /MASTER_SPI_MISO))
-    (pad 3 smd rect (at -4.72 -5.2 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at -4.72 -5.2) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 127 GND))
-    (pad 2 smd rect (at -4.72 -6 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -4.72 -6) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 127 GND))
-    (pad 1 smd rect (at -4.72 -6.8 90) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -4.72 -6.8) (size 1.79 0.54) (layers F.Cu F.Paste F.Mask)
       (net 128 "Net-(R1-Pad1)"))
   )
 
@@ -1582,10 +1582,10 @@
     )
   )
 
-  (gr_line (start 190.5 50.8) (end 190.5 134.62) (layer Edge.Cuts) (width 0.05) (tstamp 5E7AC40D))
+  (gr_line (start 50.8 130.81) (end 50.8 50.8) (layer Edge.Cuts) (width 0.05) (tstamp 5E7ADE31))
+  (gr_line (start 152.4 130.81) (end 50.8 130.81) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 152.4 50.8) (end 152.4 130.81) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 53.34 50.8) (end 152.4 50.8) (layer Edge.Cuts) (width 0.05))
   (gr_line (start 50.8 50.8) (end 53.34 50.8) (layer Edge.Cuts) (width 0.05) (tstamp 5E6E9EBC))
-  (gr_line (start 50.8 134.62) (end 50.8 50.8) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 190.5 134.62) (end 50.8 134.62) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 53.34 50.8) (end 190.5 50.8) (layer Edge.Cuts) (width 0.05))
 
 )
diff --git a/electrical/same54_dev_board/same54_dev_board.pro b/electrical/same54_dev_board/same54_dev_board.pro
index 152769cb..7d32da75 100644
--- a/electrical/same54_dev_board/same54_dev_board.pro
+++ b/electrical/same54_dev_board/same54_dev_board.pro
@@ -1,4 +1,4 @@
-update=22/05/2015 07:44:53
+update=Sun 19 Apr 2020 04:53:03 PM CDT
 version=1
 last_client=kicad
 [general]
@@ -31,3 +31,13 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=
+SpiceAjustPassiveValues=0
+LabSize=50
+ERC_TestSimilarLabels=1
diff --git a/electrical/same54_dev_board/same54_dev_board.sch b/electrical/same54_dev_board/same54_dev_board.sch
index ddd684c0..efea6bd3 100644
--- a/electrical/same54_dev_board/same54_dev_board.sch
+++ b/electrical/same54_dev_board/same54_dev_board.sch
@@ -188,22 +188,22 @@ Wire Wire Line
 Wire Wire Line
 	5750 2300 5700 2300
 Wire Wire Line
-	3850 3450 3950 3450
+	3950 3550 4050 3550
 Wire Wire Line
-	3850 3350 3950 3350
-Text Label 3950 3450 0    50   ~ 0
+	3950 3450 4050 3450
+Text Label 4050 3550 0    50   ~ 0
 DEBUG_RX
-Text Label 3950 3350 0    50   ~ 0
+Text Label 4050 3450 0    50   ~ 0
 DEBUG_TX
 $Sheet
-S 550  3250 3300 1900
+S 650  3350 3300 1900
 U 5E7C0F59
 F0 "s_USB_INTF.sch" 50
 F1 "USB_INTF.sch" 50
-F2 "DEBUG_TX" I R 3850 3350 50 
-F3 "DEBUG_RX" I R 3850 3450 50 
-F4 "FTDI_5V" I R 3850 3650 50 
-F5 "FTDI_3V3" I R 3850 3750 50 
+F2 "DEBUG_TX" I R 3950 3450 50 
+F3 "DEBUG_RX" I R 3950 3550 50 
+F4 "FTDI_5V" I R 3950 3750 50 
+F5 "FTDI_3V3" I R 3950 3850 50 
 $EndSheet
 $Sheet
 S 750  800  3250 2350
diff --git a/electrical/same54_dev_board/same54_dev_board.sch-bak b/electrical/same54_dev_board/same54_dev_board.sch-bak
index ddd684c0..efea6bd3 100644
--- a/electrical/same54_dev_board/same54_dev_board.sch-bak
+++ b/electrical/same54_dev_board/same54_dev_board.sch-bak
@@ -188,22 +188,22 @@ Wire Wire Line
 Wire Wire Line
 	5750 2300 5700 2300
 Wire Wire Line
-	3850 3450 3950 3450
+	3950 3550 4050 3550
 Wire Wire Line
-	3850 3350 3950 3350
-Text Label 3950 3450 0    50   ~ 0
+	3950 3450 4050 3450
+Text Label 4050 3550 0    50   ~ 0
 DEBUG_RX
-Text Label 3950 3350 0    50   ~ 0
+Text Label 4050 3450 0    50   ~ 0
 DEBUG_TX
 $Sheet
-S 550  3250 3300 1900
+S 650  3350 3300 1900
 U 5E7C0F59
 F0 "s_USB_INTF.sch" 50
 F1 "USB_INTF.sch" 50
-F2 "DEBUG_TX" I R 3850 3350 50 
-F3 "DEBUG_RX" I R 3850 3450 50 
-F4 "FTDI_5V" I R 3850 3650 50 
-F5 "FTDI_3V3" I R 3850 3750 50 
+F2 "DEBUG_TX" I R 3950 3450 50 
+F3 "DEBUG_RX" I R 3950 3550 50 
+F4 "FTDI_5V" I R 3950 3750 50 
+F5 "FTDI_3V3" I R 3950 3850 50 
 $EndSheet
 $Sheet
 S 750  800  3250 2350