[Cryptech-Commits] [user/ft/alpha_to_kicad] 03/03: first set of manual edits to symbols and schematics - fix multipart components

git at cryptech.is git at cryptech.is
Mon May 14 19:09:54 UTC 2018


This is an automated email from the git hooks/post-receive script.

fredrik at thulin.net pushed a commit to branch ft-multipart_symbols
in repository user/ft/alpha_to_kicad.

commit d76682a4eb2aaf5e1b368e2ffdd20928aaa861ea
Author: Fredrik Thulin <fredrik at thulin.net>
AuthorDate: Mon May 14 21:09:15 2018 +0200

    first set of manual edits to symbols and schematics - fix multipart components
---
 rev03-KiCad/Cryptech_Alpha.lib | 2676 ++++++++++++++++++----------------------
 rev03-KiCad/rev02_00.sch       |    7 +-
 rev03-KiCad/rev02_01.sch       |  226 ++--
 rev03-KiCad/rev02_02.sch       |   92 +-
 rev03-KiCad/rev02_03.sch       |  152 ++-
 rev03-KiCad/rev02_04.sch       |  134 +-
 rev03-KiCad/rev02_05.sch       |  402 +++---
 rev03-KiCad/rev02_06.sch       |  516 ++++----
 rev03-KiCad/rev02_07.sch       |   34 +-
 rev03-KiCad/rev02_08.sch       |   48 +-
 rev03-KiCad/rev02_09.sch       |  276 +++--
 rev03-KiCad/rev02_10.sch       |  276 +++--
 rev03-KiCad/rev02_11.sch       |  208 ++--
 rev03-KiCad/rev02_12.sch       |  186 +--
 rev03-KiCad/rev02_13.sch       |  180 ++-
 rev03-KiCad/rev02_14.sch       |  122 +-
 rev03-KiCad/rev02_15.sch       |  218 ++--
 rev03-KiCad/rev02_16.sch       |   52 +-
 rev03-KiCad/rev02_17.sch       |  162 +--
 rev03-KiCad/rev02_18.sch       |  206 ++--
 rev03-KiCad/rev02_19.sch       |  186 +--
 rev03-KiCad/rev02_20.sch       |   98 +-
 rev03-KiCad/rev02_21.sch       |   94 +-
 rev03-KiCad/rev02_22.sch       |  440 ++++---
 rev03-KiCad/rev02_23.sch       |  412 ++++---
 rev03-KiCad/rev02_24.sch       |  118 +-
 rev03-KiCad/rev02_25.sch       |   84 +-
 27 files changed, 3824 insertions(+), 3781 deletions(-)

diff --git a/rev03-KiCad/Cryptech_Alpha.lib b/rev03-KiCad/Cryptech_Alpha.lib
index 2ebcb7d..b63b89e 100644
--- a/rev03-KiCad/Cryptech_Alpha.lib
+++ b/rev03-KiCad/Cryptech_Alpha.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 15.10.2016 16:44:46
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
 # 15V_STABLE
@@ -9,18 +9,18 @@ F1 "15V_STABLE" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X 15V_STABLE 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
 # 23K640-I_SN
 #
-DEF 23K640-I_SN IC 0 40 Y Y 1 F N
+DEF 23K640-I_SN U 0 40 Y Y 1 F N
 F0 "U" -530 -930 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "23K640-I_SN" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -29,10 +29,10 @@ T 0 -720 630 50 0 1 1 23K640-I_SN Normal 1 C C
 T 0 -720 630 50 0 1 1 71P4706 Normal 1 C C
 T 0 -720 630 50 0 1 1 MICROCHIP Normal 1 C C
 T 0 -720 630 50 0 1 1 SOIC-8 Normal 1 C C
-P 2 0 1 10 -500 -800 -500 600
-P 2 0 1 10 -500 600 500 600
-P 2 0 1 10 500 -800 -500 -800
-P 2 0 1 10 500 600 500 -800
+P 2 0 1 10 -500 -800 -500 600 N
+P 2 0 1 10 -500 600 500 600 N
+P 2 0 1 10 500 -800 -500 -800 N
+P 2 0 1 10 500 600 500 -800 N
 X ~CS 1 -700 200 200 R 70 70 0 1 P
 X SO 2 700 400 200 L 70 70 0 1 O
 X NC 3 -700 -300 200 R 70 70 0 1 P
@@ -46,23 +46,23 @@ ENDDEF
 #
 # 2N7002
 #
-DEF 2N7002 IC 0 40 Y Y 1 F N
+DEF 2N7002 Q 0 40 Y Y 1 F N
 F0 "Q" -110 -260 60 H V L BNN
 F1 "2N7002" -200 150 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -50 -100 -100 -100
-P 2 0 1 10 -50 -100 -50 100
-P 2 0 1 10 0 -150 0 -60
-P 2 0 1 10 0 -30 0 0
-P 2 0 1 10 0 0 0 30
-P 2 0 1 10 0 50 0 140
-P 2 0 1 10 20 0 0 0
-P 2 0 1 10 20 0 70 -30
-P 2 0 1 10 20 0 70 20
-P 2 0 1 10 100 -100 100 0
-P 2 0 1 10 100 0 20 0
+P 2 0 1 10 -50 -100 -100 -100 N
+P 2 0 1 10 -50 -100 -50 100 N
+P 2 0 1 10 0 -150 0 -60 N
+P 2 0 1 10 0 -30 0 0 N
+P 2 0 1 10 0 0 0 30 N
+P 2 0 1 10 0 50 0 140 N
+P 2 0 1 10 20 0 0 0 N
+P 2 0 1 10 20 0 70 -30 N
+P 2 0 1 10 20 0 70 20 N
+P 2 0 1 10 100 -100 100 0 N
+P 2 0 1 10 100 0 20 0 N
 X G 1 -200 -100 100 R 1 1 0 1 P
 X S 2 200 -100 200 L 1 1 0 1 P
 X D 3 200 100 200 L 1 1 0 1 P
@@ -77,77 +77,55 @@ F1 "3V3_BATT" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X 3V3_BATT 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# 74*244DW_1
-#
-DEF 74*244DW_1 IC 0 40 Y Y 1 F N
-F0 "IC" -330 -530 60 H V L BNN
-F1 "74*244DW_1" -300 420 60 H V L BNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -300 -400 -300 300
-P 2 0 1 10 -300 300 300 300
-P 2 0 1 10 300 -400 -300 -400
-P 2 0 1 10 300 300 300 -400
-X G 1 -500 -300 200 R 70 70 0 1 P
-X Y4 12 500 -100 200 L 70 70 0 1 T
-X Y3 14 500 0 200 L 70 70 0 1 T
-X Y2 16 500 100 200 L 70 70 0 1 T
-X Y1 18 500 200 200 L 70 70 0 1 T
-X A1 2 -500 200 200 R 70 70 0 1 P
-X A2 4 -500 100 200 R 70 70 0 1 P
-X A3 6 -500 0 200 R 70 70 0 1 P
-X A4 8 -500 -100 200 R 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# 74*244DW_2
-#
-DEF 74*244DW_2 IC 0 40 Y Y 1 F N
-F0 "IC" -330 -530 60 H V L BNN
-F1 "74*244DW_2" -290 420 60 H V L BNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -300 -400 -300 300
-P 2 0 1 10 -300 300 300 300
-P 2 0 1 10 300 -400 -300 -400
-P 2 0 1 10 300 300 300 -400
-X A1 11 -500 200 200 R 70 70 0 1 P
-X A2 13 -500 100 200 R 70 70 0 1 P
-X A3 15 -500 0 200 R 70 70 0 1 P
-X A4 17 -500 -100 200 R 70 70 0 1 P
-X G 19 -500 -300 200 R 70 70 0 1 P
-X Y4 3 500 -100 200 L 70 70 0 1 T
-X Y3 5 500 0 200 L 70 70 0 1 T
-X Y2 7 500 100 200 L 70 70 0 1 T
-X Y1 9 500 200 200 L 70 70 0 1 T
-ENDDRAW
-ENDDEF
-#
-# 74*244DW_3
-#
-DEF 74*244DW_3 IC 0 40 Y Y 1 F N
-F0 "IC" 30 -150 60 H V L BNN
-F1 "74*244DW_3" 180 -20 60 H V L BNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-X GND 10 0 -300 200 U 70 1 0 1 W
-X VCC 20 0 300 200 D 70 1 0 1 W
+# 74*244DW
+#
+DEF 74*244DW U 0 40 Y Y 3 L N
+F0 "U" 0 900 50 H V C CNN
+F1 "74*244DW" 0 0 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 1 1 10 -300 100 -300 800 N
+P 2 1 1 10 -300 800 300 800 N
+P 2 1 1 10 300 100 -300 100 N
+P 2 1 1 10 300 800 300 100 N
+P 2 2 1 10 -300 100 -300 800 N
+P 2 2 1 10 -300 800 300 800 N
+P 2 2 1 10 300 100 -300 100 N
+P 2 2 1 10 300 800 300 100 N
+X G 1 -500 200 200 R 70 70 1 1 P
+X Y4 12 500 400 200 L 70 70 1 1 T
+X Y3 14 500 500 200 L 70 70 1 1 T
+X Y2 16 500 600 200 L 70 70 1 1 T
+X Y1 18 500 700 200 L 70 70 1 1 T
+X A1 2 -500 700 200 R 70 70 1 1 P
+X A2 4 -500 600 200 R 70 70 1 1 P
+X A3 6 -500 500 200 R 70 70 1 1 P
+X A4 8 -500 400 200 R 70 70 1 1 P
+X A1 11 -500 700 200 R 70 70 2 1 P
+X A2 13 -500 600 200 R 70 70 2 1 P
+X A3 15 -500 500 200 R 70 70 2 1 P
+X A4 17 -500 400 200 R 70 70 2 1 P
+X G 19 -500 200 200 R 70 70 2 1 P
+X Y4 3 500 400 200 L 70 70 2 1 T
+X Y3 5 500 500 200 L 70 70 2 1 T
+X Y2 7 500 600 200 L 70 70 2 1 T
+X Y1 9 500 700 200 L 70 70 2 1 T
+X GND 10 0 150 200 U 70 1 3 1 W
+X VCC 20 0 750 200 D 70 1 3 1 W
 ENDDRAW
 ENDDEF
 #
 # ASF*
 #
-DEF ASF* IC 0 40 Y Y 1 F N
+DEF ASF* Q 0 40 Y Y 1 F N
 F0 "Q" -330 -430 60 H V L BNN
 F1 "ASF*" -520 330 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -155,34 +133,34 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 T 0 -520 330 50 0 1 1 1838931 Normal 1 C C
 T 0 -520 330 50 0 1 1 19M1882 Normal 1 C C
-T 0 -520 330 50 0 1 1 ASFL1-125.000MHZ-EC-T Normal 1 C C
 T 0 -520 330 50 0 1 1 Abracon~Corporation Normal 1 C C
-P 2 0 1 10 -300 -300 -300 300
-P 2 0 1 10 -300 -300 300 -300
-P 2 0 1 10 -190 10 -190 -20
-P 2 0 1 10 -150 -40 -200 -40
-P 2 0 1 10 -150 -40 -150 -130
-P 2 0 1 10 -150 120 -150 40
-P 2 0 1 10 -110 -20 -190 -20
-P 2 0 1 10 -110 -20 -110 10
-P 2 0 1 10 -110 10 -190 10
-P 2 0 1 10 -100 -40 -150 -40
-P 2 0 1 10 -100 40 -200 40
-P 2 0 1 10 -50 -200 250 0
-P 2 0 1 10 -50 -130 -150 -130
-P 2 0 1 10 -50 -130 -50 -200
-P 2 0 1 10 -50 120 -150 120
-P 2 0 1 10 -50 120 -50 -130
-P 2 0 1 10 -50 200 -50 120
-P 2 0 1 10 100 100 -50 200
-P 2 0 1 10 100 100 100 200
-P 2 0 1 10 100 200 300 200
-P 2 0 1 10 250 0 100 100
-P 2 0 1 10 300 0 250 0
-P 2 0 1 10 300 0 300 -300
-P 2 0 1 10 300 200 300 0
-P 2 0 1 10 300 300 -300 300
-P 2 0 1 10 300 300 300 200
+T 0 -520 330 50 0 1 1 ASFL1-125.000MHZ-EC-T Normal 1 C C
+P 2 0 1 10 -300 -300 -300 300 N
+P 2 0 1 10 -300 -300 300 -300 N
+P 2 0 1 10 -190 10 -190 -20 N
+P 2 0 1 10 -150 -40 -200 -40 N
+P 2 0 1 10 -150 -40 -150 -130 N
+P 2 0 1 10 -150 120 -150 40 N
+P 2 0 1 10 -110 -20 -190 -20 N
+P 2 0 1 10 -110 -20 -110 10 N
+P 2 0 1 10 -110 10 -190 10 N
+P 2 0 1 10 -100 -40 -150 -40 N
+P 2 0 1 10 -100 40 -200 40 N
+P 2 0 1 10 -50 -200 250 0 N
+P 2 0 1 10 -50 -130 -150 -130 N
+P 2 0 1 10 -50 -130 -50 -200 N
+P 2 0 1 10 -50 120 -150 120 N
+P 2 0 1 10 -50 120 -50 -130 N
+P 2 0 1 10 -50 200 -50 120 N
+P 2 0 1 10 100 100 -50 200 N
+P 2 0 1 10 100 100 100 200 N
+P 2 0 1 10 100 200 300 200 N
+P 2 0 1 10 250 0 100 100 N
+P 2 0 1 10 300 0 250 0 N
+P 2 0 1 10 300 0 300 -300 N
+P 2 0 1 10 300 200 300 0 N
+P 2 0 1 10 300 300 -300 300 N
+P 2 0 1 10 300 300 300 200 N
 X OE 1 500 200 200 L 70 1 0 1 P
 X GND 2 -500 -200 200 R 70 1 0 1 W
 X FO 3 500 0 200 L 70 1 0 1 O
@@ -192,9 +170,9 @@ ENDDEF
 #
 # ATTINY828R-AU
 #
-DEF ATTINY828R-AU IC 0 40 Y Y 1 F N
+DEF ATTINY828R-AU U 0 40 Y Y 1 F N
 F0 "U" -2030 -1530 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "ATTINY828R-AU" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -203,10 +181,10 @@ T 0 -2220 1230 50 0 1 1 ATMEL Normal 1 C C
 T 0 -2220 1230 50 0 1 1 ATTINY828R-AU Normal 1 C C
 T 0 -2220 1230 50 0 1 1 TQFP-32 Normal 1 C C
 T 0 -2220 1230 50 0 1 1 Unknown Normal 1 C C
-P 2 0 1 10 -2000 -1400 -2000 1200
-P 2 0 1 10 -2000 1200 2000 1200
-P 2 0 1 10 2000 -1400 -2000 -1400
-P 2 0 1 10 2000 1200 2000 -1400
+P 2 0 1 10 -2000 -1400 -2000 1200 N
+P 2 0 1 10 -2000 1200 2000 1200 N
+P 2 0 1 10 2000 -1400 -2000 -1400 N
+P 2 0 1 10 2000 1200 2000 -1400 N
 X (PCINT18/ADC18/TOCC2/RXD/INT1)_PC2 1 2200 800 200 L 70 70 0 1 P
 X (PCINT1/ADC1/AIN0)_PA1 10 -2200 600 200 R 70 70 0 1 P
 X (PCINT2/ADC2/AIN1)_PA2 11 -2200 500 200 R 70 70 0 1 P
@@ -244,16 +222,16 @@ ENDDEF
 #
 # AVR_SPI_PRG_62X3_LOCK
 #
-DEF AVR_SPI_PRG_62X3_LOCK IC 0 40 Y Y 1 F N
+DEF AVR_SPI_PRG_62X3_LOCK JP 0 40 Y Y 1 F N
 F0 "JP" -170 230 60 H V L BNN
 F1 "AVR_SPI_PRG_62X3_LOCK" -960 -400 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -200 -200 -200 200
-P 2 0 1 10 -200 200 300 200
-P 2 0 1 10 300 -200 -200 -200
-P 2 0 1 10 300 200 300 -200
+P 2 0 1 10 -200 -200 -200 200 N
+P 2 0 1 10 -200 200 300 200 N
+P 2 0 1 10 300 -200 -200 -200 N
+P 2 0 1 10 300 200 300 -200 N
 X 1 1 -300 100 300 R 70 1 0 1 P
 X 2 2 400 100 300 L 70 1 0 1 P
 X 3 3 -300 0 300 R 70 1 0 1 P
@@ -265,21 +243,21 @@ ENDDEF
 #
 # BAT54
 #
-DEF BAT54 IC 0 40 Y Y 1 F N
+DEF BAT54 D 0 40 Y Y 1 F N
 F0 "D" -90 70 60 H V L BNN
 F1 "BAT54" -230 -170 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -50 -50 -50 50
-P 2 0 1 10 -50 50 50 0
-P 2 0 1 10 20 -50 20 -40
-P 2 0 1 10 20 -50 50 -50
-P 2 0 1 10 50 -50 50 0
-P 2 0 1 10 50 0 -50 -50
-P 2 0 1 10 50 0 50 50
-P 2 0 1 10 50 50 70 50
-P 2 0 1 10 70 40 70 50
+P 2 0 1 10 -50 -50 -50 50 N
+P 2 0 1 10 -50 50 50 0 N
+P 2 0 1 10 20 -50 20 -40 N
+P 2 0 1 10 20 -50 50 -50 N
+P 2 0 1 10 50 -50 50 0 N
+P 2 0 1 10 50 0 -50 -50 N
+P 2 0 1 10 50 0 50 50 N
+P 2 0 1 10 50 50 70 50 N
+P 2 0 1 10 70 40 70 50 N
 X A 1 -100 0 100 R 1 1 0 1 P
 X C 3 100 0 100 L 1 1 0 1 P
 ENDDRAW
@@ -287,7 +265,7 @@ ENDDEF
 #
 # BC818*SMD
 #
-DEF BC818*SMD IC 0 40 Y Y 1 F N
+DEF BC818*SMD T 0 40 Y Y 1 F N
 F0 "T" 250 250 60 H V L BNN
 F1 "BC818*SMD" 670 150 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -295,21 +273,21 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 S -10 -100 20 100 0 1 10 f
 S 20 100 -10 -100 0 1 10 f
-P 2 0 1 10 10 -60 60 -90
-P 2 0 1 10 20 -50 70 -80
-P 2 0 1 10 20 60 100 100
-P 2 0 1 10 50 -100 100 -100
-P 2 0 1 10 60 -90 70 -70
-P 2 0 1 10 70 -90 60 -90
-P 2 0 1 10 70 -80 70 -90
-P 2 0 1 10 70 -80 80 -90
-P 2 0 1 10 70 -70 90 -100
-P 2 0 1 10 70 -70 90 -90
-P 2 0 1 10 70 -60 50 -100
-P 2 0 1 10 80 -90 60 -90
-P 2 0 1 10 90 -100 60 -100
-P 2 0 1 10 90 -90 60 -90
-P 2 0 1 10 100 -100 70 -60
+P 2 0 1 10 10 -60 60 -90 N
+P 2 0 1 10 20 -50 70 -80 N
+P 2 0 1 10 20 60 100 100 N
+P 2 0 1 10 50 -100 100 -100 N
+P 2 0 1 10 60 -90 70 -70 N
+P 2 0 1 10 70 -90 60 -90 N
+P 2 0 1 10 70 -80 70 -90 N
+P 2 0 1 10 70 -80 80 -90 N
+P 2 0 1 10 70 -70 90 -100 N
+P 2 0 1 10 70 -70 90 -90 N
+P 2 0 1 10 70 -60 50 -100 N
+P 2 0 1 10 80 -90 60 -90 N
+P 2 0 1 10 90 -100 60 -100 N
+P 2 0 1 10 90 -90 60 -90 N
+P 2 0 1 10 100 -100 70 -60 N
 X B 1 -100 0 100 R 1 1 0 1 P
 X E 2 100 -200 100 U 1 1 0 1 P
 X C 3 100 200 100 D 1 1 0 1 P
@@ -318,7 +296,7 @@ ENDDEF
 #
 # BLM31PG330SN1_1206
 #
-DEF BLM31PG330SN1_1206 IC 0 40 Y Y 1 F N
+DEF BLM31PG330SN1_1206 FB 0 40 Y Y 1 F N
 F0 "FB" -150 200 60 H V L BNN
 F1 "BLM31PG330SN1_1206" -170 -90 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -332,9 +310,9 @@ ENDDEF
 #
 # C-EUC0402
 #
-DEF C-EUC0402 IC 0 40 Y Y 1 F N
+DEF C-EUC0402 C 0 40 Y Y 1 F N
 F0 "C" 100 0 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "C-EUC0402" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -342,8 +320,8 @@ S -80 -80 80 -60 0 1 10 f
 S -80 -40 80 -20 0 1 10 f
 S 80 -60 -80 -80 0 1 10 f
 S 80 -20 -80 -40 0 1 10 f
-P 2 0 1 10 0 -80 0 -100
-P 2 0 1 10 0 -20 0 0
+P 2 0 1 10 0 -80 0 -100 N
+P 2 0 1 10 0 -20 0 0 N
 X 1 1 0 100 100 D 1 1 0 1 P
 X 2 2 0 -200 100 U 1 1 0 1 P
 ENDDRAW
@@ -351,16 +329,16 @@ ENDDEF
 #
 # C-EUC0603
 #
-DEF C-EUC0603 IC 0 40 Y Y 1 F N
+DEF C-EUC0603 C 0 40 Y Y 1 F N
 F0 "C" 100 -100 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "C-EUC0603" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 S -80 -80 80 -60 0 1 10 f
 S -80 -40 80 -20 0 1 10 f
-P 2 0 1 10 0 -80 0 -100
-P 2 0 1 10 0 -20 0 0
+P 2 0 1 10 0 -80 0 -100 N
+P 2 0 1 10 0 -20 0 0 N
 X 1 1 0 100 100 D 1 1 0 1 P
 X 2 2 0 -200 100 U 1 1 0 1 P
 ENDDRAW
@@ -368,7 +346,7 @@ ENDDEF
 #
 # C-EUC0805
 #
-DEF C-EUC0805 IC 0 40 Y Y 1 F N
+DEF C-EUC0805 C 0 40 Y Y 1 F N
 F0 "C" 90 0 60 H V L BNN
 F1 "C-EUC0805" 100 -100 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -376,8 +354,8 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 S -80 -80 80 -60 0 1 10 f
 S -80 -40 80 -20 0 1 10 f
-P 2 0 1 10 0 -80 0 -100
-P 2 0 1 10 0 -20 0 0
+P 2 0 1 10 0 -80 0 -100 N
+P 2 0 1 10 0 -20 0 0 N
 X 1 1 0 100 100 D 1 1 0 1 P
 X 2 2 0 -200 100 U 1 1 0 1 P
 ENDDRAW
@@ -385,16 +363,16 @@ ENDDEF
 #
 # C-EUC1210
 #
-DEF C-EUC1210 IC 0 40 Y Y 1 F N
+DEF C-EUC1210 C 0 40 Y Y 1 F N
 F0 "C" 80 -190 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "C-EUC1210" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 S -80 -80 80 -60 0 1 10 f
 S -80 -40 80 -20 0 1 10 f
-P 2 0 1 10 0 -80 0 -100
-P 2 0 1 10 0 -20 0 0
+P 2 0 1 10 0 -80 0 -100 N
+P 2 0 1 10 0 -20 0 0 N
 X 1 1 0 100 100 D 1 1 0 1 P
 X 2 2 0 -200 100 U 1 1 0 1 P
 ENDDRAW
@@ -402,19 +380,19 @@ ENDDEF
 #
 # CP_E-035X080
 #
-DEF CP_E-035X080 IC 0 40 Y Y 1 F N
+DEF CP_E-035X080 C 0 40 Y Y 1 F N
 F0 "C" 120 20 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "CP_E-035X080" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A -120 0 98 0 374 1 1 20 N -22 0 -42 59
 A -120 10 98 -382 -4 1 1 20 N -42 -50 -22 9
-P 2 0 1 10 -100 0 -20 0
-P 2 0 1 10 -20 0 -20 0
-P 2 0 1 10 20 -60 20 0
-P 2 0 1 10 20 0 20 70
-P 2 0 1 10 100 0 20 0
+P 2 0 1 10 -100 0 -20 0 N
+P 2 0 1 10 -20 0 -20 0 N
+P 2 0 1 10 20 -60 20 0 N
+P 2 0 1 10 20 0 20 70 N
+P 2 0 1 10 100 0 20 0 N
 X + 1 100 0 10 L 1 1 0 1 P
 X - 2 -100 0 10 R 1 1 0 1 P
 ENDDRAW
@@ -422,22 +400,22 @@ ENDDEF
 #
 # CRYSTALTHIN
 #
-DEF CRYSTALTHIN IC 0 40 Y Y 1 F N
+DEF CRYSTALTHIN Y 0 40 Y Y 1 F N
 F0 "Y" -100 120 60 H V L BNN
 F1 "CRYSTALTHIN" 820 140 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -40 -70 -40 0
-P 2 0 1 10 -40 0 -100 0
-P 2 0 1 10 -40 0 -40 70
-P 2 0 1 10 -10 -60 -10 60
-P 2 0 1 10 -10 60 20 60
-P 2 0 1 10 20 -60 -10 -60
-P 2 0 1 10 20 60 20 -60
-P 2 0 1 10 40 -70 40 0
-P 2 0 1 10 40 0 40 70
-P 2 0 1 10 40 0 100 0
+P 2 0 1 10 -40 -70 -40 0 N
+P 2 0 1 10 -40 0 -100 0 N
+P 2 0 1 10 -40 0 -40 70 N
+P 2 0 1 10 -10 -60 -10 60 N
+P 2 0 1 10 -10 60 20 60 N
+P 2 0 1 10 20 -60 -10 -60 N
+P 2 0 1 10 20 60 20 -60 N
+P 2 0 1 10 40 -70 40 0 N
+P 2 0 1 10 40 0 40 70 N
+P 2 0 1 10 40 0 100 0 N
 X 1 1 -100 0 10 R 1 1 0 1 P
 X 2 2 -100 -100 100 R 1 1 0 1 P
 X 3 3 100 0 10 L 1 1 0 1 P
@@ -447,16 +425,16 @@ ENDDEF
 #
 # EN5364QI
 #
-DEF EN5364QI IC 0 40 Y Y 1 F N
+DEF EN5364QI U 0 40 Y Y 1 F N
 F0 "U" -450 2320 60 H V L BNN
 F1 "EN5364QI" 110 2330 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -600 -1600 -600 2300
-P 2 0 1 10 -600 2300 700 2300
-P 2 0 1 10 700 -1600 -600 -1600
-P 2 0 1 10 700 2300 700 -1600
+P 2 0 1 10 -600 -1600 -600 2300 N
+P 2 0 1 10 -600 2300 700 2300 N
+P 2 0 1 10 700 -1600 -600 -1600 N
+P 2 0 1 10 700 2300 700 -1600 N
 X PGND 1 300 -1800 200 U 1 70 0 1 W
 X VOUT 10 900 1600 200 L 70 70 0 1 W
 X VOUT 11 900 1500 200 L 70 70 0 1 W
@@ -532,16 +510,16 @@ ENDDEF
 #
 # EN6347QI
 #
-DEF EN6347QI IC 0 40 Y Y 1 F N
+DEF EN6347QI U 0 40 Y Y 1 F N
 F0 "U" -360 1090 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "EN6347QI" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -600 -900 600 -900
-P 2 0 1 10 -600 1000 -600 -900
-P 2 0 1 10 600 -900 600 1000
-P 2 0 1 10 600 1000 -600 1000
+P 2 0 1 10 -600 -900 600 -900 N
+P 2 0 1 10 -600 1000 -600 -900 N
+P 2 0 1 10 600 -900 600 1000 N
+P 2 0 1 10 600 1000 -600 1000 N
 X NC 1 800 -300 200 L 70 70 0 1 P
 X VOUT 10 800 400 200 L 70 70 0 1 W
 X VOUT 11 800 300 200 L 70 70 0 1 W
@@ -586,16 +564,16 @@ ENDDEF
 #
 # FERRITE_0603MP
 #
-DEF FERRITE_0603MP IC 0 40 Y Y 1 F N
+DEF FERRITE_0603MP FB 0 40 Y Y 1 F N
 F0 "FB" -80 -170 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "FERRITE_0603MP" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -50 -40 50 -40
-P 2 0 1 10 -50 30 -50 -40
-P 2 0 1 10 50 -40 50 30
-P 2 0 1 10 50 30 -50 30
+P 2 0 1 10 -50 -40 50 -40 N
+P 2 0 1 10 -50 30 -50 -40 N
+P 2 0 1 10 50 -40 50 30 N
+P 2 0 1 10 50 30 -50 30 N
 X P$1 1 -100 0 100 R 1 1 0 1 P
 X P$2 2 100 0 100 L 1 1 0 1 P
 ENDDRAW
@@ -609,9 +587,9 @@ F1 "FPGA_VCCAUX_1V8" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FPGA_VCCAUX_1V8 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -624,25 +602,25 @@ F1 "FPGA_VCCINT_1V0" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FPGA_VCCINT_1V0 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
 # FT232H_SERIAL
 #
-DEF FT232H_SERIAL IC 0 40 Y Y 1 F N
+DEF FT232H_SERIAL U 0 40 Y Y 1 F N
 F0 "U" 1120 1210 60 H V L BNN
 F1 "FT232H_SERIAL" -1120 1520 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -900 -1300 900 -1300
-P 2 0 1 10 -900 1300 -900 -1300
-P 2 0 1 10 900 -1300 900 1300
-P 2 0 1 10 900 1300 -900 1300
+P 2 0 1 10 -900 -1300 900 -1300 N
+P 2 0 1 10 -900 1300 -900 -1300 N
+P 2 0 1 10 900 -1300 900 1300 N
+P 2 0 1 10 900 1300 -900 1300 N
 X XCSI 1 -1100 -700 200 R 70 70 0 1 P
 X GND 10 -100 -1500 200 U 70 70 0 1 W
 X GND 11 0 -1500 200 U 70 70 0 1 W
@@ -702,9 +680,9 @@ F1 "FT_MGMT_VCC3V3" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_MGMT_VCC3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -717,9 +695,9 @@ F1 "FT_MGMT_VPHY" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_MGMT_VPHY 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -732,9 +710,9 @@ F1 "FT_MGMT_VPLL" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_MGMT_VPLL 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -747,9 +725,9 @@ F1 "FT_MGMT_VREGIN" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_MGMT_VREGIN 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -762,9 +740,9 @@ F1 "FT_VCC3V3" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_VCC3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -777,9 +755,9 @@ F1 "FT_VPHY" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_VPHY 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -792,9 +770,9 @@ F1 "FT_VPLL" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_VPLL 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -807,25 +785,25 @@ F1 "FT_VREGIN" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X FT_VREGIN 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
 # IS45S32160F
 #
-DEF IS45S32160F IC 0 40 Y Y 1 F N
+DEF IS45S32160F U 0 40 Y Y 1 F N
 F0 "U" 1220 2110 60 H V L BNN
 F1 "IS45S32160F" -1360 2250 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -1100 -2200 -1100 2200
-P 2 0 1 10 -1100 2200 1100 2200
-P 2 0 1 10 1100 -2200 -1100 -2200
-P 2 0 1 10 1100 2200 1100 -2200
+P 2 0 1 10 -1100 -2200 -1100 2200 N
+P 2 0 1 10 -1100 2200 1100 2200 N
+P 2 0 1 10 1100 -2200 -1100 -2200 N
+P 2 0 1 10 1100 2200 1100 -2200 N
 X VDD 1 -600 2300 100 D 70 70 0 1 W
 X DQ5 10 1200 1500 100 L 70 70 0 1 P
 X DQ6 11 1200 1400 100 L 70 70 0 1 P
@@ -911,20 +889,20 @@ ENDDEF
 #
 # JP1Q
 #
-DEF JP1Q IC 0 40 Y Y 1 F N
+DEF JP1Q JP 0 40 Y Y 1 F N
 F0 "JP" -230 -210 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "JP1Q" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -80 -200 70 -200
-P 2 0 1 10 -80 200 -80 -200
-P 2 0 1 10 0 -200 0 -150
-P 2 0 1 10 0 -150 0 -100
-P 2 0 1 10 0 150 0 100
-P 2 0 1 10 0 200 0 150
-P 2 0 1 10 70 -200 70 200
-P 2 0 1 10 70 200 -80 200
+P 2 0 1 10 -80 -200 70 -200 N
+P 2 0 1 10 -80 200 -80 -200 N
+P 2 0 1 10 0 -200 0 -150 N
+P 2 0 1 10 0 -150 0 -100 N
+P 2 0 1 10 0 150 0 100 N
+P 2 0 1 10 0 200 0 150 N
+P 2 0 1 10 70 -200 70 200 N
+P 2 0 1 10 70 200 -80 200 N
 X 1 1 0 -300 100 U 70 1 0 1 P
 X 2 2 0 300 100 D 70 1 0 1 P
 ENDDRAW
@@ -932,21 +910,21 @@ ENDDEF
 #
 # LEDCHIP-LED0603
 #
-DEF LEDCHIP-LED0603 IC 0 40 Y Y 1 F N
+DEF LEDCHIP-LED0603 LED 0 40 Y Y 1 F N
 F0 "LED" 630 -30 60 H V L BNN
 F1 "LEDCHIP-LED0603" 1240 -40 60 V V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -140 -80 -80 -30
-P 2 0 1 10 -130 -130 -80 -70
-P 2 0 1 10 -50 -100 0 -100
-P 2 0 1 10 -50 0 0 -100
-P 2 0 1 10 -50 0 0 0
-P 2 0 1 10 0 -100 0 0
-P 2 0 1 10 0 -100 50 -100
-P 2 0 1 10 0 -100 50 0
-P 2 0 1 10 0 0 50 0
+P 2 0 1 10 -140 -80 -80 -30 N
+P 2 0 1 10 -130 -130 -80 -70 N
+P 2 0 1 10 -50 -100 0 -100 N
+P 2 0 1 10 -50 0 0 -100 N
+P 2 0 1 10 -50 0 0 0 N
+P 2 0 1 10 0 -100 0 0 N
+P 2 0 1 10 0 -100 50 -100 N
+P 2 0 1 10 0 -100 50 0 N
+P 2 0 1 10 0 0 50 0 N
 P 4 0 1 10 -140 -80 -120 -50 -100 -70 -140 -80 F
 P 4 0 1 10 -130 -130 -120 -90 -100 -110 -130 -130 F
 X A 1 0 100 100 D 1 1 0 1 P
@@ -956,16 +934,16 @@ ENDDEF
 #
 # LMZ13608
 #
-DEF LMZ13608 IC 0 40 Y Y 1 F N
+DEF LMZ13608 U 0 40 Y Y 1 F N
 F0 "U" -710 910 60 H V L BNN
 F1 "LMZ13608" -500 900 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -700 -900 700 -900
-P 2 0 1 10 -700 900 -700 -900
-P 2 0 1 10 700 -900 700 900
-P 2 0 1 10 700 900 -700 900
+P 2 0 1 10 -700 -900 700 -900 N
+P 2 0 1 10 -700 900 -700 -900 N
+P 2 0 1 10 700 -900 700 900 N
+P 2 0 1 10 700 900 -700 900 N
 X VIN 1 -900 700 200 R 70 70 0 1 W
 X VOUT 10 900 700 200 L 70 70 0 1 w
 X VOUT 11 900 600 200 L 70 70 0 1 W
@@ -983,16 +961,16 @@ ENDDEF
 #
 # LT3060ITS8-15
 #
-DEF LT3060ITS8-15 IC 0 40 Y Y 1 F N
+DEF LT3060ITS8-15 U 0 40 Y Y 1 F N
 F0 "U" -410 410 60 H V L BNN
 F1 "LT3060ITS8-15" -410 -710 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -400 -600 -400 400
-P 2 0 1 10 400 -600 -400 -600
-P 2 0 1 10 400 -600 400 400
-P 2 0 1 10 400 400 -400 400
+P 2 0 1 10 -400 -600 -400 400 N
+P 2 0 1 10 400 -600 -400 -600 N
+P 2 0 1 10 400 -600 400 400 N
+P 2 0 1 10 400 400 -400 400 N
 X ~SHDN 1 -600 0 200 R 70 70 0 1 P
 X GND 2 -600 -300 200 R 70 70 0 1 W
 X GND 3 -600 -400 200 R 70 70 0 1 W
@@ -1006,19 +984,19 @@ ENDDEF
 #
 # M03LOCK
 #
-DEF M03LOCK IC 0 40 Y Y 1 F N
+DEF M03LOCK JP 0 40 Y Y 1 F N
 F0 "JP" -180 -330 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "M03LOCK" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -100 -200 -100 200
-P 2 0 1 10 -100 -200 150 -200
-P 2 0 1 10 100 -100 50 -100
-P 2 0 1 10 100 0 50 0
-P 2 0 1 10 100 100 50 100
-P 2 0 1 10 150 200 -100 200
-P 2 0 1 10 150 200 150 -200
+P 2 0 1 10 -100 -200 -100 200 N
+P 2 0 1 10 -100 -200 150 -200 N
+P 2 0 1 10 100 -100 50 -100 N
+P 2 0 1 10 100 0 50 0 N
+P 2 0 1 10 100 100 50 100 N
+P 2 0 1 10 150 200 -100 200 N
+P 2 0 1 10 150 200 150 -200 N
 X 1 1 300 -100 200 L 70 1 0 1 P
 X 2 2 300 0 200 L 70 1 0 1 P
 X 3 3 300 100 200 L 70 1 0 1 P
@@ -1027,9 +1005,9 @@ ENDDEF
 #
 # M03X2NO_SILK
 #
-DEF M03X2NO_SILK IC 0 40 Y Y 1 F N
+DEF M03X2NO_SILK J 0 40 Y Y 1 F N
 F0 "J" -210 -310 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "M03X2NO_SILK" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -1051,22 +1029,22 @@ A 70 0 40 -1200 0 1 1 10 N 49 -34 110 0
 A 70 100 40 0 1200 1 1 10 N 110 100 49 134
 A 70 100 40 1200 -1200 1 1 10 N 49 134 49 65
 A 70 100 40 -1200 0 1 1 10 N 49 65 110 100
-P 2 0 1 10 -200 -200 200 -200
-P 2 0 1 10 -200 -100 -200 -200
-P 2 0 1 10 -200 0 -200 -100
-P 2 0 1 10 -200 100 -200 0
-P 2 0 1 10 -200 200 -200 100
-P 2 0 1 10 -110 -100 -200 -100
-P 2 0 1 10 -110 0 -200 0
-P 2 0 1 10 -110 100 -200 100
-P 2 0 1 10 110 -100 200 -100
-P 2 0 1 10 110 0 200 0
-P 2 0 1 10 110 100 200 100
-P 2 0 1 10 200 -200 200 -100
-P 2 0 1 10 200 -100 200 0
-P 2 0 1 10 200 0 200 100
-P 2 0 1 10 200 100 200 200
-P 2 0 1 10 200 200 -200 200
+P 2 0 1 10 -200 -200 200 -200 N
+P 2 0 1 10 -200 -100 -200 -200 N
+P 2 0 1 10 -200 0 -200 -100 N
+P 2 0 1 10 -200 100 -200 0 N
+P 2 0 1 10 -200 200 -200 100 N
+P 2 0 1 10 -110 -100 -200 -100 N
+P 2 0 1 10 -110 0 -200 0 N
+P 2 0 1 10 -110 100 -200 100 N
+P 2 0 1 10 110 -100 200 -100 N
+P 2 0 1 10 110 0 200 0 N
+P 2 0 1 10 110 100 200 100 N
+P 2 0 1 10 200 -200 200 -100 N
+P 2 0 1 10 200 -100 200 0 N
+P 2 0 1 10 200 0 200 100 N
+P 2 0 1 10 200 100 200 200 N
+P 2 0 1 10 200 200 -200 200 N
 X 1 1 -300 100 100 R 1 1 0 1 P
 X 2 2 300 100 100 L 1 1 0 1 P
 X 3 3 -300 0 100 R 1 1 0 1 P
@@ -1078,26 +1056,26 @@ ENDDEF
 #
 # M10LOCK
 #
-DEF M10LOCK IC 0 40 Y Y 1 F N
+DEF M10LOCK JP 0 40 Y Y 1 F N
 F0 "JP" -280 -430 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 0 -800 0 300
-P 2 0 1 10 0 -800 250 -800
-P 2 0 1 10 200 -700 150 -700
-P 2 0 1 10 200 -600 150 -600
-P 2 0 1 10 200 -500 150 -500
-P 2 0 1 10 200 -400 150 -400
-P 2 0 1 10 200 -300 150 -300
-P 2 0 1 10 200 -200 150 -200
-P 2 0 1 10 200 -100 150 -100
-P 2 0 1 10 200 0 150 0
-P 2 0 1 10 200 100 150 100
-P 2 0 1 10 200 200 150 200
-P 2 0 1 10 250 300 0 300
-P 2 0 1 10 250 300 250 -800
+F1 "M10LOCK" 0 0 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 1 10 0 -800 0 300 N
+P 2 0 1 10 0 -800 250 -800 N
+P 2 0 1 10 200 -700 150 -700 N
+P 2 0 1 10 200 -600 150 -600 N
+P 2 0 1 10 200 -500 150 -500 N
+P 2 0 1 10 200 -400 150 -400 N
+P 2 0 1 10 200 -300 150 -300 N
+P 2 0 1 10 200 -200 150 -200 N
+P 2 0 1 10 200 -100 150 -100 N
+P 2 0 1 10 200 0 150 0 N
+P 2 0 1 10 200 100 150 100 N
+P 2 0 1 10 200 200 150 200 N
+P 2 0 1 10 250 300 0 300 N
+P 2 0 1 10 250 300 250 -800 N
 X 1 1 400 -700 200 L 70 1 0 1 P
 X 10 10 400 200 200 L 70 1 0 1 P
 X 2 2 400 -600 200 L 70 1 0 1 P
@@ -1113,7 +1091,7 @@ ENDDEF
 #
 # MA08-1
 #
-DEF MA08-1 IC 0 40 Y Y 1 F N
+DEF MA08-1 SV 0 40 Y Y 1 F N
 F0 "SV" -180 -630 60 H V L BNN
 F1 "MA08-1" 40 -630 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -1121,18 +1099,18 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 T 0 320 -430 50 0 1 1 EMPTY Normal 1 C C
 T 0 320 -430 50 0 1 1 unknown Normal 1 C C
-P 2 0 1 10 -50 -400 -50 500
-P 2 0 1 10 -50 -400 150 -400
-P 2 0 1 10 100 -300 50 -300
-P 2 0 1 10 100 -200 50 -200
-P 2 0 1 10 100 -100 50 -100
-P 2 0 1 10 100 0 50 0
-P 2 0 1 10 100 100 50 100
-P 2 0 1 10 100 200 50 200
-P 2 0 1 10 100 300 50 300
-P 2 0 1 10 100 400 50 400
-P 2 0 1 10 150 500 -50 500
-P 2 0 1 10 150 500 150 -400
+P 2 0 1 10 -50 -400 -50 500 N
+P 2 0 1 10 -50 -400 150 -400 N
+P 2 0 1 10 100 -300 50 -300 N
+P 2 0 1 10 100 -200 50 -200 N
+P 2 0 1 10 100 -100 50 -100 N
+P 2 0 1 10 100 0 50 0 N
+P 2 0 1 10 100 100 50 100 N
+P 2 0 1 10 100 200 50 200 N
+P 2 0 1 10 100 300 50 300 N
+P 2 0 1 10 100 400 50 400 N
+P 2 0 1 10 150 500 -50 500 N
+P 2 0 1 10 150 500 150 -400 N
 X 1 1 300 -300 200 L 70 1 0 1 P
 X 2 2 300 -200 200 L 70 1 0 1 P
 X 3 3 300 -100 200 L 70 1 0 1 P
@@ -1146,34 +1124,34 @@ ENDDEF
 #
 # MA08-2
 #
-DEF MA08-2 IC 0 40 Y Y 1 F N
+DEF MA08-2 SV 0 40 Y Y 1 F N
 F0 "SV" -180 -630 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "MA08-2" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 T 0 320 -430 50 0 1 1 EMPTY Normal 1 C C
 T 0 320 -430 50 0 1 1 unknown Normal 1 C C
-P 2 0 1 10 -150 -400 -150 500
-P 2 0 1 10 -150 -400 150 -400
-P 2 0 1 10 -50 -300 -100 -300
-P 2 0 1 10 -50 -200 -100 -200
-P 2 0 1 10 -50 -100 -100 -100
-P 2 0 1 10 -50 0 -100 0
-P 2 0 1 10 -50 100 -100 100
-P 2 0 1 10 -50 200 -100 200
-P 2 0 1 10 -50 300 -100 300
-P 2 0 1 10 -50 400 -100 400
-P 2 0 1 10 100 -300 50 -300
-P 2 0 1 10 100 -200 50 -200
-P 2 0 1 10 100 -100 50 -100
-P 2 0 1 10 100 0 50 0
-P 2 0 1 10 100 100 50 100
-P 2 0 1 10 100 200 50 200
-P 2 0 1 10 100 300 50 300
-P 2 0 1 10 100 400 50 400
-P 2 0 1 10 150 500 -150 500
-P 2 0 1 10 150 500 150 -400
+P 2 0 1 10 -150 -400 -150 500 N
+P 2 0 1 10 -150 -400 150 -400 N
+P 2 0 1 10 -50 -300 -100 -300 N
+P 2 0 1 10 -50 -200 -100 -200 N
+P 2 0 1 10 -50 -100 -100 -100 N
+P 2 0 1 10 -50 0 -100 0 N
+P 2 0 1 10 -50 100 -100 100 N
+P 2 0 1 10 -50 200 -100 200 N
+P 2 0 1 10 -50 300 -100 300 N
+P 2 0 1 10 -50 400 -100 400 N
+P 2 0 1 10 100 -300 50 -300 N
+P 2 0 1 10 100 -200 50 -200 N
+P 2 0 1 10 100 -100 50 -100 N
+P 2 0 1 10 100 0 50 0 N
+P 2 0 1 10 100 100 50 100 N
+P 2 0 1 10 100 200 50 200 N
+P 2 0 1 10 100 300 50 300 N
+P 2 0 1 10 100 400 50 400 N
+P 2 0 1 10 150 500 -150 500 N
+P 2 0 1 10 150 500 150 -400 N
 X 1 1 300 -300 200 L 70 1 0 1 P
 X 10 10 -300 100 200 R 70 1 0 1 P
 X 11 11 300 200 200 L 70 1 0 1 P
@@ -1195,9 +1173,9 @@ ENDDEF
 #
 # MC74HC1G14DTT1G
 #
-DEF MC74HC1G14DTT1G IC 0 40 Y Y 1 F N
+DEF MC74HC1G14DTT1G U 0 40 Y Y 1 F N
 F0 "U" -530 -730 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "MC74HC1G14DTT1G" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -1206,10 +1184,10 @@ T 0 -720 430 50 0 1 1 71J5593 Normal 1 C C
 T 0 -720 430 50 0 1 1 MC74HC1G14DTT1G Normal 1 C C
 T 0 -720 430 50 0 1 1 ON~SEMICONDUCTOR Normal 1 C C
 T 0 -720 430 50 0 1 1 SOT-23-5 Normal 1 C C
-P 2 0 1 10 -500 -600 -500 400
-P 2 0 1 10 -500 400 500 400
-P 2 0 1 10 500 -600 -500 -600
-P 2 0 1 10 500 400 500 -600
+P 2 0 1 10 -500 -600 -500 400 N
+P 2 0 1 10 -500 400 500 400 N
+P 2 0 1 10 500 -600 -500 -600 N
+P 2 0 1 10 500 400 500 -600 N
 X NC 1 -700 -200 200 R 70 70 0 1 P
 X IN_A 2 -700 0 200 R 70 70 0 1 P
 X GND 3 -700 -400 200 R 70 70 0 1 P
@@ -1220,7 +1198,7 @@ ENDDEF
 #
 # MCP79412-I_SN
 #
-DEF MCP79412-I_SN IC 0 40 Y Y 1 F N
+DEF MCP79412-I_SN U 0 40 Y Y 1 F N
 F0 "U" -430 -730 60 H V L BNN
 F1 "MCP79412-I_SN" -420 430 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -1231,10 +1209,10 @@ T 0 -620 430 50 0 1 1 94T5863 Normal 1 C C
 T 0 -620 430 50 0 1 1 MCP79412-I_SN Normal 1 C C
 T 0 -620 430 50 0 1 1 Microchip Normal 1 C C
 T 0 -620 430 50 0 1 1 SOIC-8 Normal 1 C C
-P 2 0 1 10 -400 -600 -400 400
-P 2 0 1 10 -400 400 400 400
-P 2 0 1 10 400 -600 -400 -600
-P 2 0 1 10 400 400 400 -600
+P 2 0 1 10 -400 -600 -400 400 N
+P 2 0 1 10 -400 400 400 400 N
+P 2 0 1 10 400 -600 -400 -600 N
+P 2 0 1 10 400 400 400 -600 N
 X X1 1 -600 -100 200 R 70 70 0 1 P
 X X2 2 -600 -200 200 R 70 70 0 1 P
 X VBAT 3 -600 100 200 R 70 70 0 1 W
@@ -1258,10 +1236,10 @@ T 0 -720 360 50 0 1 1 1.30470 Normal 1 C C
 T 0 -720 360 50 0 1 1 2253682 Normal 1 C C
 T 0 -720 360 50 0 1 1 5.10 Normal 1 C C
 T 0 -720 360 50 0 1 1 557-1562-ND Normal 1 C C
-P 2 0 1 10 -500 -150 550 -150
-P 2 0 1 10 -500 350 -500 -150
-P 2 0 1 10 550 -150 550 350
-P 2 0 1 10 550 350 -500 350
+P 2 0 1 10 -500 -150 550 -150 N
+P 2 0 1 10 -500 350 -500 -150 N
+P 2 0 1 10 550 -150 550 350 N
+P 2 0 1 10 550 350 -500 350 N
 X ~S 1 -700 250 200 R 70 70 0 1 P
 X DQ1 2 -700 150 200 R 70 70 0 1 P
 X ~W/VPP/DQ2 3 -700 50 200 R 70 70 0 1 P
@@ -1275,9 +1253,9 @@ ENDDEF
 #
 # OSHW-LOGOL-COPPER
 #
-DEF OSHW-LOGOL-COPPER IC 0 40 Y Y 1 F N
+DEF OSHW-LOGOL-COPPER LOGO 0 40 Y Y 1 F N
 F0 "LOGO" -460 -460 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "OSHW-LOGOL-COPPER" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -1861,19 +1839,19 @@ ENDDEF
 #
 # POWER_JACKSMD
 #
-DEF POWER_JACKSMD IC 0 40 Y Y 1 F N
+DEF POWER_JACKSMD JP 0 40 Y Y 1 F N
 F0 "JP" -410 330 60 H V L BNN
 F1 "POWER_JACKSMD" -410 -30 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 S -400 270 0 330 0 1 10 f
-P 2 0 1 10 -300 200 -400 100
-P 2 0 1 10 -200 100 -300 200
-P 2 0 1 10 -100 100 -200 100
-P 2 0 1 10 -100 200 -100 100
-P 2 0 1 10 0 100 -100 100
-P 2 0 1 10 0 200 -100 200
+P 2 0 1 10 -300 200 -400 100 N
+P 2 0 1 10 -200 100 -300 200 N
+P 2 0 1 10 -100 100 -200 100 N
+P 2 0 1 10 -100 200 -100 100 N
+P 2 0 1 10 0 100 -100 100 N
+P 2 0 1 10 0 200 -100 200 N
 X PWR 1 100 300 100 L 1 1 0 1 W
 X GND 2 100 100 100 L 1 1 0 1 W
 X GNDBREAK 3 100 200 100 L 1 1 0 1 W
@@ -1888,29 +1866,29 @@ F1 "PWR_18V" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X PWR_18V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
 # R-EU_R0402
 #
-DEF R-EU_R0402 IC 0 40 Y Y 1 F N
+DEF R-EU_R0402 R 0 40 Y Y 1 F N
 F0 "R" -150 50 60 H V L BNN
 F1 "R-EU_R0402" 150 -150 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -100 30 -100 -40
-P 2 0 1 10 -100 30 100 30
-P 2 0 1 10 -100 40 -100 -30
-P 2 0 1 10 -100 40 100 40
-P 2 0 1 10 100 -40 -100 -40
-P 2 0 1 10 100 -30 -100 -30
-P 2 0 1 10 100 30 100 -40
-P 2 0 1 10 100 40 100 -30
+P 2 0 1 10 -100 30 -100 -40 N
+P 2 0 1 10 -100 30 100 30 N
+P 2 0 1 10 -100 40 -100 -30 N
+P 2 0 1 10 -100 40 100 40 N
+P 2 0 1 10 100 -40 -100 -40 N
+P 2 0 1 10 100 -30 -100 -30 N
+P 2 0 1 10 100 30 100 -40 N
+P 2 0 1 10 100 40 100 -30 N
 X 1 1 -200 0 100 R 1 1 0 1 P
 X 2 2 200 0 100 L 1 1 0 1 P
 ENDDRAW
@@ -1918,16 +1896,16 @@ ENDDEF
 #
 # R-EU_R0603
 #
-DEF R-EU_R0603 IC 0 40 Y Y 1 F N
+DEF R-EU_R0603 R 0 40 Y Y 1 F N
 F0 "R" -110 370 60 H V L BNN
 F1 "R-EU_R0603" 70 370 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -100 40 -100 -30
-P 2 0 1 10 -100 40 100 40
-P 2 0 1 10 100 -30 -100 -30
-P 2 0 1 10 100 40 100 -30
+P 2 0 1 10 -100 40 -100 -30 N
+P 2 0 1 10 -100 40 100 40 N
+P 2 0 1 10 100 -30 -100 -30 N
+P 2 0 1 10 100 40 100 -30 N
 X 1 1 -200 0 100 R 1 1 0 1 P
 X 2 2 200 0 100 L 1 1 0 1 P
 ENDDRAW
@@ -1941,10 +1919,10 @@ F1 "RCLAMP0502ASC-89" -400 -330 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -400 -200 400 -200
-P 2 0 1 10 -400 200 -400 -200
-P 2 0 1 10 400 -200 400 200
-P 2 0 1 10 400 200 -400 200
+P 2 0 1 10 -400 -200 400 -200 N
+P 2 0 1 10 -400 200 -400 -200 N
+P 2 0 1 10 400 -200 400 200 N
+P 2 0 1 10 400 200 -400 200 N
 X OUT1 1 500 100 100 L 70 70 0 1 O
 X GND 2 500 0 100 L 70 70 0 1 W
 X OUT2 3 500 -100 100 L 70 70 0 1 O
@@ -1956,16 +1934,16 @@ ENDDEF
 #
 # STM32-SWD
 #
-DEF STM32-SWD IC 0 40 Y Y 1 F N
+DEF STM32-SWD J 0 40 Y Y 1 F N
 F0 "J" -150 430 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "STM32-SWD" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -300 -400 200 -400
-P 2 0 1 10 -300 300 -300 -400
-P 2 0 1 10 200 -400 200 300
-P 2 0 1 10 200 300 -300 300
+P 2 0 1 10 -300 -400 200 -400 N
+P 2 0 1 10 -300 300 -300 -400 N
+P 2 0 1 10 200 -400 200 300 N
+P 2 0 1 10 200 300 -300 300 N
 X VCC 1 400 -300 200 L 70 70 0 1 W
 X SWDCLK 2 400 -200 200 L 70 70 0 1 P
 X GND 3 400 -100 200 L 70 70 0 1 W
@@ -1975,278 +1953,245 @@ X SWO 6 400 200 200 L 70 70 0 1 P
 ENDDRAW
 ENDDEF
 #
-# STM32F429BIT6_1
-#
-DEF STM32F429BIT6_1 IC 0 40 Y Y 1 F N
-F0 "U" -1510 -3210 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-T 0 -1620 3210 50 0 1 1 2469581 Normal 1 C C
-P 2 0 1 10 -1500 -3100 1400 -3100
-P 2 0 1 10 -1500 3200 -1500 -3100
-P 2 0 1 10 1400 -3100 1400 3200
-P 2 0 1 10 1400 3200 -1500 3200
-X PC15 10 -1600 -2800 100 R 70 70 0 1 P
-X PB12 104 -1600 1500 100 R 70 70 0 1 P
-X SPI2_SCK/PB13 105 -1600 1400 100 R 70 70 0 1 P
-X SPI2_MISO/PB14 106 -1600 1300 100 R 70 70 0 1 P
-X SPI2_MOSI/PB15 107 -1600 1200 100 R 70 70 0 1 P
-X PJ6 118 1500 -500 100 L 70 70 0 1 P
-X PJ7 119 1500 -600 100 L 70 70 0 1 P
-X PJ8 120 1500 -700 100 L 70 70 0 1 P
-X PJ9 121 1500 -800 100 L 70 70 0 1 P
-X PJ10 122 1500 -900 100 L 70 70 0 1 P
-X PJ11 123 1500 -1000 100 L 70 70 0 1 P
-X PK0 126 1500 -1700 100 L 70 70 0 1 P
-X PK1 127 1500 -1800 100 L 70 70 0 1 P
-X PK2 128 1500 -1900 100 L 70 70 0 1 P
-X PI11 13 1500 800 100 L 70 70 0 1 P
-X FMC_INT2/PG6 133 1500 2200 100 L 70 70 0 1 P
-X FMC_INT3/PG7 134 1500 2100 100 L 70 70 0 1 P
-X PC6 138 -1600 -2400 100 R 70 70 0 1 P
-X PC7 139 -1600 -2500 100 R 70 70 0 1 P
-X SDIO_D0/PC8 140 -1600 100 100 R 70 70 0 1 P
-X SDIO_D1/PC9 141 -1600 0 100 R 70 70 0 1 P
-X PA8 142 -1600 2200 100 R 70 70 0 1 P
-X USART1_TX/PA9 143 -1600 2100 100 R 70 70 0 1 P
-X USART1_RX/PA10 144 -1600 2000 100 R 70 70 0 1 P
-X USART1_CTS/PA11 145 -1600 1800 100 R 70 70 0 1 P
-X USART1_RTS/PA12 146 -1600 1900 100 R 70 70 0 1 P
-X SDIO_D2/PC10 161 -1600 -100 100 R 70 70 0 1 P
-X SDIO_D3/PC11 162 -1600 -200 100 R 70 70 0 1 P
-X SDIO_CK/PC12 163 -1600 200 100 R 70 70 0 1 P
-X SDIO_CMD/PD2 166 -1600 300 100 R 70 70 0 1 P
-X PJ12 174 1500 -1100 100 L 70 70 0 1 P
-X PJ13 175 1500 -1200 100 L 70 70 0 1 P
-X PJ14 176 1500 -1300 100 L 70 70 0 1 P
-X PJ15 177 1500 -1400 100 L 70 70 0 1 P
-X FMC_NE2/FMC_NCE3/PG9 178 1500 2000 100 L 70 70 0 1 P
-X FMC_NCE4_1/FMC_NE3/PG10 179 1500 1900 100 L 70 70 0 1 P
-X FMC_NCE4_2/PG11 180 1500 1800 100 L 70 70 0 1 P
-X FMC_NE4/PG12 181 1500 1700 100 L 70 70 0 1 P
-X PK3 186 1500 -2000 100 L 70 70 0 1 P
-X PK4 187 1500 -2100 100 L 70 70 0 1 P
-X PK5 188 1500 -2200 100 L 70 70 0 1 P
-X PK6 189 1500 -2300 100 L 70 70 0 1 P
-X PI12 19 1500 700 100 L 70 70 0 1 P
-X PK7 190 1500 -2400 100 L 70 70 0 1 P
-X PB8/I2C1_SCL 198 -1600 -1400 100 R 70 70 0 1 P
-X PB9/I2C1_SDA 199 -1600 -1500 100 R 70 70 0 1 P
-X PI13 20 1500 600 100 L 70 70 0 1 P
-X PI14 21 1500 500 100 L 70 70 0 1 P
-X FMC_NIORD/PF6 27 1500 2900 100 L 70 70 0 1 P
-X FMC_NREG/PF7 28 1500 2800 100 L 70 70 0 1 P
-X FMC_NIOWR/PF8 29 1500 2700 100 L 70 70 0 1 P
-X FMC_CD/PF9 30 1500 2600 100 L 70 70 0 1 P
-X FMC_INTR/PF10 31 1500 2500 100 L 70 70 0 1 P
-X PC1 36 -1600 -2100 100 R 70 70 0 1 P
-X USART2_CTS/WKUP/PA0 43 -1600 2500 100 R 70 70 0 1 P
-X USART2_RTS/PA1 44 -1600 2600 100 R 70 70 0 1 P
-X USART2_TX/PA2 45 -1600 2800 100 R 70 70 0 1 P
-X FMC_SDCKE0/PH2 46 1500 1400 100 L 70 70 0 1 P
-X PH3 47 -1600 -700 100 R 70 70 0 1 P
-X I2C2_SCL/PH4 48 -1600 -600 100 R 70 70 0 1 P
-X I2C2_SDA/PH5 49 -1600 -500 100 R 70 70 0 1 P
-X USART2_RX/PA3 50 -1600 2700 100 R 70 70 0 1 P
-X PA4 53 -1600 2900 100 R 70 70 0 1 P
-X SPI1_SCK/PA5 54 -1600 800 100 R 70 70 0 1 P
-X SPI1_MISO/PA6 55 -1600 700 100 R 70 70 0 1 P
-X SPI1_MOSI/PA7 56 -1600 600 100 R 70 70 0 1 P
-X PC4 57 -1600 -2200 100 R 70 70 0 1 P
-X PC5 58 -1600 -2300 100 R 70 70 0 1 P
-X PB0 61 -1600 900 100 R 70 70 0 1 P
-X PB1 62 -1600 -1300 100 R 70 70 0 1 P
-X PI15 64 1500 400 100 L 70 70 0 1 P
-X PJ0 65 1500 100 100 L 70 70 0 1 P
-X PJ1 66 1500 0 100 L 70 70 0 1 P
-X PJ2 67 1500 -100 100 L 70 70 0 1 P
-X PJ3 68 1500 -200 100 L 70 70 0 1 P
-X PJ4 69 1500 -300 100 L 70 70 0 1 P
-X PI8 7 1500 900 100 L 70 70 0 1 P
-X PC13 8 -1600 -2600 100 R 70 70 0 1 P
-X PC14 9 -1600 -2700 100 R 70 70 0 1 P
-X PB10 90 -1600 -1600 100 R 70 70 0 1 P
-X PB11 91 -1600 -1700 100 R 70 70 0 1 P
-X PJ5 95 1500 -400 100 L 70 70 0 1 P
-X FMC_SDNE1/PH6 96 1500 1300 100 L 70 70 0 1 P
-X FMC_SDCKE1/PH7 97 1500 1200 100 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# STM32F429BIT6_2
-#
-DEF STM32F429BIT6_2 IC 0 40 Y Y 1 F N
-F0 "U" -1110 -1010 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -1100 -900 -1100 800
-P 2 0 1 10 1000 -900 -1100 -900
-P 2 0 1 10 1000 -900 1000 800
-P 2 0 1 10 1000 800 -1100 800
-X PA13/JTMS-SWDIO 147 1100 100 100 L 70 70 0 1 P
-X PA14/JTCK-SWCLK 159 1100 200 100 L 70 70 0 1 P
-X PA15/JTDI 160 1100 -200 100 L 70 70 0 1 P
-X PB3/JTDO/TRACESWO 192 1100 -400 100 L 70 70 0 1 P
-X PB4/NJTRST 193 1100 -300 100 L 70 70 0 1 P
-X BOOT0 197 -1200 -700 100 R 70 70 0 1 P
-X PDR_ON 203 -1200 400 100 R 70 70 0 1 P
-X OSC_IN/PH0 32 -1200 0 100 R 70 70 0 1 P
-X OSC_OUT/PH1 33 -1200 -100 100 R 70 70 0 1 P
-X NRST 34 1100 300 100 L 70 70 0 1 P
-X VREF+ 41 -1200 600 100 R 70 70 0 1 W
-X PB2/BOOT1 63 -1200 -500 100 R 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# STM32F429BIT6_3
-#
-DEF STM32F429BIT6_3 IC 0 40 Y Y 1 F N
-F0 "U" -710 -1610 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -700 1500 -700 -1400
-P 2 0 1 10 700 -1400 -700 -1400
-P 2 0 1 10 700 -1400 700 1500
-P 2 0 1 10 700 1500 -700 1500
-X VDD 103 -800 -100 100 R 70 70 0 1 W
-X VSS 114 800 -300 100 L 70 70 0 1 W
-X VDD 115 -800 -300 100 R 70 70 0 1 W
-X VDD 124 -800 -400 100 R 70 70 0 1 W
-X VSS 125 800 -400 100 L 70 70 0 1 W
-X VSS 136 800 -500 100 L 70 70 0 1 W
-X VDD 137 -800 -500 100 R 70 70 0 1 W
-X VSS 14 800 700 100 L 70 70 0 1 W
-X VCAP2 148 100 1600 100 D 70 70 0 1 P
-X VSS 149 800 -600 100 L 70 70 0 1 W
-X VDD 15 -800 800 100 R 70 70 0 1 W
-X VDD 150 -800 -600 100 R 70 70 0 1 W
-X VDD 158 -800 -1100 100 R 70 70 0 1 W
-X VSS 170 800 -800 100 L 70 70 0 1 W
-X VDD 171 -800 -1000 100 R 70 70 0 1 W
-X VSS 184 800 -900 100 L 70 70 0 1 W
-X VDD 185 -800 -900 100 R 70 70 0 1 W
-X VSS 202 800 -1000 100 L 70 70 0 1 W
-X VDD 204 -800 -800 100 R 70 70 0 1 W
-X VSS 25 800 600 100 L 70 70 0 1 W
-X VDD 26 -800 700 100 R 70 70 0 1 W
-X VDD 39 -800 600 100 R 70 70 0 1 W
-X VSSA 40 800 1000 100 L 70 70 0 1 W
-X VDDA 42 -800 1000 100 R 70 70 0 1 W
-X VSS 51 800 500 100 L 70 70 0 1 W
-X VDD 52 -800 500 100 R 70 70 0 1 W
-X VDD 59 -800 300 100 R 70 70 0 1 W
-X VBAT 6 -800 1200 100 R 70 70 0 1 W
-X VSS 60 800 300 100 L 70 70 0 1 W
-X VSS 72 800 200 100 L 70 70 0 1 W
-X VDD 73 -800 200 100 R 70 70 0 1 W
-X VSS 82 800 100 100 L 70 70 0 1 W
-X VDD 83 -800 100 100 R 70 70 0 1 W
-X VCAP1 92 -100 1600 100 D 70 70 0 1 P
-X VSS 93 800 0 100 L 70 70 0 1 W
-X VDD 94 -800 0 100 R 70 70 0 1 W
-ENDDRAW
-ENDDEF
-#
-# STM32F429BIT6_4
-#
-DEF STM32F429BIT6_4 IC 0 40 Y Y 1 F N
-F0 "U" -1210 -2810 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -1200 2400 -1200 -2700
-P 2 0 1 10 -1200 2400 1000 2400
-P 2 0 1 10 1000 -2700 -1200 -2700
-P 2 0 1 10 1000 2400 1000 -2700
-X FMC_A23/PE2 1 -1300 -200 100 R 70 70 0 1 P
-X PH10/FMC_D18 100 1100 300 100 L 70 70 0 1 P
-X PH11/FMC_D19 101 1100 200 100 L 70 70 0 1 P
-X PH12/FMC_D20 102 1100 100 100 L 70 70 0 1 P
-X PD8/FMC_D13 108 1100 800 100 L 70 70 0 1 P
-X PD9/FMC_D14 109 1100 700 100 L 70 70 0 1 P
-X PI9/FMC_D30 11 1100 -900 100 L 70 70 0 1 P
-X PD10/FMC_D15 110 1100 600 100 L 70 70 0 1 P
-X FMC_A16/PD11 111 -1300 500 100 R 70 70 0 1 P
-X FMC_A17/PD12 112 -1300 400 100 R 70 70 0 1 P
-X FMC_A18/PD13 113 -1300 300 100 R 70 70 0 1 P
-X PD14/FMC_D0 116 1100 2100 100 L 70 70 0 1 P
-X PD15/FMC_D1 117 1100 2000 100 L 70 70 0 1 P
-X PI10/FMC_D31 12 1100 -1000 100 L 70 70 0 1 P
-X FMC_A12/PG2 129 -1300 900 100 R 70 70 0 1 P
-X FMC_A13/PG3 130 -1300 800 100 R 70 70 0 1 P
-X FMC_A14/PG4 131 -1300 700 100 R 70 70 0 1 P
-X FMC_A15/PG5 132 -1300 600 100 R 70 70 0 1 P
-X PG8/FMC_SDCLK 135 1100 -1300 100 L 70 70 0 1 P
-X PH13/FMC_D21 151 1100 0 100 L 70 70 0 1 P
-X PH14/FMC_D22 152 1100 -100 100 L 70 70 0 1 P
-X PH15/FMC_D23 153 1100 -200 100 L 70 70 0 1 P
-X PI0/FMC_D24 154 1100 -300 100 L 70 70 0 1 P
-X PI1/FMC_D25 155 1100 -400 100 L 70 70 0 1 P
-X PI2/FMC_D26 156 1100 -500 100 L 70 70 0 1 P
-X PI3/FMC_D27 157 1100 -600 100 L 70 70 0 1 P
-X FMC_A0/PF0 16 -1300 2100 100 R 70 70 0 1 P
-X PD0/FMC_D2 164 1100 1900 100 L 70 70 0 1 P
-X PD1/FMC_D3 165 1100 1800 100 L 70 70 0 1 P
-X FMC_CLK/PD3 167 -1300 -1600 100 R 70 70 0 1 P
-X FMC_NOE/PD4 168 -1300 -1700 100 R 70 70 0 1 P
-X FMC_NWE/PD5 169 -1300 -1800 100 R 70 70 0 1 P
-X FMC_A1/PF1 17 -1300 2000 100 R 70 70 0 1 P
-X FMC_NWAIT/PD6 172 -1300 -1900 100 R 70 70 0 1 P
-X FMC_NE1/PD7 173 -1300 -2000 100 R 70 70 0 1 P
-X FMC_A2/PF2 18 -1300 1900 100 R 70 70 0 1 P
-X FMC_A24/PG13 182 -1300 -300 100 R 70 70 0 1 P
-X FMC_A25/PG14 183 -1300 -400 100 R 70 70 0 1 P
-X PG15/FMC_SDNCAS 191 1100 -2200 100 L 70 70 0 1 P
-X PB5/FMC_SDCKE1 194 1100 -2000 100 L 70 70 0 1 P
-X PB6/FMC_SDNE1 195 1100 -1700 100 L 70 70 0 1 P
-X FMC_NL/PB7 196 -1300 -1300 100 R 70 70 0 1 P
-X FMC_A19/PE3 2 -1300 200 100 R 70 70 0 1 P
-X FMC_NBL0/PE0 200 -1300 -700 100 R 70 70 0 1 P
-X FMC_NBL1/PE1 201 -1300 -800 100 R 70 70 0 1 P
-X FMC_NBL2/PI4 205 -1300 -900 100 R 70 70 0 1 P
-X FMC_NBL3/PI5 206 -1300 -1000 100 R 70 70 0 1 P
-X PI6/FMC_D28 207 1100 -700 100 L 70 70 0 1 P
-X PI7/FMC_D29 208 1100 -800 100 L 70 70 0 1 P
-X FMC_A3/PF3 22 -1300 1800 100 R 70 70 0 1 P
-X FMC_A4/PF4 23 -1300 1700 100 R 70 70 0 1 P
-X FMC_A5/PF5 24 -1300 1600 100 R 70 70 0 1 P
-X FMC_A20/PE4 3 -1300 100 100 R 70 70 0 1 P
-X PC0/FMC_SDNWE 35 1100 -1400 100 L 70 70 0 1 P
-X PC2/FMC_SDNE0 37 1100 -1600 100 L 70 70 0 1 P
-X PC3/FMC_SDCKE0 38 1100 -1900 100 L 70 70 0 1 P
-X FMC_A21/PE5 4 -1300 0 100 R 70 70 0 1 P
-X FMC_A22/PE6 5 -1300 -100 100 R 70 70 0 1 P
-X PF11/FMC_SDNRAS 70 1100 -2300 100 L 70 70 0 1 P
-X FMC_A6/PF12 71 -1300 1500 100 R 70 70 0 1 P
-X FMC_A7/PF13 74 -1300 1400 100 R 70 70 0 1 P
-X FMC_A8/PF14 75 -1300 1300 100 R 70 70 0 1 P
-X FMC_A9/PF15 76 -1300 1200 100 R 70 70 0 1 P
-X FMC_A10/PG0 77 -1300 1100 100 R 70 70 0 1 P
-X FMC_A11/PG1 78 -1300 1000 100 R 70 70 0 1 P
-X PE7/FMC_D4 79 1100 1700 100 L 70 70 0 1 P
-X PE8/FMC_D5 80 1100 1600 100 L 70 70 0 1 P
-X PE9/FMC_D6 81 1100 1500 100 L 70 70 0 1 P
-X PE10/FMC_D7 84 1100 1400 100 L 70 70 0 1 P
-X PE11/FMC_D8 85 1100 1300 100 L 70 70 0 1 P
-X PE12/FMC_D9 86 1100 1200 100 L 70 70 0 1 P
-X PE13/FMC_D10 87 1100 1100 100 L 70 70 0 1 P
-X PE14/FMC_D11 88 1100 1000 100 L 70 70 0 1 P
-X PE15/FMC_D12 89 1100 900 100 L 70 70 0 1 P
-X PH8/FMC_D16 98 1100 500 100 L 70 70 0 1 P
-X PH9/FMC_D17 99 1100 400 100 L 70 70 0 1 P
+# STM32F429BIT6
+#
+DEF STM32F429BIT6 U 0 40 Y Y 4 L N
+F0 "U" 0 100 50 H V C CNN
+F1 "STM32F429BIT6" 0 -100 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+T 0 -1620 3110 50 0 1 1 2469581 Normal 1 C C
+P 2 1 1 10 -1500 -3200 1400 -3200 N
+P 2 1 1 10 -1500 3100 -1500 -3200 N
+P 2 1 1 10 1400 -3200 1400 3100 N
+P 2 1 1 10 1400 3100 -1500 3100 N
+P 2 2 1 10 -1100 -900 -1100 800 N
+P 2 2 1 10 1000 -900 -1100 -900 N
+P 2 2 1 10 1000 -900 1000 800 N
+P 2 2 1 10 1000 800 -1100 800 N
+P 2 3 1 10 -700 1400 -700 -1500 N
+P 2 3 1 10 700 -1500 -700 -1500 N
+P 2 3 1 10 700 -1500 700 1400 N
+P 2 3 1 10 700 1400 -700 1400 N
+P 2 4 1 10 -1100 2400 -1100 -2700 N
+P 2 4 1 10 -1100 2400 1100 2400 N
+P 2 4 1 10 1100 -2700 -1100 -2700 N
+P 2 4 1 10 1100 2400 1100 -2700 N
+X PC15 10 -1600 -2900 100 R 70 70 1 1 P
+X PB12 104 -1600 1400 100 R 70 70 1 1 P
+X SPI2_SCK/PB13 105 -1600 1300 100 R 70 70 1 1 P
+X SPI2_MISO/PB14 106 -1600 1200 100 R 70 70 1 1 P
+X SPI2_MOSI/PB15 107 -1600 1100 100 R 70 70 1 1 P
+X PJ6 118 1500 -600 100 L 70 70 1 1 P
+X PJ7 119 1500 -700 100 L 70 70 1 1 P
+X PJ8 120 1500 -800 100 L 70 70 1 1 P
+X PJ9 121 1500 -900 100 L 70 70 1 1 P
+X PJ10 122 1500 -1000 100 L 70 70 1 1 P
+X PJ11 123 1500 -1100 100 L 70 70 1 1 P
+X PK0 126 1500 -1800 100 L 70 70 1 1 P
+X PK1 127 1500 -1900 100 L 70 70 1 1 P
+X PK2 128 1500 -2000 100 L 70 70 1 1 P
+X PI11 13 1500 700 100 L 70 70 1 1 P
+X FMC_INT2/PG6 133 1500 2100 100 L 70 70 1 1 P
+X FMC_INT3/PG7 134 1500 2000 100 L 70 70 1 1 P
+X PC6 138 -1600 -2500 100 R 70 70 1 1 P
+X PC7 139 -1600 -2600 100 R 70 70 1 1 P
+X SDIO_D0/PC8 140 -1600 0 100 R 70 70 1 1 P
+X SDIO_D1/PC9 141 -1600 -100 100 R 70 70 1 1 P
+X PA8 142 -1600 2100 100 R 70 70 1 1 P
+X USART1_TX/PA9 143 -1600 2000 100 R 70 70 1 1 P
+X USART1_RX/PA10 144 -1600 1900 100 R 70 70 1 1 P
+X USART1_CTS/PA11 145 -1600 1700 100 R 70 70 1 1 P
+X USART1_RTS/PA12 146 -1600 1800 100 R 70 70 1 1 P
+X SDIO_D2/PC10 161 -1600 -200 100 R 70 70 1 1 P
+X SDIO_D3/PC11 162 -1600 -300 100 R 70 70 1 1 P
+X SDIO_CK/PC12 163 -1600 100 100 R 70 70 1 1 P
+X SDIO_CMD/PD2 166 -1600 200 100 R 70 70 1 1 P
+X PJ12 174 1500 -1200 100 L 70 70 1 1 P
+X PJ13 175 1500 -1300 100 L 70 70 1 1 P
+X PJ14 176 1500 -1400 100 L 70 70 1 1 P
+X PJ15 177 1500 -1500 100 L 70 70 1 1 P
+X FMC_NE2/FMC_NCE3/PG9 178 1500 1900 100 L 70 70 1 1 P
+X FMC_NCE4_1/FMC_NE3/PG10 179 1500 1800 100 L 70 70 1 1 P
+X FMC_NCE4_2/PG11 180 1500 1700 100 L 70 70 1 1 P
+X FMC_NE4/PG12 181 1500 1600 100 L 70 70 1 1 P
+X PK3 186 1500 -2100 100 L 70 70 1 1 P
+X PK4 187 1500 -2200 100 L 70 70 1 1 P
+X PK5 188 1500 -2300 100 L 70 70 1 1 P
+X PK6 189 1500 -2400 100 L 70 70 1 1 P
+X PI12 19 1500 600 100 L 70 70 1 1 P
+X PK7 190 1500 -2500 100 L 70 70 1 1 P
+X PB8/I2C1_SCL 198 -1600 -1500 100 R 70 70 1 1 P
+X PB9/I2C1_SDA 199 -1600 -1600 100 R 70 70 1 1 P
+X PI13 20 1500 500 100 L 70 70 1 1 P
+X PI14 21 1500 400 100 L 70 70 1 1 P
+X FMC_NIORD/PF6 27 1500 2800 100 L 70 70 1 1 P
+X FMC_NREG/PF7 28 1500 2700 100 L 70 70 1 1 P
+X FMC_NIOWR/PF8 29 1500 2600 100 L 70 70 1 1 P
+X FMC_CD/PF9 30 1500 2500 100 L 70 70 1 1 P
+X FMC_INTR/PF10 31 1500 2400 100 L 70 70 1 1 P
+X PC1 36 -1600 -2200 100 R 70 70 1 1 P
+X USART2_CTS/WKUP/PA0 43 -1600 2400 100 R 70 70 1 1 P
+X USART2_RTS/PA1 44 -1600 2500 100 R 70 70 1 1 P
+X USART2_TX/PA2 45 -1600 2700 100 R 70 70 1 1 P
+X FMC_SDCKE0/PH2 46 1500 1300 100 L 70 70 1 1 P
+X PH3 47 -1600 -800 100 R 70 70 1 1 P
+X I2C2_SCL/PH4 48 -1600 -700 100 R 70 70 1 1 P
+X I2C2_SDA/PH5 49 -1600 -600 100 R 70 70 1 1 P
+X USART2_RX/PA3 50 -1600 2600 100 R 70 70 1 1 P
+X PA4 53 -1600 2800 100 R 70 70 1 1 P
+X SPI1_SCK/PA5 54 -1600 700 100 R 70 70 1 1 P
+X SPI1_MISO/PA6 55 -1600 600 100 R 70 70 1 1 P
+X SPI1_MOSI/PA7 56 -1600 500 100 R 70 70 1 1 P
+X PC4 57 -1600 -2300 100 R 70 70 1 1 P
+X PC5 58 -1600 -2400 100 R 70 70 1 1 P
+X PB0 61 -1600 800 100 R 70 70 1 1 P
+X PB1 62 -1600 -1400 100 R 70 70 1 1 P
+X PI15 64 1500 300 100 L 70 70 1 1 P
+X PJ0 65 1500 0 100 L 70 70 1 1 P
+X PJ1 66 1500 -100 100 L 70 70 1 1 P
+X PJ2 67 1500 -200 100 L 70 70 1 1 P
+X PJ3 68 1500 -300 100 L 70 70 1 1 P
+X PJ4 69 1500 -400 100 L 70 70 1 1 P
+X PI8 7 1500 800 100 L 70 70 1 1 P
+X PC13 8 -1600 -2700 100 R 70 70 1 1 P
+X PC14 9 -1600 -2800 100 R 70 70 1 1 P
+X PB10 90 -1600 -1700 100 R 70 70 1 1 P
+X PB11 91 -1600 -1800 100 R 70 70 1 1 P
+X PJ5 95 1500 -500 100 L 70 70 1 1 P
+X FMC_SDNE1/PH6 96 1500 1200 100 L 70 70 1 1 P
+X FMC_SDCKE1/PH7 97 1500 1100 100 L 70 70 1 1 P
+X PA13/JTMS-SWDIO 147 1100 100 100 L 70 70 2 1 P
+X PA14/JTCK-SWCLK 159 1100 200 100 L 70 70 2 1 P
+X PA15/JTDI 160 1100 -200 100 L 70 70 2 1 P
+X PB3/JTDO/TRACESWO 192 1100 -400 100 L 70 70 2 1 P
+X PB4/NJTRST 193 1100 -300 100 L 70 70 2 1 P
+X BOOT0 197 -1200 -700 100 R 70 70 2 1 P
+X PDR_ON 203 -1200 400 100 R 70 70 2 1 P
+X OSC_IN/PH0 32 -1200 0 100 R 70 70 2 1 P
+X OSC_OUT/PH1 33 -1200 -100 100 R 70 70 2 1 P
+X NRST 34 1100 300 100 L 70 70 2 1 P
+X VREF+ 41 -1200 600 100 R 70 70 2 1 W
+X PB2/BOOT1 63 -1200 -500 100 R 70 70 2 1 P
+X VDD 103 -800 -200 100 R 70 70 3 1 W
+X VSS 114 800 -400 100 L 70 70 3 1 W
+X VDD 115 -800 -400 100 R 70 70 3 1 W
+X VDD 124 -800 -500 100 R 70 70 3 1 W
+X VSS 125 800 -500 100 L 70 70 3 1 W
+X VSS 136 800 -600 100 L 70 70 3 1 W
+X VDD 137 -800 -600 100 R 70 70 3 1 W
+X VSS 14 800 600 100 L 70 70 3 1 W
+X VCAP2 148 100 1500 100 D 70 70 3 1 P
+X VSS 149 800 -700 100 L 70 70 3 1 W
+X VDD 15 -800 700 100 R 70 70 3 1 W
+X VDD 150 -800 -700 100 R 70 70 3 1 W
+X VDD 158 -800 -1200 100 R 70 70 3 1 W
+X VSS 170 800 -900 100 L 70 70 3 1 W
+X VDD 171 -800 -1100 100 R 70 70 3 1 W
+X VSS 184 800 -1000 100 L 70 70 3 1 W
+X VDD 185 -800 -1000 100 R 70 70 3 1 W
+X VSS 202 800 -1100 100 L 70 70 3 1 W
+X VDD 204 -800 -900 100 R 70 70 3 1 W
+X VSS 25 800 500 100 L 70 70 3 1 W
+X VDD 26 -800 600 100 R 70 70 3 1 W
+X VDD 39 -800 500 100 R 70 70 3 1 W
+X VSSA 40 800 900 100 L 70 70 3 1 W
+X VDDA 42 -800 900 100 R 70 70 3 1 W
+X VSS 51 800 400 100 L 70 70 3 1 W
+X VDD 52 -800 400 100 R 70 70 3 1 W
+X VDD 59 -800 200 100 R 70 70 3 1 W
+X VBAT 6 -800 1100 100 R 70 70 3 1 W
+X VSS 60 800 200 100 L 70 70 3 1 W
+X VSS 72 800 100 100 L 70 70 3 1 W
+X VDD 73 -800 100 100 R 70 70 3 1 W
+X VSS 82 800 0 100 L 70 70 3 1 W
+X VDD 83 -800 0 100 R 70 70 3 1 W
+X VCAP1 92 -100 1500 100 D 70 70 3 1 P
+X VSS 93 800 -100 100 L 70 70 3 1 W
+X VDD 94 -800 -100 100 R 70 70 3 1 W
+X FMC_A23/PE2 1 -1200 -200 100 R 70 70 4 1 P
+X PH10/FMC_D18 100 1200 300 100 L 70 70 4 1 P
+X PH11/FMC_D19 101 1200 200 100 L 70 70 4 1 P
+X PH12/FMC_D20 102 1200 100 100 L 70 70 4 1 P
+X PD8/FMC_D13 108 1200 800 100 L 70 70 4 1 P
+X PD9/FMC_D14 109 1200 700 100 L 70 70 4 1 P
+X PI9/FMC_D30 11 1200 -900 100 L 70 70 4 1 P
+X PD10/FMC_D15 110 1200 600 100 L 70 70 4 1 P
+X FMC_A16/PD11 111 -1200 500 100 R 70 70 4 1 P
+X FMC_A17/PD12 112 -1200 400 100 R 70 70 4 1 P
+X FMC_A18/PD13 113 -1200 300 100 R 70 70 4 1 P
+X PD14/FMC_D0 116 1200 2100 100 L 70 70 4 1 P
+X PD15/FMC_D1 117 1200 2000 100 L 70 70 4 1 P
+X PI10/FMC_D31 12 1200 -1000 100 L 70 70 4 1 P
+X FMC_A12/PG2 129 -1200 900 100 R 70 70 4 1 P
+X FMC_A13/PG3 130 -1200 800 100 R 70 70 4 1 P
+X FMC_A14/PG4 131 -1200 700 100 R 70 70 4 1 P
+X FMC_A15/PG5 132 -1200 600 100 R 70 70 4 1 P
+X PG8/FMC_SDCLK 135 1200 -1300 100 L 70 70 4 1 P
+X PH13/FMC_D21 151 1200 0 100 L 70 70 4 1 P
+X PH14/FMC_D22 152 1200 -100 100 L 70 70 4 1 P
+X PH15/FMC_D23 153 1200 -200 100 L 70 70 4 1 P
+X PI0/FMC_D24 154 1200 -300 100 L 70 70 4 1 P
+X PI1/FMC_D25 155 1200 -400 100 L 70 70 4 1 P
+X PI2/FMC_D26 156 1200 -500 100 L 70 70 4 1 P
+X PI3/FMC_D27 157 1200 -600 100 L 70 70 4 1 P
+X FMC_A0/PF0 16 -1200 2100 100 R 70 70 4 1 P
+X PD0/FMC_D2 164 1200 1900 100 L 70 70 4 1 P
+X PD1/FMC_D3 165 1200 1800 100 L 70 70 4 1 P
+X FMC_CLK/PD3 167 -1200 -1600 100 R 70 70 4 1 P
+X FMC_NOE/PD4 168 -1200 -1700 100 R 70 70 4 1 P
+X FMC_NWE/PD5 169 -1200 -1800 100 R 70 70 4 1 P
+X FMC_A1/PF1 17 -1200 2000 100 R 70 70 4 1 P
+X FMC_NWAIT/PD6 172 -1200 -1900 100 R 70 70 4 1 P
+X FMC_NE1/PD7 173 -1200 -2000 100 R 70 70 4 1 P
+X FMC_A2/PF2 18 -1200 1900 100 R 70 70 4 1 P
+X FMC_A24/PG13 182 -1200 -300 100 R 70 70 4 1 P
+X FMC_A25/PG14 183 -1200 -400 100 R 70 70 4 1 P
+X PG15/FMC_SDNCAS 191 1200 -2200 100 L 70 70 4 1 P
+X PB5/FMC_SDCKE1 194 1200 -2000 100 L 70 70 4 1 P
+X PB6/FMC_SDNE1 195 1200 -1700 100 L 70 70 4 1 P
+X FMC_NL/PB7 196 -1200 -1300 100 R 70 70 4 1 P
+X FMC_A19/PE3 2 -1200 200 100 R 70 70 4 1 P
+X FMC_NBL0/PE0 200 -1200 -700 100 R 70 70 4 1 P
+X FMC_NBL1/PE1 201 -1200 -800 100 R 70 70 4 1 P
+X FMC_NBL2/PI4 205 -1200 -900 100 R 70 70 4 1 P
+X FMC_NBL3/PI5 206 -1200 -1000 100 R 70 70 4 1 P
+X PI6/FMC_D28 207 1200 -700 100 L 70 70 4 1 P
+X PI7/FMC_D29 208 1200 -800 100 L 70 70 4 1 P
+X FMC_A3/PF3 22 -1200 1800 100 R 70 70 4 1 P
+X FMC_A4/PF4 23 -1200 1700 100 R 70 70 4 1 P
+X FMC_A5/PF5 24 -1200 1600 100 R 70 70 4 1 P
+X FMC_A20/PE4 3 -1200 100 100 R 70 70 4 1 P
+X PC0/FMC_SDNWE 35 1200 -1400 100 L 70 70 4 1 P
+X PC2/FMC_SDNE0 37 1200 -1600 100 L 70 70 4 1 P
+X PC3/FMC_SDCKE0 38 1200 -1900 100 L 70 70 4 1 P
+X FMC_A21/PE5 4 -1200 0 100 R 70 70 4 1 P
+X FMC_A22/PE6 5 -1200 -100 100 R 70 70 4 1 P
+X PF11/FMC_SDNRAS 70 1200 -2300 100 L 70 70 4 1 P
+X FMC_A6/PF12 71 -1200 1500 100 R 70 70 4 1 P
+X FMC_A7/PF13 74 -1200 1400 100 R 70 70 4 1 P
+X FMC_A8/PF14 75 -1200 1300 100 R 70 70 4 1 P
+X FMC_A9/PF15 76 -1200 1200 100 R 70 70 4 1 P
+X FMC_A10/PG0 77 -1200 1100 100 R 70 70 4 1 P
+X FMC_A11/PG1 78 -1200 1000 100 R 70 70 4 1 P
+X PE7/FMC_D4 79 1200 1700 100 L 70 70 4 1 P
+X PE8/FMC_D5 80 1200 1600 100 L 70 70 4 1 P
+X PE9/FMC_D6 81 1200 1500 100 L 70 70 4 1 P
+X PE10/FMC_D7 84 1200 1400 100 L 70 70 4 1 P
+X PE11/FMC_D8 85 1200 1300 100 L 70 70 4 1 P
+X PE12/FMC_D9 86 1200 1200 100 L 70 70 4 1 P
+X PE13/FMC_D10 87 1200 1100 100 L 70 70 4 1 P
+X PE14/FMC_D11 88 1200 1000 100 L 70 70 4 1 P
+X PE15/FMC_D12 89 1200 900 100 L 70 70 4 1 P
+X PH8/FMC_D16 98 1200 500 100 L 70 70 4 1 P
+X PH9/FMC_D17 99 1200 400 100 L 70 70 4 1 P
 ENDDRAW
 ENDDEF
 #
 # TACTILE_SWITCH
 #
-DEF TACTILE_SWITCH IC 0 40 Y Y 1 F N
+DEF TACTILE_SWITCH S 0 40 Y Y 1 F N
 F0 "S" 620 110 60 H V L BNN
 F1 "TACTILE_SWITCH" -300 470 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -2258,17 +2203,17 @@ A -200 0 25 -1200 0 1 1 10 N -212 -21 -175 0
 A 100 0 25 0 1200 1 1 10 N 125 0 87 21
 A 100 0 25 1200 -1200 1 1 10 N 87 21 87 -21
 A 100 0 25 -1200 0 1 1 10 N 87 -21 125 0
-P 2 0 1 10 -400 -200 400 -200
-P 2 0 1 10 -400 200 -400 -200
-P 2 0 1 10 -300 -200 -300 0
-P 2 0 1 10 -300 0 -300 200
-P 2 0 1 10 -200 0 -300 0
-P 2 0 1 10 0 100 -200 0
-P 2 0 1 10 300 -200 300 0
-P 2 0 1 10 300 0 100 0
-P 2 0 1 10 300 0 300 200
-P 2 0 1 10 400 -200 400 200
-P 2 0 1 10 400 200 -400 200
+P 2 0 1 10 -400 -200 400 -200 N
+P 2 0 1 10 -400 200 -400 -200 N
+P 2 0 1 10 -300 -200 -300 0 N
+P 2 0 1 10 -300 0 -300 200 N
+P 2 0 1 10 -200 0 -300 0 N
+P 2 0 1 10 0 100 -200 0 N
+P 2 0 1 10 300 -200 300 0 N
+P 2 0 1 10 300 0 100 0 N
+P 2 0 1 10 300 0 300 200 N
+P 2 0 1 10 400 -200 400 200 N
+P 2 0 1 10 400 200 -400 200 N
 X A1 A1 -300 400 200 D 70 1 0 1 P
 X A2 A2 -300 -400 200 U 70 1 0 1 P
 X B1 B1 300 400 200 D 70 1 0 1 P
@@ -2280,23 +2225,23 @@ ENDDEF
 #
 # TPB1,27
 #
-DEF TPB1,27 IC 0 40 Y Y 1 F N
+DEF TPB1,27 TP 0 40 Y Y 1 F N
 F0 "TP" -100 -300 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
+F1 "TPB1,27" 0 0 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -30 -30 0 -60
-P 2 0 1 10 0 -60 30 -30
-P 2 0 1 10 0 0 -30 -30
-P 2 0 1 10 30 -30 0 0
+P 2 0 1 10 -30 -30 0 -60 N
+P 2 0 1 10 0 -60 30 -30 N
+P 2 0 1 10 0 0 -30 -30 N
+P 2 0 1 10 30 -30 0 0 N
 X TP TP 0 -100 100 U 1 1 0 1 P
 ENDDRAW
 ENDDEF
 #
 # USBMINIB
 #
-DEF USBMINIB IC 0 40 Y Y 1 F N
+DEF USBMINIB CN 0 40 Y Y 1 F N
 F0 "CN" -420 -410 60 H V L BNN
 F1 "USBMINIB" -420 310 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -2309,29 +2254,29 @@ A -60 60 20 0 1200 1 1 30 N -40 60 -70 77
 A -60 60 20 1200 -1200 1 1 30 N -70 77 -70 42
 A -60 60 20 -1200 0 1 1 30 N -70 42 -40 60
 S -290 -20 -240 30 0 1 10 f
-P 2 0 1 10 -400 -300 -400 300
-P 2 0 1 10 -400 300 -410 300
-P 2 0 1 10 -360 60 -320 30
-P 2 0 1 10 -350 60 -330 70
-P 2 0 1 10 -340 50 -340 60
-P 2 0 1 10 -330 40 -340 50
-P 2 0 1 10 -330 70 -330 40
-P 2 0 1 10 -320 30 -320 30
-P 2 0 1 10 -320 30 -320 60
-P 2 0 1 10 -320 60 -320 90
-P 2 0 1 10 -320 60 -170 60
-P 2 0 1 10 -320 90 -360 60
-P 2 0 1 10 -320 90 -320 40
-P 2 0 1 10 -320 90 -320 90
-P 2 0 1 10 -200 0 -250 0
-P 2 0 1 10 -180 120 -220 120
-P 2 0 1 10 -170 60 -200 0
-P 2 0 1 10 -170 60 -140 60
-P 2 0 1 10 -140 60 -180 120
-P 2 0 1 10 -140 60 -60 60
-P 2 0 1 10 300 -300 -400 -300
-P 2 0 1 10 300 -300 300 300
-P 2 0 1 10 300 300 -400 300
+P 2 0 1 10 -400 -300 -400 300 N
+P 2 0 1 10 -400 300 -410 300 N
+P 2 0 1 10 -360 60 -320 30 N
+P 2 0 1 10 -350 60 -330 70 N
+P 2 0 1 10 -340 50 -340 60 N
+P 2 0 1 10 -330 40 -340 50 N
+P 2 0 1 10 -330 70 -330 40 N
+P 2 0 1 10 -320 30 -320 30 N
+P 2 0 1 10 -320 30 -320 60 N
+P 2 0 1 10 -320 60 -320 90 N
+P 2 0 1 10 -320 60 -170 60 N
+P 2 0 1 10 -320 90 -360 60 N
+P 2 0 1 10 -320 90 -320 40 N
+P 2 0 1 10 -320 90 -320 90 N
+P 2 0 1 10 -200 0 -250 0 N
+P 2 0 1 10 -180 120 -220 120 N
+P 2 0 1 10 -170 60 -200 0 N
+P 2 0 1 10 -170 60 -140 60 N
+P 2 0 1 10 -140 60 -180 120 N
+P 2 0 1 10 -140 60 -60 60 N
+P 2 0 1 10 300 -300 -400 -300 N
+P 2 0 1 10 300 -300 300 300 N
+P 2 0 1 10 300 300 -400 300 N
 X D+ D+ 400 100 100 L 1 70 0 1 P
 X D- D- 400 0 100 L 1 70 0 1 P
 X GND GND 400 -200 100 L 1 70 0 1 W
@@ -2348,9 +2293,9 @@ F1 "VCCO_3V3" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X VCCO_3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
@@ -2363,755 +2308,578 @@ F1 "VCC_5V0" 0 150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 0  -30 50  0 100 N
-P 2 0 1 0  0 0  0 100 N
-P 2 0 1 0  0 100  30 50 N
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
 X VCC_5V0 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
 # WE-SHC
 #
-DEF WE-SHC IC 0 40 Y Y 1 F N
+DEF WE-SHC S 0 40 Y Y 1 F N
 F0 "S" -300 450 60 H V L BNN
 F1 "WE-SHC" 0 400 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-P 2 0 1 10 -300 -500 -300 300
-P 2 0 1 10 -300 300 500 300
+P 2 0 1 10 -300 -500 -300 300 N
+P 2 0 1 10 -300 300 500 300 N
 X GND 1 -400 100 100 R 70 70 0 1 W
 ENDDRAW
 ENDDEF
 #
-# XC7A200TFBG484_1
-#
-DEF XC7A200TFBG484_1 IC 0 40 Y Y 1 F N
-F0 "U" -410 -910 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-T 0 -410 810 50 0 1 1 122-1871-ND Normal 1 C C
-T 0 -410 810 50 0 1 1 XC7A200T-1FBG484C Normal 1 C C
-T 0 -410 810 50 0 1 1 Xilinx Normal 1 C C
-P 2 0 1 10 -400 -800 0 -800
-P 2 0 1 10 0 -800 0 800
-P 2 0 1 10 0 800 -400 800
-X VCCBATT_0 E12 200 700 200 L 70 70 0 1 P
-X VCCO_0 F12 200 600 200 L 70 70 0 1 P
-X DONE_0 G11 200 300 200 L 70 70 0 1 P
-X CCLK_0 L12 200 0 200 L 70 70 0 1 P
-X PROGRAM_B_0 N12 200 100 200 L 70 70 0 1 P
-X TDI_0 R13 200 -500 200 L 70 70 0 1 P
-X VCCO_0 T12 200 500 200 L 70 70 0 1 P
-X TMS_0 T13 200 -700 200 L 70 70 0 1 P
-X M1_0 U10 200 -200 200 L 70 70 0 1 P
-X M0_0 U11 200 -100 200 L 70 70 0 1 P
-X INIT_B_0 U12 200 200 200 L 70 70 0 1 C
-X TDO_0 U13 200 -600 200 L 70 70 0 1 O
-X CFGBVS_0 U8 200 400 200 L 70 70 0 1 P
-X M2_0 U9 200 -300 200 L 70 70 0 1 P
-X TCK_0 V12 200 -400 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_10
-#
-DEF XC7A200TFBG484_10 IC 0 40 Y Y 1 F N
-F0 "U" -410 -2310 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2200 0 -2200
-P 2 0 1 10 0 -2200 0 2200
-P 2 0 1 10 0 2200 -400 2200
-X GND AA12 200 -1800 200 L 70 70 0 1 W
-X GND AA2 200 -1700 200 L 70 70 0 1 W
-X GND AA22 200 -1900 200 L 70 70 0 1 W
-X GND AB19 200 -2100 200 L 70 70 0 1 W
-X GND AB9 200 -2000 200 L 70 70 0 1 W
-X GND J10 200 2100 200 L 70 70 0 1 W
-X GND J12 200 2000 200 L 70 70 0 1 W
-X GND J18 200 1900 200 L 70 70 0 1 W
-X GND K11 200 1600 200 L 70 70 0 1 W
-X GND K15 200 1500 200 L 70 70 0 1 W
-X GND K5 200 1800 200 L 70 70 0 1 W
-X GND K7 200 1700 200 L 70 70 0 1 W
-X GND L2 200 1400 200 L 70 70 0 1 W
-X GND L22 200 1200 200 L 70 70 0 1 W
-X GND L8 200 1300 200 L 70 70 0 1 W
-X GND M11 200 1000 200 L 70 70 0 1 W
-X GND M19 200 900 200 L 70 70 0 1 W
-X GND M7 200 1100 200 L 70 70 0 1 W
-X GND N16 200 600 200 L 70 70 0 1 W
-X GND N6 200 800 200 L 70 70 0 1 W
-X GND N8 200 700 200 L 70 70 0 1 W
-X GND P11 200 200 200 L 70 70 0 1 W
-X GND P13 200 100 200 L 70 70 0 1 W
-X GND P3 200 500 200 L 70 70 0 1 W
-X GND P7 200 400 200 L 70 70 0 1 W
-X GND P9 200 300 200 L 70 70 0 1 W
-X GND R10 200 -100 200 L 70 70 0 1 W
-X GND R12 200 -200 200 L 70 70 0 1 W
-X GND R20 200 -300 200 L 70 70 0 1 W
-X GND R8 200 0 200 L 70 70 0 1 W
-X GND T11 200 -600 200 L 70 70 0 1 W
-X GND T17 200 -700 200 L 70 70 0 1 W
-X GND T7 200 -400 200 L 70 70 0 1 W
-X GND T9 200 -500 200 L 70 70 0 1 W
-X GND U14 200 -900 200 L 70 70 0 1 W
-X GND U4 200 -800 200 L 70 70 0 1 W
-X GND V1 200 -1000 200 L 70 70 0 1 W
-X GND V11 200 -1100 200 L 70 70 0 1 W
-X GND V21 200 -1200 200 L 70 70 0 1 W
-X GND W18 200 -1400 200 L 70 70 0 1 W
-X GND W8 200 -1300 200 L 70 70 0 1 W
-X GND Y15 200 -1600 200 L 70 70 0 1 W
-X GND Y5 200 -1500 200 L 70 70 0 1 W
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_11
-#
-DEF XC7A200TFBG484_11 IC 0 40 Y Y 1 F N
-F0 "U" -410 -410 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -300 0 -300
-P 2 0 1 10 0 -300 0 300
-P 2 0 1 10 0 300 -400 300
-X MGTAVCC D10 200 100 200 L 70 70 0 1 P
-X MGTAVCC D6 200 200 200 L 70 70 0 1 P
-X MGTAVCC E8 200 0 200 L 70 70 0 1 P
-X MGTAVCC F7 200 -100 200 L 70 70 0 1 P
-X MGTAVCC F9 200 -200 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_12
-#
-DEF XC7A200TFBG484_12 IC 0 40 Y Y 1 F N
-F0 "U" -410 -510 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -400 0 -400
-P 2 0 1 10 0 -400 0 300
-P 2 0 1 10 0 300 -400 300
-X MGTAVTT B11 200 -100 200 L 70 70 0 1 P
-X MGTAVTT B5 200 200 200 L 70 70 0 1 P
-X MGTAVTT B7 200 100 200 L 70 70 0 1 P
-X MGTAVTT B9 200 0 200 L 70 70 0 1 P
-X MGTAVTT C4 200 -200 200 L 70 70 0 1 P
-X MGTAVTT C8 200 -300 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_13
-#
-DEF XC7A200TFBG484_13 IC 0 40 Y Y 1 F N
-F0 "U" -410 -310 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -200 0 -200
-P 2 0 1 10 0 -200 0 100
-P 2 0 1 10 0 100 -400 100
-X DXP_0 N10 200 0 200 L 70 70 0 1 P
-X DXN_0 N9 200 -100 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_14
-#
-DEF XC7A200TFBG484_14 IC 0 40 Y Y 1 F N
-F0 "U" -410 -410 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -300 0 -300
-P 2 0 1 10 0 -300 0 300
-P 2 0 1 10 0 300 -400 300
-X VCCAUX H12 200 200 200 L 70 70 0 1 P
-X VCCAUX K12 200 100 200 L 70 70 0 1 P
-X VCCAUX M12 200 0 200 L 70 70 0 1 P
-X VCCAUX P12 200 -100 200 L 70 70 0 1 P
-X VCCAUX R11 200 -200 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_15
-#
-DEF XC7A200TFBG484_15 IC 0 40 Y Y 1 F N
-F0 "U" -410 -310 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -200 0 -200
-P 2 0 1 10 0 -200 0 200
-P 2 0 1 10 0 200 -400 200
-X VCCBRAM J11 200 100 200 L 70 70 0 1 P
-X VCCBRAM L11 200 0 200 L 70 70 0 1 P
-X VCCBRAM N11 200 -100 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_16
-#
-DEF XC7A200TFBG484_16 IC 0 40 Y Y 1 F N
-F0 "U" -410 -810 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -800 0 -800
-P 2 0 1 10 0 -800 0 700
-P 2 0 1 10 0 700 -400 700
-X VCCINT H10 200 500 200 L 70 70 0 1 P
-X VCCINT H8 200 600 200 L 70 70 0 1 P
-X VCCINT J7 200 400 200 L 70 70 0 1 P
-X VCCINT J9 200 300 200 L 70 70 0 1 P
-X VCCINT K8 200 200 200 L 70 70 0 1 P
-X VCCINT L7 200 100 200 L 70 70 0 1 P
-X VCCINT M8 200 0 200 L 70 70 0 1 P
-X VCCINT N7 200 -100 200 L 70 70 0 1 P
-X VCCINT P10 200 -300 200 L 70 70 0 1 P
-X VCCINT P8 200 -200 200 L 70 70 0 1 P
-X VCCINT R7 200 -400 200 L 70 70 0 1 P
-X VCCINT R9 200 -500 200 L 70 70 0 1 P
-X VCCINT T10 200 -700 200 L 70 70 0 1 P
-X VCCINT T8 200 -600 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_17
-#
-DEF XC7A200TFBG484_17 IC 0 40 Y Y 1 F N
-F0 "U" -410 -510 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -400 0 -400
-P 2 0 1 10 0 -400 0 300
-P 2 0 1 10 0 300 -400 300
-X VCCADC_0 K10 200 200 200 L 70 70 0 1 P
-X GNDADC_0 K9 200 -300 200 L 70 70 0 1 P
-X VP_0 L10 200 100 200 L 70 70 0 1 P
-X VREFN_0 L9 200 -200 200 L 70 70 0 1 P
-X VREFP_0 M10 200 -100 200 L 70 70 0 1 P
-X VN_0 M9 200 0 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_2
-#
-DEF XC7A200TFBG484_2 IC 0 40 Y Y 1 F N
-F0 "U" -410 -2210 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2100 0 -2100
-P 2 0 1 10 0 -2100 0 2000
-P 2 0 1 10 0 2000 -400 2000
-X IO_L9P_T1_DQS_13 AA10 200 -300 200 L 70 70 0 1 P
-X IO_L9N_T1_DQS_13 AA11 200 -400 200 L 70 70 0 1 P
-X IO_L3P_T0_DQS_13 AA13 200 900 200 L 70 70 0 1 P
-X IO_L5N_T0_13 AA14 200 400 200 L 70 70 0 1 P
-X IO_L4P_T0_13 AA15 200 700 200 L 70 70 0 1 P
-X IO_L1N_T0_13 AA16 200 1200 200 L 70 70 0 1 P
-X VCCO_13 AA17 200 1600 200 L 70 70 0 1 P
-X IO_L8P_T1_13 AA9 200 -100 200 L 70 70 0 1 P
-X IO_L8N_T1_13 AB10 200 -200 200 L 70 70 0 1 P
-X IO_L7P_T1_13 AB11 200 100 200 L 70 70 0 1 P
-X IO_L7N_T1_13 AB12 200 0 200 L 70 70 0 1 P
-X IO_L3N_T0_DQS_13 AB13 200 800 200 L 70 70 0 1 P
-X VCCO_13 AB14 200 1500 200 L 70 70 0 1 P
-X IO_L4N_T0_13 AB15 200 600 200 L 70 70 0 1 P
-X IO_L2P_T0_13 AB16 200 1100 200 L 70 70 0 1 P
-X IO_L2N_T0_13 AB17 200 1000 200 L 70 70 0 1 P
-X IO_L15P_T2_DQS_13 T14 200 -1500 200 L 70 70 0 1 P
-X IO_L15N_T2_DQS_13 T15 200 -1600 200 L 70 70 0 1 P
-X IO_L17P_T2_13 T16 200 -1900 200 L 70 70 0 1 P
-X IO_L14P_T2_SRCC_13 U15 200 -1300 200 L 70 70 0 1 P
-X IO_L17N_T2_13 U16 200 -2000 200 L 70 70 0 1 P
-X IO_L10P_T1_13 V10 200 -500 200 L 70 70 0 1 P
-X IO_L13P_T2_MRCC_13 V13 200 -1100 200 L 70 70 0 1 P
-X IO_L13N_T2_MRCC_13 V14 200 -1200 200 L 70 70 0 1 P
-X IO_L14N_T2_SRCC_13 V15 200 -1400 200 L 70 70 0 1 P
-X VCCO_13 V16 200 1900 200 L 70 70 0 1 P
-X IO_L10N_T1_13 W10 200 -600 200 L 70 70 0 1 P
-X IO_L12P_T1_MRCC_13 W11 200 -900 200 L 70 70 0 1 P
-X IO_L12N_T1_MRCC_13 W12 200 -1000 200 L 70 70 0 1 P
-X VCCO_13 W13 200 1800 200 L 70 70 0 1 P
-X IO_L6P_T0_13 W14 200 300 200 L 70 70 0 1 P
-X IO_L16P_T2_13 W15 200 -1700 200 L 70 70 0 1 P
-X IO_L16N_T2_13 W16 200 -1800 200 L 70 70 0 1 P
-X VCCO_13 Y10 200 1700 200 L 70 70 0 1 P
-X IO_L11P_T1_SRCC_13 Y11 200 -700 200 L 70 70 0 1 P
-X IO_L11N_T1_SRCC_13 Y12 200 -800 200 L 70 70 0 1 P
-X IO_L5P_T0_13 Y13 200 500 200 L 70 70 0 1 P
-X IO_L6N_T0_VREF_13 Y14 200 200 200 L 70 70 0 1 P
-X IO_L1P_T0_13 Y16 200 1300 200 L 70 70 0 1 P
-X IO_0_13 Y17 200 1400 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_3
-#
-DEF XC7A200TFBG484_3 IC 0 40 Y Y 1 F N
-F0 "U" -410 -3010 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2900 0 -2900
-P 2 0 1 10 0 -2900 0 2800
-P 2 0 1 10 0 2800 -400 2800
-X IO_L17P_T2_A14_D30_14 AA18 200 -1200 200 L 70 70 0 1 P
-X IO_L15P_T2_DQS_RDWR_B_14 AA19 200 -800 200 L 70 70 0 1 P
-X IO_L8P_T1_D11_14 AA20 200 600 200 L 70 70 0 1 P
-X IO_L8N_T1_D12_14 AA21 200 500 200 L 70 70 0 1 P
-X IO_L17N_T2_A13_D29_14 AB18 200 -1300 200 L 70 70 0 1 P
-X IO_L15N_T2_DQS_DOUT_CSO_B_14 AB20 200 -900 200 L 70 70 0 1 P
-X IO_L10P_T1_D14_14 AB21 200 200 200 L 70 70 0 1 P
-X IO_L10N_T1_D15_14 AB22 200 100 200 L 70 70 0 1 P
-X VCCO_14 M14 200 2700 200 L 70 70 0 1 P
-X IO_L23P_T3_A03_D19_14 N13 200 -2400 200 L 70 70 0 1 P
-X IO_L23N_T3_A02_D18_14 N14 200 -2500 200 L 70 70 0 1 P
-X IO_25_14 N15 200 -2800 200 L 70 70 0 1 P
-X IO_L21P_T3_DQS_14 N17 200 -2000 200 L 70 70 0 1 P
-X IO_L19P_T3_A10_D26_14 P14 200 -1600 200 L 70 70 0 1 P
-X IO_L22P_T3_A05_D21_14 P15 200 -2200 200 L 70 70 0 1 P
-X IO_L24P_T3_A01_D17_14 P16 200 -2600 200 L 70 70 0 1 P
-X IO_L21N_T3_DQS_A06_D22_14 P17 200 -2100 200 L 70 70 0 1 P
-X VCCO_14 P18 200 2600 200 L 70 70 0 1 P
-X IO_L5P_T0_D06_14 P19 200 1200 200 L 70 70 0 1 P
-X IO_0_14 P20 200 2100 200 L 70 70 0 1 P
-X IO_L2P_T0_D02_14 P21 200 1800 200 L 70 70 0 1 P
-X IO_L1P_T0_D00_MOSI_14 P22 200 2000 200 L 70 70 0 1 P
-X IO_L19N_T3_A09_D25_VREF_14 R14 200 -1700 200 L 70 70 0 1 P
-X VCCO_14 R15 200 2500 200 L 70 70 0 1 P
-X IO_L22N_T3_A04_D20_14 R16 200 -2300 200 L 70 70 0 1 P
-X IO_L24N_T3_A00_D16_14 R17 200 -2700 200 L 70 70 0 1 P
-X IO_L20P_T3_A08_D24_14 R18 200 -1800 200 L 70 70 0 1 P
-X IO_L5N_T0_D07_14 R19 200 1100 200 L 70 70 0 1 P
-X IO_L2N_T0_D03_14 R21 200 1700 200 L 70 70 0 1 P
-X IO_L1N_T0_D01_DIN_14 R22 200 1900 200 L 70 70 0 1 P
-X IO_L20N_T3_A07_D23_14 T18 200 -1900 200 L 70 70 0 1 P
-X IO_L6P_T0_FCS_B_14 T19 200 1000 200 L 70 70 0 1 P
-X IO_L6N_T0_D08_VREF_14 T20 200 900 200 L 70 70 0 1 P
-X IO_L4P_T0_D04_14 T21 200 1400 200 L 70 70 0 1 P
-X VCCO_14 T22 200 2400 200 L 70 70 0 1 P
-X IO_L18P_T2_A12_D28_14 U17 200 -1400 200 L 70 70 0 1 P
-X IO_L18N_T2_A11_D27_14 U18 200 -1500 200 L 70 70 0 1 P
-X VCCO_14 U19 200 2300 200 L 70 70 0 1 P
-X IO_L11P_T1_SRCC_14 U20 200 0 200 L 70 70 0 1 P
-X IO_L4N_T0_D05_14 U21 200 1300 200 L 70 70 0 1 P
-X IO_L3P_T0_DQS_PUDC_B_14 U22 200 1600 200 L 70 70 0 1 P
-X IO_L16P_T2_CSI_B_14 V17 200 -1000 200 L 70 70 0 1 P
-X IO_L14P_T2_SRCC_14 V18 200 -600 200 L 70 70 0 1 P
-X IO_L14N_T2_SRCC_14 V19 200 -700 200 L 70 70 0 1 P
-X IO_L11N_T1_SRCC_14 V20 200 -100 200 L 70 70 0 1 P
-X IO_L3N_T0_DQS_EMCCLK_14 V22 200 1500 200 L 70 70 0 1 P
-X IO_L16N_T2_A15_D31_14 W17 200 -1100 200 L 70 70 0 1 P
-X IO_L12P_T1_MRCC_14 W19 200 -200 200 L 70 70 0 1 P
-X IO_L12N_T1_MRCC_14 W20 200 -300 200 L 70 70 0 1 P
-X IO_L7P_T1_D09_14 W21 200 800 200 L 70 70 0 1 P
-X IO_L7N_T1_D10_14 W22 200 700 200 L 70 70 0 1 P
-X IO_L13P_T2_MRCC_14 Y18 200 -400 200 L 70 70 0 1 P
-X IO_L13N_T2_MRCC_14 Y19 200 -500 200 L 70 70 0 1 P
-X VCCO_14 Y20 200 2200 200 L 70 70 0 1 P
-X IO_L9P_T1_DQS_14 Y21 200 400 200 L 70 70 0 1 P
-X IO_L9N_T1_DQS_D13_14 Y22 200 300 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_4
-#
-DEF XC7A200TFBG484_4 IC 0 40 Y Y 1 F N
-F0 "U" -410 -3010 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2900 0 -2900
-P 2 0 1 10 0 -2900 0 2800
-P 2 0 1 10 0 2800 -400 2800
-X IO_L1N_T0_AD0N_15 G13 200 1900 200 L 70 70 0 1 P
-X IO_L2P_T0_AD8P_15 G15 200 1800 200 L 70 70 0 1 P
-X IO_L2N_T0_AD8N_15 G16 200 1700 200 L 70 70 0 1 P
-X IO_L4P_T0_15 G17 200 1400 200 L 70 70 0 1 P
-X IO_L4N_T0_15 G18 200 1300 200 L 70 70 0 1 P
-X VCCO_15 G19 200 2700 200 L 70 70 0 1 P
-X IO_L8N_T1_AD10N_15 G20 200 500 200 L 70 70 0 1 P
-X IO_L1P_T0_AD0P_15 H13 200 2000 200 L 70 70 0 1 P
-X IO_L3N_T0_DQS_AD1N_15 H14 200 1500 200 L 70 70 0 1 P
-X IO_L5N_T0_AD9N_15 H15 200 1100 200 L 70 70 0 1 P
-X VCCO_15 H16 200 2600 200 L 70 70 0 1 P
-X IO_L6P_T0_15 H17 200 1000 200 L 70 70 0 1 P
-X IO_L6N_T0_VREF_15 H18 200 900 200 L 70 70 0 1 P
-X IO_L12N_T1_MRCC_15 H19 200 -300 200 L 70 70 0 1 P
-X IO_L8P_T1_AD10P_15 H20 200 600 200 L 70 70 0 1 P
-X IO_L7N_T1_AD2N_15 H22 200 700 200 L 70 70 0 1 P
-X VCCO_15 J13 200 2500 200 L 70 70 0 1 P
-X IO_L3P_T0_DQS_AD1P_15 J14 200 1600 200 L 70 70 0 1 P
-X IO_L5P_T0_AD9P_15 J15 200 1200 200 L 70 70 0 1 P
-X IO_0_15 J16 200 2100 200 L 70 70 0 1 P
-X IO_L21N_T3_DQS_A18_15 J17 200 -2100 200 L 70 70 0 1 P
-X IO_L12P_T1_MRCC_15 J19 200 -200 200 L 70 70 0 1 P
-X IO_L11P_T1_SRCC_15 J20 200 0 200 L 70 70 0 1 P
-X IO_L11N_T1_SRCC_15 J21 200 -100 200 L 70 70 0 1 P
-X IO_L7P_T1_AD2P_15 J22 200 800 200 L 70 70 0 1 P
-X IO_L19P_T3_A22_15 K13 200 -1600 200 L 70 70 0 1 P
-X IO_L19N_T3_A21_VREF_15 K14 200 -1700 200 L 70 70 0 1 P
-X IO_L23N_T3_FWE_B_15 K16 200 -2500 200 L 70 70 0 1 P
-X IO_L21P_T3_DQS_15 K17 200 -2000 200 L 70 70 0 1 P
-X IO_L13P_T2_MRCC_15 K18 200 -400 200 L 70 70 0 1 P
-X IO_L13N_T2_MRCC_15 K19 200 -500 200 L 70 70 0 1 P
-X VCCO_15 K20 200 2400 200 L 70 70 0 1 P
-X IO_L9P_T1_DQS_AD3P_15 K21 200 400 200 L 70 70 0 1 P
-X IO_L9N_T1_DQS_AD3N_15 K22 200 300 200 L 70 70 0 1 P
-X IO_L20N_T3_A19_15 L13 200 -1900 200 L 70 70 0 1 P
-X IO_L22P_T3_A17_15 L14 200 -2200 200 L 70 70 0 1 P
-X IO_L22N_T3_A16_15 L15 200 -2300 200 L 70 70 0 1 P
-X IO_L23P_T3_FOE_B_15 L16 200 -2400 200 L 70 70 0 1 P
-X VCCO_15 L17 200 2300 200 L 70 70 0 1 P
-X IO_L16N_T2_A27_15 L18 200 -1100 200 L 70 70 0 1 P
-X IO_L14P_T2_SRCC_15 L19 200 -600 200 L 70 70 0 1 P
-X IO_L14N_T2_SRCC_15 L20 200 -700 200 L 70 70 0 1 P
-X IO_L10N_T1_AD11N_15 L21 200 100 200 L 70 70 0 1 P
-X IO_L20P_T3_A20_15 M13 200 -1800 200 L 70 70 0 1 P
-X IO_L24P_T3_RS1_15 M15 200 -2600 200 L 70 70 0 1 P
-X IO_L24N_T3_RS0_15 M16 200 -2700 200 L 70 70 0 1 P
-X IO_25_15 M17 200 -2800 200 L 70 70 0 1 P
-X IO_L16P_T2_A28_15 M18 200 -1000 200 L 70 70 0 1 P
-X IO_L18N_T2_A23_15 M20 200 -1500 200 L 70 70 0 1 P
-X IO_L10P_T1_AD11P_15 M21 200 200 200 L 70 70 0 1 P
-X IO_L15N_T2_DQS_ADV_B_15 M22 200 -900 200 L 70 70 0 1 P
-X IO_L17P_T2_A26_15 N18 200 -1200 200 L 70 70 0 1 P
-X IO_L17N_T2_A25_15 N19 200 -1300 200 L 70 70 0 1 P
-X IO_L18P_T2_A24_15 N20 200 -1400 200 L 70 70 0 1 P
-X VCCO_15 N21 200 2200 200 L 70 70 0 1 P
-X IO_L15P_T2_DQS_15 N22 200 -800 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_5
-#
-DEF XC7A200TFBG484_5 IC 0 40 Y Y 1 F N
-F0 "U" -410 -3010 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2900 0 -2900
-P 2 0 1 10 0 -2900 0 2800
-P 2 0 1 10 0 2800 -400 2800
-X IO_L10P_T1_16 A13 200 200 200 L 70 70 0 1 P
-X IO_L10N_T1_16 A14 200 100 200 L 70 70 0 1 P
-X IO_L9P_T1_DQS_16 A15 200 400 200 L 70 70 0 1 P
-X IO_L9N_T1_DQS_16 A16 200 300 200 L 70 70 0 1 P
-X VCCO_16 A17 200 2700 200 L 70 70 0 1 P
-X IO_L17P_T2_16 A18 200 -1200 200 L 70 70 0 1 P
-X IO_L17N_T2_16 A19 200 -1300 200 L 70 70 0 1 P
-X IO_L16N_T2_16 A20 200 -1100 200 L 70 70 0 1 P
-X IO_L21N_T3_DQS_16 A21 200 -2100 200 L 70 70 0 1 P
-X IO_L8N_T1_16 B13 200 500 200 L 70 70 0 1 P
-X VCCO_16 B14 200 2600 200 L 70 70 0 1 P
-X IO_L7P_T1_16 B15 200 800 200 L 70 70 0 1 P
-X IO_L7N_T1_16 B16 200 700 200 L 70 70 0 1 P
-X IO_L11P_T1_SRCC_16 B17 200 0 200 L 70 70 0 1 P
-X IO_L11N_T1_SRCC_16 B18 200 -100 200 L 70 70 0 1 P
-X IO_L16P_T2_16 B20 200 -1000 200 L 70 70 0 1 P
-X IO_L21P_T3_DQS_16 B21 200 -2000 200 L 70 70 0 1 P
-X IO_L20N_T3_16 B22 200 -1900 200 L 70 70 0 1 P
-X IO_L8P_T1_16 C13 200 600 200 L 70 70 0 1 P
-X IO_L3P_T0_DQS_16 C14 200 1600 200 L 70 70 0 1 P
-X IO_L3N_T0_DQS_16 C15 200 1500 200 L 70 70 0 1 P
-X IO_L12N_T1_MRCC_16 C17 200 -300 200 L 70 70 0 1 P
-X IO_L13P_T2_MRCC_16 C18 200 -400 200 L 70 70 0 1 P
-X IO_L13N_T2_MRCC_16 C19 200 -500 200 L 70 70 0 1 P
-X IO_L19N_T3_VREF_16 C20 200 -1700 200 L 70 70 0 1 P
-X VCCO_16 C21 200 2500 200 L 70 70 0 1 P
-X IO_L20P_T3_16 C22 200 -1800 200 L 70 70 0 1 P
-X IO_L6P_T0_16 D14 200 1000 200 L 70 70 0 1 P
-X IO_L6N_T0_VREF_16 D15 200 900 200 L 70 70 0 1 P
-X IO_L5N_T0_16 D16 200 1100 200 L 70 70 0 1 P
-X IO_L12P_T1_MRCC_16 D17 200 -200 200 L 70 70 0 1 P
-X VCCO_16 D18 200 2400 200 L 70 70 0 1 P
-X IO_L14N_T2_SRCC_16 D19 200 -700 200 L 70 70 0 1 P
-X IO_L19P_T3_16 D20 200 -1600 200 L 70 70 0 1 P
-X IO_L23N_T3_16 D21 200 -2500 200 L 70 70 0 1 P
-X IO_L22N_T3_16 D22 200 -2300 200 L 70 70 0 1 P
-X IO_L4P_T0_16 E13 200 1400 200 L 70 70 0 1 P
-X IO_L4N_T0_16 E14 200 1300 200 L 70 70 0 1 P
-X VCCO_16 E15 200 2300 200 L 70 70 0 1 P
-X IO_L5P_T0_16 E16 200 1200 200 L 70 70 0 1 P
-X IO_L2N_T0_16 E17 200 1700 200 L 70 70 0 1 P
-X IO_L15N_T2_DQS_16 E18 200 -900 200 L 70 70 0 1 P
-X IO_L14P_T2_SRCC_16 E19 200 -600 200 L 70 70 0 1 P
-X IO_L23P_T3_16 E21 200 -2400 200 L 70 70 0 1 P
-X IO_L22P_T3_16 E22 200 -2200 200 L 70 70 0 1 P
-X IO_L1P_T0_16 F13 200 2000 200 L 70 70 0 1 P
-X IO_L1N_T0_16 F14 200 1900 200 L 70 70 0 1 P
-X IO_0_16 F15 200 2100 200 L 70 70 0 1 P
-X IO_L2P_T0_16 F16 200 1800 200 L 70 70 0 1 P
-X IO_L15P_T2_DQS_16 F18 200 -800 200 L 70 70 0 1 P
-X IO_L18P_T2_16 F19 200 -1400 200 L 70 70 0 1 P
-X IO_L18N_T2_16 F20 200 -1500 200 L 70 70 0 1 P
-X IO_25_16 F21 200 -2800 200 L 70 70 0 1 P
-X VCCO_16 F22 200 2200 200 L 70 70 0 1 P
-X IO_L24P_T3_16 G21 200 -2600 200 L 70 70 0 1 P
-X IO_L24N_T3_16 G22 200 -2700 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_6
-#
-DEF XC7A200TFBG484_6 IC 0 40 Y Y 1 F N
-F0 "U" -410 -3010 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2900 0 -2900
-P 2 0 1 10 0 -2900 0 2800
-P 2 0 1 10 0 2800 -400 2800
-X IO_L7P_T1_34 AA1 200 800 200 L 70 70 0 1 P
-X IO_L9N_T1_DQS_34 AA3 200 300 200 L 70 70 0 1 P
-X IO_L11N_T1_SRCC_34 AA4 200 -100 200 L 70 70 0 1 P
-X IO_L10P_T1_34 AA5 200 200 200 L 70 70 0 1 P
-X IO_L18N_T2_34 AA6 200 -1500 200 L 70 70 0 1 P
-X VCCO_34 AA7 200 2300 200 L 70 70 0 1 P
-X IO_L22P_T3_34 AA8 200 -2200 200 L 70 70 0 1 P
-X IO_L7N_T1_34 AB1 200 700 200 L 70 70 0 1 P
-X IO_L8N_T1_34 AB2 200 500 200 L 70 70 0 1 P
-X IO_L8P_T1_34 AB3 200 600 200 L 70 70 0 1 P
-X VCCO_34 AB4 200 2200 200 L 70 70 0 1 P
-X IO_L10N_T1_34 AB5 200 100 200 L 70 70 0 1 P
-X IO_L20N_T3_34 AB6 200 -1900 200 L 70 70 0 1 P
-X IO_L20P_T3_34 AB7 200 -1800 200 L 70 70 0 1 P
-X IO_L22N_T3_34 AB8 200 -2300 200 L 70 70 0 1 P
-X IO_L3N_T0_DQS_34 R2 200 1500 200 L 70 70 0 1 P
-X IO_L3P_T0_DQS_34 R3 200 1600 200 L 70 70 0 1 P
-X IO_L13P_T2_MRCC_34 R4 200 -400 200 L 70 70 0 1 P
-X VCCO_34 R5 200 2700 200 L 70 70 0 1 P
-X IO_L17P_T2_34 R6 200 -1200 200 L 70 70 0 1 P
-X IO_L1P_T0_34 T1 200 2000 200 L 70 70 0 1 P
-X VCCO_34 T2 200 2600 200 L 70 70 0 1 P
-X IO_0_34 T3 200 2100 200 L 70 70 0 1 P
-X IO_L13N_T2_MRCC_34 T4 200 -500 200 L 70 70 0 1 P
-X IO_L14P_T2_SRCC_34 T5 200 -600 200 L 70 70 0 1 P
-X IO_L17N_T2_34 T6 200 -1300 200 L 70 70 0 1 P
-X IO_L1N_T0_34 U1 200 1900 200 L 70 70 0 1 P
-X IO_L2P_T0_34 U2 200 1800 200 L 70 70 0 1 P
-X IO_L6P_T0_34 U3 200 1000 200 L 70 70 0 1 P
-X IO_L14N_T2_SRCC_34 U5 200 -700 200 L 70 70 0 1 P
-X IO_L16P_T2_34 U6 200 -1000 200 L 70 70 0 1 P
-X IO_25_34 U7 200 -2800 200 L 70 70 0 1 P
-X IO_L2N_T0_34 V2 200 1700 200 L 70 70 0 1 P
-X IO_L6N_T0_VREF_34 V3 200 900 200 L 70 70 0 1 P
-X IO_L12P_T1_MRCC_34 V4 200 -200 200 L 70 70 0 1 P
-X IO_L16N_T2_34 V5 200 -1100 200 L 70 70 0 1 P
-X VCCO_34 V6 200 2500 200 L 70 70 0 1 P
-X IO_L19P_T3_34 V7 200 -1600 200 L 70 70 0 1 P
-X IO_L21N_T3_DQS_34 V8 200 -2100 200 L 70 70 0 1 P
-X IO_L21P_T3_DQS_34 V9 200 -2000 200 L 70 70 0 1 P
-X IO_L5P_T0_34 W1 200 1200 200 L 70 70 0 1 P
-X IO_L4P_T0_34 W2 200 1400 200 L 70 70 0 1 P
-X VCCO_34 W3 200 2400 200 L 70 70 0 1 P
-X IO_L12N_T1_MRCC_34 W4 200 -300 200 L 70 70 0 1 P
-X IO_L15N_T2_DQS_34 W5 200 -900 200 L 70 70 0 1 P
-X IO_L15P_T2_DQS_34 W6 200 -800 200 L 70 70 0 1 P
-X IO_L19N_T3_VREF_34 W7 200 -1700 200 L 70 70 0 1 P
-X IO_L24P_T3_34 W9 200 -2600 200 L 70 70 0 1 P
-X IO_L5N_T0_34 Y1 200 1100 200 L 70 70 0 1 P
-X IO_L4N_T0_34 Y2 200 1300 200 L 70 70 0 1 P
-X IO_L9P_T1_DQS_34 Y3 200 400 200 L 70 70 0 1 P
-X IO_L11P_T1_SRCC_34 Y4 200 0 200 L 70 70 0 1 P
-X IO_L18P_T2_34 Y6 200 -1400 200 L 70 70 0 1 P
-X IO_L23N_T3_34 Y7 200 -2500 200 L 70 70 0 1 P
-X IO_L23P_T3_34 Y8 200 -2400 200 L 70 70 0 1 P
-X IO_L24N_T3_34 Y9 200 -2700 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_7
-#
-DEF XC7A200TFBG484_7 IC 0 40 Y Y 1 F N
-F0 "U" -410 -3010 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2900 0 -2900
-P 2 0 1 10 0 -2900 0 2800
-P 2 0 1 10 0 2800 -400 2800
-X IO_L1N_T0_AD4N_35 A1 200 1900 200 L 70 70 0 1 P
-X IO_L1P_T0_AD4P_35 B1 200 2000 200 L 70 70 0 1 P
-X IO_L2N_T0_AD12N_35 B2 200 1700 200 L 70 70 0 1 P
-X VCCO_35 C1 200 2700 200 L 70 70 0 1 P
-X IO_L2P_T0_AD12P_35 C2 200 1800 200 L 70 70 0 1 P
-X IO_L3N_T0_DQS_AD5N_35 D1 200 1500 200 L 70 70 0 1 P
-X IO_L4N_T0_35 D2 200 1300 200 L 70 70 0 1 P
-X IO_L3P_T0_DQS_AD5P_35 E1 200 1600 200 L 70 70 0 1 P
-X IO_L4P_T0_35 E2 200 1400 200 L 70 70 0 1 P
-X IO_L6N_T0_VREF_35 E3 200 900 200 L 70 70 0 1 P
-X IO_L5N_T0_AD13N_35 F1 200 1100 200 L 70 70 0 1 P
-X VCCO_35 F2 200 2600 200 L 70 70 0 1 P
-X IO_L6P_T0_35 F3 200 1000 200 L 70 70 0 1 P
-X IO_0_35 F4 200 2100 200 L 70 70 0 1 P
-X IO_L5P_T0_AD13P_35 G1 200 1200 200 L 70 70 0 1 P
-X IO_L8N_T1_AD14N_35 G2 200 500 200 L 70 70 0 1 P
-X IO_L11N_T1_SRCC_35 G3 200 -100 200 L 70 70 0 1 P
-X IO_L12N_T1_MRCC_35 G4 200 -300 200 L 70 70 0 1 P
-X IO_L8P_T1_AD14P_35 H2 200 600 200 L 70 70 0 1 P
-X IO_L11P_T1_SRCC_35 H3 200 0 200 L 70 70 0 1 P
-X IO_L12P_T1_MRCC_35 H4 200 -200 200 L 70 70 0 1 P
-X IO_L10N_T1_AD15N_35 H5 200 100 200 L 70 70 0 1 P
-X VCCO_35 H6 200 2500 200 L 70 70 0 1 P
-X IO_L7N_T1_AD6N_35 J1 200 700 200 L 70 70 0 1 P
-X IO_L9N_T1_DQS_AD7N_35 J2 200 300 200 L 70 70 0 1 P
-X VCCO_35 J3 200 2400 200 L 70 70 0 1 P
-X IO_L13N_T2_MRCC_35 J4 200 -500 200 L 70 70 0 1 P
-X IO_L10P_T1_AD15P_35 J5 200 200 200 L 70 70 0 1 P
-X IO_L17N_T2_35 J6 200 -1300 200 L 70 70 0 1 P
-X IO_L7P_T1_AD6P_35 K1 200 800 200 L 70 70 0 1 P
-X IO_L9P_T1_DQS_AD7P_35 K2 200 400 200 L 70 70 0 1 P
-X IO_L14N_T2_SRCC_35 K3 200 -700 200 L 70 70 0 1 P
-X IO_L13P_T2_MRCC_35 K4 200 -400 200 L 70 70 0 1 P
-X IO_L17P_T2_35 K6 200 -1200 200 L 70 70 0 1 P
-X IO_L15N_T2_DQS_35 L1 200 -900 200 L 70 70 0 1 P
-X IO_L14P_T2_SRCC_35 L3 200 -600 200 L 70 70 0 1 P
-X IO_L18N_T2_35 L4 200 -1500 200 L 70 70 0 1 P
-X IO_L18P_T2_35 L5 200 -1400 200 L 70 70 0 1 P
-X IO_25_35 L6 200 -2800 200 L 70 70 0 1 P
-X IO_L15P_T2_DQS_35 M1 200 -800 200 L 70 70 0 1 P
-X IO_L16N_T2_35 M2 200 -1100 200 L 70 70 0 1 P
-X IO_L16P_T2_35 M3 200 -1000 200 L 70 70 0 1 P
-X VCCO_35 M4 200 2300 200 L 70 70 0 1 P
-X IO_L23N_T3_35 M5 200 -2500 200 L 70 70 0 1 P
-X IO_L23P_T3_35 M6 200 -2400 200 L 70 70 0 1 P
-X VCCO_35 N1 200 2200 200 L 70 70 0 1 P
-X IO_L22N_T3_35 N2 200 -2300 200 L 70 70 0 1 P
-X IO_L19N_T3_VREF_35 N3 200 -1700 200 L 70 70 0 1 P
-X IO_L19P_T3_35 N4 200 -1600 200 L 70 70 0 1 P
-X IO_L24N_T3_35 N5 200 -2700 200 L 70 70 0 1 P
-X IO_L20N_T3_35 P1 200 -1900 200 L 70 70 0 1 P
-X IO_L22P_T3_35 P2 200 -2200 200 L 70 70 0 1 P
-X IO_L21N_T3_DQS_35 P4 200 -2100 200 L 70 70 0 1 P
-X IO_L21P_T3_DQS_35 P5 200 -2000 200 L 70 70 0 1 P
-X IO_L24P_T3_35 P6 200 -2600 200 L 70 70 0 1 P
-X IO_L20P_T3_35 R1 200 -1800 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_8
-#
-DEF XC7A200TFBG484_8 IC 0 40 Y Y 1 F N
-F0 "U" -410 -1210 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -1100 0 -1100
-P 2 0 1 10 0 -1100 0 1100
-P 2 0 1 10 0 1100 -400 1100
-X MGTPRXN1_216 A10 200 800 200 L 70 70 0 1 P
-X MGTPTXN3_216 A4 200 -200 200 L 70 70 0 1 P
-X MGTPTXN1_216 A6 200 0 200 L 70 70 0 1 P
-X MGTPRXN3_216 A8 200 600 200 L 70 70 0 1 P
-X MGTPRXP1_216 B10 200 400 200 L 70 70 0 1 P
-X MGTPTXP3_216 B4 200 -600 200 L 70 70 0 1 P
-X MGTPTXP1_216 B6 200 -400 200 L 70 70 0 1 P
-X MGTPRXP3_216 B8 200 200 200 L 70 70 0 1 P
-X MGTPRXN0_216 C11 200 900 200 L 70 70 0 1 P
-X MGTPTXN2_216 C5 200 -100 200 L 70 70 0 1 P
-X MGTPTXN0_216 C7 200 100 200 L 70 70 0 1 P
-X MGTPRXN2_216 C9 200 700 200 L 70 70 0 1 P
-X MGTPRXP0_216 D11 200 500 200 L 70 70 0 1 P
-X MGTPTXP2_216 D5 200 -500 200 L 70 70 0 1 P
-X MGTPTXP0_216 D7 200 -300 200 L 70 70 0 1 P
-X MGTPRXP2_216 D9 200 300 200 L 70 70 0 1 P
-X MGTREFCLK0N_216 E10 200 -800 200 L 70 70 0 1 P
-X MGTREFCLK1N_216 E6 200 -1000 200 L 70 70 0 1 P
-X MGTREFCLK0P_216 F10 200 -700 200 L 70 70 0 1 P
-X MGTREFCLK1P_216 F6 200 -900 200 L 70 70 0 1 P
-X MGTRREF_216 F8 200 1000 200 L 70 70 0 1 P
-ENDDRAW
-ENDDEF
-#
-# XC7A200TFBG484_9
-#
-DEF XC7A200TFBG484_9 IC 0 40 Y Y 1 F N
-F0 "U" -410 -2410 60 H V L BNN
-F1 "" 0 0 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 1 10 -400 -2300 0 -2300
-P 2 0 1 10 0 -2300 0 2200
-P 2 0 1 10 0 2200 -400 2200
-X GND A11 200 1600 200 L 70 70 0 1 W
-X GND A12 200 1500 200 L 70 70 0 1 W
-X GND A2 200 2100 200 L 70 70 0 1 W
-X GND A22 200 1400 200 L 70 70 0 1 W
-X GND A3 200 2000 200 L 70 70 0 1 W
-X GND A5 200 1900 200 L 70 70 0 1 W
-X GND A7 200 1800 200 L 70 70 0 1 W
-X GND A9 200 1700 200 L 70 70 0 1 W
-X GND B12 200 1200 200 L 70 70 0 1 W
-X GND B19 200 1100 200 L 70 70 0 1 W
-X GND B3 200 1300 200 L 70 70 0 1 W
-X GND C10 200 800 200 L 70 70 0 1 W
-X GND C12 200 700 200 L 70 70 0 1 W
-X GND C16 200 600 200 L 70 70 0 1 W
-X GND C3 200 1000 200 L 70 70 0 1 W
-X GND C6 200 900 200 L 70 70 0 1 W
-X GND D12 200 200 200 L 70 70 0 1 W
-X GND D13 200 100 200 L 70 70 0 1 W
-X GND D3 200 500 200 L 70 70 0 1 W
-X GND D4 200 400 200 L 70 70 0 1 W
-X GND D8 200 300 200 L 70 70 0 1 W
-X GND E11 200 -400 200 L 70 70 0 1 W
-X GND E20 200 -500 200 L 70 70 0 1 W
-X GND E4 200 0 200 L 70 70 0 1 W
-X GND E5 200 -100 200 L 70 70 0 1 W
-X GND E7 200 -200 200 L 70 70 0 1 W
-X GND E9 200 -300 200 L 70 70 0 1 W
-X GND F11 200 -700 200 L 70 70 0 1 W
-X GND F17 200 -800 200 L 70 70 0 1 W
-X GND F5 200 -600 200 L 70 70 0 1 W
-X GND G10 200 -1400 200 L 70 70 0 1 W
-X GND G12 200 -1500 200 L 70 70 0 1 W
-X GND G14 200 -1600 200 L 70 70 0 1 W
-X GND G5 200 -900 200 L 70 70 0 1 W
-X GND G6 200 -1000 200 L 70 70 0 1 W
-X GND G7 200 -1100 200 L 70 70 0 1 W
-X GND G8 200 -1200 200 L 70 70 0 1 W
-X GND G9 200 -1300 200 L 70 70 0 1 W
-X GND H1 200 -1700 200 L 70 70 0 1 W
-X GND H11 200 -2000 200 L 70 70 0 1 W
-X GND H21 200 -2100 200 L 70 70 0 1 W
-X GND H7 200 -1800 200 L 70 70 0 1 W
-X GND H9 200 -1900 200 L 70 70 0 1 W
-X GND J8 200 -2200 200 L 70 70 0 1 W
+# XC7A200TFBG484
+#
+DEF XC7A200TFBG484 U 0 40 Y Y 17 L N
+F0 "U" -1550 -100 50 H V C CNN
+F1 "XC7A200TFBG484" -1800 150 50 H V C CNN
+F2 "" -400 0 50 H I C CNN
+F3 "" -400 0 50 H I C CNN
+DRAW
+T 0 -410 960 50 0 1 1 XC7A200T-1FBG484C Normal 1 C C
+T 0 -410 860 50 0 1 1 Xilinx Normal 1 C C
+P 2 1 1 10 -400 -850 0 -850 N
+P 2 1 1 10 0 -850 0 750 N
+P 2 1 1 10 0 750 -400 750 N
+P 2 2 1 10 -50 -2150 350 -2150 N
+P 2 2 1 10 350 -2150 350 1950 N
+P 2 2 1 10 350 1950 -50 1950 N
+P 2 3 1 10 -400 -3000 0 -3000 N
+P 2 3 1 10 0 -3000 0 2700 N
+P 2 3 1 10 0 2700 -400 2700 N
+P 2 4 1 10 0 -2900 400 -2900 N
+P 2 4 1 10 400 -2900 400 2800 N
+P 2 4 1 10 400 2800 0 2800 N
+P 2 5 1 10 0 -3000 400 -3000 N
+P 2 5 1 10 400 -3000 400 2700 N
+P 2 5 1 10 400 2700 0 2700 N
+P 2 6 1 10 -400 -2800 0 -2800 N
+P 2 6 1 10 0 -2800 0 2900 N
+P 2 6 1 10 0 2900 -400 2900 N
+P 2 7 1 10 -400 -3000 0 -3000 N
+P 2 7 1 10 0 -3000 0 2700 N
+P 2 7 1 10 0 2700 -400 2700 N
+P 2 8 1 10 -400 -1100 0 -1100 N
+P 2 8 1 10 0 -1100 0 1100 N
+P 2 8 1 10 0 1100 -400 1100 N
+P 2 9 1 10 -400 -2300 0 -2300 N
+P 2 9 1 10 0 -2300 0 2200 N
+P 2 9 1 10 0 2200 -400 2200 N
+P 2 10 1 10 -400 -2250 0 -2250 N
+P 2 10 1 10 0 -2250 0 2150 N
+P 2 10 1 10 0 2150 -400 2150 N
+P 2 11 1 10 -400 -300 0 -300 N
+P 2 11 1 10 0 -300 0 300 N
+P 2 11 1 10 0 300 -400 300 N
+P 2 12 1 10 -400 -350 0 -350 N
+P 2 12 1 10 0 -350 0 350 N
+P 2 12 1 10 0 350 -400 350 N
+P 2 13 1 10 -400 -150 0 -150 N
+P 2 13 1 10 0 -150 0 150 N
+P 2 13 1 10 0 150 -400 150 N
+P 2 14 1 10 -400 -350 0 -350 N
+P 2 14 1 10 0 -350 0 250 N
+P 2 14 1 10 0 250 -400 250 N
+P 2 15 1 10 -400 -200 0 -200 N
+P 2 15 1 10 0 -200 0 200 N
+P 2 15 1 10 0 200 -400 200 N
+P 2 16 1 10 -400 -800 0 -800 N
+P 2 16 1 10 0 -800 0 700 N
+P 2 16 1 10 0 700 -400 700 N
+P 2 17 1 10 -400 -350 0 -350 N
+P 2 17 1 10 0 -350 0 350 N
+P 2 17 1 10 0 350 -400 350 N
+X VCCBATT_0 E12 200 650 200 L 70 70 1 1 P
+X VCCO_0 F12 200 550 200 L 70 70 1 1 P
+X DONE_0 G11 200 250 200 L 70 70 1 1 P
+X CCLK_0 L12 200 -50 200 L 70 70 1 1 P
+X PROGRAM_B_0 N12 200 50 200 L 70 70 1 1 P
+X TDI_0 R13 200 -550 200 L 70 70 1 1 P
+X VCCO_0 T12 200 450 200 L 70 70 1 1 P
+X TMS_0 T13 200 -750 200 L 70 70 1 1 P
+X M1_0 U10 200 -250 200 L 70 70 1 1 P
+X M0_0 U11 200 -150 200 L 70 70 1 1 P
+X INIT_B_0 U12 200 150 200 L 70 70 1 1 C
+X TDO_0 U13 200 -650 200 L 70 70 1 1 O
+X CFGBVS_0 U8 200 350 200 L 70 70 1 1 P
+X M2_0 U9 200 -350 200 L 70 70 1 1 P
+X TCK_0 V12 200 -450 200 L 70 70 1 1 P
+X IO_L9P_T1_DQS_13 AA10 550 -350 200 L 70 70 2 1 P
+X IO_L9N_T1_DQS_13 AA11 550 -450 200 L 70 70 2 1 P
+X IO_L3P_T0_DQS_13 AA13 550 850 200 L 70 70 2 1 P
+X IO_L5N_T0_13 AA14 550 350 200 L 70 70 2 1 P
+X IO_L4P_T0_13 AA15 550 650 200 L 70 70 2 1 P
+X IO_L1N_T0_13 AA16 550 1150 200 L 70 70 2 1 P
+X VCCO_13 AA17 550 1550 200 L 70 70 2 1 P
+X IO_L8P_T1_13 AA9 550 -150 200 L 70 70 2 1 P
+X IO_L8N_T1_13 AB10 550 -250 200 L 70 70 2 1 P
+X IO_L7P_T1_13 AB11 550 50 200 L 70 70 2 1 P
+X IO_L7N_T1_13 AB12 550 -50 200 L 70 70 2 1 P
+X IO_L3N_T0_DQS_13 AB13 550 750 200 L 70 70 2 1 P
+X VCCO_13 AB14 550 1450 200 L 70 70 2 1 P
+X IO_L4N_T0_13 AB15 550 550 200 L 70 70 2 1 P
+X IO_L2P_T0_13 AB16 550 1050 200 L 70 70 2 1 P
+X IO_L2N_T0_13 AB17 550 950 200 L 70 70 2 1 P
+X IO_L15P_T2_DQS_13 T14 550 -1550 200 L 70 70 2 1 P
+X IO_L15N_T2_DQS_13 T15 550 -1650 200 L 70 70 2 1 P
+X IO_L17P_T2_13 T16 550 -1950 200 L 70 70 2 1 P
+X IO_L14P_T2_SRCC_13 U15 550 -1350 200 L 70 70 2 1 P
+X IO_L17N_T2_13 U16 550 -2050 200 L 70 70 2 1 P
+X IO_L10P_T1_13 V10 550 -550 200 L 70 70 2 1 P
+X IO_L13P_T2_MRCC_13 V13 550 -1150 200 L 70 70 2 1 P
+X IO_L13N_T2_MRCC_13 V14 550 -1250 200 L 70 70 2 1 P
+X IO_L14N_T2_SRCC_13 V15 550 -1450 200 L 70 70 2 1 P
+X VCCO_13 V16 550 1850 200 L 70 70 2 1 P
+X IO_L10N_T1_13 W10 550 -650 200 L 70 70 2 1 P
+X IO_L12P_T1_MRCC_13 W11 550 -950 200 L 70 70 2 1 P
+X IO_L12N_T1_MRCC_13 W12 550 -1050 200 L 70 70 2 1 P
+X VCCO_13 W13 550 1750 200 L 70 70 2 1 P
+X IO_L6P_T0_13 W14 550 250 200 L 70 70 2 1 P
+X IO_L16P_T2_13 W15 550 -1750 200 L 70 70 2 1 P
+X IO_L16N_T2_13 W16 550 -1850 200 L 70 70 2 1 P
+X VCCO_13 Y10 550 1650 200 L 70 70 2 1 P
+X IO_L11P_T1_SRCC_13 Y11 550 -750 200 L 70 70 2 1 P
+X IO_L11N_T1_SRCC_13 Y12 550 -850 200 L 70 70 2 1 P
+X IO_L5P_T0_13 Y13 550 450 200 L 70 70 2 1 P
+X IO_L6N_T0_VREF_13 Y14 550 150 200 L 70 70 2 1 P
+X IO_L1P_T0_13 Y16 550 1250 200 L 70 70 2 1 P
+X IO_0_13 Y17 550 1350 200 L 70 70 2 1 P
+X IO_L17P_T2_A14_D30_14 AA18 200 -1300 200 L 70 70 3 1 P
+X IO_L15P_T2_DQS_RDWR_B_14 AA19 200 -900 200 L 70 70 3 1 P
+X IO_L8P_T1_D11_14 AA20 200 500 200 L 70 70 3 1 P
+X IO_L8N_T1_D12_14 AA21 200 400 200 L 70 70 3 1 P
+X IO_L17N_T2_A13_D29_14 AB18 200 -1400 200 L 70 70 3 1 P
+X IO_L15N_T2_DQS_DOUT_CSO_B_14 AB20 200 -1000 200 L 70 70 3 1 P
+X IO_L10P_T1_D14_14 AB21 200 100 200 L 70 70 3 1 P
+X IO_L10N_T1_D15_14 AB22 200 0 200 L 70 70 3 1 P
+X VCCO_14 M14 200 2600 200 L 70 70 3 1 P
+X IO_L23P_T3_A03_D19_14 N13 200 -2500 200 L 70 70 3 1 P
+X IO_L23N_T3_A02_D18_14 N14 200 -2600 200 L 70 70 3 1 P
+X IO_25_14 N15 200 -2900 200 L 70 70 3 1 P
+X IO_L21P_T3_DQS_14 N17 200 -2100 200 L 70 70 3 1 P
+X IO_L19P_T3_A10_D26_14 P14 200 -1700 200 L 70 70 3 1 P
+X IO_L22P_T3_A05_D21_14 P15 200 -2300 200 L 70 70 3 1 P
+X IO_L24P_T3_A01_D17_14 P16 200 -2700 200 L 70 70 3 1 P
+X IO_L21N_T3_DQS_A06_D22_14 P17 200 -2200 200 L 70 70 3 1 P
+X VCCO_14 P18 200 2500 200 L 70 70 3 1 P
+X IO_L5P_T0_D06_14 P19 200 1100 200 L 70 70 3 1 P
+X IO_0_14 P20 200 2000 200 L 70 70 3 1 P
+X IO_L2P_T0_D02_14 P21 200 1700 200 L 70 70 3 1 P
+X IO_L1P_T0_D00_MOSI_14 P22 200 1900 200 L 70 70 3 1 P
+X IO_L19N_T3_A09_D25_VREF_14 R14 200 -1800 200 L 70 70 3 1 P
+X VCCO_14 R15 200 2400 200 L 70 70 3 1 P
+X IO_L22N_T3_A04_D20_14 R16 200 -2400 200 L 70 70 3 1 P
+X IO_L24N_T3_A00_D16_14 R17 200 -2800 200 L 70 70 3 1 P
+X IO_L20P_T3_A08_D24_14 R18 200 -1900 200 L 70 70 3 1 P
+X IO_L5N_T0_D07_14 R19 200 1000 200 L 70 70 3 1 P
+X IO_L2N_T0_D03_14 R21 200 1600 200 L 70 70 3 1 P
+X IO_L1N_T0_D01_DIN_14 R22 200 1800 200 L 70 70 3 1 P
+X IO_L20N_T3_A07_D23_14 T18 200 -2000 200 L 70 70 3 1 P
+X IO_L6P_T0_FCS_B_14 T19 200 900 200 L 70 70 3 1 P
+X IO_L6N_T0_D08_VREF_14 T20 200 800 200 L 70 70 3 1 P
+X IO_L4P_T0_D04_14 T21 200 1300 200 L 70 70 3 1 P
+X VCCO_14 T22 200 2300 200 L 70 70 3 1 P
+X IO_L18P_T2_A12_D28_14 U17 200 -1500 200 L 70 70 3 1 P
+X IO_L18N_T2_A11_D27_14 U18 200 -1600 200 L 70 70 3 1 P
+X VCCO_14 U19 200 2200 200 L 70 70 3 1 P
+X IO_L11P_T1_SRCC_14 U20 200 -100 200 L 70 70 3 1 P
+X IO_L4N_T0_D05_14 U21 200 1200 200 L 70 70 3 1 P
+X IO_L3P_T0_DQS_PUDC_B_14 U22 200 1500 200 L 70 70 3 1 P
+X IO_L16P_T2_CSI_B_14 V17 200 -1100 200 L 70 70 3 1 P
+X IO_L14P_T2_SRCC_14 V18 200 -700 200 L 70 70 3 1 P
+X IO_L14N_T2_SRCC_14 V19 200 -800 200 L 70 70 3 1 P
+X IO_L11N_T1_SRCC_14 V20 200 -200 200 L 70 70 3 1 P
+X IO_L3N_T0_DQS_EMCCLK_14 V22 200 1400 200 L 70 70 3 1 P
+X IO_L16N_T2_A15_D31_14 W17 200 -1200 200 L 70 70 3 1 P
+X IO_L12P_T1_MRCC_14 W19 200 -300 200 L 70 70 3 1 P
+X IO_L12N_T1_MRCC_14 W20 200 -400 200 L 70 70 3 1 P
+X IO_L7P_T1_D09_14 W21 200 700 200 L 70 70 3 1 P
+X IO_L7N_T1_D10_14 W22 200 600 200 L 70 70 3 1 P
+X IO_L13P_T2_MRCC_14 Y18 200 -500 200 L 70 70 3 1 P
+X IO_L13N_T2_MRCC_14 Y19 200 -600 200 L 70 70 3 1 P
+X VCCO_14 Y20 200 2100 200 L 70 70 3 1 P
+X IO_L9P_T1_DQS_14 Y21 200 300 200 L 70 70 3 1 P
+X IO_L9N_T1_DQS_D13_14 Y22 200 200 200 L 70 70 3 1 P
+X IO_L1N_T0_AD0N_15 G13 600 1900 200 L 70 70 4 1 P
+X IO_L2P_T0_AD8P_15 G15 600 1800 200 L 70 70 4 1 P
+X IO_L2N_T0_AD8N_15 G16 600 1700 200 L 70 70 4 1 P
+X IO_L4P_T0_15 G17 600 1400 200 L 70 70 4 1 P
+X IO_L4N_T0_15 G18 600 1300 200 L 70 70 4 1 P
+X VCCO_15 G19 600 2700 200 L 70 70 4 1 P
+X IO_L8N_T1_AD10N_15 G20 600 500 200 L 70 70 4 1 P
+X IO_L1P_T0_AD0P_15 H13 600 2000 200 L 70 70 4 1 P
+X IO_L3N_T0_DQS_AD1N_15 H14 600 1500 200 L 70 70 4 1 P
+X IO_L5N_T0_AD9N_15 H15 600 1100 200 L 70 70 4 1 P
+X VCCO_15 H16 600 2600 200 L 70 70 4 1 P
+X IO_L6P_T0_15 H17 600 1000 200 L 70 70 4 1 P
+X IO_L6N_T0_VREF_15 H18 600 900 200 L 70 70 4 1 P
+X IO_L12N_T1_MRCC_15 H19 600 -300 200 L 70 70 4 1 P
+X IO_L8P_T1_AD10P_15 H20 600 600 200 L 70 70 4 1 P
+X IO_L7N_T1_AD2N_15 H22 600 700 200 L 70 70 4 1 P
+X VCCO_15 J13 600 2500 200 L 70 70 4 1 P
+X IO_L3P_T0_DQS_AD1P_15 J14 600 1600 200 L 70 70 4 1 P
+X IO_L5P_T0_AD9P_15 J15 600 1200 200 L 70 70 4 1 P
+X IO_0_15 J16 600 2100 200 L 70 70 4 1 P
+X IO_L21N_T3_DQS_A18_15 J17 600 -2100 200 L 70 70 4 1 P
+X IO_L12P_T1_MRCC_15 J19 600 -200 200 L 70 70 4 1 P
+X IO_L11P_T1_SRCC_15 J20 600 0 200 L 70 70 4 1 P
+X IO_L11N_T1_SRCC_15 J21 600 -100 200 L 70 70 4 1 P
+X IO_L7P_T1_AD2P_15 J22 600 800 200 L 70 70 4 1 P
+X IO_L19P_T3_A22_15 K13 600 -1600 200 L 70 70 4 1 P
+X IO_L19N_T3_A21_VREF_15 K14 600 -1700 200 L 70 70 4 1 P
+X IO_L23N_T3_FWE_B_15 K16 600 -2500 200 L 70 70 4 1 P
+X IO_L21P_T3_DQS_15 K17 600 -2000 200 L 70 70 4 1 P
+X IO_L13P_T2_MRCC_15 K18 600 -400 200 L 70 70 4 1 P
+X IO_L13N_T2_MRCC_15 K19 600 -500 200 L 70 70 4 1 P
+X VCCO_15 K20 600 2400 200 L 70 70 4 1 P
+X IO_L9P_T1_DQS_AD3P_15 K21 600 400 200 L 70 70 4 1 P
+X IO_L9N_T1_DQS_AD3N_15 K22 600 300 200 L 70 70 4 1 P
+X IO_L20N_T3_A19_15 L13 600 -1900 200 L 70 70 4 1 P
+X IO_L22P_T3_A17_15 L14 600 -2200 200 L 70 70 4 1 P
+X IO_L22N_T3_A16_15 L15 600 -2300 200 L 70 70 4 1 P
+X IO_L23P_T3_FOE_B_15 L16 600 -2400 200 L 70 70 4 1 P
+X VCCO_15 L17 600 2300 200 L 70 70 4 1 P
+X IO_L16N_T2_A27_15 L18 600 -1100 200 L 70 70 4 1 P
+X IO_L14P_T2_SRCC_15 L19 600 -600 200 L 70 70 4 1 P
+X IO_L14N_T2_SRCC_15 L20 600 -700 200 L 70 70 4 1 P
+X IO_L10N_T1_AD11N_15 L21 600 100 200 L 70 70 4 1 P
+X IO_L20P_T3_A20_15 M13 600 -1800 200 L 70 70 4 1 P
+X IO_L24P_T3_RS1_15 M15 600 -2600 200 L 70 70 4 1 P
+X IO_L24N_T3_RS0_15 M16 600 -2700 200 L 70 70 4 1 P
+X IO_25_15 M17 600 -2800 200 L 70 70 4 1 P
+X IO_L16P_T2_A28_15 M18 600 -1000 200 L 70 70 4 1 P
+X IO_L18N_T2_A23_15 M20 600 -1500 200 L 70 70 4 1 P
+X IO_L10P_T1_AD11P_15 M21 600 200 200 L 70 70 4 1 P
+X IO_L15N_T2_DQS_ADV_B_15 M22 600 -900 200 L 70 70 4 1 P
+X IO_L17P_T2_A26_15 N18 600 -1200 200 L 70 70 4 1 P
+X IO_L17N_T2_A25_15 N19 600 -1300 200 L 70 70 4 1 P
+X IO_L18P_T2_A24_15 N20 600 -1400 200 L 70 70 4 1 P
+X VCCO_15 N21 600 2200 200 L 70 70 4 1 P
+X IO_L15P_T2_DQS_15 N22 600 -800 200 L 70 70 4 1 P
+X IO_L10P_T1_16 A13 600 100 200 L 70 70 5 1 P
+X IO_L10N_T1_16 A14 600 0 200 L 70 70 5 1 P
+X IO_L9P_T1_DQS_16 A15 600 300 200 L 70 70 5 1 P
+X IO_L9N_T1_DQS_16 A16 600 200 200 L 70 70 5 1 P
+X VCCO_16 A17 600 2600 200 L 70 70 5 1 P
+X IO_L17P_T2_16 A18 600 -1300 200 L 70 70 5 1 P
+X IO_L17N_T2_16 A19 600 -1400 200 L 70 70 5 1 P
+X IO_L16N_T2_16 A20 600 -1200 200 L 70 70 5 1 P
+X IO_L21N_T3_DQS_16 A21 600 -2200 200 L 70 70 5 1 P
+X IO_L8N_T1_16 B13 600 400 200 L 70 70 5 1 P
+X VCCO_16 B14 600 2500 200 L 70 70 5 1 P
+X IO_L7P_T1_16 B15 600 700 200 L 70 70 5 1 P
+X IO_L7N_T1_16 B16 600 600 200 L 70 70 5 1 P
+X IO_L11P_T1_SRCC_16 B17 600 -100 200 L 70 70 5 1 P
+X IO_L11N_T1_SRCC_16 B18 600 -200 200 L 70 70 5 1 P
+X IO_L16P_T2_16 B20 600 -1100 200 L 70 70 5 1 P
+X IO_L21P_T3_DQS_16 B21 600 -2100 200 L 70 70 5 1 P
+X IO_L20N_T3_16 B22 600 -2000 200 L 70 70 5 1 P
+X IO_L8P_T1_16 C13 600 500 200 L 70 70 5 1 P
+X IO_L3P_T0_DQS_16 C14 600 1500 200 L 70 70 5 1 P
+X IO_L3N_T0_DQS_16 C15 600 1400 200 L 70 70 5 1 P
+X IO_L12N_T1_MRCC_16 C17 600 -400 200 L 70 70 5 1 P
+X IO_L13P_T2_MRCC_16 C18 600 -500 200 L 70 70 5 1 P
+X IO_L13N_T2_MRCC_16 C19 600 -600 200 L 70 70 5 1 P
+X IO_L19N_T3_VREF_16 C20 600 -1800 200 L 70 70 5 1 P
+X VCCO_16 C21 600 2400 200 L 70 70 5 1 P
+X IO_L20P_T3_16 C22 600 -1900 200 L 70 70 5 1 P
+X IO_L6P_T0_16 D14 600 900 200 L 70 70 5 1 P
+X IO_L6N_T0_VREF_16 D15 600 800 200 L 70 70 5 1 P
+X IO_L5N_T0_16 D16 600 1000 200 L 70 70 5 1 P
+X IO_L12P_T1_MRCC_16 D17 600 -300 200 L 70 70 5 1 P
+X VCCO_16 D18 600 2300 200 L 70 70 5 1 P
+X IO_L14N_T2_SRCC_16 D19 600 -800 200 L 70 70 5 1 P
+X IO_L19P_T3_16 D20 600 -1700 200 L 70 70 5 1 P
+X IO_L23N_T3_16 D21 600 -2600 200 L 70 70 5 1 P
+X IO_L22N_T3_16 D22 600 -2400 200 L 70 70 5 1 P
+X IO_L4P_T0_16 E13 600 1300 200 L 70 70 5 1 P
+X IO_L4N_T0_16 E14 600 1200 200 L 70 70 5 1 P
+X VCCO_16 E15 600 2200 200 L 70 70 5 1 P
+X IO_L5P_T0_16 E16 600 1100 200 L 70 70 5 1 P
+X IO_L2N_T0_16 E17 600 1600 200 L 70 70 5 1 P
+X IO_L15N_T2_DQS_16 E18 600 -1000 200 L 70 70 5 1 P
+X IO_L14P_T2_SRCC_16 E19 600 -700 200 L 70 70 5 1 P
+X IO_L23P_T3_16 E21 600 -2500 200 L 70 70 5 1 P
+X IO_L22P_T3_16 E22 600 -2300 200 L 70 70 5 1 P
+X IO_L1P_T0_16 F13 600 1900 200 L 70 70 5 1 P
+X IO_L1N_T0_16 F14 600 1800 200 L 70 70 5 1 P
+X IO_0_16 F15 600 2000 200 L 70 70 5 1 P
+X IO_L2P_T0_16 F16 600 1700 200 L 70 70 5 1 P
+X IO_L15P_T2_DQS_16 F18 600 -900 200 L 70 70 5 1 P
+X IO_L18P_T2_16 F19 600 -1500 200 L 70 70 5 1 P
+X IO_L18N_T2_16 F20 600 -1600 200 L 70 70 5 1 P
+X IO_25_16 F21 600 -2900 200 L 70 70 5 1 P
+X VCCO_16 F22 600 2100 200 L 70 70 5 1 P
+X IO_L24P_T3_16 G21 600 -2700 200 L 70 70 5 1 P
+X IO_L24N_T3_16 G22 600 -2800 200 L 70 70 5 1 P
+X IO_L7P_T1_34 AA1 200 900 200 L 70 70 6 1 P
+X IO_L9N_T1_DQS_34 AA3 200 400 200 L 70 70 6 1 P
+X IO_L11N_T1_SRCC_34 AA4 200 0 200 L 70 70 6 1 P
+X IO_L10P_T1_34 AA5 200 300 200 L 70 70 6 1 P
+X IO_L18N_T2_34 AA6 200 -1400 200 L 70 70 6 1 P
+X VCCO_34 AA7 200 2400 200 L 70 70 6 1 P
+X IO_L22P_T3_34 AA8 200 -2100 200 L 70 70 6 1 P
+X IO_L7N_T1_34 AB1 200 800 200 L 70 70 6 1 P
+X IO_L8N_T1_34 AB2 200 600 200 L 70 70 6 1 P
+X IO_L8P_T1_34 AB3 200 700 200 L 70 70 6 1 P
+X VCCO_34 AB4 200 2300 200 L 70 70 6 1 P
+X IO_L10N_T1_34 AB5 200 200 200 L 70 70 6 1 P
+X IO_L20N_T3_34 AB6 200 -1800 200 L 70 70 6 1 P
+X IO_L20P_T3_34 AB7 200 -1700 200 L 70 70 6 1 P
+X IO_L22N_T3_34 AB8 200 -2200 200 L 70 70 6 1 P
+X IO_L3N_T0_DQS_34 R2 200 1600 200 L 70 70 6 1 P
+X IO_L3P_T0_DQS_34 R3 200 1700 200 L 70 70 6 1 P
+X IO_L13P_T2_MRCC_34 R4 200 -300 200 L 70 70 6 1 P
+X VCCO_34 R5 200 2800 200 L 70 70 6 1 P
+X IO_L17P_T2_34 R6 200 -1100 200 L 70 70 6 1 P
+X IO_L1P_T0_34 T1 200 2100 200 L 70 70 6 1 P
+X VCCO_34 T2 200 2700 200 L 70 70 6 1 P
+X IO_0_34 T3 200 2200 200 L 70 70 6 1 P
+X IO_L13N_T2_MRCC_34 T4 200 -400 200 L 70 70 6 1 P
+X IO_L14P_T2_SRCC_34 T5 200 -500 200 L 70 70 6 1 P
+X IO_L17N_T2_34 T6 200 -1200 200 L 70 70 6 1 P
+X IO_L1N_T0_34 U1 200 2000 200 L 70 70 6 1 P
+X IO_L2P_T0_34 U2 200 1900 200 L 70 70 6 1 P
+X IO_L6P_T0_34 U3 200 1100 200 L 70 70 6 1 P
+X IO_L14N_T2_SRCC_34 U5 200 -600 200 L 70 70 6 1 P
+X IO_L16P_T2_34 U6 200 -900 200 L 70 70 6 1 P
+X IO_25_34 U7 200 -2700 200 L 70 70 6 1 P
+X IO_L2N_T0_34 V2 200 1800 200 L 70 70 6 1 P
+X IO_L6N_T0_VREF_34 V3 200 1000 200 L 70 70 6 1 P
+X IO_L12P_T1_MRCC_34 V4 200 -100 200 L 70 70 6 1 P
+X IO_L16N_T2_34 V5 200 -1000 200 L 70 70 6 1 P
+X VCCO_34 V6 200 2600 200 L 70 70 6 1 P
+X IO_L19P_T3_34 V7 200 -1500 200 L 70 70 6 1 P
+X IO_L21N_T3_DQS_34 V8 200 -2000 200 L 70 70 6 1 P
+X IO_L21P_T3_DQS_34 V9 200 -1900 200 L 70 70 6 1 P
+X IO_L5P_T0_34 W1 200 1300 200 L 70 70 6 1 P
+X IO_L4P_T0_34 W2 200 1500 200 L 70 70 6 1 P
+X VCCO_34 W3 200 2500 200 L 70 70 6 1 P
+X IO_L12N_T1_MRCC_34 W4 200 -200 200 L 70 70 6 1 P
+X IO_L15N_T2_DQS_34 W5 200 -800 200 L 70 70 6 1 P
+X IO_L15P_T2_DQS_34 W6 200 -700 200 L 70 70 6 1 P
+X IO_L19N_T3_VREF_34 W7 200 -1600 200 L 70 70 6 1 P
+X IO_L24P_T3_34 W9 200 -2500 200 L 70 70 6 1 P
+X IO_L5N_T0_34 Y1 200 1200 200 L 70 70 6 1 P
+X IO_L4N_T0_34 Y2 200 1400 200 L 70 70 6 1 P
+X IO_L9P_T1_DQS_34 Y3 200 500 200 L 70 70 6 1 P
+X IO_L11P_T1_SRCC_34 Y4 200 100 200 L 70 70 6 1 P
+X IO_L18P_T2_34 Y6 200 -1300 200 L 70 70 6 1 P
+X IO_L23N_T3_34 Y7 200 -2400 200 L 70 70 6 1 P
+X IO_L23P_T3_34 Y8 200 -2300 200 L 70 70 6 1 P
+X IO_L24N_T3_34 Y9 200 -2600 200 L 70 70 6 1 P
+X IO_L1N_T0_AD4N_35 A1 200 1800 200 L 70 70 7 1 P
+X IO_L1P_T0_AD4P_35 B1 200 1900 200 L 70 70 7 1 P
+X IO_L2N_T0_AD12N_35 B2 200 1600 200 L 70 70 7 1 P
+X VCCO_35 C1 200 2600 200 L 70 70 7 1 P
+X IO_L2P_T0_AD12P_35 C2 200 1700 200 L 70 70 7 1 P
+X IO_L3N_T0_DQS_AD5N_35 D1 200 1400 200 L 70 70 7 1 P
+X IO_L4N_T0_35 D2 200 1200 200 L 70 70 7 1 P
+X IO_L3P_T0_DQS_AD5P_35 E1 200 1500 200 L 70 70 7 1 P
+X IO_L4P_T0_35 E2 200 1300 200 L 70 70 7 1 P
+X IO_L6N_T0_VREF_35 E3 200 800 200 L 70 70 7 1 P
+X IO_L5N_T0_AD13N_35 F1 200 1000 200 L 70 70 7 1 P
+X VCCO_35 F2 200 2500 200 L 70 70 7 1 P
+X IO_L6P_T0_35 F3 200 900 200 L 70 70 7 1 P
+X IO_0_35 F4 200 2000 200 L 70 70 7 1 P
+X IO_L5P_T0_AD13P_35 G1 200 1100 200 L 70 70 7 1 P
+X IO_L8N_T1_AD14N_35 G2 200 400 200 L 70 70 7 1 P
+X IO_L11N_T1_SRCC_35 G3 200 -200 200 L 70 70 7 1 P
+X IO_L12N_T1_MRCC_35 G4 200 -400 200 L 70 70 7 1 P
+X IO_L8P_T1_AD14P_35 H2 200 500 200 L 70 70 7 1 P
+X IO_L11P_T1_SRCC_35 H3 200 -100 200 L 70 70 7 1 P
+X IO_L12P_T1_MRCC_35 H4 200 -300 200 L 70 70 7 1 P
+X IO_L10N_T1_AD15N_35 H5 200 0 200 L 70 70 7 1 P
+X VCCO_35 H6 200 2400 200 L 70 70 7 1 P
+X IO_L7N_T1_AD6N_35 J1 200 600 200 L 70 70 7 1 P
+X IO_L9N_T1_DQS_AD7N_35 J2 200 200 200 L 70 70 7 1 P
+X VCCO_35 J3 200 2300 200 L 70 70 7 1 P
+X IO_L13N_T2_MRCC_35 J4 200 -600 200 L 70 70 7 1 P
+X IO_L10P_T1_AD15P_35 J5 200 100 200 L 70 70 7 1 P
+X IO_L17N_T2_35 J6 200 -1400 200 L 70 70 7 1 P
+X IO_L7P_T1_AD6P_35 K1 200 700 200 L 70 70 7 1 P
+X IO_L9P_T1_DQS_AD7P_35 K2 200 300 200 L 70 70 7 1 P
+X IO_L14N_T2_SRCC_35 K3 200 -800 200 L 70 70 7 1 P
+X IO_L13P_T2_MRCC_35 K4 200 -500 200 L 70 70 7 1 P
+X IO_L17P_T2_35 K6 200 -1300 200 L 70 70 7 1 P
+X IO_L15N_T2_DQS_35 L1 200 -1000 200 L 70 70 7 1 P
+X IO_L14P_T2_SRCC_35 L3 200 -700 200 L 70 70 7 1 P
+X IO_L18N_T2_35 L4 200 -1600 200 L 70 70 7 1 P
+X IO_L18P_T2_35 L5 200 -1500 200 L 70 70 7 1 P
+X IO_25_35 L6 200 -2900 200 L 70 70 7 1 P
+X IO_L15P_T2_DQS_35 M1 200 -900 200 L 70 70 7 1 P
+X IO_L16N_T2_35 M2 200 -1200 200 L 70 70 7 1 P
+X IO_L16P_T2_35 M3 200 -1100 200 L 70 70 7 1 P
+X VCCO_35 M4 200 2200 200 L 70 70 7 1 P
+X IO_L23N_T3_35 M5 200 -2600 200 L 70 70 7 1 P
+X IO_L23P_T3_35 M6 200 -2500 200 L 70 70 7 1 P
+X VCCO_35 N1 200 2100 200 L 70 70 7 1 P
+X IO_L22N_T3_35 N2 200 -2400 200 L 70 70 7 1 P
+X IO_L19N_T3_VREF_35 N3 200 -1800 200 L 70 70 7 1 P
+X IO_L19P_T3_35 N4 200 -1700 200 L 70 70 7 1 P
+X IO_L24N_T3_35 N5 200 -2800 200 L 70 70 7 1 P
+X IO_L20N_T3_35 P1 200 -2000 200 L 70 70 7 1 P
+X IO_L22P_T3_35 P2 200 -2300 200 L 70 70 7 1 P
+X IO_L21N_T3_DQS_35 P4 200 -2200 200 L 70 70 7 1 P
+X IO_L21P_T3_DQS_35 P5 200 -2100 200 L 70 70 7 1 P
+X IO_L24P_T3_35 P6 200 -2700 200 L 70 70 7 1 P
+X IO_L20P_T3_35 R1 200 -1900 200 L 70 70 7 1 P
+X MGTPRXN1_216 A10 200 800 200 L 70 70 8 1 P
+X MGTPTXN3_216 A4 200 -200 200 L 70 70 8 1 P
+X MGTPTXN1_216 A6 200 0 200 L 70 70 8 1 P
+X MGTPRXN3_216 A8 200 600 200 L 70 70 8 1 P
+X MGTPRXP1_216 B10 200 400 200 L 70 70 8 1 P
+X MGTPTXP3_216 B4 200 -600 200 L 70 70 8 1 P
+X MGTPTXP1_216 B6 200 -400 200 L 70 70 8 1 P
+X MGTPRXP3_216 B8 200 200 200 L 70 70 8 1 P
+X MGTPRXN0_216 C11 200 900 200 L 70 70 8 1 P
+X MGTPTXN2_216 C5 200 -100 200 L 70 70 8 1 P
+X MGTPTXN0_216 C7 200 100 200 L 70 70 8 1 P
+X MGTPRXN2_216 C9 200 700 200 L 70 70 8 1 P
+X MGTPRXP0_216 D11 200 500 200 L 70 70 8 1 P
+X MGTPTXP2_216 D5 200 -500 200 L 70 70 8 1 P
+X MGTPTXP0_216 D7 200 -300 200 L 70 70 8 1 P
+X MGTPRXP2_216 D9 200 300 200 L 70 70 8 1 P
+X MGTREFCLK0N_216 E10 200 -800 200 L 70 70 8 1 P
+X MGTREFCLK1N_216 E6 200 -1000 200 L 70 70 8 1 P
+X MGTREFCLK0P_216 F10 200 -700 200 L 70 70 8 1 P
+X MGTREFCLK1P_216 F6 200 -900 200 L 70 70 8 1 P
+X MGTRREF_216 F8 200 1000 200 L 70 70 8 1 P
+X GND A11 200 1600 200 L 70 70 9 1 W
+X GND A12 200 1500 200 L 70 70 9 1 W
+X GND A2 200 2100 200 L 70 70 9 1 W
+X GND A22 200 1400 200 L 70 70 9 1 W
+X GND A3 200 2000 200 L 70 70 9 1 W
+X GND A5 200 1900 200 L 70 70 9 1 W
+X GND A7 200 1800 200 L 70 70 9 1 W
+X GND A9 200 1700 200 L 70 70 9 1 W
+X GND B12 200 1200 200 L 70 70 9 1 W
+X GND B19 200 1100 200 L 70 70 9 1 W
+X GND B3 200 1300 200 L 70 70 9 1 W
+X GND C10 200 800 200 L 70 70 9 1 W
+X GND C12 200 700 200 L 70 70 9 1 W
+X GND C16 200 600 200 L 70 70 9 1 W
+X GND C3 200 1000 200 L 70 70 9 1 W
+X GND C6 200 900 200 L 70 70 9 1 W
+X GND D12 200 200 200 L 70 70 9 1 W
+X GND D13 200 100 200 L 70 70 9 1 W
+X GND D3 200 500 200 L 70 70 9 1 W
+X GND D4 200 400 200 L 70 70 9 1 W
+X GND D8 200 300 200 L 70 70 9 1 W
+X GND E11 200 -400 200 L 70 70 9 1 W
+X GND E20 200 -500 200 L 70 70 9 1 W
+X GND E4 200 0 200 L 70 70 9 1 W
+X GND E5 200 -100 200 L 70 70 9 1 W
+X GND E7 200 -200 200 L 70 70 9 1 W
+X GND E9 200 -300 200 L 70 70 9 1 W
+X GND F11 200 -700 200 L 70 70 9 1 W
+X GND F17 200 -800 200 L 70 70 9 1 W
+X GND F5 200 -600 200 L 70 70 9 1 W
+X GND G10 200 -1400 200 L 70 70 9 1 W
+X GND G12 200 -1500 200 L 70 70 9 1 W
+X GND G14 200 -1600 200 L 70 70 9 1 W
+X GND G5 200 -900 200 L 70 70 9 1 W
+X GND G6 200 -1000 200 L 70 70 9 1 W
+X GND G7 200 -1100 200 L 70 70 9 1 W
+X GND G8 200 -1200 200 L 70 70 9 1 W
+X GND G9 200 -1300 200 L 70 70 9 1 W
+X GND H1 200 -1700 200 L 70 70 9 1 W
+X GND H11 200 -2000 200 L 70 70 9 1 W
+X GND H21 200 -2100 200 L 70 70 9 1 W
+X GND H7 200 -1800 200 L 70 70 9 1 W
+X GND H9 200 -1900 200 L 70 70 9 1 W
+X GND J8 200 -2200 200 L 70 70 9 1 W
+X GND AA12 200 -1850 200 L 70 70 10 1 W
+X GND AA2 200 -1750 200 L 70 70 10 1 W
+X GND AA22 200 -1950 200 L 70 70 10 1 W
+X GND AB19 200 -2150 200 L 70 70 10 1 W
+X GND AB9 200 -2050 200 L 70 70 10 1 W
+X GND J10 200 2050 200 L 70 70 10 1 W
+X GND J12 200 1950 200 L 70 70 10 1 W
+X GND J18 200 1850 200 L 70 70 10 1 W
+X GND K11 200 1550 200 L 70 70 10 1 W
+X GND K15 200 1450 200 L 70 70 10 1 W
+X GND K5 200 1750 200 L 70 70 10 1 W
+X GND K7 200 1650 200 L 70 70 10 1 W
+X GND L2 200 1350 200 L 70 70 10 1 W
+X GND L22 200 1150 200 L 70 70 10 1 W
+X GND L8 200 1250 200 L 70 70 10 1 W
+X GND M11 200 950 200 L 70 70 10 1 W
+X GND M19 200 850 200 L 70 70 10 1 W
+X GND M7 200 1050 200 L 70 70 10 1 W
+X GND N16 200 550 200 L 70 70 10 1 W
+X GND N6 200 750 200 L 70 70 10 1 W
+X GND N8 200 650 200 L 70 70 10 1 W
+X GND P11 200 150 200 L 70 70 10 1 W
+X GND P13 200 50 200 L 70 70 10 1 W
+X GND P3 200 450 200 L 70 70 10 1 W
+X GND P7 200 350 200 L 70 70 10 1 W
+X GND P9 200 250 200 L 70 70 10 1 W
+X GND R10 200 -150 200 L 70 70 10 1 W
+X GND R12 200 -250 200 L 70 70 10 1 W
+X GND R20 200 -350 200 L 70 70 10 1 W
+X GND R8 200 -50 200 L 70 70 10 1 W
+X GND T11 200 -650 200 L 70 70 10 1 W
+X GND T17 200 -750 200 L 70 70 10 1 W
+X GND T7 200 -450 200 L 70 70 10 1 W
+X GND T9 200 -550 200 L 70 70 10 1 W
+X GND U14 200 -950 200 L 70 70 10 1 W
+X GND U4 200 -850 200 L 70 70 10 1 W
+X GND V1 200 -1050 200 L 70 70 10 1 W
+X GND V11 200 -1150 200 L 70 70 10 1 W
+X GND V21 200 -1250 200 L 70 70 10 1 W
+X GND W18 200 -1450 200 L 70 70 10 1 W
+X GND W8 200 -1350 200 L 70 70 10 1 W
+X GND Y15 200 -1650 200 L 70 70 10 1 W
+X GND Y5 200 -1550 200 L 70 70 10 1 W
+X MGTAVCC D10 200 100 200 L 70 70 11 1 P
+X MGTAVCC D6 200 200 200 L 70 70 11 1 P
+X MGTAVCC E8 200 0 200 L 70 70 11 1 P
+X MGTAVCC F7 200 -100 200 L 70 70 11 1 P
+X MGTAVCC F9 200 -200 200 L 70 70 11 1 P
+X MGTAVTT B11 200 -50 200 L 70 70 12 1 P
+X MGTAVTT B5 200 250 200 L 70 70 12 1 P
+X MGTAVTT B7 200 150 200 L 70 70 12 1 P
+X MGTAVTT B9 200 50 200 L 70 70 12 1 P
+X MGTAVTT C4 200 -150 200 L 70 70 12 1 P
+X MGTAVTT C8 200 -250 200 L 70 70 12 1 P
+X DXP_0 N10 200 50 200 L 70 70 13 1 P
+X DXN_0 N9 200 -50 200 L 70 70 13 1 P
+X VCCAUX H12 200 150 200 L 70 70 14 1 P
+X VCCAUX K12 200 50 200 L 70 70 14 1 P
+X VCCAUX M12 200 -50 200 L 70 70 14 1 P
+X VCCAUX P12 200 -150 200 L 70 70 14 1 P
+X VCCAUX R11 200 -250 200 L 70 70 14 1 P
+X VCCBRAM J11 200 100 200 L 70 70 15 1 P
+X VCCBRAM L11 200 0 200 L 70 70 15 1 P
+X VCCBRAM N11 200 -100 200 L 70 70 15 1 P
+X VCCINT H10 200 500 200 L 70 70 16 1 P
+X VCCINT H8 200 600 200 L 70 70 16 1 P
+X VCCINT J7 200 400 200 L 70 70 16 1 P
+X VCCINT J9 200 300 200 L 70 70 16 1 P
+X VCCINT K8 200 200 200 L 70 70 16 1 P
+X VCCINT L7 200 100 200 L 70 70 16 1 P
+X VCCINT M8 200 0 200 L 70 70 16 1 P
+X VCCINT N7 200 -100 200 L 70 70 16 1 P
+X VCCINT P10 200 -300 200 L 70 70 16 1 P
+X VCCINT P8 200 -200 200 L 70 70 16 1 P
+X VCCINT R7 200 -400 200 L 70 70 16 1 P
+X VCCINT R9 200 -500 200 L 70 70 16 1 P
+X VCCINT T10 200 -700 200 L 70 70 16 1 P
+X VCCINT T8 200 -600 200 L 70 70 16 1 P
+X VCCADC_0 K10 200 250 200 L 70 70 17 1 P
+X GNDADC_0 K9 200 -250 200 L 70 70 17 1 P
+X VP_0 L10 200 150 200 L 70 70 17 1 P
+X VREFN_0 L9 200 -150 200 L 70 70 17 1 P
+X VREFP_0 M10 200 -50 200 L 70 70 17 1 P
+X VN_0 M9 200 50 200 L 70 70 17 1 P
 ENDDRAW
 ENDDEF
 #
 # XTAL-3.2X1.5
 #
-DEF XTAL-3.2X1.5 IC 0 40 Y Y 1 F N
+DEF XTAL-3.2X1.5 X 0 40 Y Y 1 F N
 F0 "X" -110 -210 60 H V L BNN
 F1 "XTAL-3.2X1.5" -170 -750 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -3119,12 +2887,12 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 T 0 -220 110 50 0 1 1 2101347 Normal 1 C C
 T 0 -220 110 50 0 1 1 ABS07-32.768KHZ-T Normal 1 C C
-P 2 0 1 10 -100 -100 -100 100
-P 2 0 1 10 -50 -100 -50 100
-P 2 0 1 10 -50 100 50 100
-P 2 0 1 10 50 -100 -50 -100
-P 2 0 1 10 50 100 50 -100
-P 2 0 1 10 100 -100 100 100
+P 2 0 1 10 -100 -100 -100 100 N
+P 2 0 1 10 -50 -100 -50 100 N
+P 2 0 1 10 -50 100 50 100 N
+P 2 0 1 10 50 -100 -50 -100 N
+P 2 0 1 10 50 100 50 -100 N
+P 2 0 1 10 100 -100 100 100 N
 X P$1 P$1 -200 0 100 R 1 1 0 1 P
 X P$2 P$2 200 0 100 L 1 1 0 1 P
 ENDDRAW
@@ -3132,7 +2900,7 @@ ENDDEF
 #
 # XTAL-4-3225
 #
-DEF XTAL-4-3225 IC 0 40 Y Y 1 F N
+DEF XTAL-4-3225 Q 0 40 Y Y 1 F N
 F0 "Q" -110 -430 60 H V L BNN
 F1 "XTAL-4-3225" -470 230 60 H V L BNN
 F2 "" 0 0 60 H V C CNN
@@ -3140,12 +2908,12 @@ F3 "" 0 0 60 H V C CNN
 DRAW
 T 0 -220 110 50 0 1 1 2467848 Normal 1 C C
 T 0 -220 110 50 0 1 1 ABM8G-25.000MHZ-4Y-T3 Normal 1 C C
-P 2 0 1 10 -100 -100 -100 100
-P 2 0 1 10 -50 -100 -50 100
-P 2 0 1 10 -50 100 50 100
-P 2 0 1 10 50 -100 -50 -100
-P 2 0 1 10 50 100 50 -100
-P 2 0 1 10 100 -100 100 100
+P 2 0 1 10 -100 -100 -100 100 N
+P 2 0 1 10 -50 -100 -50 100 N
+P 2 0 1 10 -50 100 50 100 N
+P 2 0 1 10 50 -100 -50 -100 N
+P 2 0 1 10 50 100 50 -100 N
+P 2 0 1 10 100 -100 100 100 N
 X X1 1 -200 0 100 R 1 1 0 1 P
 X G2 2 200 -300 200 L 1 1 0 1 W
 X X2 3 200 0 100 L 1 1 0 1 P
diff --git a/rev03-KiCad/rev02_00.sch b/rev03-KiCad/rev02_00.sch
index 0622457..fe82546 100644
--- a/rev03-KiCad/rev02_00.sch
+++ b/rev03-KiCad/rev02_00.sch
@@ -13,14 +13,17 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 1500 7500 0    168   ~ 12
+Text Notes 1500 7500 0    168  ~ 34
 This document contains the electrical schematics for the Crypthech Alpha board.\nThe latest version of these schematics can be found here:\nhttps://wiki.cryptech.is/browser/hardware/eagle/alpha\nFor more information about the Alpha board including functionality, goals\nand block diagram, please see:\nhttps://wiki.cryptech.is/wiki/AlphaBoardStrategy\nFor more information about the Cryptech project, please see:\nhttps://cryptech.is/
 $Comp
 L Cryptech_Alpha:OSHW-LOGOL-COPPER LOGO1
 U 1 1 580240DE
 P 11840 10320
 F 0 "LOGO1" H 11388 9865 60  0000 L BNN
+F 1 "~" H 11840 10320 50  0001 C CNN
+F 2 "" H 11840 10320 50  0001 C CNN
+F 3 "" H 11840 10320 50  0001 C CNN
 	1    11840 10320
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_01.sch b/rev03-KiCad/rev02_01.sch
index 7e159df..51b5ba2 100644
--- a/rev03-KiCad/rev02_01.sch
+++ b/rev03-KiCad/rev02_01.sch
@@ -13,23 +13,23 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 9900 2050 0    84   ~ 12
+Text Notes 9900 2050 0    84   ~ 17
 15V LDO powered from external 18V\nand supplying stable 15V to noise source
-Text Notes 1300 2600 0    126   ~ 12
+Text Notes 1300 2600 0    126  ~ 25
 Main power input\n18V DC
 Text Notes 4850 2900 0    60   ~ 12
 To mitigate component ageing in the avalanche noise circuit,\nthis jumper can be used to decide if FPGA/ARM/None should\nbe allowed to turn off the entropy source\n(default On through pull-up)
 Text Notes 12600 3700 0    60   ~ 12
 Max 3 ohm ESR
-Text Notes 6100 5900 0    84   ~ 12
+Text Notes 6100 5900 0    84   ~ 17
 *) Intermediate Regulator: 18V -> 5V
 Text Notes 9400 9100 0    60   ~ 12
 *) VCC_5V0 = 0.8V x (1 + 6.3/1.21) = 4.965V\n*) Current sharing not used\n*) SYNC is not used
-Text Notes 4900 1900 0    126   ~ 12
+Text Notes 4900 1900 0    126  ~ 25
 Entropy source power
 Text Notes 1400 4200 0    60   ~ 12
 XXX verify symbol
-Text Notes 13700 10200 0    84   ~ 12
+Text Notes 13700 10200 0    84   ~ 17
 Input power
 Text Notes 8900 2650 2    60   ~ 12
 R7
@@ -70,10 +70,10 @@ JP2
 Text Notes 8350 2930 2    60   ~ 12
 JP1Q
 $Comp
-L power:GND GND
+L power:GND #GND0101
 U 1 1 580240DD
 P 2500 3700
-F 0 "GND" H 2500 3700 20  0000 C CNN
+F 0 "#GND0101" H 2500 3700 20  0000 C CNN
 F 1 "+GND" H 2500 3630 30  0000 C CNN
 F 2 "" H 2500 3700 70  0000 C CNN
 F 3 "" H 2500 3700 70  0000 C CNN
@@ -81,10 +81,10 @@ F 3 "" H 2500 3700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_2
+L power:GND #GND_02
 U 1 1 580240DC
 P 10600 3800
-F 0 "GND_2" H 10600 3800 20  0000 C CNN
+F 0 "#GND_02" H 10600 3800 20  0000 C CNN
 F 1 "+GND" H 10600 3730 30  0000 C CNN
 F 2 "" H 10600 3800 70  0000 C CNN
 F 3 "" H 10600 3800 70  0000 C CNN
@@ -92,10 +92,10 @@ F 3 "" H 10600 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_3
+L power:GND #GND_03
 U 1 1 580240DB
 P 12000 3800
-F 0 "GND_3" H 12000 3800 20  0000 C CNN
+F 0 "#GND_03" H 12000 3800 20  0000 C CNN
 F 1 "+GND" H 12000 3730 30  0000 C CNN
 F 2 "" H 12000 3800 70  0000 C CNN
 F 3 "" H 12000 3800 70  0000 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 12000 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_4
+L power:GND #GND_04
 U 1 1 580240DA
 P 12500 3800
-F 0 "GND_4" H 12500 3800 20  0000 C CNN
+F 0 "#GND_04" H 12500 3800 20  0000 C CNN
 F 1 "+GND" H 12500 3730 30  0000 C CNN
 F 2 "" H 12500 3800 70  0000 C CNN
 F 3 "" H 12500 3800 70  0000 C CNN
@@ -114,10 +114,10 @@ F 3 "" H 12500 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V
+L Cryptech_Alpha:PWR_18V #PWR_18V0101
 U 1 1 580240D9
 P 2500 3000
-F 0 "PWR_18V" H 2500 3000 20  0000 C CNN
+F 0 "#PWR_18V0101" H 2500 3000 20  0000 C CNN
 F 1 "+PWR_18V" H 2500 2930 30  0000 C CNN
 F 2 "" H 2500 3000 70  0000 C CNN
 F 3 "" H 2500 3000 70  0000 C CNN
@@ -125,10 +125,10 @@ F 3 "" H 2500 3000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V_2
+L Cryptech_Alpha:PWR_18V #PWR_18V_02
 U 1 1 580240D8
 P 10100 2500
-F 0 "PWR_18V_2" H 10100 2500 20  0000 C CNN
+F 0 "#PWR_18V_02" H 10100 2500 20  0000 C CNN
 F 1 "+PWR_18V" H 10100 2430 30  0000 C CNN
 F 2 "" H 10100 2500 70  0000 C CNN
 F 3 "" H 10100 2500 70  0000 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 10100 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:15V_STABLE 15V_STABLE
+L Cryptech_Alpha:15V_STABLE #15V_STABLE0101
 U 1 1 580240D7
 P 12800 2500
-F 0 "15V_STABLE" H 12800 2500 20  0000 C CNN
+F 0 "#15V_STABLE0101" H 12800 2500 20  0000 C CNN
 F 1 "+15V_STABLE" H 12800 2430 30  0000 C CNN
 F 2 "" H 12800 2500 70  0000 C CNN
 F 3 "" H 12800 2500 70  0000 C CNN
@@ -147,10 +147,10 @@ F 3 "" H 12800 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_5
+L power:GND #GND_05
 U 1 1 580240D6
 P 7700 8800
-F 0 "GND_5" H 7700 8800 20  0000 C CNN
+F 0 "#GND_05" H 7700 8800 20  0000 C CNN
 F 1 "+GND" H 7700 8730 30  0000 C CNN
 F 2 "" H 7700 8800 70  0000 C CNN
 F 3 "" H 7700 8800 70  0000 C CNN
@@ -158,10 +158,10 @@ F 3 "" H 7700 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_6
+L power:GND #GND_06
 U 1 1 580240D5
 P 7900 8800
-F 0 "GND_6" H 7900 8800 20  0000 C CNN
+F 0 "#GND_06" H 7900 8800 20  0000 C CNN
 F 1 "+GND" H 7900 8730 30  0000 C CNN
 F 2 "" H 7900 8800 70  0000 C CNN
 F 3 "" H 7900 8800 70  0000 C CNN
@@ -169,10 +169,10 @@ F 3 "" H 7900 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_7
+L power:GND #GND_07
 U 1 1 580240D4
 P 6700 8800
-F 0 "GND_7" H 6700 8800 20  0000 C CNN
+F 0 "#GND_07" H 6700 8800 20  0000 C CNN
 F 1 "+GND" H 6700 8730 30  0000 C CNN
 F 2 "" H 6700 8800 70  0000 C CNN
 F 3 "" H 6700 8800 70  0000 C CNN
@@ -180,10 +180,10 @@ F 3 "" H 6700 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_8
+L power:GND #GND_08
 U 1 1 580240D3
 P 5600 7800
-F 0 "GND_8" H 5600 7800 20  0000 C CNN
+F 0 "#GND_08" H 5600 7800 20  0000 C CNN
 F 1 "+GND" H 5600 7730 30  0000 C CNN
 F 2 "" H 5600 7800 70  0000 C CNN
 F 3 "" H 5600 7800 70  0000 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 5600 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_9
+L power:GND #GND_09
 U 1 1 580240D2
 P 5000 7800
-F 0 "GND_9" H 5000 7800 20  0000 C CNN
+F 0 "#GND_09" H 5000 7800 20  0000 C CNN
 F 1 "+GND" H 5000 7730 30  0000 C CNN
 F 2 "" H 5000 7800 70  0000 C CNN
 F 3 "" H 5000 7800 70  0000 C CNN
@@ -202,10 +202,10 @@ F 3 "" H 5000 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_10
+L power:GND #GND_010
 U 1 1 580240D1
 P 4400 7800
-F 0 "GND_10" H 4400 7800 20  0000 C CNN
+F 0 "#GND_010" H 4400 7800 20  0000 C CNN
 F 1 "+GND" H 4400 7730 30  0000 C CNN
 F 2 "" H 4400 7800 70  0000 C CNN
 F 3 "" H 4400 7800 70  0000 C CNN
@@ -213,10 +213,10 @@ F 3 "" H 4400 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_11
+L power:GND #GND_011
 U 1 1 580240D0
 P 4000 7800
-F 0 "GND_11" H 4000 7800 20  0000 C CNN
+F 0 "#GND_011" H 4000 7800 20  0000 C CNN
 F 1 "+GND" H 4000 7730 30  0000 C CNN
 F 2 "" H 4000 7800 70  0000 C CNN
 F 3 "" H 4000 7800 70  0000 C CNN
@@ -224,10 +224,10 @@ F 3 "" H 4000 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_12
+L power:GND #GND_012
 U 1 1 580240CF
 P 3600 7800
-F 0 "GND_12" H 3600 7800 20  0000 C CNN
+F 0 "#GND_012" H 3600 7800 20  0000 C CNN
 F 1 "+GND" H 3600 7730 30  0000 C CNN
 F 2 "" H 3600 7800 70  0000 C CNN
 F 3 "" H 3600 7800 70  0000 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 3600 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_13
+L power:GND #GND_013
 U 1 1 580240CE
 P 9200 8000
-F 0 "GND_13" H 9200 8000 20  0000 C CNN
+F 0 "#GND_013" H 9200 8000 20  0000 C CNN
 F 1 "+GND" H 9200 7930 30  0000 C CNN
 F 2 "" H 9200 8000 70  0000 C CNN
 F 3 "" H 9200 8000 70  0000 C CNN
@@ -246,10 +246,10 @@ F 3 "" H 9200 8000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_14
+L power:GND #GND_014
 U 1 1 580240CD
 P 9600 7300
-F 0 "GND_14" H 9600 7300 20  0000 C CNN
+F 0 "#GND_014" H 9600 7300 20  0000 C CNN
 F 1 "+GND" H 9600 7230 30  0000 C CNN
 F 2 "" H 9600 7300 70  0000 C CNN
 F 3 "" H 9600 7300 70  0000 C CNN
@@ -257,10 +257,10 @@ F 3 "" H 9600 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_15
+L power:GND #GND_015
 U 1 1 580240CC
 P 10200 7300
-F 0 "GND_15" H 10200 7300 20  0000 C CNN
+F 0 "#GND_015" H 10200 7300 20  0000 C CNN
 F 1 "+GND" H 10200 7230 30  0000 C CNN
 F 2 "" H 10200 7300 70  0000 C CNN
 F 3 "" H 10200 7300 70  0000 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 10200 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_16
+L power:GND #GND_016
 U 1 1 580240CB
 P 10800 7300
-F 0 "GND_16" H 10800 7300 20  0000 C CNN
+F 0 "#GND_016" H 10800 7300 20  0000 C CNN
 F 1 "+GND" H 10800 7230 30  0000 C CNN
 F 2 "" H 10800 7300 70  0000 C CNN
 F 3 "" H 10800 7300 70  0000 C CNN
@@ -279,10 +279,10 @@ F 3 "" H 10800 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_17
+L power:GND #GND_017
 U 1 1 580240CA
 P 11400 7300
-F 0 "GND_17" H 11400 7300 20  0000 C CNN
+F 0 "#GND_017" H 11400 7300 20  0000 C CNN
 F 1 "+GND" H 11400 7230 30  0000 C CNN
 F 2 "" H 11400 7300 70  0000 C CNN
 F 3 "" H 11400 7300 70  0000 C CNN
@@ -290,10 +290,10 @@ F 3 "" H 11400 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V_3
+L Cryptech_Alpha:PWR_18V #PWR_18V_03
 U 1 1 580240C9
 P 3400 6300
-F 0 "PWR_18V_3" H 3400 6300 20  0000 C CNN
+F 0 "#PWR_18V_03" H 3400 6300 20  0000 C CNN
 F 1 "+PWR_18V" H 3400 6230 30  0000 C CNN
 F 2 "" H 3400 6300 70  0000 C CNN
 F 3 "" H 3400 6300 70  0000 C CNN
@@ -301,10 +301,10 @@ F 3 "" H 3400 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V_4
+L Cryptech_Alpha:PWR_18V #PWR_18V_04
 U 1 1 580240C8
 P 8700 2500
-F 0 "PWR_18V_4" H 8700 2500 20  0000 C CNN
+F 0 "#PWR_18V_04" H 8700 2500 20  0000 C CNN
 F 1 "+PWR_18V" H 8700 2430 30  0000 C CNN
 F 2 "" H 8700 2500 70  0000 C CNN
 F 3 "" H 8700 2500 70  0000 C CNN
@@ -312,10 +312,10 @@ F 3 "" H 8700 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_18
+L power:GND #GND_018
 U 1 1 580240C7
 P 6900 4350
-F 0 "GND_18" H 6900 4350 20  0000 C CNN
+F 0 "#GND_018" H 6900 4350 20  0000 C CNN
 F 1 "+GND" H 6900 4280 30  0000 C CNN
 F 2 "" H 6900 4350 70  0000 C CNN
 F 3 "" H 6900 4350 70  0000 C CNN
@@ -323,10 +323,10 @@ F 3 "" H 6900 4350 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_19
+L power:GND #GND_019
 U 1 1 580240C6
 P 7700 4350
-F 0 "GND_19" H 7700 4350 20  0000 C CNN
+F 0 "#GND_019" H 7700 4350 20  0000 C CNN
 F 1 "+GND" H 7700 4280 30  0000 C CNN
 F 2 "" H 7700 4350 70  0000 C CNN
 F 3 "" H 7700 4350 70  0000 C CNN
@@ -334,10 +334,10 @@ F 3 "" H 7700 4350 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_20
+L power:GND #GND_020
 U 1 1 580240C5
 P 10100 3800
-F 0 "GND_20" H 10100 3800 20  0000 C CNN
+F 0 "#GND_020" H 10100 3800 20  0000 C CNN
 F 1 "+GND" H 10100 3730 30  0000 C CNN
 F 2 "" H 10100 3800 70  0000 C CNN
 F 3 "" H 10100 3800 70  0000 C CNN
@@ -446,7 +446,7 @@ Wire Wire Line
 	8700 3000 8700 3100
 Wire Wire Line
 	8700 3100 8450 3100
-Text Label 9000 3100 0 48 ~
+Text Label 9000 3100 0    48   ~ 0
 15V_LDO_ENABLE
 Connection ~ 8700 3100
 Wire Wire Line
@@ -503,7 +503,7 @@ Wire Wire Line
 	12300 6600 11400 6600
 Wire Wire Line
 	9600 6600 9600 6800
-Text Label 12300 6600 2 48 ~ 0
+Text Label 12300 6600 2    48   ~ 0
 VCC_5V0
 Connection ~ 9200 6600
 Connection ~ 10200 6600
@@ -525,7 +525,7 @@ Wire Wire Line
 	7850 3100 7700 3100
 Wire Wire Line
 	6300 3550 6000 3550
-Text GLabel 5450 3550 0 48 Input ~ 0
+Text GLabel 5450 3550 0    48   Input ~ 0
 FPGA_ENTROPY_DISABLE
 Wire Wire Line
 	5450 3550 6000 3550
@@ -563,52 +563,62 @@ F 1 "0.01uF" H 11900 3100 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11900 3100 60  0001 C CNN
 F 3 "" H 11900 3100 60  0000 C CNN
 	1    12000 3000
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C6
 U 1 1 580240C3
 P 9600 6900
 F 0 "C6" H 9680 6710 60  0000 L BNN
-	1    9600 6900
-	1    0    0    -1
+F 1 "~" H 9600 6900 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 9680 6710 60  0001 C CNN
+F 3 "" H 9600 6900 50  0001 C CNN
+	1    9600 6900
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C4
 U 1 1 580240C2
 P 5000 7200
 F 0 "C4" H 5080 7010 60  0000 L BNN
-	1    5000 7200
-	1    0    0    -1
+F 1 "~" H 5000 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5080 7010 60  0001 C CNN
+F 3 "" H 5000 7200 50  0001 C CNN
+	1    5000 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C2
 U 1 1 580240C1
 P 4000 7200
 F 0 "C2" H 4080 7010 60  0000 L BNN
-	1    4000 7200
-	1    0    0    -1
+F 1 "~" H 4000 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 4080 7010 60  0001 C CNN
+F 3 "" H 4000 7200 50  0001 C CNN
+	1    4000 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C3
 U 1 1 580240C0
 P 4400 7200
 F 0 "C3" H 4480 7010 60  0000 L BNN
-	1    4400 7200
-	1    0    0    -1
+F 1 "~" H 4400 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 4480 7010 60  0001 C CNN
+F 3 "" H 4400 7200 50  0001 C CNN
+	1    4400 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C8
 U 1 1 580240BF
 P 10200 6900
 F 0 "C8" H 10280 6710 60  0000 L BNN
-	1    10200 6900
-	1    0    0    -1
+F 1 "~" H 10200 6900 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 10280 6710 60  0001 C CNN
+F 3 "" H 10200 6900 50  0001 C CNN
+	1    10200 6900
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:2N7002 Q1
@@ -619,7 +629,7 @@ F 1 "2N7002P,235" H 7100 3600 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 7100 3600 60  0001 C CNN
 F 3 "" H 7100 3600 60  0000 C CNN
 	1    7300 3450
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R6
@@ -630,7 +640,7 @@ F 1 "10k" H 6900 3890 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6900 3890 60  0001 C CNN
 F 3 "" H 6900 3890 60  0000 C CNN
 	1    6900 3950
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R5
@@ -641,16 +651,18 @@ F 1 "1k" H 6500 3600 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6500 3600 60  0001 C CNN
 F 3 "" H 6500 3600 60  0000 C CNN
 	1    6500 3550
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:JP1Q JP2
 U 1 1 580240BB
 P 8150 3100
 F 0 "JP2" V 7945 3330 60  0000 R TNN
-	1    8150 3100
-	0    -1   -1   0
+F 1 "~" H 8150 3100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLS-2" H 7945 3330 60  0001 C CNN
+F 3 "" H 8150 3100 50  0001 C CNN
+	1    8150 3100
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C7
@@ -661,7 +673,7 @@ F 1 "4.7uF" H 10200 3300 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 10200 3300 60  0001 C CNN
 F 3 "" H 10200 3300 60  0000 C CNN
 	1    10100 3500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C13
@@ -672,7 +684,7 @@ F 1 "4.7uF" H 12600 3100 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 12600 3100 60  0001 C CNN
 F 3 "" H 12600 3100 60  0000 C CNN
 	1    12500 3300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LT3060ITS8-15 U2
@@ -683,7 +695,7 @@ F 1 "LT3060ITS8-15#TRMPBF" H 10890 2390 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TSOT-8-23" H 10890 2390 60  0001 C CNN
 F 3 "" H 10890 2390 60  0000 C CNN
 	1    11300 3100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LMZ13608 U1
@@ -694,16 +706,18 @@ F 1 "LMZ13608TZ*" H 7300 8200 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:NDY" H 7300 8200 60  0001 C CNN
 F 3 "" H 7300 8200 60  0000 C CNN
 	1    7800 7300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C5
 U 1 1 580240B6
 P 6700 8400
 F 0 "C5" H 6800 8350 60  0000 L BNN
-	1    6700 8400
-	1    0    0    -1
+F 1 "~" H 6700 8400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6800 8350 60  0001 C CNN
+F 3 "" H 6700 8400 50  0001 C CNN
+	1    6700 8400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C12
@@ -714,7 +728,7 @@ F 1 "0.01uF" H 11900 3700 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11900 3700 60  0001 C CNN
 F 3 "" H 11900 3700 60  0000 C CNN
 	1    12000 3600
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:POWER_JACKSMD JP1
@@ -725,7 +739,7 @@ F 1 "694106301002" H 1290 3570 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:694106301002" H 1290 3570 60  0001 C CNN
 F 3 "" H 1290 3570 60  0000 C CNN
 	1    1700 3600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:CP_E-035X080 C9
@@ -736,7 +750,7 @@ F 1 "330uF" V 10710 6907 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_D" H 10710 6907 60  0001 C CNN
 F 3 "" H 10710 6907 60  0000 C CNN
 	1    10800 7000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:CP_E-035X080 C10
@@ -747,7 +761,7 @@ F 1 "330uF" V 11310 6907 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_D" H 11310 6907 60  0001 C CNN
 F 3 "" H 11310 6907 60  0000 C CNN
 	1    11400 7000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R7
@@ -758,7 +772,7 @@ F 1 "10k" V 8750 2900 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8750 2900 60  0001 C CNN
 F 3 "" H 8750 2900 60  0000 C CNN
 	1    8700 2800
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R3
@@ -769,7 +783,7 @@ F 1 "100" H 6100 7250 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6100 7250 60  0001 C CNN
 F 3 "" H 6100 7250 60  0000 C CNN
 	1    6100 7200
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R2
@@ -780,7 +794,7 @@ F 1 "4.64k" V 5600 7400 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5600 7400 60  0001 C CNN
 F 3 "" H 5600 7400 60  0000 C CNN
 	1    5600 7500
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R1
@@ -791,16 +805,18 @@ F 1 "56k" V 5600 6800 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5600 6800 60  0001 C CNN
 F 3 "" H 5600 6800 60  0000 C CNN
 	1    5600 6900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C1
 U 1 1 580240AD
 P 3600 7200
 F 0 "C1" H 3680 7010 60  0000 L BNN
-	1    3600 7200
-	1    0    0    -1
+F 1 "~" H 3600 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 3680 7010 60  0001 C CNN
+F 3 "" H 3600 7200 50  0001 C CNN
+	1    3600 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R8
@@ -811,7 +827,7 @@ F 1 "6.3k" H 9210 7070 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9210 7070 60  0001 C CNN
 F 3 "" H 9210 7070 60  0000 C CNN
 	1    9200 7000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R9
@@ -822,44 +838,44 @@ F 1 "1.21k" H 9200 7770 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9200 7770 60  0001 C CNN
 F 3 "" H 9200 7770 60  0000 C CNN
 	1    9200 7700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 NoConn ~ 8700 8000
 Wire Wire Line
-       12300 6600 12300 6450
+	12300 6600 12300 6450
 $Comp
-L Cryptech_Alpha:VCC_5V0 #PWR?
+L Cryptech_Alpha:VCC_5V0 #PWR0101
 U 1 1 5AF35ED8
 P 12300 6450
-F 0 "#PWR?" H 12300 6300 50  0001 C CNN
+F 0 "#PWR0101" H 12300 6300 50  0001 C CNN
 F 1 "VCC_5V0" H 12315 6623 50  0000 C CNN
 F 2 "" H 12300 6450 60  0000 C CNN
 F 3 "" H 12300 6450 60  0000 C CNN
-       1    12300 6450
-       1    0    0    -1  
+	1    12300 6450
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0101
 U 1 1 5AFB973B
 P 2200 3300
-F 0 "#FLG?" H 2200 3375 50  0001 C CNN
+F 0 "#FLG0101" H 2200 3375 50  0001 C CNN
 F 1 "PWR_FLAG" H 2200 3474 50  0000 C CNN
 F 2 "" H 2200 3300 50  0001 C CNN
 F 3 "~" H 2200 3300 50  0001 C CNN
-       1    2200 3300
-       1    0    0    -1  
+	1    2200 3300
+	1    0    0    -1  
 $EndComp
 Connection ~ 2200 3300
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0102
 U 1 1 5AFB98AE
 P 2200 3500
-F 0 "#FLG?" H 2200 3575 50  0001 C CNN
+F 0 "#FLG0102" H 2200 3575 50  0001 C CNN
 F 1 "PWR_FLAG" H 2200 3673 50  0000 C CNN
 F 2 "" H 2200 3500 50  0001 C CNN
 F 3 "~" H 2200 3500 50  0001 C CNN
-       1    2200 3500
-       -1   0    0    1   
+	1    2200 3500
+	-1   0    0    1   
 $EndComp
 Connection ~ 2200 3500
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_02.sch b/rev03-KiCad/rev02_02.sch
index 99ca575..1673b47 100644
--- a/rev03-KiCad/rev02_02.sch
+++ b/rev03-KiCad/rev02_02.sch
@@ -13,29 +13,29 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 11600 3700 0    126   ~ 12
+Text Notes 11600 3700 0    126  ~ 25
 Digitizer
-Text Notes 3200 3700 0    126   ~ 12
+Text Notes 3200 3700 0    126  ~ 25
 Noise generator
 Text Notes 4200 6410 0    60   ~ 12
 Noisy diode
-Text Notes 6800 3700 0    126   ~ 12
+Text Notes 6800 3700 0    126  ~ 25
 Amplifier
 Text Notes 3200 7600 0    60   ~ 12
 AGND is connected to GND on the board using polygons\n(found no other good way) - not visible in schematics.
 Text Notes 9400 7650 0    60   ~ 12
 This whole sheets circuitry should be as shielded as possible.\nSolid isolated ground plane and internal planes connected\nto the rest of the board at a single point is expected.
-Text Notes 13690 10220 0    84   ~ 12
+Text Notes 13690 10220 0    84   ~ 17
 Noise source
 Text Notes 11980 4510 0    60   ~ 12
 U3
 Text Notes 11790 5790 0    60   ~ 12
 MC74HC1G14DTT1G
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V03
 U 1 1 580240AA
 P 11400 4100
-F 0 "VCCO_3V3" H 11400 4100 20  0000 C CNN
+F 0 "#VCCO_3V03" H 11400 4100 20  0000 C CNN
 F 1 "+VCCO_3V3" H 11400 4030 30  0000 C CNN
 F 2 "" H 11400 4100 70  0000 C CNN
 F 3 "" H 11400 4100 70  0000 C CNN
@@ -43,10 +43,10 @@ F 3 "" H 11400 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_21
+L power:GND #GND_021
 U 1 1 580240A9
 P 5050 6550
-F 0 "GND_21" H 5050 6550 20  0000 C CNN
+F 0 "#GND_021" H 5050 6550 20  0000 C CNN
 F 1 "+GND" H 5050 6480 30  0000 C CNN
 F 2 "" H 5050 6550 70  0000 C CNN
 F 3 "" H 5050 6550 70  0000 C CNN
@@ -54,10 +54,10 @@ F 3 "" H 5050 6550 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_2
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_02
 U 1 1 580240A8
 P 8800 4100
-F 0 "VCCO_3V3_2" H 8800 4100 20  0000 C CNN
+F 0 "#VCCO_3V3_02" H 8800 4100 20  0000 C CNN
 F 1 "+VCCO_3V3" H 8800 4030 30  0000 C CNN
 F 2 "" H 8800 4100 70  0000 C CNN
 F 3 "" H 8800 4100 70  0000 C CNN
@@ -65,10 +65,10 @@ F 3 "" H 8800 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:15V_STABLE 15V_STABLE_2
+L Cryptech_Alpha:15V_STABLE #15V_STABLE_02
 U 1 1 580240A7
 P 5050 4350
-F 0 "15V_STABLE_2" H 5050 4350 20  0000 C CNN
+F 0 "#15V_STABLE_02" H 5050 4350 20  0000 C CNN
 F 1 "+15V_STABLE" H 5050 4280 30  0000 C CNN
 F 2 "" H 5050 4350 70  0000 C CNN
 F 3 "" H 5050 4350 70  0000 C CNN
@@ -88,7 +88,7 @@ Wire Wire Line
 	8800 4100 8800 4200
 Wire Wire Line
 	11500 5000 10300 5000
-Text Label 10300 5000 0 48 ~
+Text Label 10300 5000 0    48   ~ 0
 AMPLIFIED
 Wire Wire Line
 	10050 5000 9300 5000
@@ -106,7 +106,7 @@ Wire Wire Line
 	8800 4700 8600 4700
 Wire Wire Line
 	9300 4900 9300 5000
-Text Label 10050 5000 2 48 ~ 0
+Text Label 10050 5000 2    48   ~ 0
 AMPLIFIED
 Connection ~ 8800 5000
 Connection ~ 8800 5000
@@ -114,7 +114,7 @@ Connection ~ 8800 4700
 Connection ~ 9300 5000
 Wire Wire Line
 	13400 4800 12900 4800
-Text GLabel 13400 4800 2 48 Output ~ 0
+Text GLabel 13400 4800 2    48   Output ~ 0
 DIGITIZED_NOISE
 Wire Wire Line
 	11500 5400 11400 5400
@@ -131,7 +131,7 @@ Wire Wire Line
 	8800 5600 8800 5700
 Wire Wire Line
 	4850 6000 4450 6000
-Text Label 4500 6000 0 48 ~
+Text Label 4500 6000 0    48   ~ 0
 NOISE_OUT
 Wire Wire Line
 	3950 5400 3950 6200
@@ -142,7 +142,7 @@ Wire Wire Line
 Wire Wire Line
 	4250 5400 4250 5800
 Connection ~ 4250 5400
-Text Label 3950 5400 0 48 ~
+Text Label 3950 5400 0    48   ~ 0
 NOISE_IN
 Wire Wire Line
 	5050 5400 4850 5400
@@ -156,13 +156,13 @@ Wire Wire Line
 	6400 5400 5350 5400
 Wire Wire Line
 	5350 5300 5350 5400
-Text Label 6400 5400 2 48 ~ 0
+Text Label 6400 5400 2    48   ~ 0
 RAW_NOISE
 Connection ~ 5050 5400
 Connection ~ 5350 5400
 Wire Wire Line
 	7700 5400 6750 5400
-Text Label 6750 5400 0 48 ~
+Text Label 6750 5400 0    48   ~ 0
 RAW_NOISE
 Wire Wire Line
 	8400 4700 8100 4700
@@ -192,10 +192,10 @@ Wire Wire Line
 Wire Wire Line
 	3150 5750 3150 4950
 $Comp
-L power:GND GND_22
+L power:GND #GND_022
 U 1 1 580240A6
 P 3150 5750
-F 0 "GND_22" H 3150 5750 20  0000 C CNN
+F 0 "#GND_022" H 3150 5750 20  0000 C CNN
 F 1 "+GND" H 3150 5680 30  0000 C CNN
 F 2 "" H 3150 5750 70  0000 C CNN
 F 3 "" H 3150 5750 70  0000 C CNN
@@ -203,10 +203,10 @@ F 3 "" H 3150 5750 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_23
+L power:GND #GND_023
 U 1 1 580240A5
 P 8800 5700
-F 0 "GND_23" H 8800 5700 20  0000 C CNN
+F 0 "#GND_023" H 8800 5700 20  0000 C CNN
 F 1 "+GND" H 8800 5630 30  0000 C CNN
 F 2 "" H 8800 5700 70  0000 C CNN
 F 3 "" H 8800 5700 70  0000 C CNN
@@ -214,10 +214,10 @@ F 3 "" H 8800 5700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_24
+L power:GND #GND_024
 U 1 1 580240A4
 P 11400 5900
-F 0 "GND_24" H 11400 5900 20  0000 C CNN
+F 0 "#GND_024" H 11400 5900 20  0000 C CNN
 F 1 "+GND" H 11400 5830 30  0000 C CNN
 F 2 "" H 11400 5900 70  0000 C CNN
 F 3 "" H 11400 5900 70  0000 C CNN
@@ -233,7 +233,7 @@ F 1 "0.1uF" H 11510 5350 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11510 5350 60  0001 C CNN
 F 3 "" H 11510 5350 60  0000 C CNN
 	1    11100 5300
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:WE-SHC S1
@@ -244,7 +244,7 @@ F 1 "SHIELDING CABINET" H 3600 5450 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:WE-SHC_36103205_NO_CREAM" H 3600 5450 60  0001 C CNN
 F 3 "" H 3600 5450 60  0000 C CNN
 	1    3600 5050
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BC818*SMD Q2
@@ -255,7 +255,7 @@ F 1 "BC818-40LT1G" H 4420 5780 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 4420 5780 60  0001 C CNN
 F 3 "" H 4420 5780 60  0000 C CNN
 	1    4350 6000
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:BC818*SMD T1
@@ -266,7 +266,7 @@ F 1 "BC847BLT3G" H 5620 6150 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 5620 6150 60  0001 C CNN
 F 3 "" H 5620 6150 60  0000 C CNN
 	1    4950 6000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BC818*SMD T2
@@ -277,34 +277,40 @@ F 1 "BC847BLT3G" H 9370 5550 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 9370 5550 60  0001 C CNN
 F 3 "" H 9370 5550 60  0000 C CNN
 	1    8700 5400
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:TPB1,27 TP1
 U 1 1 5802409E
 P 5350 5200
 F 0 "TP1" H 5250 4900 60  0000 L BNN
-	1    5350 5200
-	1    0    0    -1
+F 1 "~" H 5350 5200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:B1,27" H 5250 4900 60  0001 C CNN
+F 3 "" H 5350 5200 50  0001 C CNN
+	1    5350 5200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:TPB1,27 TP2
 U 1 1 5802409D
 P 9300 4800
 F 0 "TP2" H 9200 4500 60  0000 L BNN
-	1    9300 4800
-	1    0    0    -1
+F 1 "~" H 9300 4800 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:B1,27" H 9200 4500 60  0001 C CNN
+F 3 "" H 9300 4800 50  0001 C CNN
+	1    9300 4800
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:MC74HC1G14DTT1G U3
 U 1 1 5802409C
 P 12200 5000
 F 0 "U3" H 11670 4270 60  0000 L BNN
-	1    12200 5000
-	1    0    0    -1
+F 1 "~" H 12200 5000 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23-5" H 11670 4270 60  0001 C CNN
+F 3 "" H 12200 5000 50  0001 C CNN
+	1    12200 5000
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C14
@@ -315,7 +321,7 @@ F 1 "0.1uF" H 4410 6420 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4410 6420 60  0001 C CNN
 F 3 "" H 4410 6420 60  0000 C CNN
 	1    3950 6400
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R10
@@ -326,7 +332,7 @@ F 1 "470" H 4800 5350 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4800 5350 60  0001 C CNN
 F 3 "" H 4800 5350 60  0000 C CNN
 	1    4650 5400
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R11
@@ -337,7 +343,7 @@ F 1 "1k" V 5060 5240 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5060 5240 60  0001 C CNN
 F 3 "" H 5060 5240 60  0000 C CNN
 	1    5050 5100
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C15
@@ -348,7 +354,7 @@ F 1 "0.1uF" V 7510 5500 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7510 5500 60  0001 C CNN
 F 3 "" H 7510 5500 60  0000 C CNN
 	1    7800 5400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R12
@@ -359,7 +365,7 @@ F 1 "10k" H 8470 4850 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8470 4850 60  0001 C CNN
 F 3 "" H 8470 4850 60  0000 C CNN
 	1    8500 5000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R13
@@ -370,7 +376,7 @@ F 1 "1k" V 8710 4310 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8710 4310 60  0001 C CNN
 F 3 "" H 8710 4310 60  0000 C CNN
 	1    8800 4400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:BAT54 D1
@@ -381,7 +387,7 @@ F 1 "BAT54LT1G" H 8270 4530 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 8270 4530 60  0001 C CNN
 F 3 "" H 8270 4530 60  0000 C CNN
 	1    8500 4700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 NoConn ~ 11500 5200
 NoConn ~ 4250 6200
diff --git a/rev03-KiCad/rev02_03.sch b/rev03-KiCad/rev02_03.sch
index 033a74d..19b46d1 100644
--- a/rev03-KiCad/rev02_03.sch
+++ b/rev03-KiCad/rev02_03.sch
@@ -25,9 +25,9 @@ Text Notes 5140 4340 0    60   ~ 12
 PDR_ON high enables\ninternal power regulator
 Text Notes 2490 4280 0    60   ~ 12
 CL 10pF
-Text Notes 2000 2300 0    126   ~ 12
+Text Notes 2000 2300 0    126  ~ 25
 Basic configuration, STM32
-Text Notes 13670 10230 0    84   ~ 12
+Text Notes 13670 10230 0    84   ~ 17
 ARM configuration
 Text Notes 6560 5960 0    60   ~ 12
 R15
@@ -40,10 +40,10 @@ XTAL-4-3225
 Text Notes 3100 5000 0    60   ~ 12
 Gnd
 $Comp
-L power:GND GND_25
+L power:GND #GND_025
 U 1 1 58024094
 P 2400 5100
-F 0 "GND_25" H 2400 5100 20  0000 C CNN
+F 0 "#GND_025" H 2400 5100 20  0000 C CNN
 F 1 "+GND" H 2400 5030 30  0000 C CNN
 F 2 "" H 2400 5100 70  0000 C CNN
 F 3 "" H 2400 5100 70  0000 C CNN
@@ -51,10 +51,10 @@ F 3 "" H 2400 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_26
+L power:GND #GND_026
 U 1 1 58024093
 P 4000 5100
-F 0 "GND_26" H 4000 5100 20  0000 C CNN
+F 0 "#GND_026" H 4000 5100 20  0000 C CNN
 F 1 "+GND" H 4000 5030 30  0000 C CNN
 F 2 "" H 4000 5100 70  0000 C CNN
 F 3 "" H 4000 5100 70  0000 C CNN
@@ -62,10 +62,10 @@ F 3 "" H 4000 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_27
+L power:GND #GND_027
 U 1 1 58024092
 P 6440 6300
-F 0 "GND_27" H 6440 6300 20  0000 C CNN
+F 0 "#GND_027" H 6440 6300 20  0000 C CNN
 F 1 "+GND" H 6440 6230 30  0000 C CNN
 F 2 "" H 6440 6300 70  0000 C CNN
 F 3 "" H 6440 6300 70  0000 C CNN
@@ -73,10 +73,10 @@ F 3 "" H 6440 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_28
+L power:GND #GND_028
 U 1 1 58024091
 P 12860 4800
-F 0 "GND_28" H 12860 4800 20  0000 C CNN
+F 0 "#GND_028" H 12860 4800 20  0000 C CNN
 F 1 "+GND" H 12860 4730 30  0000 C CNN
 F 2 "" H 12860 4800 70  0000 C CNN
 F 3 "" H 12860 4800 70  0000 C CNN
@@ -84,10 +84,10 @@ F 3 "" H 12860 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_29
+L power:GND #GND_029
 U 1 1 58024090
 P 12100 4800
-F 0 "GND_29" H 12100 4800 20  0000 C CNN
+F 0 "#GND_029" H 12100 4800 20  0000 C CNN
 F 1 "+GND" H 12100 4730 30  0000 C CNN
 F 2 "" H 12100 4800 70  0000 C CNN
 F 3 "" H 12100 4800 70  0000 C CNN
@@ -95,10 +95,10 @@ F 3 "" H 12100 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_3
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_03
 U 1 1 5802408F
 P 11800 3500
-F 0 "VCCO_3V3_3" H 11800 3500 20  0000 C CNN
+F 0 "#VCCO_3V3_03" H 11800 3500 20  0000 C CNN
 F 1 "+VCCO_3V3" H 11800 3430 30  0000 C CNN
 F 2 "" H 11800 3500 70  0000 C CNN
 F 3 "" H 11800 3500 70  0000 C CNN
@@ -106,10 +106,10 @@ F 3 "" H 11800 3500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_4
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_04
 U 1 1 5802408E
 P 6500 3600
-F 0 "VCCO_3V3_4" H 6500 3600 20  0000 C CNN
+F 0 "#VCCO_3V3_04" H 6500 3600 20  0000 C CNN
 F 1 "+VCCO_3V3" H 6500 3530 30  0000 C CNN
 F 2 "" H 6500 3600 70  0000 C CNN
 F 3 "" H 6500 3600 70  0000 C CNN
@@ -117,10 +117,10 @@ F 3 "" H 6500 3600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_30
+L power:GND #GND_030
 U 1 1 5802408D
 P 13700 6900
-F 0 "GND_30" H 13700 6900 20  0000 C CNN
+F 0 "#GND_030" H 13700 6900 20  0000 C CNN
 F 1 "+GND" H 13700 6830 30  0000 C CNN
 F 2 "" H 13700 6900 70  0000 C CNN
 F 3 "" H 13700 6900 70  0000 C CNN
@@ -128,10 +128,10 @@ F 3 "" H 13700 6900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_31
+L power:GND #GND_031
 U 1 1 5802408C
 P 3000 5100
-F 0 "GND_31" H 3000 5100 20  0000 C CNN
+F 0 "#GND_031" H 3000 5100 20  0000 C CNN
 F 1 "+GND" H 3000 5030 30  0000 C CNN
 F 2 "" H 3000 5100 70  0000 C CNN
 F 3 "" H 3000 5100 70  0000 C CNN
@@ -139,10 +139,10 @@ F 3 "" H 3000 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_32
+L power:GND #GND_032
 U 1 1 5802408B
 P 3400 5100
-F 0 "GND_32" H 3400 5100 20  0000 C CNN
+F 0 "#GND_032" H 3400 5100 20  0000 C CNN
 F 1 "+GND" H 3400 5030 30  0000 C CNN
 F 2 "" H 3400 5100 70  0000 C CNN
 F 3 "" H 3400 5100 70  0000 C CNN
@@ -150,10 +150,10 @@ F 3 "" H 3400 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_33
+L power:GND #GND_033
 U 1 1 5802408A
 P 11800 4800
-F 0 "GND_33" H 11800 4800 20  0000 C CNN
+F 0 "#GND_033" H 11800 4800 20  0000 C CNN
 F 1 "+GND" H 11800 4730 30  0000 C CNN
 F 2 "" H 11800 4800 70  0000 C CNN
 F 3 "" H 11800 4800 70  0000 C CNN
@@ -190,12 +190,8 @@ Wire Wire Line
 	3400 5000 3400 5100
 Wire Wire Line
 	11800 4300 11800 4800
-Wire Wire Line
-	11800 3500 11800 3800
 Wire Wire Line
 	11800 3830 11800 4000
-Wire Wire Line
-	11800 3800 11800 3830
 Wire Wire Line
 	6800 4300 6500 4300
 Wire Wire Line
@@ -210,47 +206,47 @@ Wire Wire Line
 	3700 4700 3700 5800
 Wire Wire Line
 	4000 4700 3700 4700
-Text Label 3700 5800 1 48 ~
+Text Label 3700 5800 1    48   ~ 0
 OSC_OUT
 Wire Wire Line
 	6800 5000 6420 5000
-Text Label 6420 5000 0 48 ~
+Text Label 6420 5000 0    48   ~ 0
 OSC_OUT
 Wire Wire Line
 	2700 5300 2700 5800
-Text Label 2700 5800 1 48 ~
+Text Label 2700 5800 1    48   ~ 0
 OSC_IN
 Wire Wire Line
 	6800 4900 6420 4900
-Text Label 6420 4900 0 48 ~
+Text Label 6420 4900 0    48   ~ 0
 OSC_IN
 Wire Wire Line
 	13040 4130 12760 4130
-Text Label 12760 4130 0 48 ~
+Text Label 12760 4130 0    48   ~ 0
 SWDIO
 Wire Wire Line
 	9400 4800 9100 4800
-Text Label 9400 4800 0 48 ~
+Text Label 9400 4800 0    48   ~ 0
 SWDIO
 Wire Wire Line
 	13040 3930 12760 3930
-Text Label 12760 3930 0 48 ~
+Text Label 12760 3930 0    48   ~ 0
 SWDCLK
 Wire Wire Line
 	9400 4700 9100 4700
-Text Label 9400 4700 0 48 ~
+Text Label 9400 4700 0    48   ~ 0
 SWDCLK
-Text Label 12760 4230 0 48 ~
+Text Label 12760 4230 0    48   ~ 0
 NRST
 Wire Wire Line
 	9400 4600 9100 4600
-Text Label 9400 4600 0 48 ~
+Text Label 9400 4600 0    48   ~ 0
 NRST
 Wire Wire Line
 	6800 5600 6440 5600
 Wire Wire Line
 	6440 5600 6440 5800
-Text Label 6440 5600 0 48 ~
+Text Label 6440 5600 0    48   ~ 0
 BOOT0
 Wire Wire Line
 	3000 4700 2700 4700
@@ -260,24 +256,20 @@ Wire Wire Line
 	2700 4700 2700 4900
 Wire Wire Line
 	12600 6500 11960 6500
-Text GLabel 11960 6500 0 48 Input ~ 0
+Text GLabel 11960 6500 0    48   Input ~ 0
 ARM_LED1
 Wire Wire Line
 	12290 6600 11960 6600
-Text GLabel 11960 6600 0 48 Input ~ 0
+Text GLabel 11960 6600 0    48   Input ~ 0
 ARM_LED2
-Wire Wire Line
-	12200 6700 11950 6700
-Text GLabel 11950 6700 0 48 Input ~ 0
+Text GLabel 11950 6700 0    48   Input ~ 0
 ARM_LED3
 Wire Wire Line
 	12290 6800 11950 6800
-Text GLabel 11950 6800 0 48 Input ~ 0
+Text GLabel 11950 6800 0    48   Input ~ 0
 ARM_LED4
 Wire Wire Line
 	13300 6500 13000 6500
-Wire Wire Line
-	13100 6600 13000 6600
 Wire Wire Line
 	13300 6700 13000 6700
 Wire Wire Line
@@ -292,10 +284,6 @@ Wire Wire Line
 	12100 4030 13040 4030
 Wire Wire Line
 	13040 3830 11800 3830
-Wire Wire Line
-	13000 6600 12690 6600
-Wire Wire Line
-	12600 6700 12200 6700
 Connection ~ 11800 3830
 Connection ~ 12860 4230
 $Comp
@@ -307,7 +295,7 @@ F 1 "5pF" H 3880 4890 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3880 4890 60  0001 C CNN
 F 3 "" H 3880 4890 60  0000 C CNN
 	1    4000 4900
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:XTAL-4-3225 Q3
@@ -318,7 +306,7 @@ F 1 "ABM8G-25.000MHZ-4Y-T3" H 2730 4930 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:CRYSTAL_3.2X2.5" H 2730 4930 60  0001 C CNN
 F 3 "" H 2730 4930 60  0000 C CNN
 	1    3200 4700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C19
@@ -329,25 +317,18 @@ F 1 "0.1uF" H 11340 4050 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11340 4050 60  0001 C CNN
 F 3 "" H 11340 4050 60  0000 C CNN
 	1    11800 4100
-	1    0    0    -1
-$EndComp
-$Comp
-L Cryptech_Alpha:STM32F429BIT6_2 U4
-U 1 1 58024086
-P 8000 4900
-F 0 "U4" H 6890 3890 60  0000 L BNN
-	1    8000 4900
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:TSQFP50P3000X3000X160-208N" H 6890 3890 60  0001 C CNN
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:STM32-SWD J1
 U 1 1 58024085
 P 13440 4130
 F 0 "J1" H 13588 3700 60  0000 R TNN
-	1    13440 4130
-	-1   0    0    1
+F 1 "~" H 13440 4130 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLS-6" H 13588 3700 60  0001 C CNN
+F 3 "" H 13440 4130 50  0001 C CNN
+	1    13440 4130
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R93
@@ -358,7 +339,7 @@ F 1 "330" H 12900 6410 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 12900 6410 60  0001 C CNN
 F 3 "" H 12900 6410 60  0000 C CNN
 	1    12800 6500
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R92
@@ -369,7 +350,7 @@ F 1 "330" H 12630 6410 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 12630 6410 60  0001 C CNN
 F 3 "" H 12630 6410 60  0000 C CNN
 	1    12490 6600
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R16
@@ -380,7 +361,7 @@ F 1 "330" H 12490 6400 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 12490 6400 60  0001 C CNN
 F 3 "" H 12490 6400 60  0000 C CNN
 	1    12800 6700
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R94
@@ -391,7 +372,7 @@ F 1 "330" H 12590 7060 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 12590 7060 60  0001 C CNN
 F 3 "" H 12590 7060 60  0000 C CNN
 	1    12490 6800
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C17
@@ -402,7 +383,7 @@ F 1 "5pF" H 2800 4900 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2800 4900 60  0001 C CNN
 F 3 "" H 2800 4900 60  0000 C CNN
 	1    2400 4900
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R15
@@ -413,7 +394,7 @@ F 1 "10k" V 6380 5880 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6380 5880 60  0001 C CNN
 F 3 "" H 6380 5880 60  0000 C CNN
 	1    6440 6000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C20
@@ -424,7 +405,7 @@ F 1 "0.1uF" H 12410 4550 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12410 4550 60  0001 C CNN
 F 3 "" H 12410 4550 60  0000 C CNN
 	1    12860 4600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R14
@@ -435,7 +416,7 @@ F 1 "0" V 2640 5230 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2640 5230 60  0001 C CNN
 F 3 "" H 2640 5230 60  0000 C CNN
 	1    2700 5100
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED3
@@ -446,7 +427,7 @@ F 1 "LTST-C193TBKT-5A" V 13350 5460 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13350 5460 60  0001 C CNN
 F 3 "" H 13350 5460 60  0000 C CNN
 	1    13400 6500
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED1
@@ -457,7 +438,7 @@ F 1 "LTST-C191KGKT" V 13160 5360 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13160 5360 60  0001 C CNN
 F 3 "" H 13160 5360 60  0000 C CNN
 	1    13200 6600
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED4
@@ -468,7 +449,7 @@ F 1 "LTST-C191KSKT" V 13355 5666 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13355 5666 60  0001 C CNN
 F 3 "" H 13355 5666 60  0000 C CNN
 	1    13400 6700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED2
@@ -479,11 +460,28 @@ F 1 "LTST-C191KRKT" V 13160 5560 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13160 5560 60  0001 C CNN
 F 3 "" H 13160 5560 60  0000 C CNN
 	1    13200 6800
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 NoConn ~ 9100 5100
 NoConn ~ 9100 5200
 NoConn ~ 9100 5300
 NoConn ~ 6800 5400
 NoConn ~ 13040 4330
+Wire Wire Line
+	11800 3500 11800 3830
+Wire Wire Line
+	11950 6700 12600 6700
+Wire Wire Line
+	12690 6600 13100 6600
+$Comp
+L Cryptech_Alpha:STM32F429BIT6 U4
+U 2 1 5AFAB2DD
+P 8000 4900
+F 0 "U4" H 7950 5867 50  0000 C CNN
+F 1 "STM32F429BIT6" H 7950 5776 50  0000 C CNN
+F 2 "" H 8000 5100 50  0001 C CNN
+F 3 "" H 8000 5100 50  0001 C CNN
+	2    8000 4900
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_04.sch b/rev03-KiCad/rev02_04.sch
index bce5104..537c508 100644
--- a/rev03-KiCad/rev02_04.sch
+++ b/rev03-KiCad/rev02_04.sch
@@ -19,15 +19,15 @@ Text Notes 9350 4850 0    60   ~ 12
 ST AN8844 §2.2\nOne 10uF bypass cap for the package.\n(two used for extra comfort)
 Text Notes 6400 4850 0    60   ~ 12
 2*2*2.2uF LowESR or\n2*1*4.7uF LowESR\n< 1 ohm\n(ST AN4488 §2.2)
-Text Notes 1900 2100 0    126   ~ 12
+Text Notes 1900 2100 0    126  ~ 25
 Power and bypass capacitors, STM32
-Text Notes 13930 10220 0    84   ~ 12
+Text Notes 13930 10220 0    84   ~ 17
 ARM power
 $Comp
-L power:GND GND_34
+L power:GND #GND_034
 U 1 1 58024078
 P 10100 6300
-F 0 "GND_34" H 10100 6300 20  0000 C CNN
+F 0 "#GND_034" H 10100 6300 20  0000 C CNN
 F 1 "+GND" H 10100 6230 30  0000 C CNN
 F 2 "" H 10100 6300 70  0000 C CNN
 F 3 "" H 10100 6300 70  0000 C CNN
@@ -35,10 +35,10 @@ F 3 "" H 10100 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_5
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_05
 U 1 1 58024077
 P 10100 5400
-F 0 "VCCO_3V3_5" H 10100 5400 20  0000 C CNN
+F 0 "#VCCO_3V3_05" H 10100 5400 20  0000 C CNN
 F 1 "+VCCO_3V3" H 10100 5330 30  0000 C CNN
 F 2 "" H 10100 5400 70  0000 C CNN
 F 3 "" H 10100 5400 70  0000 C CNN
@@ -46,10 +46,10 @@ F 3 "" H 10100 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_6
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_06
 U 1 1 58024076
 P 12200 4850
-F 0 "VCCO_3V3_6" H 12200 4850 20  0000 C CNN
+F 0 "#VCCO_3V3_06" H 12200 4850 20  0000 C CNN
 F 1 "+VCCO_3V3" H 12200 4780 30  0000 C CNN
 F 2 "" H 12200 4850 70  0000 C CNN
 F 3 "" H 12200 4850 70  0000 C CNN
@@ -57,10 +57,10 @@ F 3 "" H 12200 4850 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_35
+L power:GND #GND_035
 U 1 1 58024075
 P 12200 6300
-F 0 "GND_35" H 12200 6300 20  0000 C CNN
+F 0 "#GND_035" H 12200 6300 20  0000 C CNN
 F 1 "+GND" H 12200 6230 30  0000 C CNN
 F 2 "" H 12200 6300 70  0000 C CNN
 F 3 "" H 12200 6300 70  0000 C CNN
@@ -68,10 +68,10 @@ F 3 "" H 12200 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_36
+L power:GND #GND_036
 U 1 1 58024074
 P 2400 7200
-F 0 "GND_36" H 2400 7200 20  0000 C CNN
+F 0 "#GND_036" H 2400 7200 20  0000 C CNN
 F 1 "+GND" H 2400 7130 30  0000 C CNN
 F 2 "" H 2400 7200 70  0000 C CNN
 F 3 "" H 2400 7200 70  0000 C CNN
@@ -79,10 +79,10 @@ F 3 "" H 2400 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_7
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_07
 U 1 1 58024073
 P 2300 4250
-F 0 "VCCO_3V3_7" H 2300 4250 20  0000 C CNN
+F 0 "#VCCO_3V3_07" H 2300 4250 20  0000 C CNN
 F 1 "+VCCO_3V3" H 2300 4180 30  0000 C CNN
 F 2 "" H 2300 4250 70  0000 C CNN
 F 3 "" H 2300 4250 70  0000 C CNN
@@ -90,10 +90,10 @@ F 3 "" H 2300 4250 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_37
+L power:GND #GND_037
 U 1 1 58024072
 P 4400 7200
-F 0 "GND_37" H 4400 7200 20  0000 C CNN
+F 0 "#GND_037" H 4400 7200 20  0000 C CNN
 F 1 "+GND" H 4400 7130 30  0000 C CNN
 F 2 "" H 4400 7200 70  0000 C CNN
 F 3 "" H 4400 7200 70  0000 C CNN
@@ -101,10 +101,10 @@ F 3 "" H 4400 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_38
+L power:GND #GND_038
 U 1 1 58024071
 P 7600 6200
-F 0 "GND_38" H 7600 6200 20  0000 C CNN
+F 0 "#GND_038" H 7600 6200 20  0000 C CNN
 F 1 "+GND" H 7600 6130 30  0000 C CNN
 F 2 "" H 7600 6200 70  0000 C CNN
 F 3 "" H 7600 6200 70  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 7600 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_39
+L power:GND #GND_039
 U 1 1 58024070
 P 6300 6200
-F 0 "GND_39" H 6300 6200 20  0000 C CNN
+F 0 "#GND_039" H 6300 6200 20  0000 C CNN
 F 1 "+GND" H 6300 6130 30  0000 C CNN
 F 2 "" H 6300 6200 70  0000 C CNN
 F 3 "" H 6300 6200 70  0000 C CNN
@@ -123,10 +123,10 @@ F 3 "" H 6300 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT
+L Cryptech_Alpha:3V3_BATT #3V3_BATT0101
 U 1 1 5802406F
 P 2600 3500
-F 0 "3V3_BATT" H 2600 3500 20  0000 C CNN
+F 0 "#3V3_BATT0101" H 2600 3500 20  0000 C CNN
 F 1 "+3V3_BATT" H 2600 3430 30  0000 C CNN
 F 2 "" H 2600 3500 70  0000 C CNN
 F 3 "" H 2600 3500 70  0000 C CNN
@@ -395,13 +395,13 @@ Wire Wire Line
 	6300 5300 6300 5500
 Wire Wire Line
 	6300 5300 5900 5300
-Text Label 5900 5300 0 48 ~
+Text Label 5900 5300 0    48   ~ 0
 VCAP2
 Wire Wire Line
 	3500 3700 3500 3900
 Wire Wire Line
 	3700 3700 3500 3700
-Text Label 3700 3700 2 48 ~ 0
+Text Label 3700 3700 2    48   ~ 0
 VCAP2
 Wire Wire Line
 	7600 5500 7600 5600
@@ -413,13 +413,13 @@ Wire Wire Line
 	7600 5300 7600 5500
 Wire Wire Line
 	7600 5300 7200 5300
-Text Label 7200 5300 0 48 ~
+Text Label 7200 5300 0    48   ~ 0
 VCAP1
 Wire Wire Line
 	3300 3700 3300 3900
 Wire Wire Line
 	3300 3700 3100 3700
-Text Label 3100 3700 0 48 ~
+Text Label 3100 3700 0    48   ~ 0
 VCAP1
 Wire Wire Line
 	2600 4200 2600 4300
@@ -440,7 +440,7 @@ F 1 "10uF" H 9500 5680 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 9500 5680 60  0001 C CNN
 F 3 "" H 9500 5680 60  0000 C CNN
 	1    9900 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C31
@@ -451,7 +451,7 @@ F 1 "0.1uF" H 12480 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12480 5410 60  0001 C CNN
 F 3 "" H 12480 5410 60  0000 C CNN
 	1    12600 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C32
@@ -462,7 +462,7 @@ F 1 "0.1uF" H 12960 5930 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12960 5930 60  0001 C CNN
 F 3 "" H 12960 5930 60  0000 C CNN
 	1    12600 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C30
@@ -473,7 +473,7 @@ F 1 "0.1uF" H 12240 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12240 5410 60  0001 C CNN
 F 3 "" H 12240 5410 60  0000 C CNN
 	1    12400 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C29
@@ -484,7 +484,7 @@ F 1 "0.1uF" H 12240 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12240 5410 60  0001 C CNN
 F 3 "" H 12240 5410 60  0000 C CNN
 	1    12400 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C28
@@ -495,7 +495,7 @@ F 1 "0.1uF" H 11870 5210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11870 5210 60  0001 C CNN
 F 3 "" H 11870 5210 60  0000 C CNN
 	1    12200 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C46
@@ -506,7 +506,7 @@ F 1 "0.1uF" H 14120 5690 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 14120 5690 60  0001 C CNN
 F 3 "" H 14120 5690 60  0000 C CNN
 	1    14000 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C44
@@ -517,7 +517,7 @@ F 1 "0.1uF" H 13760 5400 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13760 5400 60  0001 C CNN
 F 3 "" H 13760 5400 60  0000 C CNN
 	1    13800 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C42
@@ -528,7 +528,7 @@ F 1 "0.1uF" H 13530 5420 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13530 5420 60  0001 C CNN
 F 3 "" H 13530 5420 60  0000 C CNN
 	1    13600 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C40
@@ -539,7 +539,7 @@ F 1 "0.1uF" H 13290 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13290 5410 60  0001 C CNN
 F 3 "" H 13290 5410 60  0000 C CNN
 	1    13400 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C38
@@ -550,7 +550,7 @@ F 1 "0.1uF" H 13110 5260 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13110 5260 60  0001 C CNN
 F 3 "" H 13110 5260 60  0000 C CNN
 	1    13200 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0805 C27
@@ -561,7 +561,7 @@ F 1 "10uF" H 10400 5710 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 10400 5710 60  0001 C CNN
 F 3 "" H 10400 5710 60  0000 C CNN
 	1    10300 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C36
@@ -572,7 +572,7 @@ F 1 "0.1uF" H 12950 5430 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12950 5430 60  0001 C CNN
 F 3 "" H 12950 5430 60  0000 C CNN
 	1    13000 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C34
@@ -583,7 +583,7 @@ F 1 "0.1uF" H 12700 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12700 5410 60  0001 C CNN
 F 3 "" H 12700 5410 60  0000 C CNN
 	1    12800 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C21
@@ -594,7 +594,7 @@ F 1 "1uF" H 2090 6870 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0603" H 2090 6870 60  0001 C CNN
 F 3 "" H 2090 6870 60  0000 C CNN
 	1    2400 6900
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C24
@@ -605,7 +605,7 @@ F 1 "2.2uF" H 6130 5870 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0603" H 6130 5870 60  0001 C CNN
 F 3 "" H 6130 5870 60  0000 C CNN
 	1    6300 5800
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C22
@@ -616,7 +616,7 @@ F 1 "2.2uF" H 7630 5870 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0603" H 7630 5870 60  0001 C CNN
 F 3 "" H 7630 5870 60  0000 C CNN
 	1    7800 5800
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C23
@@ -627,7 +627,7 @@ F 1 "2.2uF" H 7940 5870 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0603" H 7940 5870 60  0001 C CNN
 F 3 "" H 7940 5870 60  0000 C CNN
 	1    7600 5800
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C25
@@ -638,7 +638,7 @@ F 1 "2.2uF" H 6460 5880 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0603" H 6460 5880 60  0001 C CNN
 F 3 "" H 6460 5880 60  0000 C CNN
 	1    6100 5800
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R32
@@ -649,16 +649,7 @@ F 1 "0" V 2580 3600 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2580 3600 60  0001 C CNN
 F 3 "" H 2580 3600 60  0000 C CNN
 	1    2600 3800
-	0    1    1    0
-$EndComp
-$Comp
-L Cryptech_Alpha:STM32F429BIT6_3 U4_2
-U 1 1 5802405A
-P 3400 5500
-F 0 "U4_2" H 2690 3890 60  0000 L BNN
-	1    3400 5500
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:TSQFP50P3000X3000X160-208N" H 2690 3890 60  0001 C CNN
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C45
@@ -669,7 +660,7 @@ F 1 "0.1uF" H 13960 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13960 5410 60  0001 C CNN
 F 3 "" H 13960 5410 60  0000 C CNN
 	1    14000 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C43
@@ -680,7 +671,7 @@ F 1 "0.1uF" H 13780 4930 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13780 4930 60  0001 C CNN
 F 3 "" H 13780 4930 60  0000 C CNN
 	1    13800 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C41
@@ -691,7 +682,7 @@ F 1 "0.1uF" H 13540 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13540 5410 60  0001 C CNN
 F 3 "" H 13540 5410 60  0000 C CNN
 	1    13600 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C39
@@ -702,7 +693,7 @@ F 1 "0.1uF" H 13390 4920 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13390 4920 60  0001 C CNN
 F 3 "" H 13390 4920 60  0000 C CNN
 	1    13400 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C37
@@ -713,7 +704,7 @@ F 1 "0.1uF" H 13120 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 13120 5410 60  0001 C CNN
 F 3 "" H 13120 5410 60  0000 C CNN
 	1    13200 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C35
@@ -724,7 +715,7 @@ F 1 "0.1uF" H 12760 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12760 5410 60  0001 C CNN
 F 3 "" H 12760 5410 60  0000 C CNN
 	1    13000 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C33
@@ -735,18 +726,29 @@ F 1 "0.1uF" H 12520 4920 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12520 4920 60  0001 C CNN
 F 3 "" H 12520 4920 60  0000 C CNN
 	1    12800 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0103
 U 1 1 5AFAF93B
 P 2600 4000
-F 0 "#FLG?" H 2600 4075 50  0001 C CNN
+F 0 "#FLG0103" H 2600 4075 50  0001 C CNN
 F 1 "PWR_FLAG" V 2600 4128 50  0000 L CNN
 F 2 "" H 2600 4000 50  0001 C CNN
 F 3 "~" H 2600 4000 50  0001 C CNN
-       1    2600 4000
-       0    -1   -1   0   
+	1    2600 4000
+	0    -1   -1   0   
 $EndComp
 Connection ~ 2600 4000
+$Comp
+L Cryptech_Alpha:STM32F429BIT6 U4
+U 3 1 5AFA964E
+P 3400 5400
+F 0 "U4" H 3400 3826 50  0000 C CNN
+F 1 "STM32F429BIT6" H 3400 3735 50  0000 C CNN
+F 2 "" H 3400 5600 50  0001 C CNN
+F 3 "" H 3400 5600 50  0001 C CNN
+	3    3400 5400
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_05.sch b/rev03-KiCad/rev02_05.sch
index 165f622..bb4aac8 100644
--- a/rev03-KiCad/rev02_05.sch
+++ b/rev03-KiCad/rev02_05.sch
@@ -3,7 +3,7 @@ EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
-Sheet 7 27
+Sheet 19 27
 Title "rev02_05"
 Date "15 10 2016"
 Rev ""
@@ -15,9 +15,9 @@ Comment4 ""
 $EndDescr
 Text Notes 3200 9350 0    60   ~ 12
 All of these input/outputs can be swapped\nwith equivalent functionality pins.
-Text Notes 1400 1500 0    126   ~ 12
+Text Notes 1400 1500 0    126  ~ 25
 Input/output, STM32
-Text Notes 13930 10220 0    84   ~ 12
+Text Notes 13930 10220 0    84   ~ 17
 ARM I/O
 Text Notes 3400 2100 0    60   ~ 12
 U4
@@ -25,606 +25,584 @@ Text Notes 3400 2300 0    60   ~ 12
 STM32F429BIT6
 Wire Wire Line
 	10600 7100 9990 7100
-Text GLabel 9990 7100 0 48 Output ~ 0
+Text GLabel 9990 7100 0    48   Output ~ 0
 FMC_CLK
 Wire Wire Line
 	10600 6800 9990 6800
-Text GLabel 9990 6800 0 48 UnSpc ~ 0
+Text GLabel 9990 6800 0    48   UnSpc ~ 0
 FMC_NL
 Wire Wire Line
 	10600 7200 9990 7200
-Text GLabel 9990 7200 0 48 Output ~ 0
+Text GLabel 9990 7200 0    48   Output ~ 0
 FMC_NOE
 Wire Wire Line
 	10600 7300 9990 7300
-Text GLabel 9990 7300 0 48 Output ~ 0
+Text GLabel 9990 7300 0    48   Output ~ 0
 FMC_NWE
 Wire Wire Line
 	10600 7400 9990 7400
-Text GLabel 9990 7400 0 48 Output ~ 0
+Text GLabel 9990 7400 0    48   Output ~ 0
 FMC_NWAIT
 Wire Wire Line
 	10600 7500 9990 7500
-Text GLabel 9990 7500 0 48 Output ~ 0
+Text GLabel 9990 7500 0    48   Output ~ 0
 FMC_NE1
 Wire Wire Line
 	13490 7700 13000 7700
-Text GLabel 13490 7700 2 48 Output ~ 0
+Text GLabel 13490 7700 2    48   Output ~ 0
 FMC_SDNCAS
 Wire Wire Line
 	13490 7800 13000 7800
-Text GLabel 13490 7800 2 48 Output ~ 0
+Text GLabel 13490 7800 2    48   Output ~ 0
 FMC_SDNRAS
 Wire Wire Line
 	10600 6200 9990 6200
-Text GLabel 9990 6200 0 48 Output ~ 0
+Text GLabel 9990 6200 0    48   Output ~ 0
 FMC_NBL0
 Wire Wire Line
 	10600 6300 9990 6300
-Text GLabel 9990 6300 0 48 Output ~ 0
+Text GLabel 9990 6300 0    48   Output ~ 0
 FMC_NBL1
 Wire Wire Line
 	10600 6400 9990 6400
-Text GLabel 9990 6400 0 48 Output ~ 0
+Text GLabel 9990 6400 0    48   Output ~ 0
 FMC_NBL2
 Wire Wire Line
 	10600 6500 9990 6500
-Text GLabel 9990 6500 0 48 Output ~ 0
+Text GLabel 9990 6500 0    48   Output ~ 0
 FMC_NBL3
 Wire Wire Line
 	13490 7500 13000 7500
-Text GLabel 13490 7500 2 48 Output ~ 0
+Text GLabel 13490 7500 2    48   Output ~ 0
 FMC_SDCKE1
 Wire Wire Line
 	13490 7200 13000 7200
-Text GLabel 13490 7200 2 48 Output ~ 0
+Text GLabel 13490 7200 2    48   Output ~ 0
 FMC_SDNE1
 Entry Wire Line
- 	10040 3400 9990 3450
+	10040 3400 9990 3450
 Wire Wire Line
 	10600 3400 10040 3400
-Text GLabel 10160 3400 2 48 Output ~ 0
+Text GLabel 10160 3400 2    48   Output ~ 0
 FMC_A0
 Entry Wire Line
- 	10040 3500 9990 3550
+	10040 3500 9990 3550
 Wire Wire Line
 	10600 3500 10040 3500
-Text GLabel 10160 3500 2 48 Output ~ 0
+Text GLabel 10160 3500 2    48   Output ~ 0
 FMC_A1
 Entry Wire Line
- 	10040 3600 9990 3650
+	10040 3600 9990 3650
 Wire Wire Line
 	10600 3600 10040 3600
-Text GLabel 10160 3600 2 48 Output ~ 0
+Text GLabel 10160 3600 2    48   Output ~ 0
 FMC_A2
 Entry Wire Line
- 	10040 3700 9990 3750
+	10040 3700 9990 3750
 Wire Wire Line
 	10600 3700 10040 3700
-Text GLabel 10160 3700 2 48 Output ~ 0
+Text GLabel 10160 3700 2    48   Output ~ 0
 FMC_A3
 Entry Wire Line
- 	10040 3800 9990 3850
+	10040 3800 9990 3850
 Wire Wire Line
 	10600 3800 10040 3800
-Text GLabel 10160 3800 2 48 Output ~ 0
+Text GLabel 10160 3800 2    48   Output ~ 0
 FMC_A4
 Entry Wire Line
- 	10040 3900 9990 3950
+	10040 3900 9990 3950
 Wire Wire Line
 	10600 3900 10040 3900
-Text GLabel 10160 3900 2 48 Output ~ 0
+Text GLabel 10160 3900 2    48   Output ~ 0
 FMC_A5
 Entry Wire Line
- 	10040 4000 9990 4050
+	10040 4000 9990 4050
 Wire Wire Line
 	10600 4000 10040 4000
-Text GLabel 10160 4000 2 48 Output ~ 0
+Text GLabel 10160 4000 2    48   Output ~ 0
 FMC_A6
 Entry Wire Line
- 	10040 4100 9990 4150
+	10040 4100 9990 4150
 Wire Wire Line
 	10600 4100 10040 4100
-Text GLabel 10160 4100 2 48 Output ~ 0
+Text GLabel 10160 4100 2    48   Output ~ 0
 FMC_A7
 Entry Wire Line
- 	10040 4200 9990 4250
+	10040 4200 9990 4250
 Wire Wire Line
 	10600 4200 10040 4200
-Text GLabel 10160 4200 2 48 Output ~ 0
+Text GLabel 10160 4200 2    48   Output ~ 0
 FMC_A8
 Entry Wire Line
- 	10040 4300 9990 4350
+	10040 4300 9990 4350
 Wire Wire Line
 	10600 4300 10040 4300
-Text GLabel 10160 4300 2 48 Output ~ 0
+Text GLabel 10160 4300 2    48   Output ~ 0
 FMC_A9
 Entry Wire Line
- 	10040 4400 9990 4450
+	10040 4400 9990 4450
 Wire Wire Line
 	10600 4400 10040 4400
-Text GLabel 10160 4400 2 48 Output ~ 0
+Text GLabel 10160 4400 2    48   Output ~ 0
 FMC_A10
 Entry Wire Line
- 	10040 4500 9990 4550
+	10040 4500 9990 4550
 Wire Wire Line
 	10600 4500 10040 4500
-Text GLabel 10160 4500 2 48 Output ~ 0
+Text GLabel 10160 4500 2    48   Output ~ 0
 FMC_A11
 Entry Wire Line
- 	10040 4600 9990 4650
+	10040 4600 9990 4650
 Wire Wire Line
 	10600 4600 10040 4600
-Text GLabel 10160 4600 2 48 Output ~ 0
+Text GLabel 10160 4600 2    48   Output ~ 0
 FMC_A12
 Entry Wire Line
- 	10040 4700 9990 4750
+	10040 4700 9990 4750
 Wire Wire Line
 	10600 4700 10040 4700
-Text GLabel 10160 4700 2 48 Output ~ 0
+Text GLabel 10160 4700 2    48   Output ~ 0
 FMC_A13
 Entry Wire Line
- 	10040 4800 9990 4850
+	10040 4800 9990 4850
 Wire Wire Line
 	10600 4800 10040 4800
-Text GLabel 10160 4800 2 48 Output ~ 0
+Text GLabel 10160 4800 2    48   Output ~ 0
 FMC_A14
 Entry Wire Line
- 	10040 4900 9990 4950
+	10040 4900 9990 4950
 Wire Wire Line
 	10600 4900 10040 4900
-Text GLabel 10160 4900 2 48 Output ~ 0
+Text GLabel 10160 4900 2    48   Output ~ 0
 FMC_A15
 Entry Wire Line
- 	10040 5000 9990 5050
+	10040 5000 9990 5050
 Wire Wire Line
 	10600 5000 10040 5000
-Text GLabel 10160 5000 2 48 Output ~ 0
+Text GLabel 10160 5000 2    48   Output ~ 0
 FMC_A16
 Entry Wire Line
- 	10040 5100 9990 5150
+	10040 5100 9990 5150
 Wire Wire Line
 	10600 5100 10040 5100
-Text GLabel 10160 5100 2 48 Output ~ 0
+Text GLabel 10160 5100 2    48   Output ~ 0
 FMC_A17
 Entry Wire Line
- 	10040 5200 9990 5250
+	10040 5200 9990 5250
 Wire Wire Line
 	10600 5200 10040 5200
-Text GLabel 10160 5200 2 48 Output ~ 0
+Text GLabel 10160 5200 2    48   Output ~ 0
 FMC_A18
 Entry Wire Line
- 	10040 5300 9990 5350
+	10040 5300 9990 5350
 Wire Wire Line
 	10600 5300 10040 5300
-Text GLabel 10160 5300 2 48 Output ~ 0
+Text GLabel 10160 5300 2    48   Output ~ 0
 FMC_A19
 Entry Wire Line
- 	10040 5400 9990 5450
+	10040 5400 9990 5450
 Wire Wire Line
 	10600 5400 10040 5400
-Text GLabel 10160 5400 2 48 Output ~ 0
+Text GLabel 10160 5400 2    48   Output ~ 0
 FMC_A20
 Entry Wire Line
- 	10040 5500 9990 5550
+	10040 5500 9990 5550
 Wire Wire Line
 	10600 5500 10040 5500
-Text GLabel 10160 5500 2 48 Output ~ 0
+Text GLabel 10160 5500 2    48   Output ~ 0
 FMC_A21
 Entry Wire Line
- 	10040 5600 9990 5650
+	10040 5600 9990 5650
 Wire Wire Line
 	10600 5600 10040 5600
-Text GLabel 10160 5600 2 48 Output ~ 0
+Text GLabel 10160 5600 2    48   Output ~ 0
 FMC_A22
 Entry Wire Line
- 	10040 5700 9990 5750
+	10040 5700 9990 5750
 Wire Wire Line
 	10600 5700 10040 5700
-Text GLabel 10160 5700 2 48 Output ~ 0
+Text GLabel 10160 5700 2    48   Output ~ 0
 FMC_A23
 Entry Wire Line
- 	10040 5800 9990 5850
+	10040 5800 9990 5850
 Wire Wire Line
 	10600 5800 10040 5800
-Text GLabel 10160 5800 2 48 Output ~ 0
+Text GLabel 10160 5800 2    48   Output ~ 0
 FMC_A24
 Entry Wire Line
- 	10040 5900 9990 5900
+	10040 5900 9990 5900
 Wire Wire Line
 	10600 5900 10040 5900
-Text GLabel 10160 5900 2 48 Output ~ 0
+Text GLabel 10160 5900 2    48   Output ~ 0
 FMC_A25
 Entry Wire Line
- 	13450 3400 13500 3350
+	13450 3400 13500 3350
 Wire Wire Line
 	13450 3400 13000 3400
-Text GLabel 13070 3400 2 48 BiDi ~ 0
+Text GLabel 13070 3400 2    48   BiDi ~ 0
 FMC_D0
 Entry Wire Line
- 	13450 3500 13500 3450
+	13450 3500 13500 3450
 Wire Wire Line
 	13450 3500 13000 3500
-Text GLabel 13070 3500 2 48 BiDi ~ 0
+Text GLabel 13070 3500 2    48   BiDi ~ 0
 FMC_D1
 Entry Wire Line
- 	13450 3600 13500 3550
+	13450 3600 13500 3550
 Wire Wire Line
 	13450 3600 13000 3600
-Text GLabel 13070 3600 2 48 BiDi ~ 0
+Text GLabel 13070 3600 2    48   BiDi ~ 0
 FMC_D2
 Entry Wire Line
- 	13450 3700 13500 3650
+	13450 3700 13500 3650
 Wire Wire Line
 	13450 3700 13000 3700
-Text GLabel 13070 3700 2 48 BiDi ~ 0
+Text GLabel 13070 3700 2    48   BiDi ~ 0
 FMC_D3
 Entry Wire Line
- 	13450 3800 13500 3750
+	13450 3800 13500 3750
 Wire Wire Line
 	13450 3800 13000 3800
-Text GLabel 13070 3800 2 48 BiDi ~ 0
+Text GLabel 13070 3800 2    48   BiDi ~ 0
 FMC_D4
 Entry Wire Line
- 	13450 3900 13500 3850
+	13450 3900 13500 3850
 Wire Wire Line
 	13450 3900 13000 3900
-Text GLabel 13070 3900 2 48 BiDi ~ 0
+Text GLabel 13070 3900 2    48   BiDi ~ 0
 FMC_D5
 Entry Wire Line
- 	13450 4000 13500 3950
+	13450 4000 13500 3950
 Wire Wire Line
 	13450 4000 13000 4000
-Text GLabel 13070 4000 2 48 BiDi ~ 0
+Text GLabel 13070 4000 2    48   BiDi ~ 0
 FMC_D6
 Entry Wire Line
- 	13450 4100 13500 4050
+	13450 4100 13500 4050
 Wire Wire Line
 	13450 4100 13000 4100
-Text GLabel 13070 4100 2 48 BiDi ~ 0
+Text GLabel 13070 4100 2    48   BiDi ~ 0
 FMC_D7
 Entry Wire Line
- 	13450 4200 13500 4150
+	13450 4200 13500 4150
 Wire Wire Line
 	13450 4200 13000 4200
-Text GLabel 13070 4200 2 48 BiDi ~ 0
+Text GLabel 13070 4200 2    48   BiDi ~ 0
 FMC_D8
 Entry Wire Line
- 	13450 4300 13500 4250
+	13450 4300 13500 4250
 Wire Wire Line
 	13450 4300 13000 4300
-Text GLabel 13070 4300 2 48 BiDi ~ 0
+Text GLabel 13070 4300 2    48   BiDi ~ 0
 FMC_D9
 Entry Wire Line
- 	13450 4400 13500 4350
+	13450 4400 13500 4350
 Wire Wire Line
 	13450 4400 13000 4400
-Text GLabel 13070 4400 2 48 BiDi ~ 0
+Text GLabel 13070 4400 2    48   BiDi ~ 0
 FMC_D10
 Entry Wire Line
- 	13450 4500 13500 4450
+	13450 4500 13500 4450
 Wire Wire Line
 	13450 4500 13000 4500
-Text GLabel 13070 4500 2 48 BiDi ~ 0
+Text GLabel 13070 4500 2    48   BiDi ~ 0
 FMC_D11
 Entry Wire Line
- 	13450 4600 13500 4550
+	13450 4600 13500 4550
 Wire Wire Line
 	13450 4600 13000 4600
-Text GLabel 13070 4600 2 48 BiDi ~ 0
+Text GLabel 13070 4600 2    48   BiDi ~ 0
 FMC_D12
 Entry Wire Line
- 	13450 4700 13500 4650
+	13450 4700 13500 4650
 Wire Wire Line
 	13450 4700 13000 4700
-Text GLabel 13070 4700 2 48 BiDi ~ 0
+Text GLabel 13070 4700 2    48   BiDi ~ 0
 FMC_D13
 Entry Wire Line
- 	13450 4800 13500 4750
+	13450 4800 13500 4750
 Wire Wire Line
 	13450 4800 13000 4800
-Text GLabel 13070 4800 2 48 BiDi ~ 0
+Text GLabel 13070 4800 2    48   BiDi ~ 0
 FMC_D14
 Entry Wire Line
- 	13450 4900 13500 4850
+	13450 4900 13500 4850
 Wire Wire Line
 	13450 4900 13000 4900
-Text GLabel 13070 4900 2 48 BiDi ~ 0
+Text GLabel 13070 4900 2    48   BiDi ~ 0
 FMC_D15
 Entry Wire Line
- 	13450 5000 13500 4950
+	13450 5000 13500 4950
 Wire Wire Line
 	13450 5000 13000 5000
-Text GLabel 13070 5000 2 48 BiDi ~ 0
+Text GLabel 13070 5000 2    48   BiDi ~ 0
 FMC_D16
 Entry Wire Line
- 	13450 5100 13500 5050
+	13450 5100 13500 5050
 Wire Wire Line
 	13450 5100 13000 5100
-Text GLabel 13070 5100 2 48 BiDi ~ 0
+Text GLabel 13070 5100 2    48   BiDi ~ 0
 FMC_D17
 Entry Wire Line
- 	13450 5200 13500 5150
+	13450 5200 13500 5150
 Wire Wire Line
 	13450 5200 13000 5200
-Text GLabel 13070 5200 2 48 BiDi ~ 0
+Text GLabel 13070 5200 2    48   BiDi ~ 0
 FMC_D18
 Entry Wire Line
- 	13450 5300 13500 5250
+	13450 5300 13500 5250
 Wire Wire Line
 	13450 5300 13000 5300
-Text GLabel 13070 5300 2 48 BiDi ~ 0
+Text GLabel 13070 5300 2    48   BiDi ~ 0
 FMC_D19
 Entry Wire Line
- 	13450 5400 13500 5350
+	13450 5400 13500 5350
 Wire Wire Line
 	13450 5400 13000 5400
-Text GLabel 13070 5400 2 48 BiDi ~ 0
+Text GLabel 13070 5400 2    48   BiDi ~ 0
 FMC_D20
 Entry Wire Line
- 	13450 5500 13500 5450
+	13450 5500 13500 5450
 Wire Wire Line
 	13450 5500 13000 5500
-Text GLabel 13070 5500 2 48 BiDi ~ 0
+Text GLabel 13070 5500 2    48   BiDi ~ 0
 FMC_D21
 Entry Wire Line
- 	13450 5600 13500 5550
+	13450 5600 13500 5550
 Wire Wire Line
 	13450 5600 13000 5600
-Text GLabel 13070 5600 2 48 BiDi ~ 0
+Text GLabel 13070 5600 2    48   BiDi ~ 0
 FMC_D22
 Entry Wire Line
- 	13450 5700 13500 5650
+	13450 5700 13500 5650
 Wire Wire Line
 	13450 5700 13000 5700
-Text GLabel 13070 5700 2 48 BiDi ~ 0
+Text GLabel 13070 5700 2    48   BiDi ~ 0
 FMC_D23
 Entry Wire Line
- 	13450 5800 13500 5750
+	13450 5800 13500 5750
 Wire Wire Line
 	13450 5800 13000 5800
-Text GLabel 13070 5800 2 48 BiDi ~ 0
+Text GLabel 13070 5800 2    48   BiDi ~ 0
 FMC_D24
 Entry Wire Line
- 	13450 5900 13500 5850
+	13450 5900 13500 5850
 Wire Wire Line
 	13450 5900 13000 5900
-Text GLabel 13070 5900 2 48 BiDi ~ 0
+Text GLabel 13070 5900 2    48   BiDi ~ 0
 FMC_D25
 Entry Wire Line
- 	13450 6000 13500 5950
+	13450 6000 13500 5950
 Wire Wire Line
 	13450 6000 13000 6000
-Text GLabel 13070 6000 2 48 BiDi ~ 0
+Text GLabel 13070 6000 2    48   BiDi ~ 0
 FMC_D26
 Entry Wire Line
- 	13450 6100 13500 6050
+	13450 6100 13500 6050
 Wire Wire Line
 	13450 6100 13000 6100
-Text GLabel 13070 6100 2 48 BiDi ~ 0
+Text GLabel 13070 6100 2    48   BiDi ~ 0
 FMC_D27
 Entry Wire Line
- 	13450 6200 13500 6150
+	13450 6200 13500 6150
 Wire Wire Line
 	13450 6200 13000 6200
-Text GLabel 13070 6200 2 48 BiDi ~ 0
+Text GLabel 13070 6200 2    48   BiDi ~ 0
 FMC_D28
 Entry Wire Line
- 	13450 6300 13500 6250
+	13450 6300 13500 6250
 Wire Wire Line
 	13450 6300 13000 6300
-Text GLabel 13070 6300 2 48 BiDi ~ 0
+Text GLabel 13070 6300 2    48   BiDi ~ 0
 FMC_D29
 Entry Wire Line
- 	13450 6400 13500 6350
+	13450 6400 13500 6350
 Wire Wire Line
 	13450 6400 13000 6400
-Text GLabel 13070 6400 2 48 BiDi ~ 0
+Text GLabel 13070 6400 2    48   BiDi ~ 0
 FMC_D30
 Entry Wire Line
- 	13450 6500 13500 6450
+	13450 6500 13500 6450
 Wire Wire Line
 	13450 6500 13000 6500
-Text GLabel 13070 6500 2 48 BiDi ~ 0
+Text GLabel 13070 6500 2    48   BiDi ~ 0
 FMC_D31
 Wire Wire Line
 	13490 7400 13000 7400
-Text GLabel 13490 7400 2 48 Output ~ 0
+Text GLabel 13490 7400 2    48   Output ~ 0
 FMC_SDCKE0
 Wire Wire Line
 	13490 7100 13000 7100
-Text GLabel 13490 7100 2 48 Output ~ 0
+Text GLabel 13490 7100 2    48   Output ~ 0
 FMC_SDNE0
 Wire Wire Line
 	13490 6900 13000 6900
-Text GLabel 13490 6900 2 48 Output ~ 0
+Text GLabel 13490 6900 2    48   Output ~ 0
 FMC_SDNWE
 Wire Wire Line
 	13490 6800 13000 6800
-Text GLabel 13490 6800 2 48 Output ~ 0
+Text GLabel 13490 6800 2    48   Output ~ 0
 FMC_SDCLK
 Wire Wire Line
 	3100 2900 2250 2900
-Text GLabel 2250 2900 0 48 Input ~ 0
+Text GLabel 2250 2900 0    48   Input ~ 0
 FT_TXD
 Wire Wire Line
 	3100 2800 2250 2800
-Text GLabel 2250 2800 0 48 Output ~ 0
+Text GLabel 2250 2800 0    48   Output ~ 0
 FT_RXD
 Wire Wire Line
 	7050 4300 6200 4300
-Text GLabel 7050 4300 2 48 BiDi ~ 0
+Text GLabel 7050 4300 2    48   BiDi ~ 0
 AVR_GPIO_ARM_1
 Wire Wire Line
 	7050 4400 6200 4400
-Text GLabel 7050 4400 2 48 BiDi ~ 0
+Text GLabel 7050 4400 2    48   BiDi ~ 0
 AVR_GPIO_ARM_0
 Wire Wire Line
 	3100 6200 2250 6200
-Text GLabel 2250 6200 0 48 Output ~ 0
+Text GLabel 2250 6200 0    48   Output ~ 0
 RTC_SCL
 Wire Wire Line
 	3100 6100 2250 6100
-Text GLabel 2250 6100 0 48 BiDi ~ 0
+Text GLabel 2250 6100 0    48   BiDi ~ 0
 RTC_SDA
 Wire Wire Line
 	3100 6300 2250 6300
-Text GLabel 2250 6300 0 48 UnSpc ~ 0
+Text GLabel 2250 6300 0    48   UnSpc ~ 0
 RTC_MFP
 Wire Wire Line
 	7000 6500 6200 6500
-Text GLabel 7000 6500 2 48 UnSpc ~ 0
+Text GLabel 7000 6500 2    48   UnSpc ~ 0
 FPGA_IRQ_N_0
 Wire Wire Line
 	7000 6600 6200 6600
-Text GLabel 7000 6600 2 48 UnSpc ~ 0
+Text GLabel 7000 6600 2    48   UnSpc ~ 0
 FPGA_IRQ_N_1
 Wire Wire Line
 	7000 6700 6200 6700
-Text GLabel 7000 6700 2 48 UnSpc ~ 0
+Text GLabel 7000 6700 2    48   UnSpc ~ 0
 FPGA_IRQ_N_2
 Wire Wire Line
 	7000 6800 6200 6800
-Text GLabel 7000 6800 2 48 UnSpc ~ 0
+Text GLabel 7000 6800 2    48   UnSpc ~ 0
 FPGA_IRQ_N_3
 Wire Wire Line
 	7000 6300 6200 6300
-Text GLabel 7000 6300 2 48 UnSpc ~ 0
+Text GLabel 7000 6300 2    48   UnSpc ~ 0
 FPGA_PROGRAM_B
 Wire Wire Line
 	7000 6200 6200 6200
-Text GLabel 7000 6200 2 48 UnSpc ~ 0
+Text GLabel 7000 6200 2    48   UnSpc ~ 0
 FPGA_INIT_B
 Wire Wire Line
 	3100 4200 2250 4200
-Text GLabel 2250 4200 0 48 Output ~ 0
+Text GLabel 2250 4200 0    48   Output ~ 0
 ARM_FPGA_CFG_SCLK
 Wire Wire Line
 	3100 4300 2250 4300
-Text GLabel 2250 4300 0 48 Input ~ 0
+Text GLabel 2250 4300 0    48   Input ~ 0
 ARM_FPGA_CFG_MISO
 Wire Wire Line
 	3100 4400 2250 4400
-Text GLabel 2250 4400 0 48 Output ~ 0
+Text GLabel 2250 4400 0    48   Output ~ 0
 ARM_FPGA_CFG_MOSI
 Wire Wire Line
 	3100 4800 2250 4800
-Text GLabel 2250 4800 0 48 Output ~ 0
+Text GLabel 2250 4800 0    48   Output ~ 0
 KSM_PROM_SCLK
 Wire Wire Line
 	3100 4900 2250 4900
-Text GLabel 2250 4900 0 48 Input ~ 0
+Text GLabel 2250 4900 0    48   Input ~ 0
 KSM_PROM_MISO
 Wire Wire Line
 	3100 5000 2250 5000
-Text GLabel 2250 5000 0 48 Output ~ 0
+Text GLabel 2250 5000 0    48   Output ~ 0
 KSM_PROM_MOSI
 Wire Wire Line
 	3100 3100 2250 3100
-Text GLabel 2250 3100 0 48 Output ~ 0
+Text GLabel 2250 3100 0    48   Output ~ 0
 FT_RTS
 Wire Wire Line
 	3100 3000 2250 3000
-Text GLabel 2250 3000 0 48 UnSpc ~ 0
+Text GLabel 2250 3000 0    48   UnSpc ~ 0
 FT_CTS
 Wire Wire Line
 	3100 3500 2250 3500
-Text GLabel 2250 3500 0 48 Output ~ 0
+Text GLabel 2250 3500 0    48   Output ~ 0
 FT_MGMT_RXD
 Wire Wire Line
 	3100 3600 2250 3600
-Text GLabel 2250 3600 0 48 Input ~ 0
+Text GLabel 2250 3600 0    48   Input ~ 0
 FT_MGMT_TXD
 Wire Wire Line
 	3100 3700 2250 3700
-Text GLabel 2250 3700 0 48 Input ~ 0
+Text GLabel 2250 3700 0    48   Input ~ 0
 FT_MGMT_CTS
 Wire Wire Line
 	3100 3800 2250 3800
-Text GLabel 2250 3800 0 48 Output ~ 0
+Text GLabel 2250 3800 0    48   Output ~ 0
 FT_MGMT_RTS
 Wire Wire Line
 	7000 7000 6200 7000
-Text GLabel 7000 7000 2 48 UnSpc ~ 0
+Text GLabel 7000 7000 2    48   UnSpc ~ 0
 FPGA_DONE
 Wire Wire Line
 	3100 2700 2250 2700
-Text GLabel 2250 2700 0 48 UnSpc ~ 0
+Text GLabel 2250 2700 0    48   UnSpc ~ 0
 FT_DTR
 Wire Wire Line
 	3100 3400 2250 3400
-Text GLabel 2250 3400 0 48 Output ~ 0
+Text GLabel 2250 3400 0    48   Output ~ 0
 FT_MGMT_DTR
 Wire Wire Line
 	3100 4100 2250 4100
-Text GLabel 2250 4100 0 48 Output ~ 0
+Text GLabel 2250 4100 0    48   Output ~ 0
 ARM_FPGA_CFG_CS_N
 Wire Wire Line
 	3100 4700 2250 4700
-Text GLabel 2250 4700 0 48 Output ~ 0
+Text GLabel 2250 4700 0    48   Output ~ 0
 KSM_PROM_CS_N
 Wire Wire Line
 	3100 7300 2250 7300
-Text GLabel 2250 7300 0 48 BiDi ~ 0
+Text GLabel 2250 7300 0    48   BiDi ~ 0
 AVR_GPIO_ARM_2
 Wire Wire Line
 	3100 7200 2250 7200
-Text GLabel 2250 7200 0 48 BiDi ~ 0
+Text GLabel 2250 7200 0    48   BiDi ~ 0
 AVR_GPIO_ARM_3
 Wire Bus Line
 	14900 3200 13500 3200
-Wire Bus Line
-	13500 3200 13500 6500
-Text Label 13500 3200 0 60 ~
+Text Label 13500 3200 0    60   ~ 0
 FMC_D[0..31]FMC_A[0..25]
-Wire Bus Line
-	9990 3200 9990 5900
 Wire Bus Line
 	9990 3200 8590 3200
-Text Label 8590 3200 0 60 ~
+Text Label 8590 3200 0    60   ~ 0
 FMC_D[0..31]FMC_A[0..25]
 Wire Wire Line
 	7000 7700 6200 7700
-Text GLabel 7000 7700 2 48 Output ~ 0
+Text GLabel 7000 7700 2    48   Output ~ 0
 ARM_LED1
 Wire Wire Line
 	7000 7800 6200 7800
-Text GLabel 7000 7800 2 48 Output ~ 0
+Text GLabel 7000 7800 2    48   Output ~ 0
 ARM_LED2
 Wire Wire Line
 	7000 7900 6200 7900
-Text GLabel 7000 7900 2 48 Output ~ 0
+Text GLabel 7000 7900 2    48   Output ~ 0
 ARM_LED3
 Wire Wire Line
 	7000 8000 6200 8000
-Text GLabel 7000 8000 2 48 Output ~ 0
+Text GLabel 7000 8000 2    48   Output ~ 0
 ARM_LED4
 Wire Wire Line
 	7000 5100 6200 5100
-Text GLabel 7000 5100 2 48 Output ~ 0
+Text GLabel 7000 5100 2    48   Output ~ 0
 FPGA_CFG_CTRL_FPGA_DIS
 Wire Wire Line
 	7000 2700 6200 2700
-Text GLabel 7000 2700 2 48 Output ~ 0
+Text GLabel 7000 2700 2    48   Output ~ 0
 FPGA_CFG_CTRL_ARM_ENA
-$Comp
-L Cryptech_Alpha:STM32F429BIT6_4 U4_3
-U 1 1 58024052
-P 11900 5500
-F 0 "U4_3" H 10690 2690 60  0000 L BNN
-	1    11900 5500
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:TSQFP50P3000X3000X160-208N" H 10690 2690 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:STM32F429BIT6_1 U4_4
-U 1 1 58024051
-P 4700 5600
-F 0 "U4_4" H 3190 2390 60  0000 L BNN
-	1    4700 5600
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:TSQFP50P3000X3000X160-208N" H 3190 2390 60  0001 C CNN
-$EndComp
 NoConn ~ 3100 5300
 NoConn ~ 3100 5400
 NoConn ~ 3100 5500
@@ -671,4 +649,30 @@ NoConn ~ 6200 3100
 NoConn ~ 6200 3000
 NoConn ~ 6200 2900
 NoConn ~ 6200 2800
+Wire Bus Line
+	9990 3200 9990 5900
+Wire Bus Line
+	13500 3200 13500 6500
+$Comp
+L Cryptech_Alpha:STM32F429BIT6 U4
+U 1 1 5AFB3C57
+P 4700 5500
+F 0 "U4" H 4565 8808 50  0000 C CNN
+F 1 "STM32F429BIT6" H 4565 8717 50  0000 C CNN
+F 2 "" H 4700 5700 50  0001 C CNN
+F 3 "" H 4700 5700 50  0001 C CNN
+	1    4700 5500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:STM32F429BIT6 U4
+U 4 1 5AFB3D8E
+P 11800 5500
+F 0 "U4" H 11800 8067 50  0000 C CNN
+F 1 "STM32F429BIT6" H 11800 7976 50  0000 C CNN
+F 2 "" H 11800 5700 50  0001 C CNN
+F 3 "" H 11800 5700 50  0001 C CNN
+	4    11800 5500
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_06.sch b/rev03-KiCad/rev02_06.sch
index a2ca561..f98887a 100644
--- a/rev03-KiCad/rev02_06.sch
+++ b/rev03-KiCad/rev02_06.sch
@@ -13,9 +13,9 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 5500 1300 0    126   ~ 12
+Text Notes 5500 1300 0    126  ~ 25
 2x512 Mbit SDRAM memory for the ARM
-Text Notes 13910 10230 0    84   ~ 12
+Text Notes 13910 10230 0    84   ~ 17
 SDRAM
 Text Notes 6000 1700 0    60   ~ 12
 These packages are TSSOP, but if new packages are to be created\nfor layout, BGA package is preferred.
@@ -28,10 +28,10 @@ U6
 Text Notes 10900 4600 0    60   ~ 12
 IS45S32160F
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_8
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_08
 U 1 1 58024050
 P 3900 2050
-F 0 "VCCO_3V3_8" H 3900 2050 20  0000 C CNN
+F 0 "#VCCO_3V3_08" H 3900 2050 20  0000 C CNN
 F 1 "+VCCO_3V3" H 3900 1980 30  0000 C CNN
 F 2 "" H 3900 2050 70  0000 C CNN
 F 3 "" H 3900 2050 70  0000 C CNN
@@ -39,10 +39,10 @@ F 3 "" H 3900 2050 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_9
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_09
 U 1 1 5802404F
 P 4400 2050
-F 0 "VCCO_3V3_9" H 4400 2050 20  0000 C CNN
+F 0 "#VCCO_3V3_09" H 4400 2050 20  0000 C CNN
 F 1 "+VCCO_3V3" H 4400 1980 30  0000 C CNN
 F 2 "" H 4400 2050 70  0000 C CNN
 F 3 "" H 4400 2050 70  0000 C CNN
@@ -50,10 +50,10 @@ F 3 "" H 4400 2050 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_40
+L power:GND #GND_040
 U 1 1 5802404E
 P 4500 7200
-F 0 "GND_40" H 4500 7200 20  0000 C CNN
+F 0 "#GND_040" H 4500 7200 20  0000 C CNN
 F 1 "+GND" H 4500 7130 30  0000 C CNN
 F 2 "" H 4500 7200 70  0000 C CNN
 F 3 "" H 4500 7200 70  0000 C CNN
@@ -61,10 +61,10 @@ F 3 "" H 4500 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_10
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_010
 U 1 1 5802404D
 P 3500 7650
-F 0 "VCCO_3V3_10" H 3500 7650 20  0000 C CNN
+F 0 "#VCCO_3V3_010" H 3500 7650 20  0000 C CNN
 F 1 "+VCCO_3V3" H 3500 7580 30  0000 C CNN
 F 2 "" H 3500 7650 70  0000 C CNN
 F 3 "" H 3500 7650 70  0000 C CNN
@@ -72,10 +72,10 @@ F 3 "" H 3500 7650 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_41
+L power:GND #GND_041
 U 1 1 5802404C
 P 3500 9000
-F 0 "GND_41" H 3500 9000 20  0000 C CNN
+F 0 "#GND_041" H 3500 9000 20  0000 C CNN
 F 1 "+GND" H 3500 8930 30  0000 C CNN
 F 2 "" H 3500 9000 70  0000 C CNN
 F 3 "" H 3500 9000 70  0000 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 3500 9000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_11
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_011
 U 1 1 5802404B
 P 10900 2150
-F 0 "VCCO_3V3_11" H 10900 2150 20  0000 C CNN
+F 0 "#VCCO_3V3_011" H 10900 2150 20  0000 C CNN
 F 1 "+VCCO_3V3" H 10900 2080 30  0000 C CNN
 F 2 "" H 10900 2150 70  0000 C CNN
 F 3 "" H 10900 2150 70  0000 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 10900 2150 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_12
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_012
 U 1 1 5802404A
 P 11400 2150
-F 0 "VCCO_3V3_12" H 11400 2150 20  0000 C CNN
+F 0 "#VCCO_3V3_012" H 11400 2150 20  0000 C CNN
 F 1 "+VCCO_3V3" H 11400 2080 30  0000 C CNN
 F 2 "" H 11400 2150 70  0000 C CNN
 F 3 "" H 11400 2150 70  0000 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 11400 2150 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_42
+L power:GND #GND_042
 U 1 1 58024049
 P 11500 7300
-F 0 "GND_42" H 11500 7300 20  0000 C CNN
+F 0 "#GND_042" H 11500 7300 20  0000 C CNN
 F 1 "+GND" H 11500 7230 30  0000 C CNN
 F 2 "" H 11500 7300 70  0000 C CNN
 F 3 "" H 11500 7300 70  0000 C CNN
@@ -116,10 +116,10 @@ F 3 "" H 11500 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_13
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_013
 U 1 1 58024048
 P 10500 7750
-F 0 "VCCO_3V3_13" H 10500 7750 20  0000 C CNN
+F 0 "#VCCO_3V3_013" H 10500 7750 20  0000 C CNN
 F 1 "+VCCO_3V3" H 10500 7680 30  0000 C CNN
 F 2 "" H 10500 7750 70  0000 C CNN
 F 3 "" H 10500 7750 70  0000 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 10500 7750 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_43
+L power:GND #GND_043
 U 1 1 58024047
 P 10500 9100
-F 0 "GND_43" H 10500 9100 20  0000 C CNN
+F 0 "#GND_043" H 10500 9100 20  0000 C CNN
 F 1 "+GND" H 10500 9030 30  0000 C CNN
 F 2 "" H 10500 9100 70  0000 C CNN
 F 3 "" H 10500 9100 70  0000 C CNN
@@ -500,672 +500,672 @@ Connection ~ 11100 8500
 Connection ~ 11300 8500
 Connection ~ 11500 8500
 Entry Wire Line
- 	2750 2600 2700 2650
+	2750 2600 2700 2650
 Wire Wire Line
 	3300 2600 2750 2600
 Entry Wire Line
- 	9750 2700 9700 2750
+	9750 2700 9700 2750
 Wire Wire Line
 	10300 2700 9750 2700
-Text GLabel 2860 2600 2 48 Input ~ 0
+Text GLabel 2860 2600 2    48   Input ~ 0
 FMC_A0
-Text GLabel 9850 2700 2 48 Input ~ 0
+Text GLabel 9850 2700 2    48   Input ~ 0
 FMC_A0
 Entry Wire Line
- 	2750 2700 2700 2750
+	2750 2700 2700 2750
 Wire Wire Line
 	3300 2700 2750 2700
 Entry Wire Line
- 	9750 2800 9700 2850
+	9750 2800 9700 2850
 Wire Wire Line
 	10300 2800 9750 2800
-Text GLabel 2860 2700 2 48 Input ~ 0
+Text GLabel 2860 2700 2    48   Input ~ 0
 FMC_A1
-Text GLabel 9850 2800 2 48 Input ~ 0
+Text GLabel 9850 2800 2    48   Input ~ 0
 FMC_A1
 Entry Wire Line
- 	2750 2800 2700 2850
+	2750 2800 2700 2850
 Wire Wire Line
 	3300 2800 2750 2800
 Entry Wire Line
- 	9750 2900 9700 2950
+	9750 2900 9700 2950
 Wire Wire Line
 	10300 2900 9750 2900
-Text GLabel 2860 2800 2 48 Input ~ 0
+Text GLabel 2860 2800 2    48   Input ~ 0
 FMC_A2
-Text GLabel 9850 2900 2 48 Input ~ 0
+Text GLabel 9850 2900 2    48   Input ~ 0
 FMC_A2
 Entry Wire Line
- 	2750 2900 2700 2950
+	2750 2900 2700 2950
 Wire Wire Line
 	3300 2900 2750 2900
 Entry Wire Line
- 	9750 3000 9700 3050
+	9750 3000 9700 3050
 Wire Wire Line
 	10300 3000 9750 3000
-Text GLabel 2860 2900 2 48 Input ~ 0
+Text GLabel 2860 2900 2    48   Input ~ 0
 FMC_A3
-Text GLabel 9850 3000 2 48 Input ~ 0
+Text GLabel 9850 3000 2    48   Input ~ 0
 FMC_A3
 Entry Wire Line
- 	2750 3000 2700 3050
+	2750 3000 2700 3050
 Wire Wire Line
 	3300 3000 2750 3000
 Entry Wire Line
- 	9750 3100 9700 3150
+	9750 3100 9700 3150
 Wire Wire Line
 	10300 3100 9750 3100
-Text GLabel 2860 3000 2 48 Input ~ 0
+Text GLabel 2860 3000 2    48   Input ~ 0
 FMC_A4
-Text GLabel 9850 3100 2 48 Input ~ 0
+Text GLabel 9850 3100 2    48   Input ~ 0
 FMC_A4
 Entry Wire Line
- 	2750 3100 2700 3150
+	2750 3100 2700 3150
 Wire Wire Line
 	3300 3100 2750 3100
 Entry Wire Line
- 	9750 3200 9700 3250
+	9750 3200 9700 3250
 Wire Wire Line
 	10300 3200 9750 3200
-Text GLabel 2860 3100 2 48 Input ~ 0
+Text GLabel 2860 3100 2    48   Input ~ 0
 FMC_A5
-Text GLabel 9850 3200 2 48 Input ~ 0
+Text GLabel 9850 3200 2    48   Input ~ 0
 FMC_A5
 Entry Wire Line
- 	2750 3200 2700 3250
+	2750 3200 2700 3250
 Wire Wire Line
 	3300 3200 2750 3200
 Entry Wire Line
- 	9750 3300 9700 3350
+	9750 3300 9700 3350
 Wire Wire Line
 	10300 3300 9750 3300
-Text GLabel 2860 3200 2 48 Input ~ 0
+Text GLabel 2860 3200 2    48   Input ~ 0
 FMC_A6
-Text GLabel 9850 3300 2 48 Input ~ 0
+Text GLabel 9850 3300 2    48   Input ~ 0
 FMC_A6
 Entry Wire Line
- 	2750 3300 2700 3350
+	2750 3300 2700 3350
 Wire Wire Line
 	3300 3300 2750 3300
 Entry Wire Line
- 	9750 3400 9700 3450
+	9750 3400 9700 3450
 Wire Wire Line
 	10300 3400 9750 3400
-Text GLabel 2860 3300 2 48 Input ~ 0
+Text GLabel 2860 3300 2    48   Input ~ 0
 FMC_A7
-Text GLabel 9850 3400 2 48 Input ~ 0
+Text GLabel 9850 3400 2    48   Input ~ 0
 FMC_A7
 Entry Wire Line
- 	2750 3400 2700 3450
+	2750 3400 2700 3450
 Wire Wire Line
 	3300 3400 2750 3400
 Entry Wire Line
- 	9750 3500 9700 3550
+	9750 3500 9700 3550
 Wire Wire Line
 	10300 3500 9750 3500
-Text GLabel 2860 3400 2 48 Input ~ 0
+Text GLabel 2860 3400 2    48   Input ~ 0
 FMC_A8
-Text GLabel 9850 3500 2 48 Input ~ 0
+Text GLabel 9850 3500 2    48   Input ~ 0
 FMC_A8
 Entry Wire Line
- 	2750 3500 2700 3550
+	2750 3500 2700 3550
 Wire Wire Line
 	3300 3500 2750 3500
 Entry Wire Line
- 	9750 3600 9700 3650
+	9750 3600 9700 3650
 Wire Wire Line
 	10300 3600 9750 3600
-Text GLabel 2860 3500 2 48 Input ~ 0
+Text GLabel 2860 3500 2    48   Input ~ 0
 FMC_A9
-Text GLabel 9850 3600 2 48 Input ~ 0
+Text GLabel 9850 3600 2    48   Input ~ 0
 FMC_A9
 Entry Wire Line
- 	2750 3600 2700 3650
+	2750 3600 2700 3650
 Wire Wire Line
 	3300 3600 2750 3600
 Entry Wire Line
- 	9750 3700 9700 3750
+	9750 3700 9700 3750
 Wire Wire Line
 	10300 3700 9750 3700
-Text GLabel 2860 3600 2 48 Input ~ 0
+Text GLabel 2860 3600 2    48   Input ~ 0
 FMC_A10
-Text GLabel 9850 3700 2 48 Input ~ 0
+Text GLabel 9850 3700 2    48   Input ~ 0
 FMC_A10
 Entry Wire Line
- 	2750 3700 2700 3750
+	2750 3700 2700 3750
 Wire Wire Line
 	3300 3700 2750 3700
 Entry Wire Line
- 	9750 3800 9700 3850
+	9750 3800 9700 3850
 Wire Wire Line
 	10300 3800 9750 3800
-Text GLabel 2860 3700 2 48 Input ~ 0
+Text GLabel 2860 3700 2    48   Input ~ 0
 FMC_A11
-Text GLabel 9850 3800 2 48 Input ~ 0
+Text GLabel 9850 3800 2    48   Input ~ 0
 FMC_A11
 Entry Wire Line
- 	2750 3800 2700 3850
+	2750 3800 2700 3850
 Wire Wire Line
 	3300 3800 2750 3800
 Entry Wire Line
- 	9750 3900 9700 3950
+	9750 3900 9700 3950
 Wire Wire Line
 	10300 3900 9750 3900
-Text GLabel 2860 3800 2 48 Input ~ 0
+Text GLabel 2860 3800 2    48   Input ~ 0
 FMC_A12
-Text GLabel 9850 3900 2 48 Input ~ 0
+Text GLabel 9850 3900 2    48   Input ~ 0
 FMC_A12
 Entry Wire Line
- 	6250 2600 6300 2550
+	6250 2600 6300 2550
 Wire Wire Line
 	6250 2600 5700 2600
 Entry Wire Line
- 	13250 2700 13300 2650
+	13250 2700 13300 2650
 Wire Wire Line
 	13250 2700 12700 2700
-Text GLabel 5820 2600 2 48 BiDi ~ 0
+Text GLabel 5820 2600 2    48   BiDi ~ 0
 FMC_D0
-Text GLabel 12820 2700 2 48 BiDi ~ 0
+Text GLabel 12820 2700 2    48   BiDi ~ 0
 FMC_D0
 Entry Wire Line
- 	6250 2700 6300 2650
+	6250 2700 6300 2650
 Wire Wire Line
 	6250 2700 5700 2700
 Entry Wire Line
- 	13250 2800 13300 2750
+	13250 2800 13300 2750
 Wire Wire Line
 	13250 2800 12700 2800
-Text GLabel 5820 2700 2 48 BiDi ~ 0
+Text GLabel 5820 2700 2    48   BiDi ~ 0
 FMC_D1
-Text GLabel 12820 2800 2 48 BiDi ~ 0
+Text GLabel 12820 2800 2    48   BiDi ~ 0
 FMC_D1
 Entry Wire Line
- 	6250 2800 6300 2750
+	6250 2800 6300 2750
 Wire Wire Line
 	6250 2800 5700 2800
 Entry Wire Line
- 	13250 2900 13300 2850
+	13250 2900 13300 2850
 Wire Wire Line
 	13250 2900 12700 2900
-Text GLabel 5820 2800 2 48 BiDi ~ 0
+Text GLabel 5820 2800 2    48   BiDi ~ 0
 FMC_D2
-Text GLabel 12820 2900 2 48 BiDi ~ 0
+Text GLabel 12820 2900 2    48   BiDi ~ 0
 FMC_D2
 Entry Wire Line
- 	6250 2900 6300 2850
+	6250 2900 6300 2850
 Wire Wire Line
 	6250 2900 5700 2900
 Entry Wire Line
- 	13250 3000 13300 2950
+	13250 3000 13300 2950
 Wire Wire Line
 	13250 3000 12700 3000
-Text GLabel 5820 2900 2 48 BiDi ~ 0
+Text GLabel 5820 2900 2    48   BiDi ~ 0
 FMC_D3
-Text GLabel 12820 3000 2 48 BiDi ~ 0
+Text GLabel 12820 3000 2    48   BiDi ~ 0
 FMC_D3
 Entry Wire Line
- 	6250 3000 6300 2950
+	6250 3000 6300 2950
 Wire Wire Line
 	6250 3000 5700 3000
 Entry Wire Line
- 	13250 3100 13300 3050
+	13250 3100 13300 3050
 Wire Wire Line
 	13250 3100 12700 3100
-Text GLabel 5820 3000 2 48 BiDi ~ 0
+Text GLabel 5820 3000 2    48   BiDi ~ 0
 FMC_D4
-Text GLabel 12820 3100 2 48 BiDi ~ 0
+Text GLabel 12820 3100 2    48   BiDi ~ 0
 FMC_D4
 Entry Wire Line
- 	6250 3100 6300 3050
+	6250 3100 6300 3050
 Wire Wire Line
 	6250 3100 5700 3100
 Entry Wire Line
- 	13250 3200 13300 3150
+	13250 3200 13300 3150
 Wire Wire Line
 	13250 3200 12700 3200
-Text GLabel 5820 3100 2 48 BiDi ~ 0
+Text GLabel 5820 3100 2    48   BiDi ~ 0
 FMC_D5
-Text GLabel 12820 3200 2 48 BiDi ~ 0
+Text GLabel 12820 3200 2    48   BiDi ~ 0
 FMC_D5
 Entry Wire Line
- 	6250 3200 6300 3150
+	6250 3200 6300 3150
 Wire Wire Line
 	6250 3200 5700 3200
 Entry Wire Line
- 	13250 3300 13300 3250
+	13250 3300 13300 3250
 Wire Wire Line
 	13250 3300 12700 3300
-Text GLabel 5820 3200 2 48 BiDi ~ 0
+Text GLabel 5820 3200 2    48   BiDi ~ 0
 FMC_D6
-Text GLabel 12820 3300 2 48 BiDi ~ 0
+Text GLabel 12820 3300 2    48   BiDi ~ 0
 FMC_D6
 Entry Wire Line
- 	6250 3300 6300 3250
+	6250 3300 6300 3250
 Wire Wire Line
 	6250 3300 5700 3300
 Entry Wire Line
- 	13250 3400 13300 3350
+	13250 3400 13300 3350
 Wire Wire Line
 	13250 3400 12700 3400
-Text GLabel 5820 3300 2 48 BiDi ~ 0
+Text GLabel 5820 3300 2    48   BiDi ~ 0
 FMC_D7
-Text GLabel 12820 3400 2 48 BiDi ~ 0
+Text GLabel 12820 3400 2    48   BiDi ~ 0
 FMC_D7
 Entry Wire Line
- 	6250 3400 6300 3350
+	6250 3400 6300 3350
 Wire Wire Line
 	6250 3400 5700 3400
 Entry Wire Line
- 	13250 3500 13300 3450
+	13250 3500 13300 3450
 Wire Wire Line
 	13250 3500 12700 3500
-Text GLabel 5820 3400 2 48 BiDi ~ 0
+Text GLabel 5820 3400 2    48   BiDi ~ 0
 FMC_D8
-Text GLabel 12820 3500 2 48 BiDi ~ 0
+Text GLabel 12820 3500 2    48   BiDi ~ 0
 FMC_D8
 Entry Wire Line
- 	6250 3500 6300 3450
+	6250 3500 6300 3450
 Wire Wire Line
 	6250 3500 5700 3500
 Entry Wire Line
- 	6250 3600 6300 3550
+	6250 3600 6300 3550
 Wire Wire Line
 	6250 3600 5700 3600
 Entry Wire Line
- 	13250 3600 13300 3550
+	13250 3600 13300 3550
 Wire Wire Line
 	13250 3600 12700 3600
 Entry Wire Line
- 	13250 3700 13300 3650
+	13250 3700 13300 3650
 Wire Wire Line
 	13250 3700 12700 3700
-Text GLabel 5820 3500 2 48 BiDi ~ 0
+Text GLabel 5820 3500 2    48   BiDi ~ 0
 FMC_D9
-Text GLabel 5820 3600 2 48 BiDi ~ 0
+Text GLabel 5820 3600 2    48   BiDi ~ 0
 FMC_D10
-Text GLabel 12820 3600 2 48 BiDi ~ 0
+Text GLabel 12820 3600 2    48   BiDi ~ 0
 FMC_D9
-Text GLabel 12820 3700 2 48 BiDi ~ 0
+Text GLabel 12820 3700 2    48   BiDi ~ 0
 FMC_D10
 Entry Wire Line
- 	6250 3700 6300 3650
+	6250 3700 6300 3650
 Wire Wire Line
 	6250 3700 5700 3700
 Entry Wire Line
- 	13250 3800 13300 3750
+	13250 3800 13300 3750
 Wire Wire Line
 	13250 3800 12700 3800
-Text GLabel 5820 3700 2 48 BiDi ~ 0
+Text GLabel 5820 3700 2    48   BiDi ~ 0
 FMC_D11
-Text GLabel 12820 3800 2 48 BiDi ~ 0
+Text GLabel 12820 3800 2    48   BiDi ~ 0
 FMC_D11
 Entry Wire Line
- 	6250 3800 6300 3750
+	6250 3800 6300 3750
 Wire Wire Line
 	6250 3800 5700 3800
 Entry Wire Line
- 	13250 3900 13300 3850
+	13250 3900 13300 3850
 Wire Wire Line
 	13250 3900 12700 3900
-Text GLabel 5820 3800 2 48 BiDi ~ 0
+Text GLabel 5820 3800 2    48   BiDi ~ 0
 FMC_D12
-Text GLabel 12820 3900 2 48 BiDi ~ 0
+Text GLabel 12820 3900 2    48   BiDi ~ 0
 FMC_D12
 Entry Wire Line
- 	6250 3900 6300 3850
+	6250 3900 6300 3850
 Wire Wire Line
 	6250 3900 5700 3900
 Entry Wire Line
- 	13250 4000 13300 3950
+	13250 4000 13300 3950
 Wire Wire Line
 	13250 4000 12700 4000
-Text GLabel 5820 3900 2 48 BiDi ~ 0
+Text GLabel 5820 3900 2    48   BiDi ~ 0
 FMC_D13
-Text GLabel 12820 4000 2 48 BiDi ~ 0
+Text GLabel 12820 4000 2    48   BiDi ~ 0
 FMC_D13
 Entry Wire Line
- 	6250 4000 6300 3950
+	6250 4000 6300 3950
 Wire Wire Line
 	6250 4000 5700 4000
 Entry Wire Line
- 	13250 4100 13300 4050
+	13250 4100 13300 4050
 Wire Wire Line
 	13250 4100 12700 4100
-Text GLabel 5820 4000 2 48 BiDi ~ 0
+Text GLabel 5820 4000 2    48   BiDi ~ 0
 FMC_D14
-Text GLabel 12820 4100 2 48 BiDi ~ 0
+Text GLabel 12820 4100 2    48   BiDi ~ 0
 FMC_D14
 Entry Wire Line
- 	6250 4100 6300 4050
+	6250 4100 6300 4050
 Wire Wire Line
 	6250 4100 5700 4100
 Entry Wire Line
- 	13250 4200 13300 4150
+	13250 4200 13300 4150
 Wire Wire Line
 	13250 4200 12700 4200
-Text GLabel 5820 4100 2 48 BiDi ~ 0
+Text GLabel 5820 4100 2    48   BiDi ~ 0
 FMC_D15
-Text GLabel 12820 4200 2 48 BiDi ~ 0
+Text GLabel 12820 4200 2    48   BiDi ~ 0
 FMC_D15
 Entry Wire Line
- 	6250 4200 6300 4150
+	6250 4200 6300 4150
 Wire Wire Line
 	6250 4200 5700 4200
 Entry Wire Line
- 	13250 4300 13300 4250
+	13250 4300 13300 4250
 Wire Wire Line
 	13250 4300 12700 4300
-Text GLabel 5820 4200 2 48 BiDi ~ 0
+Text GLabel 5820 4200 2    48   BiDi ~ 0
 FMC_D16
-Text GLabel 12820 4300 2 48 BiDi ~ 0
+Text GLabel 12820 4300 2    48   BiDi ~ 0
 FMC_D16
 Entry Wire Line
- 	6250 4300 6300 4250
+	6250 4300 6300 4250
 Wire Wire Line
 	6250 4300 5700 4300
 Entry Wire Line
- 	13250 4400 13300 4350
+	13250 4400 13300 4350
 Wire Wire Line
 	13250 4400 12700 4400
-Text GLabel 5820 4300 2 48 BiDi ~ 0
+Text GLabel 5820 4300 2    48   BiDi ~ 0
 FMC_D17
-Text GLabel 12820 4400 2 48 BiDi ~ 0
+Text GLabel 12820 4400 2    48   BiDi ~ 0
 FMC_D17
 Entry Wire Line
- 	6250 4400 6300 4350
+	6250 4400 6300 4350
 Wire Wire Line
 	6250 4400 5700 4400
 Entry Wire Line
- 	13250 4500 13300 4450
+	13250 4500 13300 4450
 Wire Wire Line
 	13250 4500 12700 4500
-Text GLabel 5820 4400 2 48 BiDi ~ 0
+Text GLabel 5820 4400 2    48   BiDi ~ 0
 FMC_D18
-Text GLabel 12820 4500 2 48 BiDi ~ 0
+Text GLabel 12820 4500 2    48   BiDi ~ 0
 FMC_D18
 Entry Wire Line
- 	6250 4500 6300 4450
+	6250 4500 6300 4450
 Wire Wire Line
 	6250 4500 5700 4500
 Entry Wire Line
- 	13250 4600 13300 4550
+	13250 4600 13300 4550
 Wire Wire Line
 	13250 4600 12700 4600
-Text GLabel 5820 4500 2 48 BiDi ~ 0
+Text GLabel 5820 4500 2    48   BiDi ~ 0
 FMC_D19
-Text GLabel 12820 4600 2 48 BiDi ~ 0
+Text GLabel 12820 4600 2    48   BiDi ~ 0
 FMC_D19
 Entry Wire Line
- 	6250 4600 6300 4550
+	6250 4600 6300 4550
 Wire Wire Line
 	6250 4600 5700 4600
 Entry Wire Line
- 	13250 4700 13300 4650
+	13250 4700 13300 4650
 Wire Wire Line
 	13250 4700 12700 4700
-Text GLabel 5820 4600 2 48 BiDi ~ 0
+Text GLabel 5820 4600 2    48   BiDi ~ 0
 FMC_D20
-Text GLabel 12820 4700 2 48 BiDi ~ 0
+Text GLabel 12820 4700 2    48   BiDi ~ 0
 FMC_D20
 Entry Wire Line
- 	6250 4700 6300 4650
+	6250 4700 6300 4650
 Wire Wire Line
 	6250 4700 5700 4700
 Entry Wire Line
- 	13250 4800 13300 4750
+	13250 4800 13300 4750
 Wire Wire Line
 	13250 4800 12700 4800
-Text GLabel 5820 4700 2 48 BiDi ~ 0
+Text GLabel 5820 4700 2    48   BiDi ~ 0
 FMC_D21
-Text GLabel 12820 4800 2 48 BiDi ~ 0
+Text GLabel 12820 4800 2    48   BiDi ~ 0
 FMC_D21
 Entry Wire Line
- 	6250 4800 6300 4750
+	6250 4800 6300 4750
 Wire Wire Line
 	6250 4800 5700 4800
 Entry Wire Line
- 	13250 4900 13300 4850
+	13250 4900 13300 4850
 Wire Wire Line
 	13250 4900 12700 4900
-Text GLabel 5820 4800 2 48 BiDi ~ 0
+Text GLabel 5820 4800 2    48   BiDi ~ 0
 FMC_D22
-Text GLabel 12820 4900 2 48 BiDi ~ 0
+Text GLabel 12820 4900 2    48   BiDi ~ 0
 FMC_D22
 Entry Wire Line
- 	6250 4900 6300 4850
+	6250 4900 6300 4850
 Wire Wire Line
 	6250 4900 5700 4900
 Entry Wire Line
- 	13250 5000 13300 4950
+	13250 5000 13300 4950
 Wire Wire Line
 	13250 5000 12700 5000
-Text GLabel 5820 4900 2 48 BiDi ~ 0
+Text GLabel 5820 4900 2    48   BiDi ~ 0
 FMC_D23
-Text GLabel 12820 5000 2 48 BiDi ~ 0
+Text GLabel 12820 5000 2    48   BiDi ~ 0
 FMC_D23
 Entry Wire Line
- 	6250 5000 6300 4950
+	6250 5000 6300 4950
 Wire Wire Line
 	6250 5000 5700 5000
 Entry Wire Line
- 	13250 5100 13300 5050
+	13250 5100 13300 5050
 Wire Wire Line
 	13250 5100 12700 5100
-Text GLabel 5820 5000 2 48 BiDi ~ 0
+Text GLabel 5820 5000 2    48   BiDi ~ 0
 FMC_D24
-Text GLabel 12820 5100 2 48 BiDi ~ 0
+Text GLabel 12820 5100 2    48   BiDi ~ 0
 FMC_D24
 Entry Wire Line
- 	6250 5100 6300 5050
+	6250 5100 6300 5050
 Wire Wire Line
 	6250 5100 5700 5100
 Entry Wire Line
- 	13250 5200 13300 5150
+	13250 5200 13300 5150
 Wire Wire Line
 	13250 5200 12700 5200
-Text GLabel 5820 5100 2 48 BiDi ~ 0
+Text GLabel 5820 5100 2    48   BiDi ~ 0
 FMC_D25
-Text GLabel 12820 5200 2 48 BiDi ~ 0
+Text GLabel 12820 5200 2    48   BiDi ~ 0
 FMC_D25
 Entry Wire Line
- 	6250 5200 6300 5150
+	6250 5200 6300 5150
 Wire Wire Line
 	6250 5200 5700 5200
 Entry Wire Line
- 	13250 5300 13300 5250
+	13250 5300 13300 5250
 Wire Wire Line
 	13250 5300 12700 5300
-Text GLabel 5820 5200 2 48 BiDi ~ 0
+Text GLabel 5820 5200 2    48   BiDi ~ 0
 FMC_D26
-Text GLabel 12820 5300 2 48 BiDi ~ 0
+Text GLabel 12820 5300 2    48   BiDi ~ 0
 FMC_D26
 Entry Wire Line
- 	6250 5300 6300 5250
+	6250 5300 6300 5250
 Wire Wire Line
 	6250 5300 5700 5300
 Entry Wire Line
- 	13250 5400 13300 5350
+	13250 5400 13300 5350
 Wire Wire Line
 	13250 5400 12700 5400
-Text GLabel 5820 5300 2 48 BiDi ~ 0
+Text GLabel 5820 5300 2    48   BiDi ~ 0
 FMC_D27
-Text GLabel 12820 5400 2 48 BiDi ~ 0
+Text GLabel 12820 5400 2    48   BiDi ~ 0
 FMC_D27
 Entry Wire Line
- 	6250 5400 6300 5350
+	6250 5400 6300 5350
 Wire Wire Line
 	6250 5400 5700 5400
 Entry Wire Line
- 	13250 5500 13300 5450
+	13250 5500 13300 5450
 Wire Wire Line
 	13250 5500 12700 5500
-Text GLabel 5820 5400 2 48 BiDi ~ 0
+Text GLabel 5820 5400 2    48   BiDi ~ 0
 FMC_D28
-Text GLabel 12820 5500 2 48 BiDi ~ 0
+Text GLabel 12820 5500 2    48   BiDi ~ 0
 FMC_D28
 Entry Wire Line
- 	6250 5500 6300 5450
+	6250 5500 6300 5450
 Wire Wire Line
 	6250 5500 5700 5500
 Entry Wire Line
- 	13250 5600 13300 5550
+	13250 5600 13300 5550
 Wire Wire Line
 	13250 5600 12700 5600
-Text GLabel 5820 5500 2 48 BiDi ~ 0
+Text GLabel 5820 5500 2    48   BiDi ~ 0
 FMC_D29
-Text GLabel 12820 5600 2 48 BiDi ~ 0
+Text GLabel 12820 5600 2    48   BiDi ~ 0
 FMC_D29
 Entry Wire Line
- 	6250 5600 6300 5550
+	6250 5600 6300 5550
 Wire Wire Line
 	6250 5600 5700 5600
 Entry Wire Line
- 	13250 5700 13300 5650
+	13250 5700 13300 5650
 Wire Wire Line
 	13250 5700 12700 5700
-Text GLabel 5820 5600 2 48 BiDi ~ 0
+Text GLabel 5820 5600 2    48   BiDi ~ 0
 FMC_D30
-Text GLabel 12820 5700 2 48 BiDi ~ 0
+Text GLabel 12820 5700 2    48   BiDi ~ 0
 FMC_D30
 Entry Wire Line
- 	6250 5700 6300 5650
+	6250 5700 6300 5650
 Wire Wire Line
 	6250 5700 5700 5700
 Entry Wire Line
- 	13250 5800 13300 5750
+	13250 5800 13300 5750
 Wire Wire Line
 	13250 5800 12700 5800
-Text GLabel 5820 5700 2 48 BiDi ~ 0
+Text GLabel 5820 5700 2    48   BiDi ~ 0
 FMC_D31
-Text GLabel 12820 5800 2 48 BiDi ~ 0
+Text GLabel 12820 5800 2    48   BiDi ~ 0
 FMC_D31
 Wire Wire Line
 	3300 5500 2700 5500
-Text GLabel 2700 5500 0 48 Input ~ 0
+Text GLabel 2700 5500 0    48   Input ~ 0
 FMC_SDCKE0
 Wire Wire Line
 	3300 6000 2700 6000
-Text GLabel 2700 6000 0 48 Input ~ 0
+Text GLabel 2700 6000 0    48   Input ~ 0
 FMC_SDNE0
 Wire Wire Line
 	3300 6500 2700 6500
-Text GLabel 2700 6500 0 48 Input ~ 0
+Text GLabel 2700 6500 0    48   Input ~ 0
 FMC_SDNWE
 Wire Wire Line
 	10300 6600 9700 6600
-Text GLabel 9700 6600 0 48 Input ~ 0
+Text GLabel 9700 6600 0    48   Input ~ 0
 FMC_SDNWE
 Wire Wire Line
 	3300 4400 2700 4400
-Text GLabel 2700 4400 0 48 Input ~ 0
+Text GLabel 2700 4400 0    48   Input ~ 0
 FMC_SDNCAS
 Wire Wire Line
 	10300 4500 9700 4500
-Text GLabel 9700 4500 0 48 Input ~ 0
+Text GLabel 9700 4500 0    48   Input ~ 0
 FMC_SDNCAS
 Wire Wire Line
 	3300 4500 2700 4500
-Text GLabel 2700 4500 0 48 Input ~ 0
+Text GLabel 2700 4500 0    48   Input ~ 0
 FMC_SDNRAS
 Wire Wire Line
 	10300 4600 9700 4600
-Text GLabel 9700 4600 0 48 Input ~ 0
+Text GLabel 9700 4600 0    48   Input ~ 0
 FMC_SDNRAS
 Entry Wire Line
- 	2750 4100 2700 4150
+	2750 4100 2700 4150
 Wire Wire Line
 	3300 4100 2750 4100
-Text GLabel 2850 4100 2 48 Input ~ 0
+Text GLabel 2850 4100 2    48   Input ~ 0
 FMC_A14
 Entry Wire Line
- 	9750 4200 9700 4250
+	9750 4200 9700 4250
 Wire Wire Line
 	10300 4200 9750 4200
-Text GLabel 9850 4200 2 48 Input ~ 0
+Text GLabel 9850 4200 2    48   Input ~ 0
 FMC_A14
 Entry Wire Line
- 	2750 4200 2700 4200
+	2750 4200 2700 4200
 Wire Wire Line
 	3300 4200 2750 4200
-Text GLabel 2850 4200 2 48 Input ~ 0
+Text GLabel 2850 4200 2    48   Input ~ 0
 FMC_A15
 Entry Wire Line
- 	9750 4300 9700 4300
+	9750 4300 9700 4300
 Wire Wire Line
 	10300 4300 9750 4300
-Text GLabel 9850 4300 2 48 Input ~ 0
+Text GLabel 9850 4300 2    48   Input ~ 0
 FMC_A15
 Wire Wire Line
 	6300 5900 5700 5900
-Text GLabel 6300 5900 2 48 Input ~ 0
+Text GLabel 6300 5900 2    48   Input ~ 0
 FMC_NBL0
 Wire Wire Line
 	13300 6000 12700 6000
-Text GLabel 13300 6000 2 48 Input ~ 0
+Text GLabel 13300 6000 2    48   Input ~ 0
 FMC_NBL0
 Wire Wire Line
 	6300 6000 5700 6000
-Text GLabel 6300 6000 2 48 Input ~ 0
+Text GLabel 6300 6000 2    48   Input ~ 0
 FMC_NBL1
 Wire Wire Line
 	13300 6100 12700 6100
-Text GLabel 13300 6100 2 48 Input ~ 0
+Text GLabel 13300 6100 2    48   Input ~ 0
 FMC_NBL1
 Wire Wire Line
 	6300 6100 5700 6100
-Text GLabel 6300 6100 2 48 Input ~ 0
+Text GLabel 6300 6100 2    48   Input ~ 0
 FMC_NBL2
 Wire Wire Line
 	13300 6200 12700 6200
-Text GLabel 13300 6200 2 48 Input ~ 0
+Text GLabel 13300 6200 2    48   Input ~ 0
 FMC_NBL2
 Wire Wire Line
 	6300 6200 5700 6200
-Text GLabel 6300 6200 2 48 Input ~ 0
+Text GLabel 6300 6200 2    48   Input ~ 0
 FMC_NBL3
 Wire Wire Line
 	13300 6300 12700 6300
-Text GLabel 13300 6300 2 48 Input ~ 0
+Text GLabel 13300 6300 2    48   Input ~ 0
 FMC_NBL3
 Wire Wire Line
 	3300 5000 2700 5000
-Text GLabel 2700 5000 0 48 Input ~ 0
+Text GLabel 2700 5000 0    48   Input ~ 0
 FMC_SDCLK
 Wire Wire Line
 	10300 5100 9700 5100
-Text GLabel 9700 5100 0 48 Input ~ 0
+Text GLabel 9700 5100 0    48   Input ~ 0
 FMC_SDCLK
 Wire Wire Line
 	10300 5600 9700 5600
-Text GLabel 9700 5600 0 48 Input ~ 0
+Text GLabel 9700 5600 0    48   Input ~ 0
 FMC_SDCKE1
 Wire Wire Line
 	10300 6100 9700 6100
-Text GLabel 9700 6100 0 48 Input ~ 0
+Text GLabel 9700 6100 0    48   Input ~ 0
 FMC_SDNE1
 Wire Bus Line
 	2700 2400 2150 2400
 Wire Bus Line
 	2700 2400 2700 4200
-Text Label 2150 2400 0 60 ~
+Text Label 2150 2400 0    60   ~ 0
 FMC_A[0..25]
 Wire Bus Line
 	9700 2500 9150 2500
 Wire Bus Line
 	9700 2500 9700 4300
-Text Label 9150 2500 0 60 ~
+Text Label 9150 2500 0    60   ~ 0
 FMC_A[0..25]
 Wire Bus Line
 	6300 2400 6300 5700
 Wire Bus Line
 	6900 2400 6300 2400
-Text Label 6300 2400 0 60 ~
+Text Label 6300 2400 0    60   ~ 0
 FMC_D[0..31]
 Wire Bus Line
 	13300 2500 13300 5800
 Wire Bus Line
 	13900 2500 13300 2500
-Text Label 13300 2500 0 60 ~
+Text Label 13300 2500 0    60   ~ 0
 FMC_D[0..31]
 $Comp
 L Cryptech_Alpha:IS45S32160F U5
@@ -1176,7 +1176,7 @@ F 1 "IS45S32160F*" H 3160 6830 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TSSOP50P1180X120-86N" H 3160 6830 60  0001 C CNN
 F 3 "" H 3160 6830 60  0000 C CNN
 	1    4500 4600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C57
@@ -1187,7 +1187,7 @@ F 1 "0.1uF" H 4470 9160 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4470 9160 60  0001 C CNN
 F 3 "" H 4470 9160 60  0000 C CNN
 	1    4500 8500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C55
@@ -1198,7 +1198,7 @@ F 1 "0.1uF" H 4610 8400 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4610 8400 60  0001 C CNN
 F 3 "" H 4610 8400 60  0000 C CNN
 	1    4300 8500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C53
@@ -1209,7 +1209,7 @@ F 1 "0.1uF" H 4290 8130 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4290 8130 60  0001 C CNN
 F 3 "" H 4290 8130 60  0000 C CNN
 	1    4100 8500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:IS45S32160F U6
@@ -1220,7 +1220,7 @@ F 1 "IS45S32160F*" H 10140 6950 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TSSOP50P1180X120-86N" H 10140 6950 60  0001 C CNN
 F 3 "" H 10140 6950 60  0000 C CNN
 	1    11500 4700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C67
@@ -1231,7 +1231,7 @@ F 1 "0.1uF" H 11480 8240 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11480 8240 60  0001 C CNN
 F 3 "" H 11480 8240 60  0000 C CNN
 	1    11500 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C65
@@ -1242,7 +1242,7 @@ F 1 "0.1uF" H 11240 8240 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11240 8240 60  0001 C CNN
 F 3 "" H 11240 8240 60  0000 C CNN
 	1    11300 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C63
@@ -1253,7 +1253,7 @@ F 1 "0.1uF" H 11030 8320 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11030 8320 60  0001 C CNN
 F 3 "" H 11030 8320 60  0000 C CNN
 	1    11100 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C61
@@ -1264,7 +1264,7 @@ F 1 "0.1uF" H 10830 8230 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10830 8230 60  0001 C CNN
 F 3 "" H 10830 8230 60  0000 C CNN
 	1    10900 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C62
@@ -1275,7 +1275,7 @@ F 1 "0.1uF" H 10780 8720 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10780 8720 60  0001 C CNN
 F 3 "" H 10780 8720 60  0000 C CNN
 	1    10900 8600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C60
@@ -1286,7 +1286,7 @@ F 1 "0.1uF" H 10600 8240 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10600 8240 60  0001 C CNN
 F 3 "" H 10600 8240 60  0000 C CNN
 	1    10700 8600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C56
@@ -1297,7 +1297,7 @@ F 1 "0.1uF" H 4070 8150 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4070 8150 60  0001 C CNN
 F 3 "" H 4070 8150 60  0000 C CNN
 	1    4500 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C59
@@ -1308,7 +1308,7 @@ F 1 "0.1uF" H 10600 8230 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10600 8230 60  0001 C CNN
 F 3 "" H 10600 8230 60  0000 C CNN
 	1    10700 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C58
@@ -1319,7 +1319,7 @@ F 1 "0.1uF" H 10160 8020 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10160 8020 60  0001 C CNN
 F 3 "" H 10160 8020 60  0000 C CNN
 	1    10500 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C68
@@ -1330,7 +1330,7 @@ F 1 "0.1uF" H 11620 8500 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11620 8500 60  0001 C CNN
 F 3 "" H 11620 8500 60  0000 C CNN
 	1    11500 8600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C66
@@ -1341,7 +1341,7 @@ F 1 "0.1uF" H 11220 8720 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11220 8720 60  0001 C CNN
 F 3 "" H 11220 8720 60  0000 C CNN
 	1    11300 8600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C64
@@ -1352,7 +1352,7 @@ F 1 "0.1uF" H 11000 8240 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11000 8240 60  0001 C CNN
 F 3 "" H 11000 8240 60  0000 C CNN
 	1    11100 8600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C54
@@ -1363,7 +1363,7 @@ F 1 "0.1uF" H 4280 7640 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4280 7640 60  0001 C CNN
 F 3 "" H 4280 7640 60  0000 C CNN
 	1    4300 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C52
@@ -1374,7 +1374,7 @@ F 1 "0.1uF" H 3790 7630 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3790 7630 60  0001 C CNN
 F 3 "" H 3790 7630 60  0000 C CNN
 	1    4100 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C50
@@ -1385,7 +1385,7 @@ F 1 "0.1uF" H 3810 8150 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3810 8150 60  0001 C CNN
 F 3 "" H 3810 8150 60  0000 C CNN
 	1    3900 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C51
@@ -1396,7 +1396,7 @@ F 1 "0.1uF" H 3990 8130 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3990 8130 60  0001 C CNN
 F 3 "" H 3990 8130 60  0000 C CNN
 	1    3900 8500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C49
@@ -1407,7 +1407,7 @@ F 1 "0.1uF" H 3530 8140 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3530 8140 60  0001 C CNN
 F 3 "" H 3530 8140 60  0000 C CNN
 	1    3700 8500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C48
@@ -1418,7 +1418,7 @@ F 1 "0.1uF" H 3540 8150 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3540 8150 60  0001 C CNN
 F 3 "" H 3540 8150 60  0000 C CNN
 	1    3700 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C47
@@ -1429,6 +1429,6 @@ F 1 "0.1uF" H 3120 7920 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3120 7920 60  0001 C CNN
 F 3 "" H 3120 7920 60  0000 C CNN
 	1    3500 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_07.sch b/rev03-KiCad/rev02_07.sch
index 91dcde1..a28e8a6 100644
--- a/rev03-KiCad/rev02_07.sch
+++ b/rev03-KiCad/rev02_07.sch
@@ -15,11 +15,11 @@ Comment4 ""
 $EndDescr
 Text Notes 8900 5200 0    60   ~ 12
 *) HOLD feature not used
-Text Notes 6400 3800 0    84   ~ 12
+Text Notes 6400 3800 0    84   ~ 17
 This memory holds cryptographic keys\nwrapped with the master key.
-Text Notes 6400 3200 0    126   ~ 12
+Text Notes 6400 3200 0    126  ~ 25
 Keystore memory, 128 Mbit
-Text Notes 13640 10230 0    84   ~ 12
+Text Notes 13640 10230 0    84   ~ 17
 Keystore memory
 Text Notes 7190 5380 0    60   ~ 12
 IC1
@@ -30,10 +30,10 @@ C69
 Text Notes 9760 6190 0    60   ~ 12
 0.1~uF
 $Comp
-L power:GND GND_44
+L power:GND #GND_044
 U 1 1 5802402E
 P 6800 6500
-F 0 "GND_44" H 6800 6500 20  0000 C CNN
+F 0 "#GND_044" H 6800 6500 20  0000 C CNN
 F 1 "+GND" H 6800 6430 30  0000 C CNN
 F 2 "" H 6800 6500 70  0000 C CNN
 F 3 "" H 6800 6500 70  0000 C CNN
@@ -41,10 +41,10 @@ F 3 "" H 6800 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_45
+L power:GND #GND_045
 U 1 1 5802402D
 P 9700 6500
-F 0 "GND_45" H 9700 6500 20  0000 C CNN
+F 0 "#GND_045" H 9700 6500 20  0000 C CNN
 F 1 "+GND" H 9700 6430 30  0000 C CNN
 F 2 "" H 9700 6500 70  0000 C CNN
 F 3 "" H 9700 6500 70  0000 C CNN
@@ -52,10 +52,10 @@ F 3 "" H 9700 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_14
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_014
 U 1 1 5802402C
 P 6200 4400
-F 0 "VCCO_3V3_14" H 6200 4400 20  0000 C CNN
+F 0 "#VCCO_3V3_014" H 6200 4400 20  0000 C CNN
 F 1 "+VCCO_3V3" H 6200 4330 30  0000 C CNN
 F 2 "" H 6200 4400 70  0000 C CNN
 F 3 "" H 6200 4400 70  0000 C CNN
@@ -102,20 +102,20 @@ Wire Wire Line
 	7000 5300 7000 5500
 Wire Wire Line
 	6500 5500 6270 5500
-Text GLabel 6270 5500 0 48 Input ~ 0
+Text GLabel 6270 5500 0    48   Input ~ 0
 KSM_PROM_CS_N
 Connection ~ 7000 5500
 Wire Wire Line
 	8600 5800 8450 5800
-Text GLabel 8600 5800 2 48 Input ~ 0
+Text GLabel 8600 5800 2    48   Input ~ 0
 KSM_PROM_MOSI
 Wire Wire Line
 	8600 5700 8450 5700
-Text GLabel 8600 5700 2 48 Input ~ 0
+Text GLabel 8600 5700 2    48   Input ~ 0
 KSM_PROM_SCLK
 Wire Wire Line
 	7000 5600 6270 5600
-Text GLabel 6270 5600 0 48 Output ~ 0
+Text GLabel 6270 5600 0    48   Output ~ 0
 KSM_PROM_MISO
 Wire Wire Line
 	7000 5700 6200 5700
@@ -130,7 +130,7 @@ F 1 "N25Q128A13ESE*" H 7470 6120 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SO08" H 7470 6120 60  0001 C CNN
 F 3 "" H 7470 6120 60  0000 C CNN
 	1    7700 5750
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R18
@@ -141,7 +141,7 @@ F 1 "4.7k" V 7040 5240 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 7040 5240 60  0001 C CNN
 F 3 "" H 7040 5240 60  0000 C CNN
 	1    7000 5100
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C69
@@ -152,7 +152,7 @@ F 1 "0.1uF" H 9990 6010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 9990 6010 60  0001 C CNN
 F 3 "" H 9990 6010 60  0000 C CNN
 	1    9700 6000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R17
@@ -163,6 +163,6 @@ F 1 "4.7k" V 6250 4780 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6250 4780 60  0001 C CNN
 F 3 "" H 6250 4780 60  0000 C CNN
 	1    6200 5100
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_08.sch b/rev03-KiCad/rev02_08.sch
index ac3c592..fc76674 100644
--- a/rev03-KiCad/rev02_08.sch
+++ b/rev03-KiCad/rev02_08.sch
@@ -19,9 +19,9 @@ Text Notes 8800 6200 0    60   ~ 12
 MFP is Multi Function Pin.\nGPIO output from RTC.
 Text Notes 8400 4600 0    60   ~ 12
 i2c pull-ups, typically 10K for 100kHz
-Text Notes 6200 3400 0    126   ~ 12
+Text Notes 6200 3400 0    126  ~ 25
 Real Time Clock
-Text Notes 13730 10220 0    84   ~ 12
+Text Notes 13730 10220 0    84   ~ 17
 Real Time Clock
 Text Notes 7600 5060 0    60   ~ 12
 U7
@@ -32,10 +32,10 @@ X1
 Text Notes 6250 6200 0    60   ~ 12
 XTAL-3.2X1.5
 $Comp
-L power:GND GND_46
+L power:GND #GND_046
 U 1 1 58024027
 P 7200 6400
-F 0 "GND_46" H 7200 6400 20  0000 C CNN
+F 0 "#GND_046" H 7200 6400 20  0000 C CNN
 F 1 "+GND" H 7200 6330 30  0000 C CNN
 F 2 "" H 7200 6400 70  0000 C CNN
 F 3 "" H 7200 6400 70  0000 C CNN
@@ -43,10 +43,10 @@ F 3 "" H 7200 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_2
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_02
 U 1 1 58024026
 P 6900 4800
-F 0 "3V3_BATT_2" H 6900 4800 20  0000 C CNN
+F 0 "#3V3_BATT_02" H 6900 4800 20  0000 C CNN
 F 1 "+3V3_BATT" H 6900 4730 30  0000 C CNN
 F 2 "" H 6900 4800 70  0000 C CNN
 F 3 "" H 6900 4800 70  0000 C CNN
@@ -54,10 +54,10 @@ F 3 "" H 6900 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_15
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_015
 U 1 1 58024025
 P 7400 4800
-F 0 "VCCO_3V3_15" H 7400 4800 20  0000 C CNN
+F 0 "#VCCO_3V3_015" H 7400 4800 20  0000 C CNN
 F 1 "+VCCO_3V3" H 7400 4730 30  0000 C CNN
 F 2 "" H 7400 4800 70  0000 C CNN
 F 3 "" H 7400 4800 70  0000 C CNN
@@ -65,10 +65,10 @@ F 3 "" H 7400 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_47
+L power:GND #GND_047
 U 1 1 58024024
 P 6100 6400
-F 0 "GND_47" H 6100 6400 20  0000 C CNN
+F 0 "#GND_047" H 6100 6400 20  0000 C CNN
 F 1 "+GND" H 6100 6330 30  0000 C CNN
 F 2 "" H 6100 6400 70  0000 C CNN
 F 3 "" H 6100 6400 70  0000 C CNN
@@ -76,10 +76,10 @@ F 3 "" H 6100 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_48
+L power:GND #GND_048
 U 1 1 58024023
 P 6700 6400
-F 0 "GND_48" H 6700 6400 20  0000 C CNN
+F 0 "#GND_048" H 6700 6400 20  0000 C CNN
 F 1 "+GND" H 6700 6330 30  0000 C CNN
 F 2 "" H 6700 6400 70  0000 C CNN
 F 3 "" H 6700 6400 70  0000 C CNN
@@ -120,7 +120,7 @@ Wire Wire Line
 	9500 5500 9300 5500
 Wire Wire Line
 	9300 5400 9300 5500
-Text GLabel 9500 5500 2 48 UnSpc ~ 0
+Text GLabel 9500 5500 2    48   UnSpc ~ 0
 RTC_MFP
 Connection ~ 9300 5500
 Wire Wire Line
@@ -129,7 +129,7 @@ Wire Wire Line
 	9500 5600 9100 5600
 Wire Wire Line
 	9100 5400 9100 5600
-Text GLabel 9500 5600 2 48 Input ~ 0
+Text GLabel 9500 5600 2    48   Input ~ 0
 RTC_SCL
 Connection ~ 9100 5600
 Wire Wire Line
@@ -138,7 +138,7 @@ Wire Wire Line
 	9500 5700 8900 5700
 Wire Wire Line
 	8900 5400 8900 5700
-Text GLabel 9500 5700 2 48 BiDi ~ 0
+Text GLabel 9500 5700 2    48   BiDi ~ 0
 RTC_SDA
 Connection ~ 8900 5700
 Wire Wire Line
@@ -155,10 +155,10 @@ Wire Wire Line
 	9300 4900 9300 5000
 Connection ~ 9100 4900
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_16
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_016
 U 1 1 58024022
 P 9100 4800
-F 0 "VCCO_3V3_16" H 9100 4800 20  0000 C CNN
+F 0 "#VCCO_3V3_016" H 9100 4800 20  0000 C CNN
 F 1 "+VCCO_3V3" H 9100 4730 30  0000 C CNN
 F 2 "" H 9100 4800 70  0000 C CNN
 F 3 "" H 9100 4800 70  0000 C CNN
@@ -174,7 +174,7 @@ F 1 "MCP79412-I_SN" H 7580 6030 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOIC127P600X175-8N" H 7580 6030 60  0001 C CNN
 F 3 "" H 7580 6030 60  0000 C CNN
 	1    8000 5600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C71
@@ -185,7 +185,7 @@ F 1 "5pF" H 6570 6200 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6570 6200 60  0001 C CNN
 F 3 "" H 6570 6200 60  0000 C CNN
 	1    6700 6200
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C70
@@ -196,7 +196,7 @@ F 1 "5pF" H 6440 6220 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6440 6220 60  0001 C CNN
 F 3 "" H 6440 6220 60  0000 C CNN
 	1    6100 6200
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:XTAL-3.2X1.5 X1
@@ -207,7 +207,7 @@ F 1 "ABS07-32.768KHZ-T" H 6230 5250 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:XTAL3215" H 6230 5250 60  0001 C CNN
 F 3 "" H 6230 5250 60  0000 C CNN
 	1    6400 6000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R21
@@ -218,7 +218,7 @@ F 1 "10k" V 9290 5700 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9290 5700 60  0001 C CNN
 F 3 "" H 9290 5700 60  0000 C CNN
 	1    9300 5200
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R20
@@ -229,7 +229,7 @@ F 1 "10k" V 8990 5900 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8990 5900 60  0001 C CNN
 F 3 "" H 8990 5900 60  0000 C CNN
 	1    9100 5200
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R19
@@ -240,6 +240,6 @@ F 1 "10k" V 8690 6110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8690 6110 60  0001 C CNN
 F 3 "" H 8690 6110 60  0000 C CNN
 	1    8900 5200
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_09.sch b/rev03-KiCad/rev02_09.sch
index ec6e848..dc0a0cc 100644
--- a/rev03-KiCad/rev02_09.sch
+++ b/rev03-KiCad/rev02_09.sch
@@ -15,13 +15,13 @@ Comment4 ""
 $EndDescr
 Text Notes 5000 2800 0    60   ~ 12
 DS_FT232H.pdf\n6.1 USB Bus Powered Configuration\ncopy of reference circuit
-Text Notes 7750 7350 0    42   ~ 12
+Text Notes 7750 7350 0    42   ~ 8
 Place close to FT232
 Text Notes 5490 5650 0    60   ~ 12
 CL 10pF
-Text Notes 6200 1700 0    126   ~ 12
+Text Notes 6200 1700 0    126  ~ 25
 Application access USB UART
-Text Notes 13630 10230 0    84   ~ 12
+Text Notes 13630 10230 0    84   ~ 17
 USB-UART interface
 Text Notes 13700 5900 0    60   ~ 12
 If possible, line up with\ncorresponding header\nfor MGMT USB-UART and\nlabel pins on silk screen
@@ -56,10 +56,10 @@ Text Notes 12730 6190 0    60   ~ 12
 Text Notes 13030 6190 0    60   ~ 12
 6
 $Comp
-L power:GND GND_49
+L power:GND #GND_049
 U 1 1 5802401A
 P 6100 4600
-F 0 "GND_49" H 6100 4600 20  0000 C CNN
+F 0 "#GND_049" H 6100 4600 20  0000 C CNN
 F 1 "+GND" H 6100 4530 30  0000 C CNN
 F 2 "" H 6100 4600 70  0000 C CNN
 F 3 "" H 6100 4600 70  0000 C CNN
@@ -67,10 +67,10 @@ F 3 "" H 6100 4600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_50
+L power:GND #GND_050
 U 1 1 58024019
 P 8400 6200
-F 0 "GND_50" H 8400 6200 20  0000 C CNN
+F 0 "#GND_050" H 8400 6200 20  0000 C CNN
 F 1 "+GND" H 8400 6130 30  0000 C CNN
 F 2 "" H 8400 6200 70  0000 C CNN
 F 3 "" H 8400 6200 70  0000 C CNN
@@ -78,10 +78,10 @@ F 3 "" H 8400 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_51
+L power:GND #GND_051
 U 1 1 58024018
 P 7300 6200
-F 0 "GND_51" H 7300 6200 20  0000 C CNN
+F 0 "#GND_051" H 7300 6200 20  0000 C CNN
 F 1 "+GND" H 7300 6130 30  0000 C CNN
 F 2 "" H 7300 6200 70  0000 C CNN
 F 3 "" H 7300 6200 70  0000 C CNN
@@ -89,10 +89,10 @@ F 3 "" H 7300 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_52
+L power:GND #GND_052
 U 1 1 58024017
 P 6000 6200
-F 0 "GND_52" H 6000 6200 20  0000 C CNN
+F 0 "#GND_052" H 6000 6200 20  0000 C CNN
 F 1 "+GND" H 6000 6130 30  0000 C CNN
 F 2 "" H 6000 6200 70  0000 C CNN
 F 3 "" H 6000 6200 70  0000 C CNN
@@ -100,10 +100,10 @@ F 3 "" H 6000 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_53
+L power:GND #GND_053
 U 1 1 58024016
 P 6600 6200
-F 0 "GND_53" H 6600 6200 20  0000 C CNN
+F 0 "#GND_053" H 6600 6200 20  0000 C CNN
 F 1 "+GND" H 6600 6130 30  0000 C CNN
 F 2 "" H 6600 6200 70  0000 C CNN
 F 3 "" H 6600 6200 70  0000 C CNN
@@ -111,10 +111,10 @@ F 3 "" H 6600 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3
+L Cryptech_Alpha:FT_VCC3V3 #FT_VCC3V03
 U 1 1 58024015
 P 8500 2500
-F 0 "FT_VCC3V3" H 8500 2500 20  0000 C CNN
+F 0 "#FT_VCC3V03" H 8500 2500 20  0000 C CNN
 F 1 "+FT_VCC3V3" H 8500 2430 30  0000 C CNN
 F 2 "" H 8500 2500 70  0000 C CNN
 F 3 "" H 8500 2500 70  0000 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 8500 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_54
+L power:GND #GND_054
 U 1 1 58024014
 P 4900 8400
-F 0 "GND_54" H 4900 8400 20  0000 C CNN
+F 0 "#GND_054" H 4900 8400 20  0000 C CNN
 F 1 "+GND" H 4900 8330 30  0000 C CNN
 F 2 "" H 4900 8400 70  0000 C CNN
 F 3 "" H 4900 8400 70  0000 C CNN
@@ -133,10 +133,10 @@ F 3 "" H 4900 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_55
+L power:GND #GND_055
 U 1 1 58024013
 P 10100 8400
-F 0 "GND_55" H 10100 8400 20  0000 C CNN
+F 0 "#GND_055" H 10100 8400 20  0000 C CNN
 F 1 "+GND" H 10100 8330 30  0000 C CNN
 F 2 "" H 10100 8400 70  0000 C CNN
 F 3 "" H 10100 8400 70  0000 C CNN
@@ -144,10 +144,10 @@ F 3 "" H 10100 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_56
+L power:GND #GND_056
 U 1 1 58024012
 P 6900 8400
-F 0 "GND_56" H 6900 8400 20  0000 C CNN
+F 0 "#GND_056" H 6900 8400 20  0000 C CNN
 F 1 "+GND" H 6900 8330 30  0000 C CNN
 F 2 "" H 6900 8400 70  0000 C CNN
 F 3 "" H 6900 8400 70  0000 C CNN
@@ -155,10 +155,10 @@ F 3 "" H 6900 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_57
+L power:GND #GND_057
 U 1 1 58024011
 P 8700 8400
-F 0 "GND_57" H 8700 8400 20  0000 C CNN
+F 0 "#GND_057" H 8700 8400 20  0000 C CNN
 F 1 "+GND" H 8700 8330 30  0000 C CNN
 F 2 "" H 8700 8400 70  0000 C CNN
 F 3 "" H 8700 8400 70  0000 C CNN
@@ -166,10 +166,10 @@ F 3 "" H 8700 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_58
+L power:GND #GND_058
 U 1 1 58024010
 P 11500 8400
-F 0 "GND_58" H 11500 8400 20  0000 C CNN
+F 0 "#GND_058" H 11500 8400 20  0000 C CNN
 F 1 "+GND" H 11500 8330 30  0000 C CNN
 F 2 "" H 11500 8400 70  0000 C CNN
 F 3 "" H 11500 8400 70  0000 C CNN
@@ -177,10 +177,10 @@ F 3 "" H 11500 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_2
+L Cryptech_Alpha:FT_VCC3V3 #FT_VCC3V3_02
 U 1 1 5802400F
 P 11500 7300
-F 0 "FT_VCC3V3_2" H 11500 7300 20  0000 C CNN
+F 0 "#FT_VCC3V3_02" H 11500 7300 20  0000 C CNN
 F 1 "+FT_VCC3V3" H 11500 7230 30  0000 C CNN
 F 2 "" H 11500 7300 70  0000 C CNN
 F 3 "" H 11500 7300 70  0000 C CNN
@@ -188,10 +188,10 @@ F 3 "" H 11500 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_59
+L power:GND #GND_059
 U 1 1 5802400E
 P 2150 3850
-F 0 "GND_59" H 2150 3850 20  0000 C CNN
+F 0 "#GND_059" H 2150 3850 20  0000 C CNN
 F 1 "+GND" H 2150 3780 30  0000 C CNN
 F 2 "" H 2150 3850 70  0000 C CNN
 F 3 "" H 2150 3850 70  0000 C CNN
@@ -199,10 +199,10 @@ F 3 "" H 2150 3850 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_3
+L Cryptech_Alpha:FT_VCC3V3 #FT_VCC3V3_03
 U 1 1 5802400D
 P 9800 7300
-F 0 "FT_VCC3V3_3" H 9800 7300 20  0000 C CNN
+F 0 "#FT_VCC3V3_03" H 9800 7300 20  0000 C CNN
 F 1 "+FT_VCC3V3" H 9800 7230 30  0000 C CNN
 F 2 "" H 9800 7300 70  0000 C CNN
 F 3 "" H 9800 7300 70  0000 C CNN
@@ -210,10 +210,10 @@ F 3 "" H 9800 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VREGIN FT_VREGIN
+L Cryptech_Alpha:FT_VREGIN #FT_VREGIN0101
 U 1 1 5802400C
 P 4600 7300
-F 0 "FT_VREGIN" H 4600 7300 20  0000 C CNN
+F 0 "#FT_VREGIN0101" H 4600 7300 20  0000 C CNN
 F 1 "+FT_VREGIN" H 4600 7230 30  0000 C CNN
 F 2 "" H 4600 7300 70  0000 C CNN
 F 3 "" H 4600 7300 70  0000 C CNN
@@ -221,10 +221,10 @@ F 3 "" H 4600 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_4
+L Cryptech_Alpha:FT_VCC3V3 #FT_VCC3V3_04
 U 1 1 5802400B
 P 5900 7300
-F 0 "FT_VCC3V3_4" H 5900 7300 20  0000 C CNN
+F 0 "#FT_VCC3V3_04" H 5900 7300 20  0000 C CNN
 F 1 "+FT_VCC3V3" H 5900 7230 30  0000 C CNN
 F 2 "" H 5900 7300 70  0000 C CNN
 F 3 "" H 5900 7300 70  0000 C CNN
@@ -232,10 +232,10 @@ F 3 "" H 5900 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VPHY FT_VPHY
+L Cryptech_Alpha:FT_VPHY #FT_VPHY0101
 U 1 1 5802400A
 P 6900 7300
-F 0 "FT_VPHY" H 6900 7300 20  0000 C CNN
+F 0 "#FT_VPHY0101" H 6900 7300 20  0000 C CNN
 F 1 "+FT_VPHY" H 6900 7230 30  0000 C CNN
 F 2 "" H 6900 7300 70  0000 C CNN
 F 3 "" H 6900 7300 70  0000 C CNN
@@ -243,10 +243,10 @@ F 3 "" H 6900 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_5
+L Cryptech_Alpha:FT_VCC3V3 #FT_VCC3V3_05
 U 1 1 58024009
 P 7700 7300
-F 0 "FT_VCC3V3_5" H 7700 7300 20  0000 C CNN
+F 0 "#FT_VCC3V3_05" H 7700 7300 20  0000 C CNN
 F 1 "+FT_VCC3V3" H 7700 7230 30  0000 C CNN
 F 2 "" H 7700 7300 70  0000 C CNN
 F 3 "" H 7700 7300 70  0000 C CNN
@@ -254,10 +254,10 @@ F 3 "" H 7700 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VPLL FT_VPLL
+L Cryptech_Alpha:FT_VPLL #FT_VPLL0101
 U 1 1 58024008
 P 8700 7300
-F 0 "FT_VPLL" H 8700 7300 20  0000 C CNN
+F 0 "#FT_VPLL0101" H 8700 7300 20  0000 C CNN
 F 1 "+FT_VPLL" H 8700 7230 30  0000 C CNN
 F 2 "" H 8700 7300 70  0000 C CNN
 F 3 "" H 8700 7300 70  0000 C CNN
@@ -265,10 +265,10 @@ F 3 "" H 8700 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_60
+L power:GND #GND_060
 U 1 1 58024007
 P 3900 3900
-F 0 "GND_60" H 3900 3900 20  0000 C CNN
+F 0 "#GND_060" H 3900 3900 20  0000 C CNN
 F 1 "+GND" H 3900 3830 30  0000 C CNN
 F 2 "" H 3900 3900 70  0000 C CNN
 F 3 "" H 3900 3900 70  0000 C CNN
@@ -276,10 +276,10 @@ F 3 "" H 3900 3900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VREGIN FT_VREGIN_2
+L Cryptech_Alpha:FT_VREGIN #FT_VREGIN_02
 U 1 1 58024006
 P 13300 5400
-F 0 "FT_VREGIN_2" H 13300 5400 20  0000 C CNN
+F 0 "#FT_VREGIN_02" H 13300 5400 20  0000 C CNN
 F 1 "+FT_VREGIN" H 13300 5330 30  0000 C CNN
 F 2 "" H 13300 5400 70  0000 C CNN
 F 3 "" H 13300 5400 70  0000 C CNN
@@ -287,10 +287,10 @@ F 3 "" H 13300 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_61
+L power:GND #GND_061
 U 1 1 58024005
 P 12350 6400
-F 0 "GND_61" H 12350 6400 20  0000 C CNN
+F 0 "#GND_061" H 12350 6400 20  0000 C CNN
 F 1 "+GND" H 12350 6330 30  0000 C CNN
 F 2 "" H 12350 6400 70  0000 C CNN
 F 3 "" H 12350 6400 70  0000 C CNN
@@ -298,10 +298,10 @@ F 3 "" H 12350 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_17
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_017
 U 1 1 58024004
 P 11000 2500
-F 0 "VCCO_3V3_17" H 11000 2500 20  0000 C CNN
+F 0 "#VCCO_3V3_017" H 11000 2500 20  0000 C CNN
 F 1 "+VCCO_3V3" H 11000 2430 30  0000 C CNN
 F 2 "" H 11000 2500 70  0000 C CNN
 F 3 "" H 11000 2500 70  0000 C CNN
@@ -445,25 +445,25 @@ Wire Wire Line
 Connection ~ 12350 6000
 Wire Wire Line
 	7300 4300 6970 4300
-Text Label 6970 4300 0 48 ~
+Text Label 6970 4300 0    48   ~ 0
 FT_RESET
 Wire Wire Line
 	7300 3800 6200 3800
 Wire Wire Line
 	6200 3800 6200 4000
-Text Label 6200 3800 0 48 ~
+Text Label 6200 3800 0    48   ~ 0
 FT_VCCA
 Wire Wire Line
 	7300 3700 6000 3700
 Wire Wire Line
 	6000 3700 6000 4000
-Text Label 6000 3700 0 48 ~
+Text Label 6000 3700 0    48   ~ 0
 FT_VCCORE
 Wire Wire Line
 	7300 4100 7090 4100
 Wire Wire Line
 	4050 3400 3600 3400
-Text Label 4050 3400 0 48 ~
+Text Label 4050 3400 0    48   ~ 0
 USB_P
 Wire Wire Line
 	12600 6100 12400 6100
@@ -471,13 +471,13 @@ Wire Wire Line
 	7300 4000 7090 4000
 Wire Wire Line
 	4050 3600 3600 3600
-Text Label 4050 3600 0 48 ~
+Text Label 4050 3600 0    48   ~ 0
 USB_N
 Wire Wire Line
 	13400 6100 13200 6100
 Wire Wire Line
 	7300 3400 6000 3400
-Text Label 6000 3400 0 48 ~
+Text Label 6000 3400 0    48   ~ 0
 FT_VREGIN
 Wire Wire Line
 	2500 3300 2000 3300
@@ -496,7 +496,7 @@ Wire Wire Line
 Connection ~ 4600 7700
 Wire Wire Line
 	7300 4500 6800 4500
-Text Label 6930 4500 0 48 ~
+Text Label 6930 4500 0    48   ~ 0
 FT_REF
 Wire Wire Line
 	7300 3600 6700 3600
@@ -506,7 +506,7 @@ Wire Wire Line
 	6700 3600 6570 3600
 Wire Wire Line
 	6570 3600 6570 4300
-Text Label 6000 3600 0 48 ~
+Text Label 6000 3600 0    48   ~ 0
 FT_VCC3V3
 Wire Wire Line
 	8500 2500 8500 2800
@@ -573,18 +573,18 @@ Wire Wire Line
 	11200 3400 11000 3400
 Wire Wire Line
 	11000 3100 11000 3400
-Text GLabel 11200 3400 2 48 Output ~ 0
+Text GLabel 11200 3400 2    48   Output ~ 0
 FT_TXD
 Connection ~ 11000 3400
 Wire Wire Line
 	11200 3500 10900 3500
-Text GLabel 11200 3500 2 48 Input ~ 0
+Text GLabel 11200 3500 2    48   Input ~ 0
 FT_RXD
 Wire Wire Line
 	8200 2800 8200 3100
 Wire Wire Line
 	8200 2800 7550 2800
-Text Label 7550 2800 0 48 ~
+Text Label 7550 2800 0    48   ~ 0
 FT_VPHY
 Wire Wire Line
 	6900 7700 6400 7700
@@ -602,7 +602,7 @@ Wire Wire Line
 	8300 2600 8300 3100
 Wire Wire Line
 	8300 2600 7550 2600
-Text Label 7550 2600 0 48 ~
+Text Label 7550 2600 0    48   ~ 0
 FT_VPLL
 Wire Wire Line
 	8700 7700 8200 7700
@@ -618,15 +618,15 @@ Connection ~ 8200 7700
 Connection ~ 8700 7700
 Wire Wire Line
 	9700 3600 9500 3600
-Text GLabel 9700 3600 2 48 Output ~ 0
+Text GLabel 9700 3600 2    48   Output ~ 0
 FT_RTS
 Wire Wire Line
 	9700 3700 9500 3700
-Text GLabel 9700 3700 2 48 Input ~ 0
+Text GLabel 9700 3700 2    48   Input ~ 0
 FT_CTS
 Wire Wire Line
 	9700 3800 9500 3800
-Text GLabel 9700 3800 2 48 UnSpc ~ 0
+Text GLabel 9700 3800 2    48   UnSpc ~ 0
 FT_DTR
 Wire Wire Line
 	2600 3400 2000 3400
@@ -638,19 +638,19 @@ Wire Wire Line
 	2600 3600 2300 3600
 Wire Wire Line
 	10500 3400 9500 3400
-Text Label 9800 3400 0 48 ~
+Text Label 9800 3400 0    48   ~ 0
 FT_TXD1
 Wire Wire Line
 	13400 6200 13200 6200
-Text Label 13400 6200 0 48 ~ 0
+Text Label 13400 6200 0    48   ~ 0
 FT_TXD1
 Wire Wire Line
 	10500 3500 9500 3500
-Text Label 9800 3500 0 48 ~
+Text Label 9800 3500 0    48   ~ 0
 FT_RXD1
 Wire Wire Line
 	12600 6200 12400 6200
-Text Label 12400 6200 0 48 ~
+Text Label 12400 6200 0    48   ~ 0
 FT_RXD1
 Wire Wire Line
 	13300 5600 13300 6000
@@ -663,23 +663,23 @@ Wire Wire Line
 Connection ~ 13300 5600
 Wire Wire Line
 	11000 2500 11000 2700
-Text Label 7090 4000 0 48 ~
+Text Label 7090 4000 0    48   ~ 0
 USB_N
-Text Label 7090 4100 0 48 ~
+Text Label 7090 4100 0    48   ~ 0
 USB_P
-Text Label 13400 6100 0 48 ~ 0
+Text Label 13400 6100 0    48   ~ 0
 USB_N
-Text Label 12400 6100 0 48 ~
+Text Label 12400 6100 0    48   ~ 0
 USB_P
-Text Label 2050 3400 0 60 ~
+Text Label 2050 3400 0    60   ~ 0
 D1_P
-Text Label 2050 3500 0 60 ~
+Text Label 2050 3500 0    60   ~ 0
 D1_N
 $Comp
-L Cryptech_Alpha:FT_VREGIN FT_VREGIN_3
+L Cryptech_Alpha:FT_VREGIN #FT_VREGIN_03
 U 1 1 58024003
 P 2500 3300
-F 0 "FT_VREGIN_3" H 2500 3300 20  0000 C CNN
+F 0 "#FT_VREGIN_03" H 2500 3300 20  0000 C CNN
 F 1 "+FT_VREGIN" H 2500 3230 30  0000 C CNN
 F 2 "" H 2500 3300 70  0000 C CNN
 F 3 "" H 2500 3300 70  0000 C CNN
@@ -687,10 +687,10 @@ F 3 "" H 2500 3300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_62
+L power:GND #GND_062
 U 1 1 58024002
 P 6200 5700
-F 0 "GND_62" H 6200 5700 20  0000 C CNN
+F 0 "#GND_062" H 6200 5700 20  0000 C CNN
 F 1 "+GND" H 6200 5630 30  0000 C CNN
 F 2 "" H 6200 5700 70  0000 C CNN
 F 3 "" H 6200 5700 70  0000 C CNN
@@ -698,10 +698,10 @@ F 3 "" H 6200 5700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_63
+L power:GND #GND_063
 U 1 1 58024001
 P 6400 5700
-F 0 "GND_63" H 6400 5700 20  0000 C CNN
+F 0 "#GND_063" H 6400 5700 20  0000 C CNN
 F 1 "+GND" H 6400 5630 30  0000 C CNN
 F 2 "" H 6400 5700 70  0000 C CNN
 F 3 "" H 6400 5700 70  0000 C CNN
@@ -719,7 +719,7 @@ F 1 "FT232HL-REEL" H 7280 6120 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:LQFP-48" H 7280 6120 60  0001 C CNN
 F 3 "" H 7280 6120 60  0000 C CNN
 	1    8400 4600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C82
@@ -730,7 +730,7 @@ F 1 "4.7uF" H 9510 7990 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 9510 7990 60  0001 C CNN
 F 3 "" H 9510 7990 60  0000 C CNN
 	1    9800 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C83
@@ -741,7 +741,7 @@ F 1 "0.1uF" H 10210 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10210 8010 60  0001 C CNN
 F 3 "" H 10210 8010 60  0000 C CNN
 	1    10100 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C79
@@ -752,7 +752,7 @@ F 1 "0.1uF" H 7000 7820 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7000 7820 60  0001 C CNN
 F 3 "" H 7000 7820 60  0000 C CNN
 	1    6900 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0805 C77
@@ -763,7 +763,7 @@ F 1 "10uF" H 6070 7790 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 6070 7790 60  0001 C CNN
 F 3 "" H 6070 7790 60  0000 C CNN
 	1    6400 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C81
@@ -774,7 +774,7 @@ F 1 "0.1uF" H 8800 7820 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 8800 7820 60  0001 C CNN
 F 3 "" H 8800 7820 60  0000 C CNN
 	1    8700 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0805 C80
@@ -785,7 +785,7 @@ F 1 "10uF" H 7880 7840 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 7880 7840 60  0001 C CNN
 F 3 "" H 7880 7840 60  0000 C CNN
 	1    8200 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C84
@@ -796,7 +796,7 @@ F 1 "0.1uF" H 10750 7820 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10750 7820 60  0001 C CNN
 F 3 "" H 10750 7820 60  0000 C CNN
 	1    11100 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C85
@@ -807,7 +807,7 @@ F 1 "0.1uF" H 11210 8020 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11210 8020 60  0001 C CNN
 F 3 "" H 11210 8020 60  0000 C CNN
 	1    11500 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C86
@@ -818,16 +818,18 @@ F 1 "0.1uF" H 12000 7820 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12000 7820 60  0001 C CNN
 F 3 "" H 12000 7820 60  0000 C CNN
 	1    11900 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:FERRITE_0603MP FB2
 U 1 1 58023FF6
 P 7900 7700
 F 0 "FB2" H 7820 7532 60  0000 L BNN
-	1    7900 7700
-	1    0    0    -1
+F 1 "~" H 7900 7700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 7820 7532 60  0001 C CNN
+F 3 "" H 7900 7700 50  0001 C CNN
+	1    7900 7700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R23
@@ -838,16 +840,18 @@ F 1 "10k" H 6880 4240 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6880 4240 60  0001 C CNN
 F 3 "" H 6880 4240 60  0000 C CNN
 	1    6770 4300
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:FERRITE_0603MP FB1
 U 1 1 58023FF4
 P 6100 7700
 F 0 "FB1" H 6020 7532 60  0000 L BNN
-	1    6100 7700
-	1    0    0    -1
+F 1 "~" H 6100 7700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 6020 7532 60  0001 C CNN
+F 3 "" H 6100 7700 50  0001 C CNN
+	1    6100 7700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:USBMINIB CN1
@@ -858,7 +862,7 @@ F 1 "690-005-299-043" H 1188 3810 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:USB-MINIB" H 1188 3810 60  0001 C CNN
 F 3 "" H 1188 3810 60  0000 C CNN
 	1    1600 3500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:RCLAMP0502ASC-89 IC5
@@ -869,7 +873,7 @@ F 1 "RCLAMP0502A.TCT" H 2700 3170 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:RCLAMP0502A" H 2700 3170 60  0001 C CNN
 F 3 "" H 2700 3170 60  0000 C CNN
 	1    3100 3500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R86
@@ -880,7 +884,7 @@ F 1 "100" H 10780 3270 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 10780 3270 60  0001 C CNN
 F 3 "" H 10780 3270 60  0000 C CNN
 	1    10700 3400
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R87
@@ -891,16 +895,18 @@ F 1 "100" H 10840 3750 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 10840 3750 60  0001 C CNN
 F 3 "" H 10840 3750 60  0000 C CNN
 	1    10700 3500
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:M03X2NO_SILK J2
 U 1 1 58023FEF
 P 12900 6100
 F 0 "J2" H 12690 5790 60  0000 L BNN
-	1    12900 6100
-	1    0    0    -1
+F 1 "~" H 12900 6100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLD-6" H 12690 5790 60  0001 C CNN
+F 3 "" H 12900 6100 50  0001 C CNN
+	1    12900 6100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C214
@@ -911,7 +917,7 @@ F 1 "0.1uF" H 11950 5500 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11950 5500 60  0001 C CNN
 F 3 "" H 11950 5500 60  0000 C CNN
 	1    12350 5700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R91
@@ -922,7 +928,7 @@ F 1 "10k" V 10990 3000 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 10990 3000 60  0001 C CNN
 F 3 "" H 10990 3000 60  0000 C CNN
 	1    11000 2900
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:CRYSTALTHIN Y1
@@ -933,7 +939,7 @@ F 1 "ABM8G-12.000MHZ-4Y-T3" H 5480 5740 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:CRYSTAL_3.2X2.5" H 5480 5740 60  0001 C CNN
 F 3 "" H 5480 5740 60  0000 C CNN
 	1    6300 5600
-	-1    0    0    -1
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C76
@@ -944,7 +950,7 @@ F 1 "0.1uF" H 6310 4000 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6310 4000 60  0001 C CNN
 F 3 "" H 6310 4000 60  0000 C CNN
 	1    6200 4100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C74
@@ -955,7 +961,7 @@ F 1 "0.1uF" H 5640 3990 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5640 3990 60  0001 C CNN
 F 3 "" H 5640 3990 60  0000 C CNN
 	1    6000 4100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R22
@@ -966,7 +972,7 @@ F 1 "12k" H 6710 4750 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6710 4750 60  0001 C CNN
 F 3 "" H 6710 4750 60  0000 C CNN
 	1    6600 4500
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C78
@@ -977,7 +983,7 @@ F 1 "5pF" H 6480 6000 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6480 6000 60  0001 C CNN
 F 3 "" H 6480 6000 60  0000 C CNN
 	1    6600 5900
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C75
@@ -988,7 +994,7 @@ F 1 "5pF" H 6290 6000 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6290 6000 60  0001 C CNN
 F 3 "" H 6290 6000 60  0000 C CNN
 	1    6000 5900
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C72
@@ -999,7 +1005,7 @@ F 1 "4.7uF" H 4310 8000 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4310 8000 60  0001 C CNN
 F 3 "" H 4310 8000 60  0000 C CNN
 	1    4600 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C73
@@ -1010,7 +1016,7 @@ F 1 "0.1uF" H 4990 8020 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4990 8020 60  0001 C CNN
 F 3 "" H 4990 8020 60  0000 C CNN
 	1    4900 8000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 NoConn ~ 9500 3900
 NoConn ~ 9500 4000
@@ -1030,69 +1036,69 @@ NoConn ~ 7300 5000
 NoConn ~ 7300 4900
 NoConn ~ 2000 3600
 $Comp
-L Cryptech_Alpha:FT_VPLL #PWR?
+L Cryptech_Alpha:FT_VPLL #PWR0102
 U 1 1 5AF3BF7C
 P 7550 2600
-F 0 "#PWR?" H 7550 2450 50  0001 C CNN
+F 0 "#PWR0102" H 7550 2450 50  0001 C CNN
 F 1 "FT_VPLL" V 7565 2727 50  0000 L CNN
 F 2 "" H 7550 2600 60  0000 C CNN
 F 3 "" H 7550 2600 60  0000 C CNN
-       1    7550 2600
-       0    -1   -1   0   
+	1    7550 2600
+	0    -1   -1   0   
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VCC3V3 #PWR?
+L Cryptech_Alpha:FT_VCC3V3 #PWR0103
 U 1 1 5AF3CDAF
 P 6000 3600
-F 0 "#PWR?" H 6000 3450 50  0001 C CNN
+F 0 "#PWR0103" H 6000 3450 50  0001 C CNN
 F 1 "FT_VCC3V3" V 6015 3728 50  0000 L CNN
 F 2 "" H 6000 3600 60  0000 C CNN
 F 3 "" H 6000 3600 60  0000 C CNN
-       1    6000 3600
-       0    -1   -1   0   
+	1    6000 3600
+	0    -1   -1   0   
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VREGIN #PWR?
+L Cryptech_Alpha:FT_VREGIN #PWR0104
 U 1 1 5AF3DC52
 P 6000 3400
-F 0 "#PWR?" H 6000 3250 50  0001 C CNN
+F 0 "#PWR0104" H 6000 3250 50  0001 C CNN
 F 1 "FT_VREGIN" V 6015 3527 50  0000 L CNN
 F 2 "" H 6000 3400 60  0000 C CNN
 F 3 "" H 6000 3400 60  0000 C CNN
-       1    6000 3400
-       0    -1   -1   0   
+	1    6000 3400
+	0    -1   -1   0   
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_VPHY #PWR?
+L Cryptech_Alpha:FT_VPHY #PWR0105
 U 1 1 5AF3EA0F
 P 7550 2800
-F 0 "#PWR?" H 7550 2650 50  0001 C CNN
+F 0 "#PWR0105" H 7550 2650 50  0001 C CNN
 F 1 "FT_VPHY" V 7565 2927 50  0000 L CNN
 F 2 "" H 7550 2800 60  0000 C CNN
 F 3 "" H 7550 2800 60  0000 C CNN
-       1    7550 2800
-       0    -1   -1   0   
+	1    7550 2800
+	0    -1   -1   0   
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0104
 U 1 1 5AFAEA32
 P 8200 7700
-F 0 "#FLG?" H 8200 7775 50  0001 C CNN
+F 0 "#FLG0104" H 8200 7775 50  0001 C CNN
 F 1 "PWR_FLAG" H 8200 7874 50  0000 C CNN
 F 2 "" H 8200 7700 50  0001 C CNN
 F 3 "~" H 8200 7700 50  0001 C CNN
-       1    8200 7700
-       1    0    0    -1  
+	1    8200 7700
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0105
 U 1 1 5AFAEB88
 P 6400 7700
-F 0 "#FLG?" H 6400 7775 50  0001 C CNN
+F 0 "#FLG0105" H 6400 7775 50  0001 C CNN
 F 1 "PWR_FLAG" H 6400 7874 50  0000 C CNN
 F 2 "" H 6400 7700 50  0001 C CNN
 F 3 "~" H 6400 7700 50  0001 C CNN
-       1    6400 7700
-       1    0    0    -1  
+	1    6400 7700
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_10.sch b/rev03-KiCad/rev02_10.sch
index f84c224..bbb9bc6 100644
--- a/rev03-KiCad/rev02_10.sch
+++ b/rev03-KiCad/rev02_10.sch
@@ -15,13 +15,13 @@ Comment4 ""
 $EndDescr
 Text Notes 5100 2900 0    60   ~ 12
 DS_FT232H.pdf\n6.1 USB Bus Powered Configuration\ncopy of reference circuit
-Text Notes 7850 7450 0    42   ~ 12
+Text Notes 7850 7450 0    42   ~ 8
 Place close to FT232
 Text Notes 5610 5750 0    60   ~ 12
 CL 10pF
-Text Notes 6200 1800 0    126   ~ 12
+Text Notes 6200 1800 0    126  ~ 25
 Management access USB UART
-Text Notes 13890 10220 0    84   ~ 12
+Text Notes 13890 10220 0    84   ~ 17
 MGMT USB-UART
 Text Notes 14090 6010 0    60   ~ 12
 If possible, line up with\ncorresponding header\nfor USB-UART and label\npins on silk screen
@@ -60,10 +60,10 @@ Text Notes 12830 6290 0    60   ~ 12
 Text Notes 13130 6290 0    60   ~ 12
 6
 $Comp
-L power:GND GND_64
+L power:GND #GND_064
 U 1 1 58023FE4
 P 6200 4700
-F 0 "GND_64" H 6200 4700 20  0000 C CNN
+F 0 "#GND_064" H 6200 4700 20  0000 C CNN
 F 1 "+GND" H 6200 4630 30  0000 C CNN
 F 2 "" H 6200 4700 70  0000 C CNN
 F 3 "" H 6200 4700 70  0000 C CNN
@@ -71,10 +71,10 @@ F 3 "" H 6200 4700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_65
+L power:GND #GND_065
 U 1 1 58023FE3
 P 8700 6300
-F 0 "GND_65" H 8700 6300 20  0000 C CNN
+F 0 "#GND_065" H 8700 6300 20  0000 C CNN
 F 1 "+GND" H 8700 6230 30  0000 C CNN
 F 2 "" H 8700 6300 70  0000 C CNN
 F 3 "" H 8700 6300 70  0000 C CNN
@@ -82,10 +82,10 @@ F 3 "" H 8700 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_66
+L power:GND #GND_066
 U 1 1 58023FE2
 P 7400 6300
-F 0 "GND_66" H 7400 6300 20  0000 C CNN
+F 0 "#GND_066" H 7400 6300 20  0000 C CNN
 F 1 "+GND" H 7400 6230 30  0000 C CNN
 F 2 "" H 7400 6300 70  0000 C CNN
 F 3 "" H 7400 6300 70  0000 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 7400 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_67
+L power:GND #GND_067
 U 1 1 58023FE1
 P 6100 6300
-F 0 "GND_67" H 6100 6300 20  0000 C CNN
+F 0 "#GND_067" H 6100 6300 20  0000 C CNN
 F 1 "+GND" H 6100 6230 30  0000 C CNN
 F 2 "" H 6100 6300 70  0000 C CNN
 F 3 "" H 6100 6300 70  0000 C CNN
@@ -104,10 +104,10 @@ F 3 "" H 6100 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_68
+L power:GND #GND_068
 U 1 1 58023FE0
 P 6700 6300
-F 0 "GND_68" H 6700 6300 20  0000 C CNN
+F 0 "#GND_068" H 6700 6300 20  0000 C CNN
 F 1 "+GND" H 6700 6230 30  0000 C CNN
 F 2 "" H 6700 6300 70  0000 C CNN
 F 3 "" H 6700 6300 70  0000 C CNN
@@ -115,10 +115,10 @@ F 3 "" H 6700 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3
+L Cryptech_Alpha:FT_MGMT_VCC3V3 #FT_MGMT_VCC3V03
 U 1 1 58023FDF
 P 8600 2600
-F 0 "FT_MGMT_VCC3V3" H 8600 2600 20  0000 C CNN
+F 0 "#FT_MGMT_VCC3V03" H 8600 2600 20  0000 C CNN
 F 1 "+FT_MGMT_VCC3V3" H 8600 2530 30  0000 C CNN
 F 2 "" H 8600 2600 70  0000 C CNN
 F 3 "" H 8600 2600 70  0000 C CNN
@@ -126,10 +126,10 @@ F 3 "" H 8600 2600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_69
+L power:GND #GND_069
 U 1 1 58023FDE
 P 5000 8500
-F 0 "GND_69" H 5000 8500 20  0000 C CNN
+F 0 "#GND_069" H 5000 8500 20  0000 C CNN
 F 1 "+GND" H 5000 8430 30  0000 C CNN
 F 2 "" H 5000 8500 70  0000 C CNN
 F 3 "" H 5000 8500 70  0000 C CNN
@@ -137,10 +137,10 @@ F 3 "" H 5000 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_70
+L power:GND #GND_070
 U 1 1 58023FDD
 P 10200 8500
-F 0 "GND_70" H 10200 8500 20  0000 C CNN
+F 0 "#GND_070" H 10200 8500 20  0000 C CNN
 F 1 "+GND" H 10200 8430 30  0000 C CNN
 F 2 "" H 10200 8500 70  0000 C CNN
 F 3 "" H 10200 8500 70  0000 C CNN
@@ -148,10 +148,10 @@ F 3 "" H 10200 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_71
+L power:GND #GND_071
 U 1 1 58023FDC
 P 7000 8500
-F 0 "GND_71" H 7000 8500 20  0000 C CNN
+F 0 "#GND_071" H 7000 8500 20  0000 C CNN
 F 1 "+GND" H 7000 8430 30  0000 C CNN
 F 2 "" H 7000 8500 70  0000 C CNN
 F 3 "" H 7000 8500 70  0000 C CNN
@@ -159,10 +159,10 @@ F 3 "" H 7000 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_72
+L power:GND #GND_072
 U 1 1 58023FDB
 P 8800 8500
-F 0 "GND_72" H 8800 8500 20  0000 C CNN
+F 0 "#GND_072" H 8800 8500 20  0000 C CNN
 F 1 "+GND" H 8800 8430 30  0000 C CNN
 F 2 "" H 8800 8500 70  0000 C CNN
 F 3 "" H 8800 8500 70  0000 C CNN
@@ -170,10 +170,10 @@ F 3 "" H 8800 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_73
+L power:GND #GND_073
 U 1 1 58023FDA
 P 11700 8500
-F 0 "GND_73" H 11700 8500 20  0000 C CNN
+F 0 "#GND_073" H 11700 8500 20  0000 C CNN
 F 1 "+GND" H 11700 8430 30  0000 C CNN
 F 2 "" H 11700 8500 70  0000 C CNN
 F 3 "" H 11700 8500 70  0000 C CNN
@@ -181,10 +181,10 @@ F 3 "" H 11700 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_2
+L Cryptech_Alpha:FT_MGMT_VCC3V3 #FT_MGMT_VCC3V3_02
 U 1 1 58023FD9
 P 11700 7400
-F 0 "FT_MGMT_VCC3V3_2" H 11700 7400 20  0000 C CNN
+F 0 "#FT_MGMT_VCC3V3_02" H 11700 7400 20  0000 C CNN
 F 1 "+FT_MGMT_VCC3V3" H 11700 7330 30  0000 C CNN
 F 2 "" H 11700 7400 70  0000 C CNN
 F 3 "" H 11700 7400 70  0000 C CNN
@@ -192,10 +192,10 @@ F 3 "" H 11700 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_74
+L power:GND #GND_074
 U 1 1 58023FD8
 P 2200 4000
-F 0 "GND_74" H 2200 4000 20  0000 C CNN
+F 0 "#GND_074" H 2200 4000 20  0000 C CNN
 F 1 "+GND" H 2200 3930 30  0000 C CNN
 F 2 "" H 2200 4000 70  0000 C CNN
 F 3 "" H 2200 4000 70  0000 C CNN
@@ -203,10 +203,10 @@ F 3 "" H 2200 4000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_3
+L Cryptech_Alpha:FT_MGMT_VCC3V3 #FT_MGMT_VCC3V3_03
 U 1 1 58023FD7
 P 9900 7400
-F 0 "FT_MGMT_VCC3V3_3" H 9900 7400 20  0000 C CNN
+F 0 "#FT_MGMT_VCC3V3_03" H 9900 7400 20  0000 C CNN
 F 1 "+FT_MGMT_VCC3V3" H 9900 7330 30  0000 C CNN
 F 2 "" H 9900 7400 70  0000 C CNN
 F 3 "" H 9900 7400 70  0000 C CNN
@@ -214,10 +214,10 @@ F 3 "" H 9900 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VREGIN FT_MGMT_VREGIN
+L Cryptech_Alpha:FT_MGMT_VREGIN #FT_MGMT_VREGIN0101
 U 1 1 58023FD6
 P 4700 7400
-F 0 "FT_MGMT_VREGIN" H 4700 7400 20  0000 C CNN
+F 0 "#FT_MGMT_VREGIN0101" H 4700 7400 20  0000 C CNN
 F 1 "+FT_MGMT_VREGIN" H 4700 7330 30  0000 C CNN
 F 2 "" H 4700 7400 70  0000 C CNN
 F 3 "" H 4700 7400 70  0000 C CNN
@@ -225,10 +225,10 @@ F 3 "" H 4700 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_4
+L Cryptech_Alpha:FT_MGMT_VCC3V3 #FT_MGMT_VCC3V3_04
 U 1 1 58023FD5
 P 6000 7400
-F 0 "FT_MGMT_VCC3V3_4" H 6000 7400 20  0000 C CNN
+F 0 "#FT_MGMT_VCC3V3_04" H 6000 7400 20  0000 C CNN
 F 1 "+FT_MGMT_VCC3V3" H 6000 7330 30  0000 C CNN
 F 2 "" H 6000 7400 70  0000 C CNN
 F 3 "" H 6000 7400 70  0000 C CNN
@@ -236,10 +236,10 @@ F 3 "" H 6000 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VPHY FT_MGMT_VPHY
+L Cryptech_Alpha:FT_MGMT_VPHY #FT_MGMT_VPHY0101
 U 1 1 58023FD4
 P 7000 7400
-F 0 "FT_MGMT_VPHY" H 7000 7400 20  0000 C CNN
+F 0 "#FT_MGMT_VPHY0101" H 7000 7400 20  0000 C CNN
 F 1 "+FT_MGMT_VPHY" H 7000 7330 30  0000 C CNN
 F 2 "" H 7000 7400 70  0000 C CNN
 F 3 "" H 7000 7400 70  0000 C CNN
@@ -247,10 +247,10 @@ F 3 "" H 7000 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_5
+L Cryptech_Alpha:FT_MGMT_VCC3V3 #FT_MGMT_VCC3V3_05
 U 1 1 58023FD3
 P 7800 7400
-F 0 "FT_MGMT_VCC3V3_5" H 7800 7400 20  0000 C CNN
+F 0 "#FT_MGMT_VCC3V3_05" H 7800 7400 20  0000 C CNN
 F 1 "+FT_MGMT_VCC3V3" H 7800 7330 30  0000 C CNN
 F 2 "" H 7800 7400 70  0000 C CNN
 F 3 "" H 7800 7400 70  0000 C CNN
@@ -258,10 +258,10 @@ F 3 "" H 7800 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VPLL FT_MGMT_VPLL
+L Cryptech_Alpha:FT_MGMT_VPLL #FT_MGMT_VPLL0101
 U 1 1 58023FD2
 P 8800 7400
-F 0 "FT_MGMT_VPLL" H 8800 7400 20  0000 C CNN
+F 0 "#FT_MGMT_VPLL0101" H 8800 7400 20  0000 C CNN
 F 1 "+FT_MGMT_VPLL" H 8800 7330 30  0000 C CNN
 F 2 "" H 8800 7400 70  0000 C CNN
 F 3 "" H 8800 7400 70  0000 C CNN
@@ -269,10 +269,10 @@ F 3 "" H 8800 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_75
+L power:GND #GND_075
 U 1 1 58023FD1
 P 4000 4000
-F 0 "GND_75" H 4000 4000 20  0000 C CNN
+F 0 "#GND_075" H 4000 4000 20  0000 C CNN
 F 1 "+GND" H 4000 3930 30  0000 C CNN
 F 2 "" H 4000 4000 70  0000 C CNN
 F 3 "" H 4000 4000 70  0000 C CNN
@@ -280,10 +280,10 @@ F 3 "" H 4000 4000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VREGIN FT_MGMT_VREGIN_2
+L Cryptech_Alpha:FT_MGMT_VREGIN #FT_MGMT_VREGIN_02
 U 1 1 58023FD0
 P 13400 5500
-F 0 "FT_MGMT_VREGIN_2" H 13400 5500 20  0000 C CNN
+F 0 "#FT_MGMT_VREGIN_02" H 13400 5500 20  0000 C CNN
 F 1 "+FT_MGMT_VREGIN" H 13400 5430 30  0000 C CNN
 F 2 "" H 13400 5500 70  0000 C CNN
 F 3 "" H 13400 5500 70  0000 C CNN
@@ -291,10 +291,10 @@ F 3 "" H 13400 5500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_76
+L power:GND #GND_076
 U 1 1 58023FCF
 P 12600 6500
-F 0 "GND_76" H 12600 6500 20  0000 C CNN
+F 0 "#GND_076" H 12600 6500 20  0000 C CNN
 F 1 "+GND" H 12600 6430 30  0000 C CNN
 F 2 "" H 12600 6500 70  0000 C CNN
 F 3 "" H 12600 6500 70  0000 C CNN
@@ -302,10 +302,10 @@ F 3 "" H 12600 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_18
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_018
 U 1 1 58023FCE
 P 11100 2600
-F 0 "VCCO_3V3_18" H 11100 2600 20  0000 C CNN
+F 0 "#VCCO_3V3_018" H 11100 2600 20  0000 C CNN
 F 1 "+VCCO_3V3" H 11100 2530 30  0000 C CNN
 F 2 "" H 11100 2600 70  0000 C CNN
 F 3 "" H 11100 2600 70  0000 C CNN
@@ -449,31 +449,31 @@ Wire Wire Line
 Connection ~ 12600 6100
 Wire Wire Line
 	7400 4400 7020 4400
-Text Label 7040 4400 0 48 ~
+Text Label 7040 4400 0    48   ~ 0
 FT_RESET1
 Wire Wire Line
 	7400 3900 6300 3900
 Wire Wire Line
 	6300 3900 6300 4100
-Text Label 6670 3900 0 48 ~
+Text Label 6670 3900 0    48   ~ 0
 FT_VCCA1
 Wire Wire Line
 	7400 3800 6100 3800
 Wire Wire Line
 	6100 3800 6100 4100
-Text Label 6100 3800 0 48 ~
+Text Label 6100 3800 0    48   ~ 0
 FT_VCCORE1
 Wire Wire Line
 	7400 4100 6980 4100
 Wire Wire Line
 	4150 3700 3700 3700
-Text Label 4150 3700 0 48 ~
+Text Label 4150 3700 0    48   ~ 0
 USB_MGMT_N
 Wire Wire Line
 	13500 6200 13300 6200
 Wire Wire Line
 	7400 3500 6100 3500
-Text Label 6100 3500 0 48 ~
+Text Label 6100 3500 0    48   ~ 0
 FT_MGMT_VREGIN
 Wire Wire Line
 	5000 7800 5000 8000
@@ -492,7 +492,7 @@ Wire Wire Line
 	2700 3600 2600 3600
 Wire Wire Line
 	7400 4600 6900 4600
-Text Label 7150 4600 0 48 ~
+Text Label 7150 4600 0    48   ~ 0
 FT_REF1
 Wire Wire Line
 	7400 3700 6700 3700
@@ -502,7 +502,7 @@ Wire Wire Line
 	6700 3700 6620 3700
 Wire Wire Line
 	6620 3700 6620 4400
-Text Label 6100 3700 0 48 ~
+Text Label 6100 3700 0    48   ~ 0
 FT_MGMT_VCC3V3
 Wire Wire Line
 	8600 2600 8600 2900
@@ -567,7 +567,7 @@ Wire Wire Line
 	8400 2700 8400 3200
 Wire Wire Line
 	8400 2700 7650 2700
-Text Label 7650 2700 0 48 ~
+Text Label 7650 2700 0    48   ~ 0
 FT_MGMT_VPLL
 Wire Wire Line
 	8800 7800 8300 7800
@@ -585,7 +585,7 @@ Wire Wire Line
 	7400 4200 6980 4200
 Wire Wire Line
 	4150 3500 3700 3500
-Text Label 4150 3500 0 48 ~
+Text Label 4150 3500 0    48   ~ 0
 USB_MGMT_P
 Wire Wire Line
 	12700 6200 12050 6200
@@ -593,7 +593,7 @@ Wire Wire Line
 	8300 2900 8300 3200
 Wire Wire Line
 	8300 2900 7650 2900
-Text Label 7650 2900 0 48 ~
+Text Label 7650 2900 0    48   ~ 0
 FT_MGMT_VPHY
 Wire Wire Line
 	7000 7800 6500 7800
@@ -613,24 +613,24 @@ Wire Wire Line
 	11300 3500 11100 3500
 Wire Wire Line
 	11100 3200 11100 3500
-Text GLabel 11300 3500 2 48 Output ~ 0
+Text GLabel 11300 3500 2    48   Output ~ 0
 FT_MGMT_TXD
 Connection ~ 11100 3500
 Wire Wire Line
 	11300 3600 11000 3600
-Text GLabel 11300 3600 2 48 Input ~ 0
+Text GLabel 11300 3600 2    48   Input ~ 0
 FT_MGMT_RXD
 Wire Wire Line
 	9800 3700 9600 3700
-Text GLabel 9800 3700 2 48 Output ~ 0
+Text GLabel 9800 3700 2    48   Output ~ 0
 FT_MGMT_RTS
 Wire Wire Line
 	9800 3800 9600 3800
-Text GLabel 9800 3800 2 48 Input ~ 0
+Text GLabel 9800 3800 2    48   Input ~ 0
 FT_MGMT_CTS
 Wire Wire Line
 	9800 3900 9600 3900
-Text GLabel 9800 3900 2 48 UnSpc ~ 0
+Text GLabel 9800 3900 2    48   UnSpc ~ 0
 FT_MGMT_DTR
 Wire Wire Line
 	2700 3500 2100 3500
@@ -653,37 +653,37 @@ Wire Wire Line
 	11100 2600 11100 2800
 Wire Wire Line
 	10600 3500 9600 3500
-Text Label 9900 3500 0 48 ~
+Text Label 9900 3500 0    48   ~ 0
 FT_MGMT_TXD1
 Wire Wire Line
 	13500 6300 13300 6300
-Text Label 13500 6300 0 48 ~ 0
+Text Label 13500 6300 0    48   ~ 0
 FT_MGMT_TXD1
 Wire Wire Line
 	10600 3600 9600 3600
-Text Label 9900 3600 0 48 ~
+Text Label 9900 3600 0    48   ~ 0
 FT_MGMT_RXD1
 Wire Wire Line
 	12700 6300 12050 6300
-Text Label 12050 6300 0 48 ~
+Text Label 12050 6300 0    48   ~ 0
 FT_MGMT_RXD1
-Text Label 6980 4100 0 48 ~
+Text Label 6980 4100 0    48   ~ 0
 USB_MGMT_N
-Text Label 6980 4200 0 48 ~
+Text Label 6980 4200 0    48   ~ 0
 USB_MGMT_P
-Text Label 13500 6200 0 48 ~ 0
+Text Label 13500 6200 0    48   ~ 0
 USB_MGMT_N
-Text Label 12050 6200 0 48 ~
+Text Label 12050 6200 0    48   ~ 0
 USB_MGMT_P
-Text Label 2100 3600 0 60 ~
+Text Label 2100 3600 0    60   ~ 0
 DM_N
-Text Label 2100 3500 0 60 ~
+Text Label 2100 3500 0    60   ~ 0
 DM_P
 $Comp
-L Cryptech_Alpha:FT_MGMT_VREGIN FT_MGMT_VREGIN_3
+L Cryptech_Alpha:FT_MGMT_VREGIN #FT_MGMT_VREGIN_03
 U 1 1 58023FCD
 P 2600 3400
-F 0 "FT_MGMT_VREGIN_3" H 2600 3400 20  0000 C CNN
+F 0 "#FT_MGMT_VREGIN_03" H 2600 3400 20  0000 C CNN
 F 1 "+FT_MGMT_VREGIN" H 2600 3330 30  0000 C CNN
 F 2 "" H 2600 3400 70  0000 C CNN
 F 3 "" H 2600 3400 70  0000 C CNN
@@ -691,10 +691,10 @@ F 3 "" H 2600 3400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_77
+L power:GND #GND_077
 U 1 1 58023FCC
 P 6300 5800
-F 0 "GND_77" H 6300 5800 20  0000 C CNN
+F 0 "#GND_077" H 6300 5800 20  0000 C CNN
 F 1 "+GND" H 6300 5730 30  0000 C CNN
 F 2 "" H 6300 5800 70  0000 C CNN
 F 3 "" H 6300 5800 70  0000 C CNN
@@ -702,10 +702,10 @@ F 3 "" H 6300 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_78
+L power:GND #GND_078
 U 1 1 58023FCB
 P 6500 5800
-F 0 "GND_78" H 6500 5800 20  0000 C CNN
+F 0 "#GND_078" H 6500 5800 20  0000 C CNN
 F 1 "+GND" H 6500 5730 30  0000 C CNN
 F 2 "" H 6500 5800 70  0000 C CNN
 F 3 "" H 6500 5800 70  0000 C CNN
@@ -723,7 +723,7 @@ F 1 "FT232HL-REEL" H 7380 6220 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:LQFP-48" H 7380 6220 60  0001 C CNN
 F 3 "" H 7380 6220 60  0000 C CNN
 	1    8500 4700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C97
@@ -734,7 +734,7 @@ F 1 "4.7uF" H 9590 8080 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 9590 8080 60  0001 C CNN
 F 3 "" H 9590 8080 60  0000 C CNN
 	1    9900 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C98
@@ -745,7 +745,7 @@ F 1 "0.1uF" H 10300 8110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10300 8110 60  0001 C CNN
 F 3 "" H 10300 8110 60  0000 C CNN
 	1    10200 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C94
@@ -756,7 +756,7 @@ F 1 "0.1uF" H 7100 7900 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7100 7900 60  0001 C CNN
 F 3 "" H 7100 7900 60  0000 C CNN
 	1    7000 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0805 C92
@@ -767,7 +767,7 @@ F 1 "10uF" H 6190 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 6190 7910 60  0001 C CNN
 F 3 "" H 6190 7910 60  0000 C CNN
 	1    6500 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C96
@@ -778,7 +778,7 @@ F 1 "0.1uF" H 8900 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 8900 7910 60  0001 C CNN
 F 3 "" H 8900 7910 60  0000 C CNN
 	1    8800 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0805 C95
@@ -789,7 +789,7 @@ F 1 "10uF" H 7979 7930 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 7979 7930 60  0001 C CNN
 F 3 "" H 7979 7930 60  0000 C CNN
 	1    8300 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C99
@@ -800,7 +800,7 @@ F 1 "0.1uF" H 10950 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 10950 7910 60  0001 C CNN
 F 3 "" H 10950 7910 60  0000 C CNN
 	1    11300 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C100
@@ -811,7 +811,7 @@ F 1 "0.1uF" H 11400 8130 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11400 8130 60  0001 C CNN
 F 3 "" H 11400 8130 60  0000 C CNN
 	1    11700 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C101
@@ -822,16 +822,18 @@ F 1 "0.1uF" H 12210 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12210 7910 60  0001 C CNN
 F 3 "" H 12210 7910 60  0000 C CNN
 	1    12100 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:FERRITE_0603MP FB4
 U 1 1 58023FC0
 P 8000 7800
 F 0 "FB4" H 7920 7632 60  0000 L BNN
-	1    8000 7800
-	1    0    0    -1
+F 1 "~" H 8000 7800 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 7920 7632 60  0001 C CNN
+F 3 "" H 8000 7800 50  0001 C CNN
+	1    8000 7800
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R27
@@ -842,16 +844,18 @@ F 1 "10k" H 6930 4360 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6930 4360 60  0001 C CNN
 F 3 "" H 6930 4360 60  0000 C CNN
 	1    6820 4400
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:FERRITE_0603MP FB3
 U 1 1 58023FBE
 P 6200 7800
 F 0 "FB3" H 6120 7632 60  0000 L BNN
-	1    6200 7800
-	1    0    0    -1
+F 1 "~" H 6200 7800 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 6120 7632 60  0001 C CNN
+F 3 "" H 6200 7800 50  0001 C CNN
+	1    6200 7800
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:USBMINIB CN2
@@ -862,7 +866,7 @@ F 1 "690-005-299-043" H 1288 3910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:USB-MINIB" H 1288 3910 60  0001 C CNN
 F 3 "" H 1288 3910 60  0000 C CNN
 	1    1700 3600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:RCLAMP0502ASC-89 IC6
@@ -873,7 +877,7 @@ F 1 "RCLAMP0502A.TCT" H 2790 3280 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:RCLAMP0502A" H 2790 3280 60  0001 C CNN
 F 3 "" H 2790 3280 60  0000 C CNN
 	1    3200 3600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R88
@@ -884,7 +888,7 @@ F 1 "100" H 10890 3360 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 10890 3360 60  0001 C CNN
 F 3 "" H 10890 3360 60  0000 C CNN
 	1    10800 3500
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R89
@@ -895,16 +899,18 @@ F 1 "100" H 11150 3820 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 11150 3820 60  0001 C CNN
 F 3 "" H 11150 3820 60  0000 C CNN
 	1    10800 3600
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:M03X2NO_SILK J3
 U 1 1 58023FB9
 P 13000 6200
 F 0 "J3" H 12790 5890 60  0000 L BNN
-	1    13000 6200
-	1    0    0    -1
+F 1 "~" H 13000 6200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLD-6" H 12790 5890 60  0001 C CNN
+F 3 "" H 13000 6200 50  0001 C CNN
+	1    13000 6200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C215
@@ -915,7 +921,7 @@ F 1 "0.1uF" H 12200 5600 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12200 5600 60  0001 C CNN
 F 3 "" H 12200 5600 60  0000 C CNN
 	1    12600 5800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R90
@@ -926,7 +932,7 @@ F 1 "10k" V 11100 3090 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 11100 3090 60  0001 C CNN
 F 3 "" H 11100 3090 60  0000 C CNN
 	1    11100 3000
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:CRYSTALTHIN Y2
@@ -937,7 +943,7 @@ F 1 "ABM8G-12.000MHZ-4Y-T3" H 5610 5820 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:CRYSTAL_3.2X2.5" H 5610 5820 60  0001 C CNN
 F 3 "" H 5610 5820 60  0000 C CNN
 	1    6400 5700
-	-1    0    0    -1
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C91
@@ -948,7 +954,7 @@ F 1 "0.1uF" H 6350 3990 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6350 3990 60  0001 C CNN
 F 3 "" H 6350 3990 60  0000 C CNN
 	1    6300 4200
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C89
@@ -959,7 +965,7 @@ F 1 "0.1uF" H 5660 4100 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5660 4100 60  0001 C CNN
 F 3 "" H 5660 4100 60  0000 C CNN
 	1    6100 4200
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R26
@@ -970,7 +976,7 @@ F 1 "12k" H 6850 4870 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6850 4870 60  0001 C CNN
 F 3 "" H 6850 4870 60  0000 C CNN
 	1    6700 4600
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C93
@@ -981,7 +987,7 @@ F 1 "5pF" H 6580 6090 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6580 6090 60  0001 C CNN
 F 3 "" H 6580 6090 60  0000 C CNN
 	1    6700 6000
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C90
@@ -992,7 +998,7 @@ F 1 "5pF" H 6400 6100 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6400 6100 60  0001 C CNN
 F 3 "" H 6400 6100 60  0000 C CNN
 	1    6100 6000
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C87
@@ -1003,7 +1009,7 @@ F 1 "4.7uF" H 4400 8080 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4400 8080 60  0001 C CNN
 F 3 "" H 4400 8080 60  0000 C CNN
 	1    4700 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C88
@@ -1014,7 +1020,7 @@ F 1 "0.1uF" H 5100 8110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5100 8110 60  0001 C CNN
 F 3 "" H 5100 8110 60  0000 C CNN
 	1    5000 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 NoConn ~ 9600 4000
 NoConn ~ 9600 4100
@@ -1034,69 +1040,69 @@ NoConn ~ 7400 5000
 NoConn ~ 7400 5100
 NoConn ~ 7400 5200
 $Comp
-L Cryptech_Alpha:FT_MGMT_VPLL #PWR?
+L Cryptech_Alpha:FT_MGMT_VPLL #PWR0106
 U 1 1 5AF74540
 P 7650 2700
-F 0 "#PWR?" H 7650 2550 50  0001 C CNN
+F 0 "#PWR0106" H 7650 2550 50  0001 C CNN
 F 1 "FT_MGMT_VPLL" V 7665 2827 50  0000 L CNN
 F 2 "" H 7650 2700 60  0000 C CNN
 F 3 "" H 7650 2700 60  0000 C CNN
-       1    7650 2700
-       0    -1   -1   0   
+	1    7650 2700
+	0    -1   -1   0   
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VPHY #PWR?
+L Cryptech_Alpha:FT_MGMT_VPHY #PWR0107
 U 1 1 5AF74918
 P 7650 2900
-F 0 "#PWR?" H 7650 2750 50  0001 C CNN
+F 0 "#PWR0107" H 7650 2750 50  0001 C CNN
 F 1 "FT_MGMT_VPHY" V 7665 3028 50  0000 L CNN
 F 2 "" H 7650 2900 60  0000 C CNN
 F 3 "" H 7650 2900 60  0000 C CNN
-       1    7650 2900
-       0    -1   -1   0   
+	1    7650 2900
+	0    -1   -1   0   
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VREGIN #PWR?
+L Cryptech_Alpha:FT_MGMT_VREGIN #PWR0108
 U 1 1 5AF74D26
 P 6100 3500
-F 0 "#PWR?" H 6100 3350 50  0001 C CNN
+F 0 "#PWR0108" H 6100 3350 50  0001 C CNN
 F 1 "FT_MGMT_VREGIN" V 6115 3628 50  0000 L CNN
 F 2 "" H 6100 3500 60  0000 C CNN
 F 3 "" H 6100 3500 60  0000 C CNN
-       1    6100 3500
-       0    -1   -1   0   
+	1    6100 3500
+	0    -1   -1   0   
 $EndComp
 $Comp
-L Cryptech_Alpha:FT_MGMT_VCC3V3 #PWR?
+L Cryptech_Alpha:FT_MGMT_VCC3V3 #PWR0109
 U 1 1 5AF74F88
 P 6100 3700
-F 0 "#PWR?" H 6100 3550 50  0001 C CNN
+F 0 "#PWR0109" H 6100 3550 50  0001 C CNN
 F 1 "FT_MGMT_VCC3V3" V 6115 3828 50  0000 L CNN
 F 2 "" H 6100 3700 60  0000 C CNN
 F 3 "" H 6100 3700 60  0000 C CNN
-       1    6100 3700
-       0    -1   -1   0   
+	1    6100 3700
+	0    -1   -1   0   
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0106
 U 1 1 5AFA8493
 P 8300 7800
-F 0 "#FLG?" H 8300 7875 50  0001 C CNN
+F 0 "#FLG0106" H 8300 7875 50  0001 C CNN
 F 1 "PWR_FLAG" H 8300 7974 50  0000 C CNN
 F 2 "" H 8300 7800 50  0001 C CNN
 F 3 "~" H 8300 7800 50  0001 C CNN
-       1    8300 7800
-       1    0    0    -1  
+	1    8300 7800
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0107
 U 1 1 5AFA857D
 P 6500 7800
-F 0 "#FLG?" H 6500 7875 50  0001 C CNN
+F 0 "#FLG0107" H 6500 7875 50  0001 C CNN
 F 1 "PWR_FLAG" H 6500 7974 50  0000 C CNN
 F 2 "" H 6500 7800 50  0001 C CNN
 F 3 "~" H 6500 7800 50  0001 C CNN
-       1    6500 7800
-       1    0    0    -1  
+	1    6500 7800
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_11.sch b/rev03-KiCad/rev02_11.sch
index 7b24ddf..187a9cb 100644
--- a/rev03-KiCad/rev02_11.sch
+++ b/rev03-KiCad/rev02_11.sch
@@ -13,17 +13,17 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 4600 3100 0    126   ~ 12
+Text Notes 4600 3100 0    126  ~ 25
 AVR Tiny Tamper Detect MCU
-Text Notes 13000 3930 0    84   ~ 12
+Text Notes 13000 3930 0    84   ~ 17
 Panic button
-Text Notes 13200 6100 0    84   ~ 12
+Text Notes 13200 6100 0    84   ~ 17
 Expansion GPIO
 Text Notes 12680 1730 0    60   ~ 12
 Connector for external 3V3 battery.\nPlace a jumper between pins 1-2\nto "emulate" having a battery present.
 Text Notes 4100 7000 0    60   ~ 12
 AVR_GPIO* AVR_LED* and AVR_PANIC can be swapped.
-Text Notes 13650 10210 0    84   ~ 12
+Text Notes 13650 10210 0    84   ~ 17
 AVR Tamper circuit
 Text Notes 5900 3780 0    60   ~ 12
 U10
@@ -42,10 +42,10 @@ M03LOCK
 Text Notes 14300 2730 2    60   ~ 12
 JP4
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_3
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_03
 U 1 1 58023FAE
 P 3500 3600
-F 0 "3V3_BATT_3" H 3500 3600 20  0000 C CNN
+F 0 "#3V3_BATT_03" H 3500 3600 20  0000 C CNN
 F 1 "+3V3_BATT" H 3500 3530 30  0000 C CNN
 F 2 "" H 3500 3600 70  0000 C CNN
 F 3 "" H 3500 3600 70  0000 C CNN
@@ -53,10 +53,10 @@ F 3 "" H 3500 3600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_79
+L power:GND #GND_079
 U 1 1 58023FAD
 P 3500 6700
-F 0 "GND_79" H 3500 6700 20  0000 C CNN
+F 0 "#GND_079" H 3500 6700 20  0000 C CNN
 F 1 "+GND" H 3500 6630 30  0000 C CNN
 F 2 "" H 3500 6700 70  0000 C CNN
 F 3 "" H 3500 6700 70  0000 C CNN
@@ -64,10 +64,10 @@ F 3 "" H 3500 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_4
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_04
 U 1 1 58023FAC
 P 10900 5700
-F 0 "3V3_BATT_4" H 10900 5700 20  0000 C CNN
+F 0 "#3V3_BATT_04" H 10900 5700 20  0000 C CNN
 F 1 "+3V3_BATT" H 10900 5630 30  0000 C CNN
 F 2 "" H 10900 5700 70  0000 C CNN
 F 3 "" H 10900 5700 70  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 10900 5700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_5
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_05
 U 1 1 58023FAB
 P 9600 4100
-F 0 "3V3_BATT_5" H 9600 4100 20  0000 C CNN
+F 0 "#3V3_BATT_05" H 9600 4100 20  0000 C CNN
 F 1 "+3V3_BATT" H 9600 4030 30  0000 C CNN
 F 2 "" H 9600 4100 70  0000 C CNN
 F 3 "" H 9600 4100 70  0000 C CNN
@@ -86,10 +86,10 @@ F 3 "" H 9600 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_80
+L power:GND #GND_080
 U 1 1 58023FAA
 P 10900 6700
-F 0 "GND_80" H 10900 6700 20  0000 C CNN
+F 0 "#GND_080" H 10900 6700 20  0000 C CNN
 F 1 "+GND" H 10900 6630 30  0000 C CNN
 F 2 "" H 10900 6700 70  0000 C CNN
 F 3 "" H 10900 6700 70  0000 C CNN
@@ -97,10 +97,10 @@ F 3 "" H 10900 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_81
+L power:GND #GND_081
 U 1 1 58023FA9
 P 2200 4800
-F 0 "GND_81" H 2200 4800 20  0000 C CNN
+F 0 "#GND_081" H 2200 4800 20  0000 C CNN
 F 1 "+GND" H 2200 4730 30  0000 C CNN
 F 2 "" H 2200 4800 70  0000 C CNN
 F 3 "" H 2200 4800 70  0000 C CNN
@@ -108,10 +108,10 @@ F 3 "" H 2200 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_82
+L power:GND #GND_082
 U 1 1 58023FA8
 P 14300 9200
-F 0 "GND_82" H 14300 9200 20  0000 C CNN
+F 0 "#GND_082" H 14300 9200 20  0000 C CNN
 F 1 "+GND" H 14300 9130 30  0000 C CNN
 F 2 "" H 14300 9200 70  0000 C CNN
 F 3 "" H 14300 9200 70  0000 C CNN
@@ -119,10 +119,10 @@ F 3 "" H 14300 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_83
+L power:GND #GND_083
 U 1 1 58023FA7
 P 13700 7500
-F 0 "GND_83" H 13700 7500 20  0000 C CNN
+F 0 "#GND_083" H 13700 7500 20  0000 C CNN
 F 1 "+GND" H 13700 7430 30  0000 C CNN
 F 2 "" H 13700 7500 70  0000 C CNN
 F 3 "" H 13700 7500 70  0000 C CNN
@@ -130,10 +130,10 @@ F 3 "" H 13700 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_84
+L power:GND #GND_084
 U 1 1 58023FA6
 P 14200 5300
-F 0 "GND_84" H 14200 5300 20  0000 C CNN
+F 0 "#GND_084" H 14200 5300 20  0000 C CNN
 F 1 "+GND" H 14200 5230 30  0000 C CNN
 F 2 "" H 14200 5300 70  0000 C CNN
 F 3 "" H 14200 5300 70  0000 C CNN
@@ -141,10 +141,10 @@ F 3 "" H 14200 5300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_85
+L power:GND #GND_085
 U 1 1 58023FA5
 P 13700 2800
-F 0 "GND_85" H 13700 2800 20  0000 C CNN
+F 0 "#GND_085" H 13700 2800 20  0000 C CNN
 F 1 "+GND" H 13700 2730 30  0000 C CNN
 F 2 "" H 13700 2800 70  0000 C CNN
 F 3 "" H 13700 2800 70  0000 C CNN
@@ -152,10 +152,10 @@ F 3 "" H 13700 2800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_6
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_06
 U 1 1 58023FA4
 P 13200 2200
-F 0 "3V3_BATT_6" H 13200 2200 20  0000 C CNN
+F 0 "#3V3_BATT_06" H 13200 2200 20  0000 C CNN
 F 1 "+3V3_BATT" H 13200 2130 30  0000 C CNN
 F 2 "" H 13200 2200 70  0000 C CNN
 F 3 "" H 13200 2200 70  0000 C CNN
@@ -163,10 +163,10 @@ F 3 "" H 13200 2200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_19
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_019
 U 1 1 58023FA3
 P 13700 2200
-F 0 "VCCO_3V3_19" H 13700 2200 20  0000 C CNN
+F 0 "#VCCO_3V3_019" H 13700 2200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 13700 2130 30  0000 C CNN
 F 2 "" H 13700 2200 70  0000 C CNN
 F 3 "" H 13700 2200 70  0000 C CNN
@@ -174,10 +174,10 @@ F 3 "" H 13700 2200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_86
+L power:GND #GND_086
 U 1 1 58023FA2
 P 12800 7500
-F 0 "GND_86" H 12800 7500 20  0000 C CNN
+F 0 "#GND_086" H 12800 7500 20  0000 C CNN
 F 1 "+GND" H 12800 7430 30  0000 C CNN
 F 2 "" H 12800 7500 70  0000 C CNN
 F 3 "" H 12800 7500 70  0000 C CNN
@@ -185,10 +185,10 @@ F 3 "" H 12800 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_7
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_07
 U 1 1 58023FA1
 P 12800 4400
-F 0 "3V3_BATT_7" H 12800 4400 20  0000 C CNN
+F 0 "#3V3_BATT_07" H 12800 4400 20  0000 C CNN
 F 1 "+3V3_BATT" H 12800 4330 30  0000 C CNN
 F 2 "" H 12800 4400 70  0000 C CNN
 F 3 "" H 12800 4400 70  0000 C CNN
@@ -278,7 +278,7 @@ Wire Wire Line
 Wire Wire Line
 	9600 4800 9600 5200
 Connection ~ 9600 5200
-Text Label 9600 5700 0 48 ~
+Text Label 9600 5700 0    48   ~ 0
 AVR_RESET
 Wire Wire Line
 	10900 6000 10800 6000
@@ -317,7 +317,7 @@ Wire Wire Line
 	12800 4400 12800 4500
 Wire Wire Line
 	3900 5000 3070 5000
-Text GLabel 3070 5000 0 48 Output ~ 0
+Text GLabel 3070 5000 0    48   Output ~ 0
 MKM_CONTROL_AVR_ENA
 Wire Wire Line
 	9700 5300 8500 5300
@@ -327,11 +327,11 @@ Wire Wire Line
 	10100 6100 9700 6100
 Wire Wire Line
 	8500 5300 8300 5300
-Text GLabel 8440 5300 2 48 Output ~ 0
+Text GLabel 8440 5300 2    48   Output ~ 0
 MKM_AVR_SCK
 Wire Wire Line
 	3900 4900 3070 4900
-Text GLabel 3070 4900 0 48 Output ~ 0
+Text GLabel 3070 4900 0    48   Output ~ 0
 MKM_AVR_CS_N
 Wire Wire Line
 	8700 5000 8300 5000
@@ -341,7 +341,7 @@ Wire Wire Line
 	11100 5000 11100 6100
 Wire Wire Line
 	11100 6100 10800 6100
-Text GLabel 8440 5000 2 48 Output ~ 0
+Text GLabel 8440 5000 2    48   Output ~ 0
 MKM_AVR_MOSI
 Wire Wire Line
 	10100 6000 9800 6000
@@ -351,111 +351,111 @@ Wire Wire Line
 	9800 5100 8600 5100
 Wire Wire Line
 	8600 5100 8300 5100
-Text GLabel 8440 5100 2 48 Input ~ 0
+Text GLabel 8440 5100 2    48   Input ~ 0
 MKM_AVR_MISO
 Wire Wire Line
 	13900 8700 13600 8700
 Wire Wire Line
 	13200 8700 12610 8700
-Text Label 12610 8700 0 48 ~
+Text Label 12610 8700 0    48   ~ 0
 AVR_LED1
 Wire Wire Line
 	3900 4400 3170 4400
-Text Label 3170 4400 0 48 ~
+Text Label 3170 4400 0    48   ~ 0
 AVR_LED1
 Wire Wire Line
 	13700 8800 13290 8800
 Wire Wire Line
 	12890 8800 12610 8800
-Text Label 12610 8800 0 48 ~
+Text Label 12610 8800 0    48   ~ 0
 AVR_LED2
 Wire Wire Line
 	3900 4500 3170 4500
-Text Label 3170 4500 0 48 ~
+Text Label 3170 4500 0    48   ~ 0
 AVR_LED2
 Wire Wire Line
 	13900 8900 13600 8900
 Wire Wire Line
 	13200 8900 12610 8900
-Text Label 12610 8900 0 48 ~
+Text Label 12610 8900 0    48   ~ 0
 AVR_LED3
 Wire Wire Line
 	3900 4600 3180 4600
-Text Label 3180 4600 0 48 ~
+Text Label 3180 4600 0    48   ~ 0
 AVR_LED3
 Wire Wire Line
 	13700 9000 13290 9000
 Wire Wire Line
 	12890 9000 12610 9000
-Text Label 12610 9000 0 48 ~
+Text Label 12610 9000 0    48   ~ 0
 AVR_LED4
 Wire Wire Line
 	3900 4700 3170 4700
-Text Label 3170 4700 0 48 ~
+Text Label 3170 4700 0    48   ~ 0
 AVR_LED4
 Wire Wire Line
 	13900 6600 13500 6600
-Text Label 13500 6600 2 48 ~ 0
+Text Label 13500 6600 2    48   ~ 0
 AVR_GPIO_0
 Wire Wire Line
 	8500 4100 8300 4100
-Text Label 8500 4100 0 48 ~
+Text Label 8500 4100 0    48   ~ 0
 AVR_GPIO_0
 Wire Wire Line
 	13900 6700 13500 6700
-Text Label 13500 6700 2 48 ~ 0
+Text Label 13500 6700 2    48   ~ 0
 AVR_GPIO_1
 Wire Wire Line
 	8500 4200 8300 4200
-Text Label 8500 4200 0 48 ~
+Text Label 8500 4200 0    48   ~ 0
 AVR_GPIO_1
 Wire Wire Line
 	13900 6800 13500 6800
-Text Label 13500 6800 2 48 ~ 0
+Text Label 13500 6800 2    48   ~ 0
 AVR_GPIO_2
 Wire Wire Line
 	8500 4300 8300 4300
-Text Label 8500 4300 0 48 ~
+Text Label 8500 4300 0    48   ~ 0
 AVR_GPIO_2
 Wire Wire Line
 	13900 6900 13500 6900
-Text Label 13500 6900 2 48 ~ 0
+Text Label 13500 6900 2    48   ~ 0
 AVR_GPIO_3
 Wire Wire Line
 	8500 4400 8300 4400
-Text Label 8500 4400 0 48 ~
+Text Label 8500 4400 0    48   ~ 0
 AVR_GPIO_3
 Wire Wire Line
 	13900 7000 13500 7000
-Text Label 13500 7000 2 48 ~ 0
+Text Label 13500 7000 2    48   ~ 0
 AVR_GPIO_4
 Wire Wire Line
 	8500 4500 8300 4500
-Text Label 8500 4500 0 48 ~
+Text Label 8500 4500 0    48   ~ 0
 AVR_GPIO_4
 Wire Wire Line
 	13900 7100 13500 7100
-Text Label 13500 7100 2 48 ~ 0
+Text Label 13500 7100 2    48   ~ 0
 AVR_GPIO_5
 Wire Wire Line
 	8500 4600 8300 4600
-Text Label 8500 4600 0 48 ~
+Text Label 8500 4600 0    48   ~ 0
 AVR_GPIO_5
 Wire Wire Line
 	13900 7200 13500 7200
-Text Label 13500 7200 2 48 ~ 0
+Text Label 13500 7200 2    48   ~ 0
 AVR_GPIO_6
 Wire Wire Line
 	8500 4700 8300 4700
-Text Label 8500 4700 0 48 ~
+Text Label 8500 4700 0    48   ~ 0
 AVR_GPIO_6
 Wire Wire Line
 	13900 7300 13500 7300
-Text Label 13500 7300 2 48 ~ 0
+Text Label 13500 7300 2    48   ~ 0
 AVR_GPIO_7
 Wire Wire Line
 	8500 4800 8300 4800
-Text Label 8500 4800 0 48 ~
+Text Label 8500 4800 0    48   ~ 0
 AVR_GPIO_7
 Wire Wire Line
 	13200 5100 12800 5100
@@ -463,12 +463,12 @@ Wire Wire Line
 	12800 5100 12500 5100
 Wire Wire Line
 	12800 4900 12800 5100
-Text Label 12500 5100 0 48 ~
+Text Label 12500 5100 0    48   ~ 0
 AVR_PANIC
 Connection ~ 12800 5100
 Wire Wire Line
 	3900 4800 3170 4800
-Text Label 3170 4800 0 48 ~
+Text Label 3170 4800 0    48   ~ 0
 AVR_PANIC
 Wire Wire Line
 	13900 2400 13700 2400
@@ -476,19 +476,19 @@ Wire Wire Line
 	13700 2200 13700 2400
 Wire Wire Line
 	3900 5300 3170 5300
-Text GLabel 3170 5300 0 48 BiDi ~ 0
+Text GLabel 3170 5300 0    48   BiDi ~ 0
 AVR_GPIO_ARM_0
 Wire Wire Line
 	3900 5400 3170 5400
-Text GLabel 3170 5400 0 48 BiDi ~ 0
+Text GLabel 3170 5400 0    48   BiDi ~ 0
 AVR_GPIO_ARM_1
 Wire Wire Line
 	3900 5700 3170 5700
-Text GLabel 3170 5700 0 48 BiDi ~ 0
+Text GLabel 3170 5700 0    48   BiDi ~ 0
 AVR_GPIO_FPGA_0
 Wire Wire Line
 	3900 5800 3170 5800
-Text GLabel 3170 5800 0 48 BiDi ~ 0
+Text GLabel 3170 5800 0    48   BiDi ~ 0
 AVR_GPIO_FPGA_1
 Wire Wire Line
 	12800 6400 12800 6500
@@ -499,29 +499,29 @@ Wire Wire Line
 Connection ~ 12800 6500
 Wire Wire Line
 	3900 5100 3070 5100
-Text GLabel 3070 5100 0 48 Output ~ 0
+Text GLabel 3070 5100 0    48   Output ~ 0
 MKM_CONTROL_FPGA_DIS
 Wire Wire Line
 	3900 5500 3170 5500
-Text GLabel 3170 5500 0 48 BiDi ~ 0
+Text GLabel 3170 5500 0    48   BiDi ~ 0
 AVR_GPIO_ARM_2
 Wire Wire Line
 	3900 5600 3170 5600
-Text GLabel 3170 5600 0 48 BiDi ~ 0
+Text GLabel 3170 5600 0    48   BiDi ~ 0
 AVR_GPIO_ARM_3
 Wire Wire Line
 	3900 5900 3170 5900
-Text GLabel 3170 5900 0 48 BiDi ~ 0
+Text GLabel 3170 5900 0    48   BiDi ~ 0
 AVR_GPIO_FPGA_2
 Wire Wire Line
 	3900 6000 3170 6000
-Text GLabel 3170 6000 0 48 BiDi ~ 0
+Text GLabel 3170 6000 0    48   BiDi ~ 0
 AVR_GPIO_FPGA_3
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_20
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_020
 U 1 1 58023FA0
 P 12800 6400
-F 0 "VCCO_3V3_20" H 12800 6400 20  0000 C CNN
+F 0 "#VCCO_3V3_020" H 12800 6400 20  0000 C CNN
 F 1 "+VCCO_3V3" H 12800 6330 30  0000 C CNN
 F 2 "" H 12800 6400 70  0000 C CNN
 F 3 "" H 12800 6400 70  0000 C CNN
@@ -533,9 +533,11 @@ L Cryptech_Alpha:ATTINY828R-AU U10
 U 1 1 58023F9F
 P 6100 5100
 F 0 "U10" H 4070 3570 60  0000 L BNN
-	1    6100 5100
-	1    0    0    -1
+F 1 "~" H 6100 5100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:LQFP-32" H 4070 3570 60  0001 C CNN
+F 3 "" H 6100 5100 50  0001 C CNN
+	1    6100 5100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED10
@@ -546,16 +548,18 @@ F 1 "LTST-C191KRKT" V 13760 7810 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13760 7810 60  0001 C CNN
 F 3 "" H 13760 7810 60  0000 C CNN
 	1    13800 9000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:M10LOCK JP5
 U 1 1 58023F9D
 P 14300 7200
 F 0 "JP5" H 14580 7630 60  0000 R TNN
-	1    14300 7200
-	-1   0    0    1
+F 1 "~" H 14300 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:HDR1X10" H 14580 7630 60  0001 C CNN
+F 3 "" H 14300 7200 50  0001 C CNN
+	1    14300 7200
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:TACTILE_SWITCH S2
@@ -566,16 +570,18 @@ F 1 "EVQPT9A15" H 13200 5170 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TACTILE_SWITCH" H 13200 5170 60  0001 C CNN
 F 3 "" H 13200 5170 60  0000 C CNN
 	1    13500 4700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:M03LOCK JP4
 U 1 1 58023F9B
 P 14200 2500
 F 0 "JP4" H 14380 2830 60  0000 R TNN
-	1    14200 2500
-	-1   0    0    1
+F 1 "~" H 14200 2500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLS-3" H 14380 2830 60  0001 C CNN
+F 3 "" H 14200 2500 50  0001 C CNN
+	1    14200 2500
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C105
@@ -586,7 +592,7 @@ F 1 "0.1uF" H 12380 6740 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 12380 6740 60  0001 C CNN
 F 3 "" H 12380 6740 60  0000 C CNN
 	1    12800 6900
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R82
@@ -597,7 +603,7 @@ F 1 "15k" V 12660 5050 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 12660 5050 60  0001 C CNN
 F 3 "" H 12660 5050 60  0000 C CNN
 	1    12800 4700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R96
@@ -608,7 +614,7 @@ F 1 "330" H 13500 8610 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 13500 8610 60  0001 C CNN
 F 3 "" H 13500 8610 60  0000 C CNN
 	1    13400 8700
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R95
@@ -619,7 +625,7 @@ F 1 "330" H 13230 8610 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 13230 8610 60  0001 C CNN
 F 3 "" H 13230 8610 60  0000 C CNN
 	1    13090 8800
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R31
@@ -630,7 +636,7 @@ F 1 "330" H 13090 8600 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 13090 8600 60  0001 C CNN
 F 3 "" H 13090 8600 60  0000 C CNN
 	1    13400 8900
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R97
@@ -641,7 +647,7 @@ F 1 "330" H 13190 9260 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 13190 9260 60  0001 C CNN
 F 3 "" H 13190 9260 60  0000 C CNN
 	1    13090 9000
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:AVR_SPI_PRG_62X3_LOCK JP3
@@ -652,7 +658,7 @@ F 1 "AVR_SPI_PRG_62X3_LOCK" H 9440 5700 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:PLD-6" H 9440 5700 60  0001 C CNN
 F 3 "" H 9440 5700 60  0000 C CNN
 	1    10400 6100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R30
@@ -663,7 +669,7 @@ F 1 "15k" V 9540 4510 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9540 4510 60  0001 C CNN
 F 3 "" H 9540 4510 60  0000 C CNN
 	1    9600 4600
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0805 C102
@@ -674,7 +680,7 @@ F 1 "10uF" H 1570 4290 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 1570 4290 60  0001 C CNN
 F 3 "" H 1570 4290 60  0000 C CNN
 	1    1900 4400
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C104
@@ -685,7 +691,7 @@ F 1 "0.1uF" H 2620 4300 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2620 4300 60  0001 C CNN
 F 3 "" H 2620 4300 60  0000 C CNN
 	1    2500 4400
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C103
@@ -696,7 +702,7 @@ F 1 "0.1uF" H 2220 4400 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2220 4400 60  0001 C CNN
 F 3 "" H 2220 4400 60  0000 C CNN
 	1    2200 4400
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED11
@@ -707,7 +713,7 @@ F 1 "LTST-C193TBKT-5A" V 13960 7710 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13960 7710 60  0001 C CNN
 F 3 "" H 13960 7710 60  0000 C CNN
 	1    14000 8700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED9
@@ -718,7 +724,7 @@ F 1 "LTST-C191KGKT" V 13755 7616 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13755 7616 60  0001 C CNN
 F 3 "" H 13755 7616 60  0000 C CNN
 	1    13800 8800
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED12
@@ -729,19 +735,19 @@ F 1 "LTST-C191KSKT" V 13960 7920 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 13960 7920 60  0001 C CNN
 F 3 "" H 13960 7920 60  0000 C CNN
 	1    14000 8900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 NoConn ~ 13200 4300
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0108
 U 1 1 5AF61081
 P 13200 2500
-F 0 "#FLG?" H 13200 2575 50  0001 C CNN
+F 0 "#FLG0108" H 13200 2575 50  0001 C CNN
 F 1 "PWR_FLAG" V 13200 2628 50  0000 L CNN
 F 2 "" H 13200 2500 50  0001 C CNN
 F 3 "~" H 13200 2500 50  0001 C CNN
-        1    13200 2500
-        0    -1   -1   0
+	1    13200 2500
+	0    -1   -1   0   
 $EndComp
 Connection ~ 13200 2500
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_12.sch b/rev03-KiCad/rev02_12.sch
index 2b33e1f..68ca293 100644
--- a/rev03-KiCad/rev02_12.sch
+++ b/rev03-KiCad/rev02_12.sch
@@ -3,7 +3,7 @@ EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
-Sheet 14 27
+Sheet 13 27
 Title "rev02_12"
 Date "15 10 2016"
 Rev ""
@@ -13,19 +13,19 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 12700 5600 0    42   ~ 12
+Text Notes 12700 5600 0    42   ~ 8
 CS pull-up to disable MKM by\ndefault (allows programming\nof AVR)
-Text Notes 11400 3800 0    84   ~ 12
+Text Notes 11400 3800 0    84   ~ 17
 Master Key Memory
-Text Notes 3400 2700 0    84   ~ 12
+Text Notes 3400 2700 0    84   ~ 17
 SPI mux controlling access to the MKM.\nNormally, the FPGA has R/W access to the MKM but on a\ntamper event the tamper detect MCU (AVR) will grab access\nto the MKM and erase the contents.
-Text Notes 7800 6100 0    42   ~ 12
+Text Notes 7800 6100 0    42   ~ 8
 Make AVR unable to read the\nMKM by installing this jumper
-Text Notes 3900 5900 0    42   ~ 12
+Text Notes 3900 5900 0    42   ~ 8
 AVR access default\ndisabled through pull-up
-Text Notes 3800 7000 0    42   ~ 12
+Text Notes 3800 7000 0    42   ~ 8
 FPGA access default\nenabled through pull-down
-Text Notes 13630 10230 0    84   ~ 12
+Text Notes 13630 10230 0    84   ~ 17
 Master Key Memory
 Text Notes 11890 4940 0    60   ~ 12
 U12
@@ -44,10 +44,10 @@ IC4
 Text Notes 5500 5900 0    60   ~ 12
 74*244DW
 $Comp
-L power:GND GND_87
+L power:GND #GND_087
 U 1 1 58023F8C
 P 11300 6500
-F 0 "GND_87" H 11300 6500 20  0000 C CNN
+F 0 "#GND_087" H 11300 6500 20  0000 C CNN
 F 1 "+GND" H 11300 6430 30  0000 C CNN
 F 2 "" H 11300 6500 70  0000 C CNN
 F 3 "" H 11300 6500 70  0000 C CNN
@@ -55,10 +55,10 @@ F 3 "" H 11300 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_8
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_08
 U 1 1 58023F8B
 P 11300 4200
-F 0 "3V3_BATT_8" H 11300 4200 20  0000 C CNN
+F 0 "#3V3_BATT_08" H 11300 4200 20  0000 C CNN
 F 1 "+3V3_BATT" H 11300 4130 30  0000 C CNN
 F 2 "" H 11300 4200 70  0000 C CNN
 F 3 "" H 11300 4200 70  0000 C CNN
@@ -66,10 +66,10 @@ F 3 "" H 11300 4200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_9
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_09
 U 1 1 58023F8A
 P 3300 4100
-F 0 "3V3_BATT_9" H 3300 4100 20  0000 C CNN
+F 0 "#3V3_BATT_09" H 3300 4100 20  0000 C CNN
 F 1 "+3V3_BATT" H 3300 4030 30  0000 C CNN
 F 2 "" H 3300 4100 70  0000 C CNN
 F 3 "" H 3300 4100 70  0000 C CNN
@@ -77,10 +77,10 @@ F 3 "" H 3300 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_10
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_010
 U 1 1 58023F89
 P 10800 4200
-F 0 "3V3_BATT_10" H 10800 4200 20  0000 C CNN
+F 0 "#3V3_BATT_010" H 10800 4200 20  0000 C CNN
 F 1 "+3V3_BATT" H 10800 4130 30  0000 C CNN
 F 2 "" H 10800 4200 70  0000 C CNN
 F 3 "" H 10800 4200 70  0000 C CNN
@@ -88,10 +88,10 @@ F 3 "" H 10800 4200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_88
+L power:GND #GND_088
 U 1 1 58023F88
 P 11500 4700
-F 0 "GND_88" H 11500 4700 20  0000 C CNN
+F 0 "#GND_088" H 11500 4700 20  0000 C CNN
 F 1 "+GND" H 11500 4630 30  0000 C CNN
 F 2 "" H 11500 4700 70  0000 C CNN
 F 3 "" H 11500 4700 70  0000 C CNN
@@ -99,10 +99,10 @@ F 3 "" H 11500 4700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_89
+L power:GND #GND_089
 U 1 1 58023F87
 P 7600 6400
-F 0 "GND_89" H 7600 6400 20  0000 C CNN
+F 0 "#GND_089" H 7600 6400 20  0000 C CNN
 F 1 "+GND" H 7600 6330 30  0000 C CNN
 F 2 "" H 7600 6400 70  0000 C CNN
 F 3 "" H 7600 6400 70  0000 C CNN
@@ -110,10 +110,10 @@ F 3 "" H 7600 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_90
+L power:GND #GND_090
 U 1 1 58023F86
 P 3300 5200
-F 0 "GND_90" H 3300 5200 20  0000 C CNN
+F 0 "#GND_090" H 3300 5200 20  0000 C CNN
 F 1 "+GND" H 3300 5130 30  0000 C CNN
 F 2 "" H 3300 5200 70  0000 C CNN
 F 3 "" H 3300 5200 70  0000 C CNN
@@ -121,10 +121,10 @@ F 3 "" H 3300 5200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_91
+L power:GND #GND_091
 U 1 1 58023F85
 P 5000 7500
-F 0 "GND_91" H 5000 7500 20  0000 C CNN
+F 0 "#GND_091" H 5000 7500 20  0000 C CNN
 F 1 "+GND" H 5000 7430 30  0000 C CNN
 F 2 "" H 5000 7500 70  0000 C CNN
 F 3 "" H 5000 7500 70  0000 C CNN
@@ -132,10 +132,10 @@ F 3 "" H 5000 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_11
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_011
 U 1 1 58023F84
 P 5000 4100
-F 0 "3V3_BATT_11" H 5000 4100 20  0000 C CNN
+F 0 "#3V3_BATT_011" H 5000 4100 20  0000 C CNN
 F 1 "+3V3_BATT" H 5000 4030 30  0000 C CNN
 F 2 "" H 5000 4100 70  0000 C CNN
 F 3 "" H 5000 4100 70  0000 C CNN
@@ -143,10 +143,10 @@ F 3 "" H 5000 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT 3V3_BATT_12
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_012
 U 1 1 58023F83
 P 10100 4220
-F 0 "3V3_BATT_12" H 10100 4220 20  0000 C CNN
+F 0 "#3V3_BATT_012" H 10100 4220 20  0000 C CNN
 F 1 "+3V3_BATT" H 10100 4150 30  0000 C CNN
 F 2 "" H 10100 4220 70  0000 C CNN
 F 3 "" H 10100 4220 70  0000 C CNN
@@ -177,7 +177,7 @@ Wire Wire Line
 	10800 5000 10800 5700
 Wire Wire Line
 	11400 5600 10100 5600
-Text Label 10100 5600 0 48 ~
+Text Label 10100 5600 0    48   ~ 0
 MKM_SCK
 Wire Wire Line
 	6500 5300 6300 5300
@@ -187,11 +187,11 @@ Wire Wire Line
 	6500 6400 6300 6400
 Wire Wire Line
 	7000 5300 6500 5300
-Text Label 7000 5300 0 48 ~
+Text Label 7000 5300 0    48   ~ 0
 MKM_SCK
 Wire Wire Line
 	11400 5500 10100 5500
-Text Label 10100 5500 0 48 ~
+Text Label 10100 5500 0    48   ~ 0
 MKM_MOSI
 Wire Wire Line
 	6600 6500 6300 6500
@@ -201,11 +201,9 @@ Wire Wire Line
 	6600 5400 6300 5400
 Wire Wire Line
 	7000 5400 6600 5400
-Text Label 7000 5400 0 48 ~
+Text Label 7000 5400 0    48   ~ 0
 MKM_MOSI
-Wire Wire Line
-	11400 5400 10500 5400
-Text Label 10140 5400 0 48 ~
+Text Label 10140 5400 0    48   ~ 0
 MKM_CS_N
 Wire Wire Line
 	6400 6300 6300 6300
@@ -215,11 +213,11 @@ Wire Wire Line
 	6400 5200 6300 5200
 Wire Wire Line
 	7000 5200 6400 5200
-Text Label 7000 5200 0 48 ~
+Text Label 7000 5200 0    48   ~ 0
 MKM_CS_N
 Wire Wire Line
 	13150 5200 12800 5200
-Text Label 13150 5200 2 48 ~ 0
+Text Label 13150 5200 2    48   ~ 0
 MKM_MISO
 Wire Wire Line
 	5300 6600 5200 6600
@@ -229,7 +227,7 @@ Wire Wire Line
 	5300 5500 5200 5500
 Wire Wire Line
 	5200 5500 4800 5500
-Text Label 4800 5500 0 48 ~
+Text Label 4800 5500 0    48   ~ 0
 MKM_MISO
 Wire Wire Line
 	11400 5200 11300 5200
@@ -259,31 +257,31 @@ Wire Wire Line
 	5300 5700 5000 5700
 Wire Wire Line
 	5000 5000 5000 5700
-Text GLabel 4550 5700 0 48 Input ~ 0
+Text GLabel 4550 5700 0    48   Input ~ 0
 MKM_CONTROL_AVR_ENA
 Wire Wire Line
 	5300 5300 4800 5300
-Text GLabel 4800 5300 0 48 Input ~ 0
+Text GLabel 4800 5300 0    48   Input ~ 0
 MKM_AVR_SCK
 Wire Wire Line
 	5300 6300 4610 6300
-Text GLabel 4610 6300 0 48 Input ~ 0
+Text GLabel 4610 6300 0    48   Input ~ 0
 MKM_FPGA_CS_N
 Wire Wire Line
 	5300 5200 4800 5200
-Text GLabel 4800 5200 0 48 Input ~ 0
+Text GLabel 4800 5200 0    48   Input ~ 0
 MKM_AVR_CS_N
 Wire Wire Line
 	5300 6500 4610 6500
-Text GLabel 4610 6500 0 48 Input ~ 0
+Text GLabel 4610 6500 0    48   Input ~ 0
 MKM_FPGA_MOSI
 Wire Wire Line
 	5300 5400 4800 5400
-Text GLabel 4800 5400 0 48 Input ~ 0
+Text GLabel 4800 5400 0    48   Input ~ 0
 MKM_AVR_MOSI
 Wire Wire Line
 	6500 6600 6300 6600
-Text GLabel 6500 6600 2 48 Output ~ 0
+Text GLabel 6500 6600 2    48   Output ~ 0
 MKM_FPGA_MISO
 Wire Wire Line
 	7600 5500 6300 5500
@@ -291,11 +289,11 @@ Wire Wire Line
 	7800 5500 7600 5500
 Wire Wire Line
 	7600 5500 7600 5700
-Text GLabel 7800 5500 2 48 Output ~ 0
+Text GLabel 7800 5500 2    48   Output ~ 0
 MKM_AVR_MISO
 Wire Wire Line
 	5300 6400 4610 6400
-Text GLabel 4610 6400 0 48 Input ~ 0
+Text GLabel 4610 6400 0    48   Input ~ 0
 MKM_FPGA_SCK
 Wire Wire Line
 	5300 6800 5000 6800
@@ -303,42 +301,20 @@ Wire Wire Line
 	5000 6800 5000 7000
 Wire Wire Line
 	5000 6800 4480 6800
-Text GLabel 4480 6800 0 48 Input ~ 0
+Text GLabel 4480 6800 0    48   Input ~ 0
 MKM_CONTROL_FPGA_DIS
 Wire Wire Line
 	10100 5400 10100 5020
-Wire Wire Line
-	10500 5400 10100 5400
 $Comp
 L Cryptech_Alpha:23K640-I_SN U12
 U 1 1 58023F82
 P 12100 5600
 F 0 "U12" H 11570 4670 60  0000 L BNN
-	1    12100 5600
-	1    0    0    -1
+F 1 "~" H 12100 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:SOIC127P600X175-8N" H 11570 4670 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:74*244DW_2 IC4_2
-U 1 1 58023F81
-P 5800 6500
-F 0 "IC4_2" H 5470 5970 60  0000 L BNN
-F 1 "MC74AC244DW*" H 5510 6920 60  0000 L BNN
-F 2 "Cryptech_Alpha_Footprints:SO20W" H 5510 6920 60  0001 C CNN
-F 3 "" H 5510 6920 60  0000 C CNN
-	1    5800 6500
-	1    0    0    -1
-$EndComp
-$Comp
-L Cryptech_Alpha:74*244DW_3 IC4_3
-U 1 1 58023F80
-P 3300 4700
-F 0 "IC4_3" H 3330 4550 60  0000 L BNN
-F 1 "MC74AC244DW*" H 3480 4680 60  0000 L BNN
-F 2 "Cryptech_Alpha_Footprints:SO20W" H 3480 4680 60  0001 C CNN
-F 3 "" H 3480 4680 60  0000 C CNN
-	1    3300 4700
-	1    0    0    -1
+F 3 "" H 12100 5600 50  0001 C CNN
+	1    12100 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R33
@@ -349,7 +325,7 @@ F 1 "4.7k" V 10830 4540 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 10830 4540 60  0001 C CNN
 F 3 "" H 10830 4540 60  0000 C CNN
 	1    10800 4800
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R34
@@ -360,7 +336,7 @@ F 1 "4.7k" V 10080 5180 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 10080 5180 60  0001 C CNN
 F 3 "" H 10080 5180 60  0000 C CNN
 	1    10100 4820
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C106
@@ -371,7 +347,7 @@ F 1 "0.1uF" H 2490 4500 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2490 4500 60  0001 C CNN
 F 3 "" H 2490 4500 60  0000 C CNN
 	1    2900 4700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C107
@@ -382,16 +358,18 @@ F 1 "0.1uF" H 11600 4400 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11600 4400 60  0001 C CNN
 F 3 "" H 11600 4400 60  0000 C CNN
 	1    11500 4400
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:JP1Q JP6
 U 1 1 58023F7B
 P 7600 6000
 F 0 "JP6" H 7705 6030 60  0000 L BNN
-	1    7600 6000
-	1    0    0    -1
+F 1 "~" H 7600 6000 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLS-2" H 7705 6030 60  0001 C CNN
+F 3 "" H 7600 6000 50  0001 C CNN
+	1    7600 6000
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R80
@@ -402,7 +380,7 @@ F 1 "4.7k" V 4990 4690 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4990 4690 60  0001 C CNN
 F 3 "" H 4990 4690 60  0000 C CNN
 	1    5000 4800
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R81
@@ -413,18 +391,42 @@ F 1 "4.7k" V 5060 7310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5060 7310 60  0001 C CNN
 F 3 "" H 5060 7310 60  0000 C CNN
 	1    5000 7200
-	0    1    1    0
+	0    1    1    0   
 $EndComp
+NoConn ~ 11400 5900
+Wire Wire Line
+	10100 5400 11400 5400
 $Comp
-L Cryptech_Alpha:74*244DW_1 IC4
-U 1 1 58023F78
-P 5800 5400
-F 0 "IC4" H 5470 4870 60  0000 L BNN
-F 1 "MC74AC244DW*" H 5500 5820 60  0000 L BNN
-F 2 "Cryptech_Alpha_Footprints:SO20W" H 5500 5820 60  0001 C CNN
-F 3 "" H 5500 5820 60  0000 C CNN
-	1    5800 5400
-	1    0    0    -1
+L Cryptech_Alpha:74*244DW IC4
+U 1 1 5AF9B7E3
+P 5800 5900
+F 0 "IC4" H 5800 6867 50  0000 C CNN
+F 1 "74*244DW" H 5800 6776 50  0000 C CNN
+F 2 "" H 5800 5900 50  0001 C CNN
+F 3 "" H 5800 5900 50  0001 C CNN
+	1    5800 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:74*244DW IC4
+U 2 1 5AF9B924
+P 5800 7000
+F 0 "IC4" H 5800 7967 50  0000 C CNN
+F 1 "74*244DW" H 5800 7876 50  0000 C CNN
+F 2 "" H 5800 7000 50  0001 C CNN
+F 3 "" H 5800 7000 50  0001 C CNN
+	2    5800 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:74*244DW IC4
+U 3 1 5AF9B9F8
+P 3300 5150
+F 0 "IC4" H 3341 5646 50  0000 L CNN
+F 1 "74*244DW" H 3341 5555 50  0000 L CNN
+F 2 "" H 3300 5150 50  0001 C CNN
+F 3 "" H 3300 5150 50  0001 C CNN
+	3    3300 5150
+	1    0    0    -1  
 $EndComp
-NoConn ~ 11400 5900
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_13.sch b/rev03-KiCad/rev02_13.sch
index adb2c1e..f93aaaa 100644
--- a/rev03-KiCad/rev02_13.sch
+++ b/rev03-KiCad/rev02_13.sch
@@ -3,7 +3,7 @@ EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
-Sheet 15 27
+Sheet 14 27
 Title "rev02_13"
 Date "15 10 2016"
 Rev ""
@@ -17,11 +17,11 @@ Text Notes 1100 4300 0    60   ~ 12
 *) Configuration Interface
 Text Notes 1000 8700 0    60   ~ 12
 M[2:0] == 3'b001 => Master SPI
-Text Notes 700 7400 0    60   ~ 12
+Text Notes 700  7400 0    60   ~ 12
 *) Since VCCO is 3.3V, CFGBVS must be tied High.\n*) Battery is not used\n*) PROG_B is dedicated input -- can be driven by STM32 directly\n*) INIT_B is bi-directional open-drain, must be driven with MOSFET to ground
 Text Notes 3700 9800 0    60   ~ 12
 *) "Not DONE" LED, should be of red color
-Text Notes 8590 10210 0    54   ~ 12
+Text Notes 8590 10210 0    54   ~ 11
 FPGA configuration interface
 Text Notes 1600 9380 0    60   ~ 12
 R35
@@ -42,10 +42,10 @@ U13
 Text Notes 1050 6300 0    60   ~ 12
 XC7A200TFBG484
 $Comp
-L power:GND GND_92
+L power:GND #GND_092
 U 1 1 58023F77
 P 2200 6300
-F 0 "GND_92" H 2200 6300 20  0000 C CNN
+F 0 "#GND_092" H 2200 6300 20  0000 C CNN
 F 1 "+GND" H 2200 6230 30  0000 C CNN
 F 2 "" H 2200 6300 70  0000 C CNN
 F 3 "" H 2200 6300 70  0000 C CNN
@@ -53,10 +53,10 @@ F 3 "" H 2200 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_93
+L power:GND #GND_093
 U 1 1 58023F76
 P 1500 9800
-F 0 "GND_93" H 1500 9800 20  0000 C CNN
+F 0 "#GND_093" H 1500 9800 20  0000 C CNN
 F 1 "+GND" H 1500 9730 30  0000 C CNN
 F 2 "" H 1500 9800 70  0000 C CNN
 F 3 "" H 1500 9800 70  0000 C CNN
@@ -64,10 +64,10 @@ F 3 "" H 1500 9800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_94
+L power:GND #GND_094
 U 1 1 58023F75
 P 2300 9800
-F 0 "GND_94" H 2300 9800 20  0000 C CNN
+F 0 "#GND_094" H 2300 9800 20  0000 C CNN
 F 1 "+GND" H 2300 9730 30  0000 C CNN
 F 2 "" H 2300 9800 70  0000 C CNN
 F 3 "" H 2300 9800 70  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 2300 9800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_95
+L power:GND #GND_095
 U 1 1 58023F74
 P 5800 6400
-F 0 "GND_95" H 5800 6400 20  0000 C CNN
+F 0 "#GND_095" H 5800 6400 20  0000 C CNN
 F 1 "+GND" H 5800 6330 30  0000 C CNN
 F 2 "" H 5800 6400 70  0000 C CNN
 F 3 "" H 5800 6400 70  0000 C CNN
@@ -86,10 +86,10 @@ F 3 "" H 5800 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_96
+L power:GND #GND_096
 U 1 1 58023F73
 P 6600 6400
-F 0 "GND_96" H 6600 6400 20  0000 C CNN
+F 0 "#GND_096" H 6600 6400 20  0000 C CNN
 F 1 "+GND" H 6600 6330 30  0000 C CNN
 F 2 "" H 6600 6400 70  0000 C CNN
 F 3 "" H 6600 6400 70  0000 C CNN
@@ -97,10 +97,10 @@ F 3 "" H 6600 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_97
+L power:GND #GND_097
 U 1 1 58023F72
 P 9100 9300
-F 0 "GND_97" H 9100 9300 20  0000 C CNN
+F 0 "#GND_097" H 9100 9300 20  0000 C CNN
 F 1 "+GND" H 9100 9230 30  0000 C CNN
 F 2 "" H 9100 9300 70  0000 C CNN
 F 3 "" H 9100 9300 70  0000 C CNN
@@ -108,10 +108,10 @@ F 3 "" H 9100 9300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_98
+L power:GND #GND_098
 U 1 1 58023F71
 P 7700 9300
-F 0 "GND_98" H 7700 9300 20  0000 C CNN
+F 0 "#GND_098" H 7700 9300 20  0000 C CNN
 F 1 "+GND" H 7700 9230 30  0000 C CNN
 F 2 "" H 7700 9300 70  0000 C CNN
 F 3 "" H 7700 9300 70  0000 C CNN
@@ -119,10 +119,10 @@ F 3 "" H 7700 9300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_21
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_021
 U 1 1 58023F70
 P 3100 8200
-F 0 "VCCO_3V3_21" H 3100 8200 20  0000 C CNN
+F 0 "#VCCO_3V3_021" H 3100 8200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 3100 8130 30  0000 C CNN
 F 2 "" H 3100 8200 70  0000 C CNN
 F 3 "" H 3100 8200 70  0000 C CNN
@@ -130,10 +130,10 @@ F 3 "" H 3100 8200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_22
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_022
 U 1 1 58023F6F
 P 4700 8200
-F 0 "VCCO_3V3_22" H 4700 8200 20  0000 C CNN
+F 0 "#VCCO_3V3_022" H 4700 8200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 4700 8130 30  0000 C CNN
 F 2 "" H 4700 8200 70  0000 C CNN
 F 3 "" H 4700 8200 70  0000 C CNN
@@ -141,10 +141,10 @@ F 3 "" H 4700 8200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_23
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_023
 U 1 1 58023F6E
 P 7700 8200
-F 0 "VCCO_3V3_23" H 7700 8200 20  0000 C CNN
+F 0 "#VCCO_3V3_023" H 7700 8200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 7700 8130 30  0000 C CNN
 F 2 "" H 7700 8200 70  0000 C CNN
 F 3 "" H 7700 8200 70  0000 C CNN
@@ -152,10 +152,10 @@ F 3 "" H 7700 8200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_24
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_024
 U 1 1 58023F6D
 P 9100 7400
-F 0 "VCCO_3V3_24" H 9100 7400 20  0000 C CNN
+F 0 "#VCCO_3V3_024" H 9100 7400 20  0000 C CNN
 F 1 "+VCCO_3V3" H 9100 7330 30  0000 C CNN
 F 2 "" H 9100 7400 70  0000 C CNN
 F 3 "" H 9100 7400 70  0000 C CNN
@@ -163,10 +163,10 @@ F 3 "" H 9100 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_25
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_025
 U 1 1 58023F6C
 P 2400 4500
-F 0 "VCCO_3V3_25" H 2400 4500 20  0000 C CNN
+F 0 "#VCCO_3V3_025" H 2400 4500 20  0000 C CNN
 F 1 "+VCCO_3V3" H 2400 4430 30  0000 C CNN
 F 2 "" H 2400 4500 70  0000 C CNN
 F 3 "" H 2400 4500 70  0000 C CNN
@@ -174,10 +174,10 @@ F 3 "" H 2400 4500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_26
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_026
 U 1 1 58023F6B
 P 6000 4100
-F 0 "VCCO_3V3_26" H 6000 4100 20  0000 C CNN
+F 0 "#VCCO_3V3_026" H 6000 4100 20  0000 C CNN
 F 1 "+VCCO_3V3" H 6000 4030 30  0000 C CNN
 F 2 "" H 6000 4100 70  0000 C CNN
 F 3 "" H 6000 4100 70  0000 C CNN
@@ -265,65 +265,57 @@ Connection ~ 2400 4800
 Connection ~ 2400 4900
 Wire Wire Line
 	3400 5700 2000 5700
-Text Label 3400 5700 2 48 ~ 0
+Text Label 3400 5700 2    48   ~ 0
 FPGA_M2
 Wire Wire Line
 	1500 9000 1500 9200
 Wire Wire Line
-	1500 9000 900 9000
-Text Label 900 9000 0 48 ~ 0
+	1500 9000 900  9000
+Text Label 900  9000 0    48   ~ 0
 FPGA_M2
 Wire Wire Line
 	3400 5800 2000 5800
-Text Label 3400 5800 2 48 ~ 0
+Text Label 3400 5800 2    48   ~ 0
 FPGA_JTAG_TCK
-Text Label 8430 8500 0 48 ~
+Text Label 8430 8500 0    48   ~ 0
 FPGA_JTAG_TCK
 Wire Wire Line
 	3400 5900 2000 5900
-Text Label 3400 5900 2 48 ~ 0
+Text Label 3400 5900 2    48   ~ 0
 FPGA_JTAG_TDI
-Wire Wire Line
-	9000 8700 8800 8700
 Wire Wire Line
 	9300 8700 9000 8700
-Wire Wire Line
-	8800 8700 8430 8700
-Text Label 8430 8700 0 48 ~
+Text Label 8430 8700 0    48   ~ 0
 FPGA_JTAG_TDI
 Wire Wire Line
 	3400 6000 2000 6000
-Text Label 3400 6000 2 48 ~ 0
+Text Label 3400 6000 2    48   ~ 0
 FPGA_JTAG_TDO
 Wire Wire Line
 	9300 8800 8430 8800
-Text Label 8430 8800 0 48 ~
+Text Label 8430 8800 0    48   ~ 0
 FPGA_JTAG_TDO
 Wire Wire Line
 	3400 6100 2000 6100
-Text Label 3400 6100 2 48 ~ 0
+Text Label 3400 6100 2    48   ~ 0
 FPGA_JTAG_TMS
-Wire Wire Line
-	9100 8600 8900 8600
 Wire Wire Line
 	9300 8600 9100 8600
-Wire Wire Line
-	8900 8600 8430 8600
-Text Label 8430 8600 0 48 ~
+Text Label 8430 8600 0    48   ~ 0
 FPGA_JTAG_TMS
 Wire Wire Line
 	6200 4900 6200 5100
 Wire Wire Line
 	7600 5100 6200 5100
-Text GLabel 7600 5100 2 48 Input ~ 0
+Text GLabel 7600 5100 2    48   Input ~ 0
 FPGA_PROGRAM_B
 Wire Wire Line
 	3940 5300 3240 5300
-Text GLabel 3940 5300 2 48 Input ~ 0
+Text GLabel 3940 5300 2    48   Input ~ 0
 FPGA_PROGRAM_B
 Wire Wire Line
 	3400 5100 2000 5100
-Text Label 3400 5100 2 48 ~ 0
+Text Label 3400 5100 2    48   ~ 0
 FPGA_DONE_INT
 Wire Wire Line
 	4700 9400 4700 9500
@@ -331,28 +323,28 @@ Wire Wire Line
 	4700 9500 3700 9500
 Wire Wire Line
 	5000 9500 4700 9500
-Text Label 3700 9500 0 48 ~
+Text Label 3700 9500 0    48   ~ 0
 FPGA_DONE_INT
 Connection ~ 4700 9500
 Wire Wire Line
 	3400 5500 2000 5500
-Text Label 3400 5500 2 48 ~ 0
+Text Label 3400 5500 2    48   ~ 0
 FPGA_M0
 Wire Wire Line
 	3100 9000 2500 9000
 Wire Wire Line
 	3100 8800 3100 9000
-Text Label 2500 9000 0 48 ~ 0
+Text Label 2500 9000 0    48   ~ 0
 FPGA_M0
 Wire Wire Line
 	3400 5600 2000 5600
-Text Label 3400 5600 2 48 ~ 0
+Text Label 3400 5600 2    48   ~ 0
 FPGA_M1
 Wire Wire Line
 	2300 9000 1700 9000
 Wire Wire Line
 	2300 9000 2300 9200
-Text Label 1700 9000 0 48 ~ 0
+Text Label 1700 9000 0    48   ~ 0
 FPGA_M1
 Wire Wire Line
 	5800 4900 5800 5400
@@ -360,12 +352,12 @@ Wire Wire Line
 	5800 5400 4800 5400
 Wire Wire Line
 	6000 5400 5800 5400
-Text Label 4800 5400 0 48 ~
+Text Label 4800 5400 0    48   ~ 0
 FPGA_INIT_B_INT
 Connection ~ 5800 5400
 Wire Wire Line
 	3940 5200 3240 5200
-Text Label 3940 5200 2 48 ~ 0
+Text Label 3940 5200 2    48   ~ 0
 FPGA_INIT_B_INT
 Wire Wire Line
 	6600 5600 6400 5600
@@ -373,30 +365,30 @@ Wire Wire Line
 	6600 5600 6600 5800
 Wire Wire Line
 	7600 5600 6600 5600
-Text GLabel 7600 5600 2 48 BiDi ~ 0
+Text GLabel 7600 5600 2    48   BiDi ~ 0
 FPGA_INIT_B
 Connection ~ 6600 5600
 Wire Wire Line
 	4700 8900 4700 9100
 Wire Wire Line
 	5700 9500 5400 9500
-Text GLabel 5700 9500 2 48 Output ~ 0
+Text GLabel 5700 9500 2    48   Output ~ 0
 FPGA_DONE
 Wire Wire Line
 	3940 5400 3240 5400
-Text GLabel 3940 5400 2 48 Output ~ 0
+Text GLabel 3940 5400 2    48   Output ~ 0
 FPGA_CFG_SCLK
 Wire Wire Line
 	2840 5200 2000 5200
-Text Label 2220 5200 0 48 ~
+Text Label 2220 5200 0    48   ~ 0
 FPGA_INIT_B_INT1
 Wire Wire Line
 	2840 5300 2000 5300
-Text Label 2220 5300 0 48 ~
+Text Label 2220 5300 0    48   ~ 0
 FPGA_PROGRAM_B1
 Wire Wire Line
 	2840 5400 2000 5400
-Text Label 2220 5400 0 48 ~
+Text Label 2220 5400 0    48   ~ 0
 FPGA_CFG_SCLK1
 Wire Wire Line
 	9100 8600 9100 8200
@@ -420,7 +412,7 @@ F 1 "1k" V 1430 9310 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 1430 9310 60  0001 C CNN
 F 3 "" H 1430 9310 60  0000 C CNN
 	1    1500 9400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R39
@@ -431,7 +423,7 @@ F 1 "100" H 5220 9650 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5220 9650 60  0001 C CNN
 F 3 "" H 5220 9650 60  0000 C CNN
 	1    5200 9500
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:MA08-1 SV1
@@ -442,7 +434,7 @@ F 1 "MA08-1" H 9560 9330 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:PLS-8" H 9560 9330 60  0001 C CNN
 F 3 "" H 9560 9330 60  0000 C CNN
 	1    9600 8700
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C108
@@ -453,7 +445,7 @@ F 1 "0.1uF" H 7860 8710 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7860 8710 60  0001 C CNN
 F 3 "" H 7860 8710 60  0000 C CNN
 	1    7700 8800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R43
@@ -464,7 +456,7 @@ F 1 "10k" V 9170 7450 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9170 7450 60  0001 C CNN
 F 3 "" H 9170 7450 60  0000 C CNN
 	1    9000 8000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R44
@@ -475,7 +467,7 @@ F 1 "10k" V 9170 7550 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9170 7550 60  0001 C CNN
 F 3 "" H 9170 7550 60  0000 C CNN
 	1    9100 8000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R45
@@ -486,7 +478,7 @@ F 1 "10k" V 9170 7650 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9170 7650 60  0001 C CNN
 F 3 "" H 9170 7650 60  0000 C CNN
 	1    9200 8000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0603 R62
@@ -497,7 +489,7 @@ F 1 "0" H 2940 4890 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2940 4890 60  0001 C CNN
 F 3 "" H 2940 4890 60  0000 C CNN
 	1    3040 5200
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0603 R63
@@ -508,7 +500,7 @@ F 1 "0" H 2940 4950 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2940 4950 60  0001 C CNN
 F 3 "" H 2940 4950 60  0000 C CNN
 	1    3040 5300
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0603 R71
@@ -519,16 +511,7 @@ F 1 "0" H 2940 5020 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2940 5020 60  0001 C CNN
 F 3 "" H 2940 5020 60  0000 C CNN
 	1    3040 5400
-	-1   0    0    1
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_1 U13
-U 1 1 58023F60
-P 1800 5400
-F 0 "U13" H 1390 4490 60  0000 L BNN
-	1    1800 5400
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1390 4490 60  0001 C CNN
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R36
@@ -539,7 +522,7 @@ F 1 "1k" V 2240 9310 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2240 9310 60  0001 C CNN
 F 3 "" H 2240 9310 60  0000 C CNN
 	1    2300 9400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R37
@@ -550,7 +533,7 @@ F 1 "1k" V 3060 8460 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 3060 8460 60  0001 C CNN
 F 3 "" H 3060 8460 60  0000 C CNN
 	1    3100 8600
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R41
@@ -561,7 +544,7 @@ F 1 "4.7k" V 6190 4550 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6190 4550 60  0001 C CNN
 F 3 "" H 6190 4550 60  0000 C CNN
 	1    6200 4700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R40
@@ -572,7 +555,7 @@ F 1 "4.7k" V 5780 5050 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5780 5050 60  0001 C CNN
 F 3 "" H 5780 5050 60  0000 C CNN
 	1    5800 4700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:2N7002 Q4
@@ -583,7 +566,7 @@ F 1 "2N7002P,235" H 6420 5655 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 6420 5655 60  0001 C CNN
 F 3 "" H 6420 5655 60  0000 C CNN
 	1    6200 5500
-	-1    0    0    -1
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R42
@@ -594,7 +577,7 @@ F 1 "4.7k" V 6470 5850 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6470 5850 60  0001 C CNN
 F 3 "" H 6470 5850 60  0000 C CNN
 	1    6600 6000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED13
@@ -605,7 +588,7 @@ F 1 "LTST-C191KRKT" H 4820 9075 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 4820 9075 60  0001 C CNN
 F 3 "" H 4820 9075 60  0000 C CNN
 	1    4700 9200
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R38
@@ -616,6 +599,21 @@ F 1 "330" V 4670 8560 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4670 8560 60  0001 C CNN
 F 3 "" H 4670 8560 60  0000 C CNN
 	1    4700 8700
-	0    -1   -1   0
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	8430 8700 9000 8700
+Wire Wire Line
+	8430 8600 9100 8600
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 1 1 5AFCAAD8
+P 1800 5350
+F 0 "U13" H 1499 6508 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1499 6417 50  0000 C CNN
+F 2 "" H 1400 5350 50  0001 C CNN
+F 3 "" H 1400 5350 50  0001 C CNN
+	1    1800 5350
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_14.sch b/rev03-KiCad/rev02_14.sch
index 00feba2..fd3bcc6 100644
--- a/rev03-KiCad/rev02_14.sch
+++ b/rev03-KiCad/rev02_14.sch
@@ -3,7 +3,7 @@ EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
-Sheet 16 27
+Sheet 15 27
 Title "rev02_14"
 Date "15 10 2016"
 Rev ""
@@ -19,17 +19,17 @@ Text Notes 5200 4300 0    60   ~ 12
 *) XADC [NOT USED]
 Text Notes 1100 4200 0    60   ~ 12
 *) Transceivers [NOT USED]
-Text Notes 8810 10230 0    84   ~ 12
+Text Notes 8810 10230 0    84   ~ 17
 FPGA unused
 Text Notes 6160 4990 0    60   ~ 12
 C109
 Text Notes 6160 5190 0    60   ~ 12
 0.1~uF
 $Comp
-L power:GND GND_99
+L power:GND #GND_099
 U 1 1 58023F57
 P 8700 5000
-F 0 "GND_99" H 8700 5000 20  0000 C CNN
+F 0 "#GND_099" H 8700 5000 20  0000 C CNN
 F 1 "+GND" H 8700 4930 30  0000 C CNN
 F 2 "" H 8700 5000 70  0000 C CNN
 F 3 "" H 8700 5000 70  0000 C CNN
@@ -37,10 +37,10 @@ F 3 "" H 8700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_100
+L power:GND #GND_0100
 U 1 1 58023F56
 P 5700 5400
-F 0 "GND_100" H 5700 5400 20  0000 C CNN
+F 0 "#GND_0100" H 5700 5400 20  0000 C CNN
 F 1 "+GND" H 5700 5330 30  0000 C CNN
 F 2 "" H 5700 5400 70  0000 C CNN
 F 3 "" H 5700 5400 70  0000 C CNN
@@ -48,10 +48,10 @@ F 3 "" H 5700 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_101
+L power:GND #GND_0101
 U 1 1 58023F55
 P 6100 5400
-F 0 "GND_101" H 6100 5400 20  0000 C CNN
+F 0 "#GND_0101" H 6100 5400 20  0000 C CNN
 F 1 "+GND" H 6100 5330 30  0000 C CNN
 F 2 "" H 6100 5400 70  0000 C CNN
 F 3 "" H 6100 5400 70  0000 C CNN
@@ -59,10 +59,10 @@ F 3 "" H 6100 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FPGA_VCCAUX_1V8 FPGA_VCCAUX_1V8
+L Cryptech_Alpha:FPGA_VCCAUX_1V8 #FPGA_VCCAUX_1V08
 U 1 1 58023F54
 P 6100 4500
-F 0 "FPGA_VCCAUX_1V8" H 6100 4500 20  0000 C CNN
+F 0 "#FPGA_VCCAUX_1V08" H 6100 4500 20  0000 C CNN
 F 1 "+FPGA_VCCAUX_1V8" H 6100 4430 30  0000 C CNN
 F 2 "" H 6100 4500 70  0000 C CNN
 F 3 "" H 6100 4500 70  0000 C CNN
@@ -106,52 +106,7 @@ F 1 "0.1uF" H 6420 5020 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6420 5020 60  0001 C CNN
 F 3 "" H 6420 5020 60  0000 C CNN
 	1    6100 5000
-	1    0    0    -1
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_8 U13_2
-U 1 1 58023F52
-P 1900 7900
-F 0 "U13_2" H 1490 6690 60  0000 L BNN
-	1    1900 7900
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 6690 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_11 U13_3
-U 1 1 58023F51
-P 1900 5000
-F 0 "U13_3" H 1490 4590 60  0000 L BNN
-	1    1900 5000
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 4590 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_12 U13_4
-U 1 1 58023F50
-P 1900 6000
-F 0 "U13_4" H 1490 5490 60  0000 L BNN
-	1    1900 6000
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 5490 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_13 U13_5
-U 1 1 58023F4F
-P 8300 4700
-F 0 "U13_5" H 7890 4390 60  0000 L BNN
-	1    8300 4700
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 7890 4390 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_17 U13_6
-U 1 1 58023F4E
-P 5300 4900
-F 0 "U13_6" H 4890 4390 60  0000 L BNN
-	1    5300 4900
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 4890 4390 60  0001 C CNN
+	1    0    0    -1  
 $EndComp
 NoConn ~ 5500 4800
 NoConn ~ 5500 4900
@@ -187,4 +142,59 @@ NoConn ~ 2100 8600
 NoConn ~ 2100 8700
 NoConn ~ 2100 8800
 NoConn ~ 2100 8900
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 13 1 5AFCAEF3
+P 8300 4750
+F 0 "U13" H 8205 5067 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 8205 4976 50  0000 C CNN
+F 2 "" H 7900 4750 50  0001 C CNN
+F 3 "" H 7900 4750 50  0001 C CNN
+	13   8300 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 17 1 5AFCB157
+P 5300 4950
+F 0 "U13" H 5106 5467 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 5106 5376 50  0000 C CNN
+F 2 "" H 4900 4950 50  0001 C CNN
+F 3 "" H 4900 4950 50  0001 C CNN
+	17   5300 4950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 12 1 5AFCB27F
+P 1900 6050
+F 0 "U13" H 1741 6567 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1741 6476 50  0000 C CNN
+F 2 "" H 1500 6050 50  0001 C CNN
+F 3 "" H 1500 6050 50  0001 C CNN
+	12   1900 6050
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 11 1 5AFCB365
+P 1900 5000
+F 0 "U13" H 1741 5467 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1741 5376 50  0000 C CNN
+F 2 "" H 1500 5000 50  0001 C CNN
+F 3 "" H 1500 5000 50  0001 C CNN
+	11   1900 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 8 1 5AFCB64C
+P 1900 7900
+F 0 "U13" H 1461 9167 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1461 9076 50  0000 C CNN
+F 2 "" H 1500 7900 50  0001 C CNN
+F 3 "" H 1500 7900 50  0001 C CNN
+	8    1900 7900
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_15.sch b/rev03-KiCad/rev02_15.sch
index 542dc6e..33ec60d 100644
--- a/rev03-KiCad/rev02_15.sch
+++ b/rev03-KiCad/rev02_15.sch
@@ -3,7 +3,7 @@ EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
-Sheet 17 27
+Sheet 16 27
 Title "rev02_15"
 Date "15 10 2016"
 Rev ""
@@ -15,19 +15,19 @@ Comment4 ""
 $EndDescr
 Text Notes 7100 4900 0    60   ~ 12
 *) HOLD feature not used\n*) PROM is write-protected by default, to disable\nwrite protection (such as during firmware update),\njumper must be inserted
-Text Notes 4800 8600 0    84   ~ 12
+Text Notes 4800 8600 0    84   ~ 17
 FPGA clock
-Text Notes 7100 4200 0    84   ~ 12
+Text Notes 7100 4200 0    84   ~ 17
 FPGA config memory, 128 Mbit
-Text Notes 1260 3930 0    84   ~ 12
+Text Notes 1260 3930 0    84   ~ 17
 SPI mux to let ARM override access to\nFPGA config memory (to reprogram FPGA)
-Text Notes 420 6220 0    42   ~ 12
+Text Notes 420  6220 0    42   ~ 8
 Install this jumper to allow\nARM to configure the FPGA
-Text Notes 3490 4850 0    42   ~ 12
+Text Notes 3490 4850 0    42   ~ 8
 ARM access default\ndisabled through pull-up
-Text Notes 3190 7830 0    42   ~ 12
+Text Notes 3190 7830 0    42   ~ 8
 FPGA access default\nenabled through pull-down
-Text Notes 430 6540 0    42   ~ 12
+Text Notes 430  6540 0    42   ~ 8
 Install this jumper to allow\nARM to configure the FPGA
 Text Notes 8520 10210 0    60   ~ 12
 FPGA supporting components
@@ -56,10 +56,10 @@ IC2
 Text Notes 3860 6330 0    60   ~ 12
 74*244DW
 $Comp
-L power:GND GND_102
+L power:GND #GND_0102
 U 1 1 58023F4D
 P 7600 7300
-F 0 "GND_102" H 7600 7300 20  0000 C CNN
+F 0 "#GND_0102" H 7600 7300 20  0000 C CNN
 F 1 "+GND" H 7600 7230 30  0000 C CNN
 F 2 "" H 7600 7300 70  0000 C CNN
 F 3 "" H 7600 7300 70  0000 C CNN
@@ -67,10 +67,10 @@ F 3 "" H 7600 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_103
+L power:GND #GND_0103
 U 1 1 58023F4C
 P 6700 7300
-F 0 "GND_103" H 6700 7300 20  0000 C CNN
+F 0 "#GND_0103" H 6700 7300 20  0000 C CNN
 F 1 "+GND" H 6700 7230 30  0000 C CNN
 F 2 "" H 6700 7300 70  0000 C CNN
 F 3 "" H 6700 7300 70  0000 C CNN
@@ -78,10 +78,10 @@ F 3 "" H 6700 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_104
+L power:GND #GND_0104
 U 1 1 58023F4B
 P 10000 7300
-F 0 "GND_104" H 10000 7300 20  0000 C CNN
+F 0 "#GND_0104" H 10000 7300 20  0000 C CNN
 F 1 "+GND" H 10000 7230 30  0000 C CNN
 F 2 "" H 10000 7300 70  0000 C CNN
 F 3 "" H 10000 7300 70  0000 C CNN
@@ -89,10 +89,10 @@ F 3 "" H 10000 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_105
+L power:GND #GND_0105
 U 1 1 58023F4A
 P 5000 10000
-F 0 "GND_105" H 5000 10000 20  0000 C CNN
+F 0 "#GND_0105" H 5000 10000 20  0000 C CNN
 F 1 "+GND" H 5000 9930 30  0000 C CNN
 F 2 "" H 5000 10000 70  0000 C CNN
 F 3 "" H 5000 10000 70  0000 C CNN
@@ -100,10 +100,10 @@ F 3 "" H 5000 10000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_106
+L power:GND #GND_0106
 U 1 1 58023F49
 P 4400 10000
-F 0 "GND_106" H 4400 10000 20  0000 C CNN
+F 0 "#GND_0106" H 4400 10000 20  0000 C CNN
 F 1 "+GND" H 4400 9930 30  0000 C CNN
 F 2 "" H 4400 10000 70  0000 C CNN
 F 3 "" H 4400 10000 70  0000 C CNN
@@ -111,10 +111,10 @@ F 3 "" H 4400 10000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_27
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_027
 U 1 1 58023F48
 P 6700 5200
-F 0 "VCCO_3V3_27" H 6700 5200 20  0000 C CNN
+F 0 "#VCCO_3V3_027" H 6700 5200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 6700 5130 30  0000 C CNN
 F 2 "" H 6700 5200 70  0000 C CNN
 F 3 "" H 6700 5200 70  0000 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 6700 5200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_28
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_028
 U 1 1 58023F47
 P 4400 8900
-F 0 "VCCO_3V3_28" H 4400 8900 20  0000 C CNN
+F 0 "#VCCO_3V3_028" H 4400 8900 20  0000 C CNN
 F 1 "+VCCO_3V3" H 4400 8830 30  0000 C CNN
 F 2 "" H 4400 8900 70  0000 C CNN
 F 3 "" H 4400 8900 70  0000 C CNN
@@ -133,10 +133,10 @@ F 3 "" H 4400 8900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_29
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_029
 U 1 1 58023F46
 P 1660 4630
-F 0 "VCCO_3V3_29" H 1660 4630 20  0000 C CNN
+F 0 "#VCCO_3V3_029" H 1660 4630 20  0000 C CNN
 F 1 "+VCCO_3V3" H 1660 4560 30  0000 C CNN
 F 2 "" H 1660 4630 70  0000 C CNN
 F 3 "" H 1660 4630 70  0000 C CNN
@@ -144,10 +144,10 @@ F 3 "" H 1660 4630 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_107
+L power:GND #GND_0107
 U 1 1 58023F45
 P 1660 5630
-F 0 "GND_107" H 1660 5630 20  0000 C CNN
+F 0 "#GND_0107" H 1660 5630 20  0000 C CNN
 F 1 "+GND" H 1660 5560 30  0000 C CNN
 F 2 "" H 1660 5630 70  0000 C CNN
 F 3 "" H 1660 5630 70  0000 C CNN
@@ -155,10 +155,10 @@ F 3 "" H 1660 5630 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_30
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_030
 U 1 1 58023F44
 P 3360 4300
-F 0 "VCCO_3V3_30" H 3360 4300 20  0000 C CNN
+F 0 "#VCCO_3V3_030" H 3360 4300 20  0000 C CNN
 F 1 "+VCCO_3V3" H 3360 4230 30  0000 C CNN
 F 2 "" H 3360 4300 70  0000 C CNN
 F 3 "" H 3360 4300 70  0000 C CNN
@@ -166,10 +166,10 @@ F 3 "" H 3360 4300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_108
+L power:GND #GND_0108
 U 1 1 58023F43
 P 2960 7930
-F 0 "GND_108" H 2960 7930 20  0000 C CNN
+F 0 "#GND_0108" H 2960 7930 20  0000 C CNN
 F 1 "+GND" H 2960 7860 30  0000 C CNN
 F 2 "" H 2960 7930 70  0000 C CNN
 F 3 "" H 2960 7930 70  0000 C CNN
@@ -246,7 +246,7 @@ Wire Wire Line
 	3360 4300 3360 4420
 Wire Wire Line
 	9770 6500 9150 6500
-Text Label 9150 6500 0 48 ~
+Text Label 9150 6500 0    48   ~ 0
 FPGA_PROM_SCLK
 Wire Wire Line
 	4860 5730 4660 5730
@@ -256,11 +256,11 @@ Wire Wire Line
 	4860 6830 4660 6830
 Wire Wire Line
 	5160 5730 4860 5730
-Text Label 5160 5730 0 48 ~
+Text Label 5160 5730 0    48   ~ 0
 FPGA_PROM_SCLK
 Wire Wire Line
 	9770 6600 9150 6600
-Text Label 9150 6600 0 48 ~
+Text Label 9150 6600 0    48   ~ 0
 FPGA_PROM_MOSI
 Wire Wire Line
 	4960 6930 4660 6930
@@ -270,7 +270,7 @@ Wire Wire Line
 	4960 5830 4660 5830
 Wire Wire Line
 	5160 5830 4960 5830
-Text Label 5160 5830 0 48 ~
+Text Label 5160 5830 0    48   ~ 0
 FPGA_PROM_MOSI
 Wire Wire Line
 	7700 6300 7600 6300
@@ -278,7 +278,7 @@ Wire Wire Line
 	7600 6100 7600 6300
 Wire Wire Line
 	7600 6300 6900 6300
-Text Label 6900 6300 0 48 ~
+Text Label 6900 6300 0    48   ~ 0
 FPGA_PROM_CS_N
 Wire Wire Line
 	4760 6730 4660 6730
@@ -288,11 +288,11 @@ Wire Wire Line
 	4760 5630 4660 5630
 Wire Wire Line
 	5160 5630 4760 5630
-Text Label 5160 5630 0 48 ~
+Text Label 5160 5630 0    48   ~ 0
 FPGA_PROM_CS_N
 Wire Wire Line
 	7700 6400 6900 6400
-Text Label 6900 6400 0 48 ~
+Text Label 6900 6400 0    48   ~ 0
 FPGA_PROM_MISO
 Wire Wire Line
 	3660 5930 3560 5930
@@ -302,17 +302,17 @@ Wire Wire Line
 	3660 7030 3560 7030
 Wire Wire Line
 	3560 5930 3560 7030
-Text Label 2980 5930 0 48 ~
+Text Label 2980 5930 0    48   ~ 0
 FPGA_PROM_MISO
 Wire Wire Line
 	7700 6500 6700 6500
 Wire Wire Line
 	6700 6500 6700 6700
-Text Label 6900 6500 0 48 ~
+Text Label 6900 6500 0    48   ~ 0
 FPGA_PROM_W_N
 Wire Wire Line
 	7000 9500 6700 9500
-Text GLabel 6700 9500 0 48 Input ~ 0
+Text GLabel 6700 9500 0    48   Input ~ 0
 FPGA_GCLK
 Wire Wire Line
 	6200 9300 6100 9300
@@ -322,51 +322,51 @@ Wire Wire Line
 	6200 8900 5800 8900
 Wire Wire Line
 	3660 6830 3090 6830
-Text GLabel 3090 6830 0 48 Input ~ 0
+Text GLabel 3090 6830 0    48   Input ~ 0
 FPGA_CFG_SCLK
 Wire Wire Line
 	3660 6930 3090 6930
-Text GLabel 3090 6930 0 48 Input ~ 0
+Text GLabel 3090 6930 0    48   Input ~ 0
 FPGA_CFG_MOSI
 Wire Wire Line
 	3660 6730 3090 6730
-Text GLabel 3090 6730 0 48 Input ~ 0
+Text GLabel 3090 6730 0    48   Input ~ 0
 FPGA_CFG_CS_N
 Wire Wire Line
 	5160 7030 4660 7030
-Text GLabel 5160 7030 2 48 Output ~ 0
+Text GLabel 5160 7030 2    48   Output ~ 0
 FPGA_CFG_MISO
 Wire Wire Line
 	3660 5630 2980 5630
-Text GLabel 2980 5630 0 48 Input ~ 0
+Text GLabel 2980 5630 0    48   Input ~ 0
 ARM_FPGA_CFG_CS_N
 Wire Wire Line
 	3660 5830 2980 5830
-Text GLabel 2980 5830 0 48 Input ~ 0
+Text GLabel 2980 5830 0    48   Input ~ 0
 ARM_FPGA_CFG_MOSI
 Wire Wire Line
 	5160 5930 4660 5930
-Text GLabel 5160 5930 2 48 Output ~ 0
+Text GLabel 5160 5930 2    48   Output ~ 0
 ARM_FPGA_CFG_MISO
 Wire Wire Line
 	3660 5730 2980 5730
-Text GLabel 2980 5730 0 48 Input ~ 0
+Text GLabel 2980 5730 0    48   Input ~ 0
 ARM_FPGA_CFG_SCLK
-Text Label 3360 5510 1 48 ~
+Text Label 3360 5510 1    48   ~ 0
 SPI_A_TRISTATE
-Text Label 3060 7230 0 48 ~
+Text Label 3060 7230 0    48   ~ 0
 SPI_B_TRISTATE
-Text GLabel 430 6430 0 48 Input ~ 0
+Text GLabel 430  6430 0    48   Input ~ 0
 FPGA_CFG_CTRL_FPGA_DIS
 Wire Wire Line
 	6300 9500 6100 9500
-Text Notes 5320 9730 0    54   ~ 12
+Text Notes 5320 9730 0    54   ~ 11
 GND
-Text Notes 5320 9330 0    54   ~ 12
+Text Notes 5320 9330 0    54   ~ 11
 VCC
-Text Notes 5760 9660 0    54   ~ 12
+Text Notes 5760 9660 0    54   ~ 11
 FO
-Text Notes 5750 9300 0    54   ~ 12
+Text Notes 5750 9300 0    54   ~ 11
 OE
 Text Notes 1890 6120 0    60   ~ 12
 1
@@ -391,13 +391,13 @@ Wire Wire Line
 Wire Wire Line
 	2360 6230 2960 6230
 Wire Wire Line
-	1560 6430 430 6430
+	1560 6430 430  6430
 Wire Wire Line
 	1560 6230 1560 6430
 Wire Wire Line
 	1760 6230 1560 6230
 Wire Wire Line
-	1640 6830 420 6830
+	1640 6830 420  6830
 Wire Wire Line
 	1640 6330 1640 6830
 Wire Wire Line
@@ -408,15 +408,15 @@ Wire Wire Line
 	2710 4420 2710 6330
 Wire Wire Line
 	3360 4420 2710 4420
-Text Label 420 6830 0 48 ~
+Text Label 420  6830 0    48   ~ 0
 FPGA_PROM_W_N
 Wire Wire Line
 	3360 6130 2360 6130
 Wire Wire Line
 	3660 6130 3360 6130
 Wire Wire Line
-	430 6130 1760 6130
-Text GLabel 430 6130 0 48 Input ~ 0
+	430  6130 1760 6130
+Text GLabel 430  6130 0    48   Input ~ 0
 FPGA_CFG_CTRL_ARM_ENA
 Connection ~ 3360 4420
 $Comp
@@ -428,7 +428,7 @@ F 1 "N25Q128A13ESE*" H 8100 6920 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SO08" H 8100 6920 60  0001 C CNN
 F 3 "" H 8100 6920 60  0000 C CNN
 	1    8400 6550
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R4
@@ -439,40 +439,7 @@ F 1 "0" H 6460 9660 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6460 9660 60  0001 C CNN
 F 3 "" H 6460 9660 60  0000 C CNN
 	1    6500 9500
-	-1   0    0    1
-$EndComp
-$Comp
-L Cryptech_Alpha:74*244DW_1 IC2
-U 1 1 58023F40
-P 4160 5830
-F 0 "IC2" H 3830 5300 60  0000 L BNN
-F 1 "MC74AC244DW*" H 3850 5300 60  0000 L BNN
-F 2 "Cryptech_Alpha_Footprints:SO20W" H 3850 5300 60  0001 C CNN
-F 3 "" H 3850 5300 60  0000 C CNN
-	1    4160 5830
-	1    0    0    -1
-$EndComp
-$Comp
-L Cryptech_Alpha:74*244DW_2 IC2_2
-U 1 1 58023F3F
-P 4160 6930
-F 0 "IC2_2" H 3830 6400 60  0000 L BNN
-F 1 "MC74AC244DW*" H 3860 6390 60  0000 L BNN
-F 2 "Cryptech_Alpha_Footprints:SO20W" H 3860 6390 60  0001 C CNN
-F 3 "" H 3860 6390 60  0000 C CNN
-	1    4160 6930
-	1    0    0    -1
-$EndComp
-$Comp
-L Cryptech_Alpha:74*244DW_3 IC2_3
-U 1 1 58023F3E
-P 1660 5130
-F 0 "IC2_3" H 1690 4980 60  0000 L BNN
-F 1 "MC74AC244DW*" H 1860 5110 60  0000 L BNN
-F 2 "Cryptech_Alpha_Footprints:SO20W" H 1860 5110 60  0001 C CNN
-F 3 "" H 1860 5110 60  0000 C CNN
-	1    1660 5130
-	1    0    0    -1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:ASF* Q5
@@ -483,16 +450,18 @@ F 1 "ASFL1-50.000MHZ-EK-T" H 5080 9830 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:ASF" H 5080 9830 60  0001 C CNN
 F 3 "" H 5080 9830 60  0000 C CNN
 	1    5600 9500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:M03X2NO_SILK JP7
 U 1 1 58023F3C
 P 2060 6230
 F 0 "JP7" H 1850 5920 60  0000 L BNN
-	1    2060 6230
-	1    0    0    -1
+F 1 "~" H 2060 6230 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLD-6" H 1850 5920 60  0001 C CNN
+F 3 "" H 2060 6230 50  0001 C CNN
+	1    2060 6230
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R51
@@ -503,7 +472,7 @@ F 1 "4.7k" V 7510 5810 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 7510 5810 60  0001 C CNN
 F 3 "" H 7510 5810 60  0000 C CNN
 	1    7600 5900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R50
@@ -514,16 +483,18 @@ F 1 "4.7k" V 6620 6800 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6620 6800 60  0001 C CNN
 F 3 "" H 6620 6800 60  0000 C CNN
 	1    6700 6900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C111
 U 1 1 58023F39
 P 4400 9600
 F 0 "C111" H 4480 9410 60  0000 L BNN
-	1    4400 9600
-	1    0    0    -1
+F 1 "~" H 4400 9600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4480 9410 60  0001 C CNN
+F 3 "" H 4400 9600 50  0001 C CNN
+	1    4400 9600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R49
@@ -534,7 +505,7 @@ F 1 "0" H 5710 9060 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5710 9060 60  0001 C CNN
 F 3 "" H 5710 9060 60  0000 C CNN
 	1    5600 8900
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C112
@@ -545,7 +516,7 @@ F 1 "0.1uF" H 9660 6530 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 9660 6530 60  0001 C CNN
 F 3 "" H 9660 6530 60  0000 C CNN
 	1    10000 6800
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C110
@@ -556,7 +527,7 @@ F 1 "0.1uF" H 1320 4920 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1320 4920 60  0001 C CNN
 F 3 "" H 1320 4920 60  0000 C CNN
 	1    1260 5130
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R46
@@ -567,7 +538,7 @@ F 1 "4.7k" V 3340 4590 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 3340 4590 60  0001 C CNN
 F 3 "" H 3340 4590 60  0000 C CNN
 	1    3360 4700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R47
@@ -578,6 +549,39 @@ F 1 "4.7k" V 3040 7710 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 3040 7710 60  0001 C CNN
 F 3 "" H 3040 7710 60  0000 C CNN
 	1    2960 7630
-	0    1    1    0
+	0    1    1    0   
+$EndComp
+$Comp
+L Cryptech_Alpha:74*244DW IC2
+U 1 1 5AF9F7DE
+P 4160 6330
+F 0 "IC2" H 4160 7297 50  0000 C CNN
+F 1 "74*244DW" H 4160 7206 50  0000 C CNN
+F 2 "" H 4160 6330 50  0001 C CNN
+F 3 "" H 4160 6330 50  0001 C CNN
+	1    4160 6330
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:74*244DW IC2
+U 2 1 5AF9F8A6
+P 4160 7430
+F 0 "IC2" H 4160 8397 50  0000 C CNN
+F 1 "74*244DW" H 4160 8306 50  0000 C CNN
+F 2 "" H 4160 7430 50  0001 C CNN
+F 3 "" H 4160 7430 50  0001 C CNN
+	2    4160 7430
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:74*244DW IC2
+U 3 1 5AF9F94D
+P 1660 5580
+F 0 "IC2" H 1701 6076 50  0000 L CNN
+F 1 "74*244DW" H 1701 5985 50  0000 L CNN
+F 2 "" H 1660 5580 50  0001 C CNN
+F 3 "" H 1660 5580 50  0001 C CNN
+	3    1660 5580
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_16.sch b/rev03-KiCad/rev02_16.sch
index 7c6e0ac..2a8ddcd 100644
--- a/rev03-KiCad/rev02_16.sch
+++ b/rev03-KiCad/rev02_16.sch
@@ -3,7 +3,7 @@ EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
-Sheet 18 27
+Sheet 17 27
 Title "rev02_16"
 Date "15 10 2016"
 Rev ""
@@ -21,13 +21,13 @@ Text Notes 2400 4800 0    60   ~ 12
 *) Completely unused banks\nstill must be powered
 Text Notes 5900 4700 0    60   ~ 12
 *) Completely unused banks\nstill must be powered
-Text Notes 8600 10230 0    84   ~ 12
+Text Notes 8600 10230 0    84   ~ 17
 FPGA unused banks
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_31
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_031
 U 1 1 58023F33
 P 2300 4300
-F 0 "VCCO_3V3_31" H 2300 4300 20  0000 C CNN
+F 0 "#VCCO_3V3_031" H 2300 4300 20  0000 C CNN
 F 1 "+VCCO_3V3" H 2300 4230 30  0000 C CNN
 F 2 "" H 2300 4300 70  0000 C CNN
 F 3 "" H 2300 4300 70  0000 C CNN
@@ -35,10 +35,10 @@ F 3 "" H 2300 4300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_32
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_032
 U 1 1 58023F32
 P 5800 4200
-F 0 "VCCO_3V3_32" H 5800 4200 20  0000 C CNN
+F 0 "#VCCO_3V3_032" H 5800 4200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 5800 4130 30  0000 C CNN
 F 2 "" H 5800 4200 70  0000 C CNN
 F 3 "" H 5800 4200 70  0000 C CNN
@@ -93,24 +93,6 @@ Wire Wire Line
 	5800 4700 5800 4800
 Wire Wire Line
 	5800 4800 5600 4800
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_4 U13_7
-U 1 1 58023F31
-P 1900 7200
-F 0 "U13_7" H 1490 4190 60  0000 L BNN
-	1    1900 7200
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 4190 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_7 U13_8
-U 1 1 58023F30
-P 5400 7100
-F 0 "U13_8" H 4990 4090 60  0000 L BNN
-	1    5400 7100
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 4990 4090 60  0001 C CNN
-$EndComp
 NoConn ~ 2100 5100
 NoConn ~ 2100 5200
 NoConn ~ 2100 5300
@@ -211,4 +193,26 @@ NoConn ~ 2100 9700
 NoConn ~ 2100 9800
 NoConn ~ 2100 9900
 NoConn ~ 2100 10000
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 7 1 5AFCC6CE
+P 5400 7000
+F 0 "U13" H 4751 9867 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 4751 9776 50  0000 C CNN
+F 2 "" H 5000 7000 50  0001 C CNN
+F 3 "" H 5000 7000 50  0001 C CNN
+	7    5400 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 4 1 5AFCC869
+P 1500 7200
+F 0 "U13" H 1181 10167 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1181 10076 50  0000 C CNN
+F 2 "" H 1100 7200 50  0001 C CNN
+F 3 "" H 1100 7200 50  0001 C CNN
+	4    1500 7200
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_17.sch b/rev03-KiCad/rev02_17.sch
index 79be203..0f1fa26 100644
--- a/rev03-KiCad/rev02_17.sch
+++ b/rev03-KiCad/rev02_17.sch
@@ -3,7 +3,7 @@ EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
-Sheet 19 27
+Sheet 18 27
 Title "rev02_17"
 Date "15 10 2016"
 Rev ""
@@ -25,13 +25,13 @@ Text Notes 3260 5160 0    60   ~ 12
 FMC_D[...] signals can be swapped
 Text Notes 2900 8700 0    60   ~ 12
 <-- FMC_* control signals\n      can be swapped
-Text Notes 8580 10230 0    84   ~ 12
+Text Notes 8580 10230 0    84   ~ 17
 FPGA FMC interface
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_33
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_033
 U 1 1 58023F2F
 P 2000 4400
-F 0 "VCCO_3V3_33" H 2000 4400 20  0000 C CNN
+F 0 "#VCCO_3V3_033" H 2000 4400 20  0000 C CNN
 F 1 "+VCCO_3V3" H 2000 4330 30  0000 C CNN
 F 2 "" H 2000 4400 70  0000 C CNN
 F 3 "" H 2000 4400 70  0000 C CNN
@@ -39,10 +39,10 @@ F 3 "" H 2000 4400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_34
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_034
 U 1 1 58023F2E
 P 7000 4700
-F 0 "VCCO_3V3_34" H 7000 4700 20  0000 C CNN
+F 0 "#VCCO_3V3_034" H 7000 4700 20  0000 C CNN
 F 1 "+VCCO_3V3" H 7000 4630 30  0000 C CNN
 F 2 "" H 7000 4700 70  0000 C CNN
 F 3 "" H 7000 4700 70  0000 C CNN
@@ -95,7 +95,7 @@ Wire Wire Line
 	7000 5300 7000 5400
 Wire Wire Line
 	7890 7800 6750 7800
-Text GLabel 7890 7800 2 48 Output ~ 0
+Text GLabel 7890 7800 2    48   Output ~ 0
 FMC_CLK
 Wire Wire Line
 	2950 5200 1800 5200
@@ -103,23 +103,23 @@ Wire Wire Line
 	2950 5300 1800 5300
 Wire Wire Line
 	2950 5400 1800 5400
-Text GLabel 2950 5400 2 48 BiDi ~ 0
+Text GLabel 2950 5400 2    48   BiDi ~ 0
 FMC_D2
 Wire Wire Line
 	2950 5500 1800 5500
-Text GLabel 2950 5500 2 48 BiDi ~ 0
+Text GLabel 2950 5500 2    48   BiDi ~ 0
 FMC_D3
 Wire Wire Line
 	2950 5600 1800 5600
-Text GLabel 7900 6800 2 48 BiDi ~ 0
+Text GLabel 7900 6800 2    48   BiDi ~ 0
 FMC_D4
-Text GLabel 7900 7300 2 48 BiDi ~ 0
+Text GLabel 7900 7300 2    48   BiDi ~ 0
 FMC_D5
-Text GLabel 7900 7600 2 48 BiDi ~ 0
+Text GLabel 7900 7600 2    48   BiDi ~ 0
 FMC_D6
 Wire Wire Line
 	2950 5900 1800 5900
-Text GLabel 7900 7700 2 48 BiDi ~ 0
+Text GLabel 7900 7700 2    48   BiDi ~ 0
 FMC_D7
 Wire Wire Line
 	2950 6100 1800 6100
@@ -131,135 +131,135 @@ Wire Wire Line
 	2950 6400 1800 6400
 Wire Wire Line
 	2950 6500 1800 6500
-Text GLabel 2950 6500 2 48 BiDi ~ 0
+Text GLabel 2950 6500 2    48   BiDi ~ 0
 FMC_D13
 Wire Wire Line
 	2950 6600 1800 6600
-Text GLabel 2950 6600 2 48 BiDi ~ 0
+Text GLabel 2950 6600 2    48   BiDi ~ 0
 FMC_D14
 Wire Wire Line
 	2950 6700 1800 6700
-Text GLabel 2950 6800 2 48 BiDi ~ 0
+Text GLabel 2950 6800 2    48   BiDi ~ 0
 FMC_D15
 Wire Wire Line
 	2950 6800 1800 6800
-Text GLabel 2950 6700 2 48 BiDi ~ 0
+Text GLabel 2950 6700 2    48   BiDi ~ 0
 FMC_D16
 Wire Wire Line
 	2950 6900 1800 6900
-Text GLabel 2950 6900 2 48 BiDi ~ 0
+Text GLabel 2950 6900 2    48   BiDi ~ 0
 FMC_D17
 Wire Wire Line
 	2950 7000 1800 7000
-Text GLabel 2950 7000 2 48 BiDi ~ 0
+Text GLabel 2950 7000 2    48   BiDi ~ 0
 FMC_D18
 Wire Wire Line
 	2950 7100 1800 7100
-Text GLabel 2950 7100 2 48 BiDi ~ 0
+Text GLabel 2950 7100 2    48   BiDi ~ 0
 FMC_D19
 Wire Wire Line
 	2950 7200 1800 7200
-Text GLabel 2950 7200 2 48 BiDi ~ 0
+Text GLabel 2950 7200 2    48   BiDi ~ 0
 FMC_D20
 Wire Wire Line
 	2950 7300 1800 7300
-Text GLabel 2950 7300 2 48 BiDi ~ 0
+Text GLabel 2950 7300 2    48   BiDi ~ 0
 FMC_D21
 Wire Wire Line
 	2950 7400 1800 7400
-Text GLabel 2950 7400 2 48 BiDi ~ 0
+Text GLabel 2950 7400 2    48   BiDi ~ 0
 FMC_D22
 Wire Wire Line
 	2950 7500 1800 7500
-Text GLabel 2950 7500 2 48 BiDi ~ 0
+Text GLabel 2950 7500 2    48   BiDi ~ 0
 FMC_D23
 Wire Wire Line
 	2950 7700 1800 7700
-Text GLabel 2950 7700 2 48 BiDi ~ 0
+Text GLabel 2950 7700 2    48   BiDi ~ 0
 FMC_D25
-Text GLabel 2950 8400 2 48 Input ~ 0
+Text GLabel 2950 8400 2    48   Input ~ 0
 FMC_NE1
 Wire Wire Line
 	2960 8700 1800 8700
-Text GLabel 2960 8700 2 48 Output ~ 0
+Text GLabel 2960 8700 2    48   Output ~ 0
 FMC_NWAIT
 Wire Wire Line
 	2960 8800 1800 8800
-Text GLabel 2960 8800 2 48 Input ~ 0
+Text GLabel 2960 8800 2    48   Input ~ 0
 FMC_NWE
 Wire Wire Line
 	7900 5500 6750 5500
-Text GLabel 7900 5500 2 48 Input ~ 0
+Text GLabel 7900 5500 2    48   Input ~ 0
 FMC_A0
 Wire Wire Line
 	7900 5600 6750 5600
-Text GLabel 7900 5800 2 48 Input ~ 0
+Text GLabel 7900 5800 2    48   Input ~ 0
 FMC_A1
 Wire Wire Line
 	7900 5700 6750 5700
-Text GLabel 7900 5700 2 48 Input ~ 0
+Text GLabel 7900 5700 2    48   Input ~ 0
 FMC_A2
 Wire Wire Line
 	7900 5800 6750 5800
-Text GLabel 7900 5600 2 48 Input ~ 0
+Text GLabel 7900 5600 2    48   Input ~ 0
 FMC_A3
 Wire Wire Line
 	7900 5900 6750 5900
-Text GLabel 7900 5900 2 48 Input ~ 0
+Text GLabel 7900 5900 2    48   Input ~ 0
 FMC_A4
 Wire Wire Line
 	7900 6000 6750 6000
-Text GLabel 7900 6000 2 48 Input ~ 0
+Text GLabel 7900 6000 2    48   Input ~ 0
 FMC_A5
 Wire Wire Line
 	7900 6100 6750 6100
-Text GLabel 7900 6100 2 48 Input ~ 0
+Text GLabel 7900 6100 2    48   Input ~ 0
 FMC_A6
 Wire Wire Line
 	7900 6200 6750 6200
-Text GLabel 7900 6200 2 48 Input ~ 0
+Text GLabel 7900 6200 2    48   Input ~ 0
 FMC_A7
 Wire Wire Line
 	7900 6300 6750 6300
-Text GLabel 7900 6300 2 48 Input ~ 0
+Text GLabel 7900 6300 2    48   Input ~ 0
 FMC_A8
 Wire Wire Line
 	7900 6400 6750 6400
-Text GLabel 7900 6400 2 48 Input ~ 0
+Text GLabel 7900 6400 2    48   Input ~ 0
 FMC_A9
 Wire Wire Line
 	7900 6500 6750 6500
-Text GLabel 7900 6500 2 48 Input ~ 0
+Text GLabel 7900 6500 2    48   Input ~ 0
 FMC_A10
 Wire Wire Line
 	7900 6600 6750 6600
-Text GLabel 7900 6700 2 48 Input ~ 0
+Text GLabel 7900 6700 2    48   Input ~ 0
 FMC_A11
 Wire Wire Line
 	7900 6700 6750 6700
-Text GLabel 7900 7100 2 48 Input ~ 0
+Text GLabel 7900 7100 2    48   Input ~ 0
 FMC_A12
 Wire Wire Line
 	7900 6800 6750 6800
-Text GLabel 2950 5600 2 48 Input ~ 0
+Text GLabel 2950 5600 2    48   Input ~ 0
 FMC_A13
 Wire Wire Line
 	7900 6900 6750 6900
-Text GLabel 7900 6900 2 48 Input ~ 0
+Text GLabel 7900 6900 2    48   Input ~ 0
 FMC_A14
 Wire Wire Line
 	7900 7000 6750 7000
-Text GLabel 2970 9600 2 48 Input ~ 0
+Text GLabel 2970 9600 2    48   Input ~ 0
 FMC_A15
 Wire Wire Line
 	7900 7100 6750 7100
-Text GLabel 7900 7000 2 48 Input ~ 0
+Text GLabel 7900 7000 2    48   Input ~ 0
 FMC_A16
-Text GLabel 2970 9500 2 48 Input ~ 0
+Text GLabel 2970 9500 2    48   Input ~ 0
 FMC_A17
 Wire Wire Line
 	7900 7300 6750 7300
-Text GLabel 2970 9800 2 48 Input ~ 0
+Text GLabel 2970 9800 2    48   Input ~ 0
 FMC_A18
 Wire Wire Line
 	7900 7500 6750 7500
@@ -275,68 +275,50 @@ Wire Wire Line
 	7900 8100 6750 8100
 Wire Bus Line
 	9070 5000 8470 5000
-Text Label 8470 5000 0 60 ~
+Text Label 8470 5000 0    60   ~ 0
 FMC_A[0..25]
 Wire Bus Line
 	3860 5000 3260 5000
-Text Label 3260 5000 0 60 ~
+Text Label 3260 5000 0    60   ~ 0
 FMC_D[0..31]
 Wire Wire Line
 	2970 9600 1800 9600
 Wire Wire Line
 	2970 9200 1800 9200
-Text GLabel 2970 9100 2 48 BiDi ~ 0
+Text GLabel 2970 9100 2    48   BiDi ~ 0
 FMC_D0
 Wire Wire Line
 	2970 9100 1800 9100
-Text GLabel 2970 9200 2 48 BiDi ~ 0
+Text GLabel 2970 9200 2    48   BiDi ~ 0
 FMC_D1
 Wire Wire Line
 	2970 9800 1800 9800
 Wire Wire Line
 	2970 9500 1800 9500
-Text GLabel 7900 7500 2 48 BiDi ~ 0
+Text GLabel 7900 7500 2    48   BiDi ~ 0
 FMC_D24
-Text GLabel 7900 7900 2 48 BiDi ~ 0
+Text GLabel 7900 7900 2    48   BiDi ~ 0
 FMC_D26
-Text GLabel 7900 6600 2 48 BiDi ~ 0
+Text GLabel 7900 6600 2    48   BiDi ~ 0
 FMC_D27
-Text GLabel 7910 8700 2 48 Input ~ 0
+Text GLabel 7910 8700 2    48   Input ~ 0
 FMC_NOE
 Wire Wire Line
 	7910 8700 6750 8700
 Wire Wire Line
 	2950 8400 1800 8400
-Text GLabel 2950 5900 2 48 Output ~ 0
+Text GLabel 2950 5900 2    48   Output ~ 0
 MKM_FPGA_CS_N
-Text GLabel 2950 6400 2 48 Output ~ 0
+Text GLabel 2950 6400 2    48   Output ~ 0
 MKM_FPGA_SCK
-Text GLabel 2950 6100 2 48 Output ~ 0
+Text GLabel 2950 6100 2    48   Output ~ 0
 MKM_FPGA_MOSI
-Text GLabel 2950 6200 2 48 Input ~ 0
+Text GLabel 2950 6200 2    48   Input ~ 0
 MKM_FPGA_MISO
-Text GLabel 2950 6300 2 48 Output ~ 0
+Text GLabel 2950 6300 2    48   Output ~ 0
 FPGA_GPIO_LED_0
-Text GLabel 2950 5300 2 48 Output ~ 0
+Text GLabel 2950 5300 2    48   Output ~ 0
 FPGA_GPIO_LED_1
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_2 U13_9
-U 1 1 58023F2D
-P 6550 6900
-F 0 "U13_9" H 6140 4690 60  0000 L BNN
-	1    6550 6900
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 6140 4690 60  0001 C CNN
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_6 U13_10
-U 1 1 58023F2C
-P 1600 7300
-F 0 "U13_10" H 1190 4290 60  0000 L BNN
-	1    1600 7300
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1190 4290 60  0001 C CNN
-$EndComp
 NoConn ~ 1800 5700
 NoConn ~ 1800 5800
 NoConn ~ 1800 6000
@@ -369,4 +351,26 @@ NoConn ~ 6750 7200
 NoConn ~ 2950 5200
 NoConn ~ 7900 8000
 NoConn ~ 7900 8100
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 2 1 5AFEA428
+P 6200 6850
+F 0 "U13" H 6006 8967 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 6006 8876 50  0000 C CNN
+F 2 "" H 5800 6850 50  0001 C CNN
+F 3 "" H 5800 6850 50  0001 C CNN
+	2    6200 6850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 6 1 5AFEA6D1
+P 1600 7400
+F 0 "U13" H 1056 10467 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1056 10376 50  0000 C CNN
+F 2 "" H 1200 7400 50  0001 C CNN
+F 3 "" H 1200 7400 50  0001 C CNN
+	6    1600 7400
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_18.sch b/rev03-KiCad/rev02_18.sch
index e1947c7..b7b7e23 100644
--- a/rev03-KiCad/rev02_18.sch
+++ b/rev03-KiCad/rev02_18.sch
@@ -19,7 +19,7 @@ Text Notes 7500 5100 0    60   ~ 12
 *) VCCAUX = 0.75V x (1 + 205 / 147) = 1.796V\n*) VCCO = 0.75V x (1 + 205 / 59) = 3.356\n*) Minimal load current is 2 mA:\n1.8V / 470 Ohm = ~~4mA\n3.3V /  470 Ohm = ~~7mA\n*) Light-load mode is enabled
 Text Notes 6700 8500 0    60   ~ 12
 This is the 3V3 rail that powers\nboth the FPGA and the ARM as well\nas various other components.
-Text Notes 8450 10220 0    66   ~ 12
+Text Notes 8450 10220 0    66   ~ 13
 FPGA voltage regulators
 Text Notes 1160 5190 0    60   ~ 12
 C113
@@ -74,10 +74,10 @@ C120
 Text Notes 5060 8890 0    60   ~ 12
 47uF
 $Comp
-L power:GND GND_109
+L power:GND #GND_0109
 U 1 1 58023F2B
 P 2800 6700
-F 0 "GND_109" H 2800 6700 20  0000 C CNN
+F 0 "#GND_0109" H 2800 6700 20  0000 C CNN
 F 1 "+GND" H 2800 6630 30  0000 C CNN
 F 2 "" H 2800 6700 70  0000 C CNN
 F 3 "" H 2800 6700 70  0000 C CNN
@@ -85,10 +85,10 @@ F 3 "" H 2800 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_110
+L power:GND #GND_0110
 U 1 1 58023F2A
 P 3300 6700
-F 0 "GND_110" H 3300 6700 20  0000 C CNN
+F 0 "#GND_0110" H 3300 6700 20  0000 C CNN
 F 1 "+GND" H 3300 6630 30  0000 C CNN
 F 2 "" H 3300 6700 70  0000 C CNN
 F 3 "" H 3300 6700 70  0000 C CNN
@@ -96,10 +96,10 @@ F 3 "" H 3300 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_111
+L power:GND #GND_0111
 U 1 1 58023F29
 P 2100 6700
-F 0 "GND_111" H 2100 6700 20  0000 C CNN
+F 0 "#GND_0111" H 2100 6700 20  0000 C CNN
 F 1 "+GND" H 2100 6630 30  0000 C CNN
 F 2 "" H 2100 6700 70  0000 C CNN
 F 3 "" H 2100 6700 70  0000 C CNN
@@ -107,10 +107,10 @@ F 3 "" H 2100 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_112
+L power:GND #GND_0112
 U 1 1 58023F28
 P 1100 5600
-F 0 "GND_112" H 1100 5600 20  0000 C CNN
+F 0 "#GND_0112" H 1100 5600 20  0000 C CNN
 F 1 "+GND" H 1100 5530 30  0000 C CNN
 F 2 "" H 1100 5600 70  0000 C CNN
 F 3 "" H 1100 5600 70  0000 C CNN
@@ -118,10 +118,10 @@ F 3 "" H 1100 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_113
+L power:GND #GND_0113
 U 1 1 58023F27
 P 1600 6700
-F 0 "GND_113" H 1600 6700 20  0000 C CNN
+F 0 "#GND_0113" H 1600 6700 20  0000 C CNN
 F 1 "+GND" H 1600 6630 30  0000 C CNN
 F 2 "" H 1600 6700 70  0000 C CNN
 F 3 "" H 1600 6700 70  0000 C CNN
@@ -129,10 +129,10 @@ F 3 "" H 1600 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_114
+L power:GND #GND_0114
 U 1 1 58023F26
 P 4300 6000
-F 0 "GND_114" H 4300 6000 20  0000 C CNN
+F 0 "#GND_0114" H 4300 6000 20  0000 C CNN
 F 1 "+GND" H 4300 5930 30  0000 C CNN
 F 2 "" H 4300 6000 70  0000 C CNN
 F 3 "" H 4300 6000 70  0000 C CNN
@@ -140,10 +140,10 @@ F 3 "" H 4300 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_115
+L power:GND #GND_0115
 U 1 1 58023F25
 P 5000 6000
-F 0 "GND_115" H 5000 6000 20  0000 C CNN
+F 0 "#GND_0115" H 5000 6000 20  0000 C CNN
 F 1 "+GND" H 5000 5930 30  0000 C CNN
 F 2 "" H 5000 6000 70  0000 C CNN
 F 3 "" H 5000 6000 70  0000 C CNN
@@ -151,10 +151,10 @@ F 3 "" H 5000 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_116
+L power:GND #GND_0116
 U 1 1 58023F24
 P 5500 6000
-F 0 "GND_116" H 5500 6000 20  0000 C CNN
+F 0 "#GND_0116" H 5500 6000 20  0000 C CNN
 F 1 "+GND" H 5500 5930 30  0000 C CNN
 F 2 "" H 5500 6000 70  0000 C CNN
 F 3 "" H 5500 6000 70  0000 C CNN
@@ -162,10 +162,10 @@ F 3 "" H 5500 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_117
+L power:GND #GND_0117
 U 1 1 58023F23
 P 2800 9900
-F 0 "GND_117" H 2800 9900 20  0000 C CNN
+F 0 "#GND_0117" H 2800 9900 20  0000 C CNN
 F 1 "+GND" H 2800 9830 30  0000 C CNN
 F 2 "" H 2800 9900 70  0000 C CNN
 F 3 "" H 2800 9900 70  0000 C CNN
@@ -173,10 +173,10 @@ F 3 "" H 2800 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_118
+L power:GND #GND_0118
 U 1 1 58023F22
 P 3300 9900
-F 0 "GND_118" H 3300 9900 20  0000 C CNN
+F 0 "#GND_0118" H 3300 9900 20  0000 C CNN
 F 1 "+GND" H 3300 9830 30  0000 C CNN
 F 2 "" H 3300 9900 70  0000 C CNN
 F 3 "" H 3300 9900 70  0000 C CNN
@@ -184,10 +184,10 @@ F 3 "" H 3300 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_119
+L power:GND #GND_0119
 U 1 1 58023F21
 P 2100 9900
-F 0 "GND_119" H 2100 9900 20  0000 C CNN
+F 0 "#GND_0119" H 2100 9900 20  0000 C CNN
 F 1 "+GND" H 2100 9830 30  0000 C CNN
 F 2 "" H 2100 9900 70  0000 C CNN
 F 3 "" H 2100 9900 70  0000 C CNN
@@ -195,10 +195,10 @@ F 3 "" H 2100 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_120
+L power:GND #GND_0120
 U 1 1 58023F20
 P 1100 8800
-F 0 "GND_120" H 1100 8800 20  0000 C CNN
+F 0 "#GND_0120" H 1100 8800 20  0000 C CNN
 F 1 "+GND" H 1100 8730 30  0000 C CNN
 F 2 "" H 1100 8800 70  0000 C CNN
 F 3 "" H 1100 8800 70  0000 C CNN
@@ -206,10 +206,10 @@ F 3 "" H 1100 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_121
+L power:GND #GND_0121
 U 1 1 58023F1F
 P 1600 9900
-F 0 "GND_121" H 1600 9900 20  0000 C CNN
+F 0 "#GND_0121" H 1600 9900 20  0000 C CNN
 F 1 "+GND" H 1600 9830 30  0000 C CNN
 F 2 "" H 1600 9900 70  0000 C CNN
 F 3 "" H 1600 9900 70  0000 C CNN
@@ -217,10 +217,10 @@ F 3 "" H 1600 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_122
+L power:GND #GND_0122
 U 1 1 58023F1E
 P 4300 9200
-F 0 "GND_122" H 4300 9200 20  0000 C CNN
+F 0 "#GND_0122" H 4300 9200 20  0000 C CNN
 F 1 "+GND" H 4300 9130 30  0000 C CNN
 F 2 "" H 4300 9200 70  0000 C CNN
 F 3 "" H 4300 9200 70  0000 C CNN
@@ -228,10 +228,10 @@ F 3 "" H 4300 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_123
+L power:GND #GND_0123
 U 1 1 58023F1D
 P 5000 9200
-F 0 "GND_123" H 5000 9200 20  0000 C CNN
+F 0 "#GND_0123" H 5000 9200 20  0000 C CNN
 F 1 "+GND" H 5000 9130 30  0000 C CNN
 F 2 "" H 5000 9200 70  0000 C CNN
 F 3 "" H 5000 9200 70  0000 C CNN
@@ -239,10 +239,10 @@ F 3 "" H 5000 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_124
+L power:GND #GND_0124
 U 1 1 58023F1C
 P 5500 9200
-F 0 "GND_124" H 5500 9200 20  0000 C CNN
+F 0 "#GND_0124" H 5500 9200 20  0000 C CNN
 F 1 "+GND" H 5500 9130 30  0000 C CNN
 F 2 "" H 5500 9200 70  0000 C CNN
 F 3 "" H 5500 9200 70  0000 C CNN
@@ -250,10 +250,10 @@ F 3 "" H 5500 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCC_5V0 VCC_5V0
+L Cryptech_Alpha:VCC_5V0 #VCC_5V00
 U 1 1 58023F1B
 P 1100 4600
-F 0 "VCC_5V0" H 1100 4600 20  0000 C CNN
+F 0 "#VCC_5V00" H 1100 4600 20  0000 C CNN
 F 1 "+VCC_5V0" H 1100 4530 30  0000 C CNN
 F 2 "" H 1100 4600 70  0000 C CNN
 F 3 "" H 1100 4600 70  0000 C CNN
@@ -261,10 +261,10 @@ F 3 "" H 1100 4600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCC_5V0 VCC_5V0_2
+L Cryptech_Alpha:VCC_5V0 #VCC_5V0_02
 U 1 1 58023F1A
 P 1100 7800
-F 0 "VCC_5V0_2" H 1100 7800 20  0000 C CNN
+F 0 "#VCC_5V0_02" H 1100 7800 20  0000 C CNN
 F 1 "+VCC_5V0" H 1100 7730 30  0000 C CNN
 F 2 "" H 1100 7800 70  0000 C CNN
 F 3 "" H 1100 7800 70  0000 C CNN
@@ -305,11 +305,11 @@ Wire Wire Line
 	5500 9000 5500 9200
 Wire Wire Line
 	7000 4800 6000 4800
-Text Label 7000 4800 2 48 ~ 0
+Text Label 7000 4800 2    48   ~ 0
 FPGA_VCCAUX_1V8
 Wire Wire Line
 	7000 8000 6000 8000
-Text Label 7000 8000 0 48 ~ 0
+Text Label 7000 8000 0    48   ~ 0
 VCCO_3V3
 Wire Wire Line
 	2100 6200 2100 6300
@@ -357,7 +357,7 @@ Wire Wire Line
 	2300 5200 1900 5200
 Wire Wire Line
 	1900 4150 1900 5200
-Text GLabel 1900 4150 0 48 Input ~ 0
+Text GLabel 1900 4150 0    48   Input ~ 0
 PWR_ENA_VCCAUX
 Wire Wire Line
 	1600 5800 1600 6200
@@ -453,19 +453,19 @@ Wire Wire Line
 	1900 7500 1900 8400
 Wire Wire Line
 	1900 7500 1800 7500
-Text GLabel 1400 7500 0 48 Input ~ 0
+Text GLabel 1400 7500 0    48   Input ~ 0
 PWR_ENA_VCCO
 Wire Wire Line
 	4000 6200 3900 6200
 Wire Wire Line
 	4000 6200 4000 6500
-Text GLabel 4000 6500 2 48 Output ~ 0
+Text GLabel 4000 6500 2    48   Output ~ 0
 POK_VCCAUX
 Wire Wire Line
 	4000 9400 3900 9400
 Wire Wire Line
 	4000 9400 4000 9700
-Text GLabel 4000 9700 2 48 Output ~ 0
+Text GLabel 4000 9700 2    48   Output ~ 0
 POK_VCCO
 Text Notes 2700 4440 0    60   ~ 12
 U14
@@ -543,9 +543,11 @@ L Cryptech_Alpha:C-EUC1210 C113
 U 1 1 58023F19
 P 1100 5200
 F 0 "C113" H 1180 5010 60  0000 L BNN
-	1    1100 5200
-	1    0    0    -1
+F 1 "~" H 1100 5200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1180 5010 60  0001 C CNN
+F 3 "" H 1100 5200 50  0001 C CNN
+	1    1100 5200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R54
@@ -556,7 +558,7 @@ F 1 "4.7k" V 1490 8350 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 1490 8350 60  0001 C CNN
 F 3 "" H 1490 8350 60  0000 C CNN
 	1    1600 8400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R58
@@ -567,7 +569,7 @@ F 1 "205k" V 4250 8560 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4250 8560 60  0001 C CNN
 F 3 "" H 4250 8560 60  0000 C CNN
 	1    4300 8300
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R59
@@ -578,7 +580,7 @@ F 1 "59k" V 4240 9130 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4240 9130 60  0001 C CNN
 F 3 "" H 4240 9130 60  0000 C CNN
 	1    4300 8900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R61
@@ -589,7 +591,7 @@ F 1 "470" V 5520 8700 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5520 8700 60  0001 C CNN
 F 3 "" H 5520 8700 60  0000 C CNN
 	1    5500 8800
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:BLM31PG330SN1_1206 FB6
@@ -600,52 +602,62 @@ F 1 "BLM31PG330SN1" H 5630 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:L_1206" H 5630 8010 60  0001 C CNN
 F 3 "" H 5630 8010 60  0000 C CNN
 	1    5800 8100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C115
 U 1 1 58023F13
 P 2100 6400
 F 0 "C115" H 2180 6210 60  0000 L BNN
-	1    2100 6400
-	1    0    0    -1
+F 1 "~" H 2100 6400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2180 6210 60  0001 C CNN
+F 3 "" H 2100 6400 50  0001 C CNN
+	1    2100 6400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C116
 U 1 1 58023F12
 P 2100 9600
 F 0 "C116" H 2180 9410 60  0000 L BNN
-	1    2100 9600
-	1    0    0    -1
+F 1 "~" H 2100 9600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2180 9410 60  0001 C CNN
+F 3 "" H 2100 9600 50  0001 C CNN
+	1    2100 9600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C118
 U 1 1 58023F11
 P 4600 8200
 F 0 "C118" H 4680 8010 60  0000 L BNN
-	1    4600 8200
-	1    0    0    -1
+F 1 "~" H 4600 8200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 8010 60  0001 C CNN
+F 3 "" H 4600 8200 50  0001 C CNN
+	1    4600 8200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C117
 U 1 1 58023F10
 P 4600 5000
 F 0 "C117" H 4680 4810 60  0000 L BNN
-	1    4600 5000
-	1    0    0    -1
+F 1 "~" H 4600 5000 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 4810 60  0001 C CNN
+F 3 "" H 4600 5000 50  0001 C CNN
+	1    4600 5000
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C119
 U 1 1 58023F0F
 P 5000 5500
 F 0 "C119" H 5080 5310 60  0000 L BNN
-	1    5000 5500
-	1    0    0    -1
+F 1 "~" H 5000 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 5080 5310 60  0001 C CNN
+F 3 "" H 5000 5500 50  0001 C CNN
+	1    5000 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R53
@@ -656,34 +668,40 @@ F 1 "62k" V 1550 6290 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 1550 6290 60  0001 C CNN
 F 3 "" H 1550 6290 60  0000 C CNN
 	1    1600 6400
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C120
 U 1 1 58023F0D
 P 5000 8700
 F 0 "C120" H 5080 8510 60  0000 L BNN
-	1    5000 8700
-	1    0    0    -1
+F 1 "~" H 5000 8700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 5080 8510 60  0001 C CNN
+F 3 "" H 5000 8700 50  0001 C CNN
+	1    5000 8700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:EN6347QI U14
 U 1 1 58023F0C
 P 3100 5500
 F 0 "U14" H 2740 6590 60  0000 L BNN
-	1    3100 5500
-	1    0    0    -1
+F 1 "~" H 3100 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:QFN38" H 2740 6590 60  0001 C CNN
+F 3 "" H 3100 5500 50  0001 C CNN
+	1    3100 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:EN6347QI U15
 U 1 1 58023F0B
 P 3100 8700
 F 0 "U15" H 2740 9790 60  0000 L BNN
-	1    3100 8700
-	1    0    0    -1
+F 1 "~" H 3100 8700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:QFN38" H 2740 9790 60  0001 C CNN
+F 3 "" H 3100 8700 50  0001 C CNN
+	1    3100 8700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R52
@@ -694,7 +712,7 @@ F 1 "4.7k" V 1540 5120 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 1540 5120 60  0001 C CNN
 F 3 "" H 1540 5120 60  0000 C CNN
 	1    1600 5200
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R56
@@ -705,7 +723,7 @@ F 1 "205k" V 4220 5360 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4220 5360 60  0001 C CNN
 F 3 "" H 4220 5360 60  0000 C CNN
 	1    4300 5100
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R57
@@ -716,7 +734,7 @@ F 1 "147k" V 4210 5610 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4210 5610 60  0001 C CNN
 F 3 "" H 4210 5610 60  0000 C CNN
 	1    4300 5700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R60
@@ -727,7 +745,7 @@ F 1 "470" V 5450 5470 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5450 5470 60  0001 C CNN
 F 3 "" H 5450 5470 60  0000 C CNN
 	1    5500 5600
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:BLM31PG330SN1_1206 FB5
@@ -738,16 +756,18 @@ F 1 "BLM31PG330SN1" H 5640 4810 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:L_1206" H 5640 4810 60  0001 C CNN
 F 3 "" H 5640 4810 60  0000 C CNN
 	1    5800 4900
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C114
 U 1 1 58023F05
 P 1100 8400
 F 0 "C114" H 1180 8210 60  0000 L BNN
-	1    1100 8400
-	1    0    0    -1
+F 1 "~" H 1100 8400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1180 8210 60  0001 C CNN
+F 3 "" H 1100 8400 50  0001 C CNN
+	1    1100 8400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R55
@@ -758,58 +778,58 @@ F 1 "62k" V 1570 9470 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 1570 9470 60  0001 C CNN
 F 3 "" H 1570 9470 60  0000 C CNN
 	1    1600 9600
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 NoConn ~ 3900 5800
 NoConn ~ 3900 9000
 Wire Wire Line
-      7000 4800 7000 4500
+	7000 4800 7000 4500
 $Comp
-L Cryptech_Alpha:FPGA_VCCAUX_1V8 #PWR?
+L Cryptech_Alpha:FPGA_VCCAUX_1V8 #PWR0110
 U 1 1 5AF45C1F
 P 7000 4500
-F 0 "#PWR?" H 7000 4350 50  0001 C CNN
+F 0 "#PWR0110" H 7000 4350 50  0001 C CNN
 F 1 "FPGA_VCCAUX_1V8" H 7015 4673 50  0000 C CNN
 F 2 "" H 7000 4500 60  0000 C CNN
 F 3 "" H 7000 4500 60  0000 C CNN
-      1    7000 4500
-      1    0    0    -1
+	1    7000 4500
+	1    0    0    -1  
 $EndComp
 Wire Wire Line
-      7000 8000 7000 7800
+	7000 8000 7000 7800
 $Comp
-L Cryptech_Alpha:VCCO_3V3 #PWR?
+L Cryptech_Alpha:VCCO_3V3 #PWR0111
 U 1 1 5AF49BC2
 P 7000 7800
-F 0 "#PWR?" H 7000 7650 50  0001 C CNN
+F 0 "#PWR0111" H 7000 7650 50  0001 C CNN
 F 1 "VCCO_3V3" H 7015 7973 50  0000 C CNN
 F 2 "" H 7000 7800 60  0000 C CNN
 F 3 "" H 7000 7800 60  0000 C CNN
-      1    7000 7800
-      1    0    0    -1
+	1    7000 7800
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0109
 U 1 1 5AFA31D0
 P 6050 4800
-F 0 "#FLG?" H 6050 4875 50  0001 C CNN
+F 0 "#FLG0109" H 6050 4875 50  0001 C CNN
 F 1 "PWR_FLAG" H 6050 4974 50  0000 C CNN
 F 2 "" H 6050 4800 50  0001 C CNN
 F 3 "~" H 6050 4800 50  0001 C CNN
-       1    6050 4800
-       1    0    0    -1  
+	1    6050 4800
+	1    0    0    -1  
 $EndComp
 Connection ~ 6050 4800
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0110
 U 1 1 5AFB3F33
 P 6050 8000
-F 0 "#FLG?" H 6050 8075 50  0001 C CNN
+F 0 "#FLG0110" H 6050 8075 50  0001 C CNN
 F 1 "PWR_FLAG" H 6050 8174 50  0000 C CNN
 F 2 "" H 6050 8000 50  0001 C CNN
 F 3 "~" H 6050 8000 50  0001 C CNN
-       1    6050 8000
-       1    0    0    -1  
+	1    6050 8000
+	1    0    0    -1  
 $EndComp
 Connection ~ 6050 8000
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_19.sch b/rev03-KiCad/rev02_19.sch
index f0db4ae..d343cdd 100644
--- a/rev03-KiCad/rev02_19.sch
+++ b/rev03-KiCad/rev02_19.sch
@@ -23,7 +23,7 @@ Text Notes 6930 3910 0    60   ~ 12
 *) Signals, that are allowed to be swapped, can be be swapped\nwith each other and/or moved to different pins within their bank.
 Text Notes 3300 6500 0    60   ~ 12
 NOTE: One of the FPGA_GPIO_* pins\nshould be connected to one of the\nMRCC pins.\nThe non-MRCC GPIO signals should be\nlength matched to within 500 ps of\nthe MRCC signal.
-Text Notes 8840 10230 0    84   ~ 12
+Text Notes 8840 10230 0    84   ~ 17
 FPGA GPIO
 Text Notes 8950 4500 2    60   ~ 12
 MA08-2
@@ -42,10 +42,10 @@ C122
 Text Notes 7260 7190 0    60   ~ 12
 0.1~uF
 $Comp
-L power:GND GND_125
+L power:GND #GND_0125
 U 1 1 58023F03
 P 7200 5600
-F 0 "GND_125" H 7200 5600 20  0000 C CNN
+F 0 "#GND_0125" H 7200 5600 20  0000 C CNN
 F 1 "+GND" H 7200 5530 30  0000 C CNN
 F 2 "" H 7200 5600 70  0000 C CNN
 F 3 "" H 7200 5600 70  0000 C CNN
@@ -53,10 +53,10 @@ F 3 "" H 7200 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_126
+L power:GND #GND_0126
 U 1 1 58023F02
 P 8400 5600
-F 0 "GND_126" H 8400 5600 20  0000 C CNN
+F 0 "#GND_0126" H 8400 5600 20  0000 C CNN
 F 1 "+GND" H 8400 5530 30  0000 C CNN
 F 2 "" H 8400 5600 70  0000 C CNN
 F 3 "" H 8400 5600 70  0000 C CNN
@@ -64,10 +64,10 @@ F 3 "" H 8400 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_127
+L power:GND #GND_0127
 U 1 1 58023F01
 P 9200 5600
-F 0 "GND_127" H 9200 5600 20  0000 C CNN
+F 0 "#GND_0127" H 9200 5600 20  0000 C CNN
 F 1 "+GND" H 9200 5530 30  0000 C CNN
 F 2 "" H 9200 5600 70  0000 C CNN
 F 3 "" H 9200 5600 70  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 9200 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_128
+L power:GND #GND_0128
 U 1 1 58023F00
 P 7200 7500
-F 0 "GND_128" H 7200 7500 20  0000 C CNN
+F 0 "#GND_0128" H 7200 7500 20  0000 C CNN
 F 1 "+GND" H 7200 7430 30  0000 C CNN
 F 2 "" H 7200 7500 70  0000 C CNN
 F 3 "" H 7200 7500 70  0000 C CNN
@@ -86,10 +86,10 @@ F 3 "" H 7200 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_129
+L power:GND #GND_0129
 U 1 1 58023EFF
 P 8400 7500
-F 0 "GND_129" H 8400 7500 20  0000 C CNN
+F 0 "#GND_0129" H 8400 7500 20  0000 C CNN
 F 1 "+GND" H 8400 7430 30  0000 C CNN
 F 2 "" H 8400 7500 70  0000 C CNN
 F 3 "" H 8400 7500 70  0000 C CNN
@@ -97,10 +97,10 @@ F 3 "" H 8400 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_130
+L power:GND #GND_0130
 U 1 1 58023EFE
 P 9200 7500
-F 0 "GND_130" H 9200 7500 20  0000 C CNN
+F 0 "#GND_0130" H 9200 7500 20  0000 C CNN
 F 1 "+GND" H 9200 7430 30  0000 C CNN
 F 2 "" H 9200 7500 70  0000 C CNN
 F 3 "" H 9200 7500 70  0000 C CNN
@@ -108,10 +108,10 @@ F 3 "" H 9200 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_35
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_035
 U 1 1 58023EFD
 P 2100 4200
-F 0 "VCCO_3V3_35" H 2100 4200 20  0000 C CNN
+F 0 "#VCCO_3V3_035" H 2100 4200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 2100 4130 30  0000 C CNN
 F 2 "" H 2100 4200 70  0000 C CNN
 F 3 "" H 2100 4200 70  0000 C CNN
@@ -119,10 +119,10 @@ F 3 "" H 2100 4200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_36
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_036
 U 1 1 58023EFC
 P 7200 4300
-F 0 "VCCO_3V3_36" H 7200 4300 20  0000 C CNN
+F 0 "#VCCO_3V3_036" H 7200 4300 20  0000 C CNN
 F 1 "+VCCO_3V3" H 7200 4230 30  0000 C CNN
 F 2 "" H 7200 4300 70  0000 C CNN
 F 3 "" H 7200 4300 70  0000 C CNN
@@ -130,10 +130,10 @@ F 3 "" H 7200 4300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_37
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_037
 U 1 1 58023EFB
 P 7200 6200
-F 0 "VCCO_3V3_37" H 7200 6200 20  0000 C CNN
+F 0 "#VCCO_3V3_037" H 7200 6200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 7200 6130 30  0000 C CNN
 F 2 "" H 7200 6200 70  0000 C CNN
 F 3 "" H 7200 6200 70  0000 C CNN
@@ -141,10 +141,10 @@ F 3 "" H 7200 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_131
+L power:GND #GND_0131
 U 1 1 58023EFA
 P 9300 9100
-F 0 "GND_131" H 9300 9100 20  0000 C CNN
+F 0 "#GND_0131" H 9300 9100 20  0000 C CNN
 F 1 "+GND" H 9300 9030 30  0000 C CNN
 F 2 "" H 9300 9100 70  0000 C CNN
 F 3 "" H 9300 9100 70  0000 C CNN
@@ -277,167 +277,167 @@ Wire Wire Line
 	8500 6600 8400 6600
 Wire Wire Line
 	3100 8100 1900 8100
-Text GLabel 3100 8100 2 48 UnSpc ~ 0
+Text GLabel 3100 8100 2    48   UnSpc ~ 0
 AVR_GPIO_FPGA_0
 Wire Wire Line
 	3100 8200 1900 8200
-Text GLabel 3100 8200 2 48 UnSpc ~ 0
+Text GLabel 3100 8200 2    48   UnSpc ~ 0
 AVR_GPIO_FPGA_1
 Wire Wire Line
 	3100 5200 1900 5200
-Text GLabel 3100 5200 2 48 UnSpc ~ 0
+Text GLabel 3100 5200 2    48   UnSpc ~ 0
 FPGA_IRQ_N_0
 Wire Wire Line
 	3100 5300 1900 5300
-Text GLabel 3100 5300 2 48 UnSpc ~ 0
+Text GLabel 3100 5300 2    48   UnSpc ~ 0
 FPGA_IRQ_N_1
 Wire Wire Line
 	3100 5400 1900 5400
-Text GLabel 3100 5400 2 48 UnSpc ~ 0
+Text GLabel 3100 5400 2    48   UnSpc ~ 0
 FPGA_IRQ_N_2
 Wire Wire Line
 	3100 5500 1900 5500
-Text GLabel 3100 5500 2 48 UnSpc ~ 0
+Text GLabel 3100 5500 2    48   UnSpc ~ 0
 FPGA_IRQ_N_3
 Wire Wire Line
 	3100 5600 1900 5600
-Text GLabel 3100 5800 2 48 BiDi ~ 0
+Text GLabel 3100 5800 2    48   BiDi ~ 0
 FPGA_GPIO_A_0
 Wire Wire Line
 	8500 5000 7600 5000
-Text GLabel 7600 5000 0 48 BiDi ~ 0
+Text GLabel 7600 5000 0    48   BiDi ~ 0
 FPGA_GPIO_A_0
 Wire Wire Line
 	3100 5700 1900 5700
-Text GLabel 3100 5700 2 48 BiDi ~ 0
+Text GLabel 3100 5700 2    48   BiDi ~ 0
 FPGA_GPIO_A_1
 Wire Wire Line
 	10000 5000 9100 5000
-Text GLabel 10000 5000 2 48 BiDi ~ 0
+Text GLabel 10000 5000 2    48   BiDi ~ 0
 FPGA_GPIO_A_1
 Wire Wire Line
 	3100 5800 1900 5800
-Text GLabel 3100 6900 2 48 BiDi ~ 0
+Text GLabel 3100 6900 2    48   BiDi ~ 0
 FPGA_GPIO_A_2
 Wire Wire Line
 	8500 5100 7600 5100
-Text GLabel 7600 5100 0 48 BiDi ~ 0
+Text GLabel 7600 5100 0    48   BiDi ~ 0
 FPGA_GPIO_A_2
-Text GLabel 3100 7000 2 48 BiDi ~ 0
+Text GLabel 3100 7000 2    48   BiDi ~ 0
 FPGA_GPIO_A_3
 Wire Wire Line
 	10000 5100 9100 5100
-Text GLabel 10000 5100 2 48 BiDi ~ 0
+Text GLabel 10000 5100 2    48   BiDi ~ 0
 FPGA_GPIO_A_3
-Text GLabel 3100 6500 2 48 BiDi ~ 0
+Text GLabel 3100 6500 2    48   BiDi ~ 0
 FPGA_GPIO_A_4
 Wire Wire Line
 	8500 5300 7600 5300
-Text GLabel 7600 5300 0 48 BiDi ~ 0
+Text GLabel 7600 5300 0    48   BiDi ~ 0
 FPGA_GPIO_A_4
 Wire Wire Line
 	3100 6100 1900 6100
-Text GLabel 3100 6600 2 48 BiDi ~ 0
+Text GLabel 3100 6600 2    48   BiDi ~ 0
 FPGA_GPIO_A_5
 Wire Wire Line
 	10000 5300 9100 5300
-Text GLabel 10000 5300 2 48 BiDi ~ 0
+Text GLabel 10000 5300 2    48   BiDi ~ 0
 FPGA_GPIO_A_5
-Text GLabel 3100 6700 2 48 BiDi ~ 0
+Text GLabel 3100 6700 2    48   BiDi ~ 0
 FPGA_GPIO_A_6
 Wire Wire Line
 	8500 5400 7600 5400
-Text GLabel 7600 5400 0 48 BiDi ~ 0
+Text GLabel 7600 5400 0    48   BiDi ~ 0
 FPGA_GPIO_A_6
 Wire Wire Line
 	3100 6300 1900 6300
-Text GLabel 3100 6300 2 48 BiDi ~ 0
+Text GLabel 3100 6300 2    48   BiDi ~ 0
 FPGA_GPIO_A_7
 Wire Wire Line
 	10000 5400 9100 5400
-Text GLabel 10000 5400 2 48 BiDi ~ 0
+Text GLabel 10000 5400 2    48   BiDi ~ 0
 FPGA_GPIO_A_7
 Wire Wire Line
 	3100 6400 1900 6400
-Text GLabel 3100 6800 2 48 BiDi ~ 0
+Text GLabel 3100 6800 2    48   BiDi ~ 0
 FPGA_GPIO_B_0
 Wire Wire Line
 	8500 6900 7600 6900
-Text GLabel 7600 6900 0 48 BiDi ~ 0
+Text GLabel 7600 6900 0    48   BiDi ~ 0
 FPGA_GPIO_B_0
 Wire Wire Line
 	3100 6500 1900 6500
-Text GLabel 3100 5600 2 48 BiDi ~ 0
+Text GLabel 3100 5600 2    48   BiDi ~ 0
 FPGA_GPIO_B_1
 Wire Wire Line
 	10000 6900 9100 6900
-Text GLabel 10000 6900 2 48 BiDi ~ 0
+Text GLabel 10000 6900 2    48   BiDi ~ 0
 FPGA_GPIO_B_1
 Wire Wire Line
 	3100 6600 1900 6600
-Text GLabel 3100 6400 2 48 BiDi ~ 0
+Text GLabel 3100 6400 2    48   BiDi ~ 0
 FPGA_GPIO_B_2
 Wire Wire Line
 	8500 7000 7600 7000
-Text GLabel 7600 7000 0 48 BiDi ~ 0
+Text GLabel 7600 7000 0    48   BiDi ~ 0
 FPGA_GPIO_B_2
 Wire Wire Line
 	3100 6700 1900 6700
-Text GLabel 3100 6100 2 48 BiDi ~ 0
+Text GLabel 3100 6100 2    48   BiDi ~ 0
 FPGA_GPIO_B_3
 Wire Wire Line
 	10000 7000 9100 7000
-Text GLabel 10000 7000 2 48 BiDi ~ 0
+Text GLabel 10000 7000 2    48   BiDi ~ 0
 FPGA_GPIO_B_3
 Wire Wire Line
 	3100 6800 1900 6800
-Text GLabel 3100 7500 2 48 BiDi ~ 0
+Text GLabel 3100 7500 2    48   BiDi ~ 0
 FPGA_GPIO_B_4
 Wire Wire Line
 	8500 7200 7600 7200
-Text GLabel 7600 7200 0 48 BiDi ~ 0
+Text GLabel 7600 7200 0    48   BiDi ~ 0
 FPGA_GPIO_B_4
 Wire Wire Line
 	3100 6900 1900 6900
-Text GLabel 3100 9200 2 48 BiDi ~ 0
+Text GLabel 3100 9200 2    48   BiDi ~ 0
 FPGA_GPIO_B_5
 Wire Wire Line
 	10000 7200 9100 7200
-Text GLabel 10000 7200 2 48 BiDi ~ 0
+Text GLabel 10000 7200 2    48   BiDi ~ 0
 FPGA_GPIO_B_5
 Wire Wire Line
 	3100 7000 1900 7000
-Text GLabel 3100 8800 2 48 BiDi ~ 0
+Text GLabel 3100 8800 2    48   BiDi ~ 0
 FPGA_GPIO_B_6
 Wire Wire Line
 	8500 7300 7600 7300
-Text GLabel 7600 7300 0 48 BiDi ~ 0
+Text GLabel 7600 7300 0    48   BiDi ~ 0
 FPGA_GPIO_B_6
-Text GLabel 3100 8900 2 48 BiDi ~ 0
+Text GLabel 3100 8900 2    48   BiDi ~ 0
 FPGA_GPIO_B_7
 Wire Wire Line
 	10000 7300 9100 7300
-Text GLabel 10000 7300 2 48 BiDi ~ 0
+Text GLabel 10000 7300 2    48   BiDi ~ 0
 FPGA_GPIO_B_7
 Wire Wire Line
 	3100 7300 1900 7300
-Text GLabel 3100 7300 2 48 UnSpc ~ 0
+Text GLabel 3100 7300 2    48   UnSpc ~ 0
 FPGA_GCLK
 Wire Wire Line
 	7890 8700 7300 8700
-Text GLabel 7300 8700 0 48 Input ~ 0
+Text GLabel 7300 8700 0    48   Input ~ 0
 FPGA_GPIO_LED_2
 Wire Wire Line
 	8200 8600 7300 8600
-Text GLabel 7300 8600 0 48 Input ~ 0
+Text GLabel 7300 8600 0    48   Input ~ 0
 FPGA_GPIO_LED_3
 Wire Wire Line
 	7890 8900 7300 8900
-Text GLabel 7300 8900 0 48 Input ~ 0
+Text GLabel 7300 8900 0    48   Input ~ 0
 FPGA_GPIO_LED_0
 Wire Wire Line
 	8200 8800 7300 8800
-Text GLabel 7300 8800 0 48 Input ~ 0
+Text GLabel 7300 8800 0    48   Input ~ 0
 FPGA_GPIO_LED_1
 Wire Wire Line
 	8900 8900 8290 8900
@@ -449,15 +449,15 @@ Wire Wire Line
 	8700 8600 8600 8600
 Wire Wire Line
 	3100 7200 1900 7200
-Text GLabel 3100 7200 2 48 Output ~ 0
+Text GLabel 3100 7200 2    48   Output ~ 0
 FPGA_ENTROPY_DISABLE
 Wire Wire Line
 	3100 8300 1900 8300
-Text GLabel 3100 8300 2 48 UnSpc ~ 0
+Text GLabel 3100 8300 2    48   UnSpc ~ 0
 AVR_GPIO_FPGA_2
 Wire Wire Line
 	3100 8400 1900 8400
-Text GLabel 3100 8400 2 48 UnSpc ~ 0
+Text GLabel 3100 8400 2    48   UnSpc ~ 0
 AVR_GPIO_FPGA_3
 Wire Wire Line
 	3100 7500 1900 7500
@@ -472,9 +472,11 @@ L Cryptech_Alpha:MA08-2 SV2
 U 1 1 58023EF9
 P 8800 5000
 F 0 "SV2" H 8980 5630 60  0000 R TNN
-	1    8800 5000
-	-1   0    0    1
+F 1 "~" H 8800 5000 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLD-16" H 8980 5630 60  0001 C CNN
+F 3 "" H 8800 5000 50  0001 C CNN
+	1    8800 5000
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R99
@@ -485,7 +487,7 @@ F 1 "330" H 8500 8510 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8500 8510 60  0001 C CNN
 F 3 "" H 8500 8510 60  0000 C CNN
 	1    8400 8600
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R98
@@ -496,7 +498,7 @@ F 1 "330" H 8230 8510 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8230 8510 60  0001 C CNN
 F 3 "" H 8230 8510 60  0000 C CNN
 	1    8090 8700
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R64
@@ -507,7 +509,7 @@ F 1 "330" H 8090 8500 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8090 8500 60  0001 C CNN
 F 3 "" H 8090 8500 60  0000 C CNN
 	1    8400 8800
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R100
@@ -518,16 +520,18 @@ F 1 "330" H 8190 9160 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8190 9160 60  0001 C CNN
 F 3 "" H 8190 9160 60  0000 C CNN
 	1    8090 8900
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:MA08-2 SV3
 U 1 1 58023EF4
 P 8800 6900
 F 0 "SV3" H 8980 7530 60  0000 R TNN
-	1    8800 6900
-	-1   0    0    1
+F 1 "~" H 8800 6900 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLD-16" H 8980 7530 60  0001 C CNN
+F 3 "" H 8800 6900 50  0001 C CNN
+	1    8800 6900
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C121
@@ -538,7 +542,7 @@ F 1 "0.1uF" H 7320 5010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7320 5010 60  0001 C CNN
 F 3 "" H 7320 5010 60  0000 C CNN
 	1    7200 5100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C122
@@ -549,7 +553,7 @@ F 1 "0.1uF" H 7330 6910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7330 6910 60  0001 C CNN
 F 3 "" H 7330 6910 60  0000 C CNN
 	1    7200 7000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED17
@@ -560,7 +564,7 @@ F 1 "LTST-C193TBKT-5A" V 8960 8220 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 8960 8220 60  0001 C CNN
 F 3 "" H 8960 8220 60  0000 C CNN
 	1    9000 8900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED15
@@ -571,7 +575,7 @@ F 1 "LTST-C191KGKT" V 8760 7920 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 8760 7920 60  0001 C CNN
 F 3 "" H 8760 7920 60  0000 C CNN
 	1    8800 8800
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED16
@@ -582,7 +586,7 @@ F 1 "LTST-C191KSKT" V 8960 8030 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 8960 8030 60  0001 C CNN
 F 3 "" H 8960 8030 60  0000 C CNN
 	1    9000 8700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED14
@@ -593,16 +597,7 @@ F 1 "LTST-C191KRKT" V 8760 7720 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 8760 7720 60  0001 C CNN
 F 3 "" H 8760 7720 60  0000 C CNN
 	1    8800 8600
-	0    -1   -1   0
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_5 U13_11
-U 1 1 58023EED
-P 1700 7100
-F 0 "U13_11" H 1290 4090 60  0000 L BNN
-	1    1700 7100
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1290 4090 60  0001 C CNN
+	0    -1   -1   0   
 $EndComp
 NoConn ~ 1900 5000
 NoConn ~ 1900 5100
@@ -628,4 +623,15 @@ NoConn ~ 1900 9700
 NoConn ~ 1900 9800
 NoConn ~ 1900 9900
 NoConn ~ 1900 6200
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 5 1 5AFD188C
+P 1300 7000
+F 0 "U13" H 1156 9867 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1156 9776 50  0000 C CNN
+F 2 "" H 900 7000 50  0001 C CNN
+F 3 "" H 900 7000 50  0001 C CNN
+	5    1300 7000
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_20.sch b/rev03-KiCad/rev02_20.sch
index d528116..69fa351 100644
--- a/rev03-KiCad/rev02_20.sch
+++ b/rev03-KiCad/rev02_20.sch
@@ -23,15 +23,15 @@ Text Notes 4800 6500 0    60   ~ 12
 <-- FPGA_GPIO_* and FPGA_IRQ_N_* signals can be swapped
 Text Notes 4980 4810 0    60   ~ 12
 <-- Disable pull-ups on all pins during configuration
-Text Notes 8500 10220 0    84   ~ 12
+Text Notes 8500 10220 0    84   ~ 17
 FPGA MKM interface
 Text Notes 4280 4890 0    60   ~ 12
 R65
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_38
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_038
 U 1 1 58023EEC
 P 4200 4300
-F 0 "VCCO_3V3_38" H 4200 4300 20  0000 C CNN
+F 0 "#VCCO_3V3_038" H 4200 4300 20  0000 C CNN
 F 1 "+VCCO_3V3" H 4200 4230 30  0000 C CNN
 F 2 "" H 4200 4300 70  0000 C CNN
 F 3 "" H 4200 4300 70  0000 C CNN
@@ -40,20 +40,18 @@ F 3 "" H 4200 4300 70  0000 C CNN
 $EndComp
 Wire Wire Line
 	3600 7400 2400 7400
-Text GLabel 3600 7400 2 48 Input ~ 0
+Text GLabel 3600 7400 2    48   Input ~ 0
 DIGITIZED_NOISE
 Wire Wire Line
 	3600 6500 2400 6500
-Text GLabel 3600 6500 2 48 Output ~ 0
+Text GLabel 3600 6500 2    48   Output ~ 0
 FPGA_GPIO_LED_2
 Wire Wire Line
 	3600 6600 2400 6600
-Text GLabel 3600 6600 2 48 Output ~ 0
+Text GLabel 3600 6600 2    48   Output ~ 0
 FPGA_GPIO_LED_3
 Wire Wire Line
 	3600 6400 2400 6400
-Wire Wire Line
-	2900 5600 2400 5600
 Wire Wire Line
 	2600 4500 2400 4500
 Wire Wire Line
@@ -72,8 +70,6 @@ Wire Wire Line
 	2600 4700 2400 4700
 Wire Wire Line
 	2600 4600 2400 4600
-Wire Wire Line
-	2900 4500 2600 4500
 Wire Wire Line
 	4200 4300 4200 4500
 Wire Wire Line
@@ -82,102 +78,98 @@ Wire Wire Line
 	2600 5000 2400 5000
 Wire Wire Line
 	3600 5200 3500 5200
-Text GLabel 3600 5200 2 48 UnSpc ~ 0
+Text GLabel 3600 5200 2    48   UnSpc ~ 0
 FPGA_CFG_MOSI
 Wire Wire Line
 	3600 5300 3500 5300
-Text GLabel 3600 5300 2 48 Input ~ 0
+Text GLabel 3600 5300 2    48   Input ~ 0
 FPGA_CFG_MISO
 Wire Wire Line
 	3600 6200 3500 6200
-Text GLabel 3600 6200 2 48 Output ~ 0
+Text GLabel 3600 6200 2    48   Output ~ 0
 FPGA_CFG_CS_N
 Wire Wire Line
 	3100 5300 2400 5300
-Text Label 2460 5300 2 48 ~ 0
+Text Label 2460 5300 2    48   ~ 0
 FPGA_CFG_MISO1
 Wire Wire Line
 	3100 5200 2400 5200
-Text Label 2460 5200 2 48 ~ 0
+Text Label 2460 5200 2    48   ~ 0
 FPGA_CFG_MOSI1
 Wire Wire Line
 	3100 6200 2400 6200
-Text Label 2460 6200 2 48 ~ 0
+Text Label 2460 6200 2    48   ~ 0
 FPGA_CFG_CS_N1
-Text GLabel 3600 7000 2 48 Input ~ 0
+Text GLabel 3600 7000 2    48   Input ~ 0
 FMC_A19
-Text GLabel 3600 7100 2 48 Input ~ 0
+Text GLabel 3600 7100 2    48   Input ~ 0
 FMC_A20
 Wire Wire Line
 	3600 7000 2400 7000
 Wire Wire Line
 	3600 7100 2400 7100
-Text GLabel 3610 8100 2 48 Input ~ 0
+Text GLabel 3610 8100 2    48   Input ~ 0
 FMC_A21
 Wire Wire Line
 	3610 8100 2400 8100
-Text GLabel 3600 6800 2 48 Input ~ 0
+Text GLabel 3600 6800 2    48   Input ~ 0
 FMC_A22
-Text GLabel 3600 6900 2 48 Input ~ 0
+Text GLabel 3600 6900 2    48   Input ~ 0
 FMC_A23
 Wire Wire Line
 	3600 6900 2400 6900
 Wire Wire Line
 	3600 6800 2400 6800
-Text GLabel 3600 8500 2 48 Input ~ 0
+Text GLabel 3600 8500 2    48   Input ~ 0
 FMC_A24
 Wire Wire Line
 	3600 8500 2400 8500
-Text GLabel 3600 8000 2 48 Input ~ 0
+Text GLabel 3600 8000 2    48   Input ~ 0
 FMC_A25
 Wire Wire Line
 	3600 8000 2400 8000
-Text GLabel 3600 7600 2 48 BiDi ~ 0
+Text GLabel 3600 7600 2    48   BiDi ~ 0
 FMC_D8
 Wire Wire Line
 	3600 7600 2400 7600
-Text GLabel 3600 6700 2 48 BiDi ~ 0
+Text GLabel 3600 6700 2    48   BiDi ~ 0
 FMC_D9
 Wire Wire Line
 	3600 6700 2400 6700
-Text GLabel 3600 7500 2 48 BiDi ~ 0
+Text GLabel 3600 7500 2    48   BiDi ~ 0
 FMC_D10
 Wire Wire Line
 	3600 7500 2400 7500
-Text GLabel 3600 7200 2 48 BiDi ~ 0
+Text GLabel 3600 7200 2    48   BiDi ~ 0
 FMC_D12
 Wire Wire Line
 	3600 7200 2400 7200
-Text GLabel 3600 7300 2 48 BiDi ~ 0
+Text GLabel 3600 7300 2    48   BiDi ~ 0
 FMC_D28
 Wire Wire Line
 	3600 7300 2400 7300
-Text GLabel 3600 7800 2 48 BiDi ~ 0
+Text GLabel 3600 7800 2    48   BiDi ~ 0
 FMC_D29
 Wire Wire Line
 	3600 7800 2400 7800
-Text GLabel 3100 5500 2 48 BiDi ~ 0
+Text GLabel 3100 5500 2    48   BiDi ~ 0
 FMC_D30
 Wire Wire Line
 	3100 5500 2400 5500
-Text GLabel 3100 5400 2 48 BiDi ~ 0
+Text GLabel 3100 5400 2    48   BiDi ~ 0
 FMC_D31
 Wire Wire Line
 	3100 5400 2400 5400
-Text GLabel 3600 8300 2 48 UnSpc ~ 0
+Text GLabel 3600 8300 2    48   UnSpc ~ 0
 FMC_NL
 Wire Wire Line
 	3600 8300 2400 8300
-Text GLabel 3600 10000 2 48 BiDi ~ 0
+Text GLabel 3600 10000 2    48   BiDi ~ 0
 FMC_D11
 Wire Wire Line
 	3600 10000 2400 10000
-Wire Wire Line
-	4200 5600 2900 5600
 Wire Wire Line
 	4200 5000 4200 5600
-Wire Wire Line
-	4200 4500 2900 4500
 Wire Wire Line
 	4200 4600 4200 4500
 $Comp
@@ -189,7 +181,7 @@ F 1 "1k" V 4030 4730 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 4030 4730 60  0001 C CNN
 F 3 "" H 4030 4730 60  0000 C CNN
 	1    4200 4800
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0603 R83
@@ -200,7 +192,7 @@ F 1 "0" H 3220 5120 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 3220 5120 60  0001 C CNN
 F 3 "" H 3220 5120 60  0000 C CNN
 	1    3300 5200
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0603 R84
@@ -211,7 +203,7 @@ F 1 "0" H 3210 5470 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 3210 5470 60  0001 C CNN
 F 3 "" H 3210 5470 60  0000 C CNN
 	1    3300 5300
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0603 R85
@@ -222,16 +214,7 @@ F 1 "0" H 3170 6300 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 3170 6300 60  0001 C CNN
 F 3 "" H 3170 6300 60  0000 C CNN
 	1    3300 6200
-	-1   0    0    1
-$EndComp
-$Comp
-L Cryptech_Alpha:XC7A200TFBG484_3 U13_12
-U 1 1 58023EE7
-P 2200 7200
-F 0 "U13_12" H 1790 4190 60  0000 L BNN
-	1    2200 7200
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1790 4190 60  0001 C CNN
+	-1   0    0    1   
 $EndComp
 NoConn ~ 2400 5700
 NoConn ~ 2400 5900
@@ -259,4 +242,19 @@ NoConn ~ 2400 9800
 NoConn ~ 2400 9900
 NoConn ~ 2400 5100
 NoConn ~ 3600 6400
+Wire Wire Line
+	2400 5600 4200 5600
+Wire Wire Line
+	2600 4500 4200 4500
+$Comp
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 3 1 5AFEFFED
+P 2200 7100
+F 0 "U13" H 1306 9967 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1306 9876 50  0000 C CNN
+F 2 "" H 1800 7100 50  0001 C CNN
+F 3 "" H 1800 7100 50  0001 C CNN
+	3    2200 7100
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_21.sch b/rev03-KiCad/rev02_21.sch
index 02dc358..5e988e5 100644
--- a/rev03-KiCad/rev02_21.sch
+++ b/rev03-KiCad/rev02_21.sch
@@ -19,13 +19,13 @@ Text Notes 5000 4600 0    60   ~ 12
 *) Power - CORE & BRAM
 Text Notes 2000 4500 0    60   ~ 12
 *) Ground Pins
-Text Notes 8460 10210 0    66   ~ 12
+Text Notes 8460 10210 0    66   ~ 13
 FPGA power and ground
 $Comp
-L power:GND GND_132
+L power:GND #GND_0132
 U 1 1 58023EE6
 P 2000 9700
-F 0 "GND_132" H 2000 9700 20  0000 C CNN
+F 0 "#GND_0132" H 2000 9700 20  0000 C CNN
 F 1 "+GND" H 2000 9630 30  0000 C CNN
 F 2 "" H 2000 9700 70  0000 C CNN
 F 3 "" H 2000 9700 70  0000 C CNN
@@ -33,10 +33,10 @@ F 3 "" H 2000 9700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_133
+L power:GND #GND_0133
 U 1 1 58023EE5
 P 3800 9600
-F 0 "GND_133" H 3800 9600 20  0000 C CNN
+F 0 "#GND_0133" H 3800 9600 20  0000 C CNN
 F 1 "+GND" H 3800 9530 30  0000 C CNN
 F 2 "" H 3800 9600 70  0000 C CNN
 F 3 "" H 3800 9600 70  0000 C CNN
@@ -44,10 +44,10 @@ F 3 "" H 3800 9600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FPGA_VCCINT_1V0 FPGA_VCCINT_1V0
+L Cryptech_Alpha:FPGA_VCCINT_1V0 #FPGA_VCCINT_1V00
 U 1 1 58023EE4
 P 6000 4900
-F 0 "FPGA_VCCINT_1V0" H 6000 4900 20  0000 C CNN
+F 0 "#FPGA_VCCINT_1V00" H 6000 4900 20  0000 C CNN
 F 1 "+FPGA_VCCINT_1V0" H 6000 4830 30  0000 C CNN
 F 2 "" H 6000 4900 70  0000 C CNN
 F 3 "" H 6000 4900 70  0000 C CNN
@@ -55,10 +55,10 @@ F 3 "" H 6000 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FPGA_VCCAUX_1V8 FPGA_VCCAUX_1V8_2
+L Cryptech_Alpha:FPGA_VCCAUX_1V8 #FPGA_VCCAUX_1V8_02
 U 1 1 58023EE3
 P 9000 4900
-F 0 "FPGA_VCCAUX_1V8_2" H 9000 4900 20  0000 C CNN
+F 0 "#FPGA_VCCAUX_1V8_02" H 9000 4900 20  0000 C CNN
 F 1 "+FPGA_VCCAUX_1V8" H 9000 4830 30  0000 C CNN
 F 2 "" H 9000 4900 70  0000 C CNN
 F 3 "" H 9000 4900 70  0000 C CNN
@@ -502,48 +502,58 @@ Wire Wire Line
 Wire Wire Line
 	9000 4900 9000 5100
 $Comp
-L Cryptech_Alpha:XC7A200TFBG484_9 U13_13
-U 1 1 58023EE2
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 9 1 5AFE7368
 P 1600 7300
-F 0 "U13_13" H 1190 4890 60  0000 L BNN
-	1    1600 7300
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1190 4890 60  0001 C CNN
+F 0 "U13" H 1505 9667 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 1505 9576 50  0000 C CNN
+F 2 "" H 1200 7300 50  0001 C CNN
+F 3 "" H 1200 7300 50  0001 C CNN
+	9    1600 7300
+	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:XC7A200TFBG484_10 U13_14
-U 1 1 58023EE1
-P 3400 7300
-F 0 "U13_14" H 2990 4990 60  0000 L BNN
-	1    3400 7300
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 2990 4990 60  0001 C CNN
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 10 1 5AFE746E
+P 3400 7250
+F 0 "U13" H 3305 9567 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 3305 9476 50  0000 C CNN
+F 2 "" H 3000 7250 50  0001 C CNN
+F 3 "" H 3000 7250 50  0001 C CNN
+	10   3400 7250
+	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:XC7A200TFBG484_14 U13_15
-U 1 1 58023EE0
-P 8600 5300
-F 0 "U13_15" H 8190 4890 60  0000 L BNN
-	1    8600 5300
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 8190 4890 60  0001 C CNN
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 14 1 5AFE753E
+P 8600 5250
+F 0 "U13" H 8476 5667 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 8476 5576 50  0000 C CNN
+F 2 "" H 8200 5250 50  0001 C CNN
+F 3 "" H 8200 5250 50  0001 C CNN
+	14   8600 5250
+	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:XC7A200TFBG484_15 U13_16
-U 1 1 58023EDF
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 15 1 5AFE75E4
 P 5600 5200
-F 0 "U13_16" H 5190 4890 60  0000 L BNN
-	1    5600 5200
-	1    0    0    -1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 5190 4890 60  0001 C CNN
+F 0 "U13" H 5441 5567 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 5441 5476 50  0000 C CNN
+F 2 "" H 5200 5200 50  0001 C CNN
+F 3 "" H 5200 5200 50  0001 C CNN
+	15   5600 5200
+	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:XC7A200TFBG484_16 U13_17
-U 1 1 58023EDE
-P 5600 6600
-F 0 "U13_17" H 5190 7410 60  0000 L TNN
-	1    5600 6600
-	1   0    0    1
-F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 5190 7410 60  0001 C CNN
+L Cryptech_Alpha:XC7A200TFBG484 U13
+U 16 1 5AFE76A8
+P 5600 6500
+F 0 "U13" H 5476 7367 50  0000 C CNN
+F 1 "XC7A200TFBG484" H 5476 7276 50  0000 C CNN
+F 2 "" H 5200 6500 50  0001 C CNN
+F 3 "" H 5200 6500 50  0001 C CNN
+	16   5600 6500
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_22.sch b/rev03-KiCad/rev02_22.sch
index 01071c3..5e23c0d 100644
--- a/rev03-KiCad/rev02_22.sch
+++ b/rev03-KiCad/rev02_22.sch
@@ -21,7 +21,7 @@ Text Notes 6600 8500 0    60   ~ 12
 <-- Place small 0.47 uF caps right under the BGA package\n<-- Place medium 4.7 uF caps very close to the BGA package\n<-- Place large 47 uF caps not far from the BGA package\n<-- Try to place smaller caps next to FPGA balls
 Text Notes 2800 7500 0    60   ~ 12
 *) Decoupling capacitors for VCCAUX
-Text Notes 8620 10190 0    48   ~ 12
+Text Notes 8620 10190 0    48   ~ 10
 FPGA CORE and AUX capacitors
 Text Notes 3760 4690 0    60   ~ 12
 C140
@@ -184,10 +184,10 @@ C126
 Text Notes 1660 8290 0    60   ~ 12
 47uF
 $Comp
-L power:GND GND_134
+L power:GND #GND_0134
 U 1 1 58023EDD
 P 1300 5000
-F 0 "GND_134" H 1300 5000 20  0000 C CNN
+F 0 "#GND_0134" H 1300 5000 20  0000 C CNN
 F 1 "+GND" H 1300 4930 30  0000 C CNN
 F 2 "" H 1300 5000 70  0000 C CNN
 F 3 "" H 1300 5000 70  0000 C CNN
@@ -195,10 +195,10 @@ F 3 "" H 1300 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_135
+L power:GND #GND_0135
 U 1 1 58023EDC
 P 1800 5000
-F 0 "GND_135" H 1800 5000 20  0000 C CNN
+F 0 "#GND_0135" H 1800 5000 20  0000 C CNN
 F 1 "+GND" H 1800 4930 30  0000 C CNN
 F 2 "" H 1800 5000 70  0000 C CNN
 F 3 "" H 1800 5000 70  0000 C CNN
@@ -206,10 +206,10 @@ F 3 "" H 1800 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_136
+L power:GND #GND_0136
 U 1 1 58023EDB
 P 3700 5900
-F 0 "GND_136" H 3700 5900 20  0000 C CNN
+F 0 "#GND_0136" H 3700 5900 20  0000 C CNN
 F 1 "+GND" H 3700 5830 30  0000 C CNN
 F 2 "" H 3700 5900 70  0000 C CNN
 F 3 "" H 3700 5900 70  0000 C CNN
@@ -217,10 +217,10 @@ F 3 "" H 3700 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_137
+L power:GND #GND_0137
 U 1 1 58023EDA
 P 4200 5900
-F 0 "GND_137" H 4200 5900 20  0000 C CNN
+F 0 "#GND_0137" H 4200 5900 20  0000 C CNN
 F 1 "+GND" H 4200 5830 30  0000 C CNN
 F 2 "" H 4200 5900 70  0000 C CNN
 F 3 "" H 4200 5900 70  0000 C CNN
@@ -228,10 +228,10 @@ F 3 "" H 4200 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_138
+L power:GND #GND_0138
 U 1 1 58023ED9
 P 4700 5900
-F 0 "GND_138" H 4700 5900 20  0000 C CNN
+F 0 "#GND_0138" H 4700 5900 20  0000 C CNN
 F 1 "+GND" H 4700 5830 30  0000 C CNN
 F 2 "" H 4700 5900 70  0000 C CNN
 F 3 "" H 4700 5900 70  0000 C CNN
@@ -239,10 +239,10 @@ F 3 "" H 4700 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_139
+L power:GND #GND_0139
 U 1 1 58023ED8
 P 5200 5900
-F 0 "GND_139" H 5200 5900 20  0000 C CNN
+F 0 "#GND_0139" H 5200 5900 20  0000 C CNN
 F 1 "+GND" H 5200 5830 30  0000 C CNN
 F 2 "" H 5200 5900 70  0000 C CNN
 F 3 "" H 5200 5900 70  0000 C CNN
@@ -250,10 +250,10 @@ F 3 "" H 5200 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_140
+L power:GND #GND_0140
 U 1 1 58023ED7
 P 5700 5900
-F 0 "GND_140" H 5700 5900 20  0000 C CNN
+F 0 "#GND_0140" H 5700 5900 20  0000 C CNN
 F 1 "+GND" H 5700 5830 30  0000 C CNN
 F 2 "" H 5700 5900 70  0000 C CNN
 F 3 "" H 5700 5900 70  0000 C CNN
@@ -261,10 +261,10 @@ F 3 "" H 5700 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_141
+L power:GND #GND_0141
 U 1 1 58023ED6
 P 6200 5900
-F 0 "GND_141" H 6200 5900 20  0000 C CNN
+F 0 "#GND_0141" H 6200 5900 20  0000 C CNN
 F 1 "+GND" H 6200 5830 30  0000 C CNN
 F 2 "" H 6200 5900 70  0000 C CNN
 F 3 "" H 6200 5900 70  0000 C CNN
@@ -272,10 +272,10 @@ F 3 "" H 6200 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_142
+L power:GND #GND_0142
 U 1 1 58023ED5
 P 3700 5000
-F 0 "GND_142" H 3700 5000 20  0000 C CNN
+F 0 "#GND_0142" H 3700 5000 20  0000 C CNN
 F 1 "+GND" H 3700 4930 30  0000 C CNN
 F 2 "" H 3700 5000 70  0000 C CNN
 F 3 "" H 3700 5000 70  0000 C CNN
@@ -283,10 +283,10 @@ F 3 "" H 3700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_143
+L power:GND #GND_0143
 U 1 1 58023ED4
 P 4200 5000
-F 0 "GND_143" H 4200 5000 20  0000 C CNN
+F 0 "#GND_0143" H 4200 5000 20  0000 C CNN
 F 1 "+GND" H 4200 4930 30  0000 C CNN
 F 2 "" H 4200 5000 70  0000 C CNN
 F 3 "" H 4200 5000 70  0000 C CNN
@@ -294,10 +294,10 @@ F 3 "" H 4200 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_144
+L power:GND #GND_0144
 U 1 1 58023ED3
 P 4700 5000
-F 0 "GND_144" H 4700 5000 20  0000 C CNN
+F 0 "#GND_0144" H 4700 5000 20  0000 C CNN
 F 1 "+GND" H 4700 4930 30  0000 C CNN
 F 2 "" H 4700 5000 70  0000 C CNN
 F 3 "" H 4700 5000 70  0000 C CNN
@@ -305,10 +305,10 @@ F 3 "" H 4700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_145
+L power:GND #GND_0145
 U 1 1 58023ED2
 P 5200 5000
-F 0 "GND_145" H 5200 5000 20  0000 C CNN
+F 0 "#GND_0145" H 5200 5000 20  0000 C CNN
 F 1 "+GND" H 5200 4930 30  0000 C CNN
 F 2 "" H 5200 5000 70  0000 C CNN
 F 3 "" H 5200 5000 70  0000 C CNN
@@ -316,10 +316,10 @@ F 3 "" H 5200 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_146
+L power:GND #GND_0146
 U 1 1 58023ED1
 P 5700 5000
-F 0 "GND_146" H 5700 5000 20  0000 C CNN
+F 0 "#GND_0146" H 5700 5000 20  0000 C CNN
 F 1 "+GND" H 5700 4930 30  0000 C CNN
 F 2 "" H 5700 5000 70  0000 C CNN
 F 3 "" H 5700 5000 70  0000 C CNN
@@ -327,10 +327,10 @@ F 3 "" H 5700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_147
+L power:GND #GND_0147
 U 1 1 58023ED0
 P 6200 5000
-F 0 "GND_147" H 6200 5000 20  0000 C CNN
+F 0 "#GND_0147" H 6200 5000 20  0000 C CNN
 F 1 "+GND" H 6200 4930 30  0000 C CNN
 F 2 "" H 6200 5000 70  0000 C CNN
 F 3 "" H 6200 5000 70  0000 C CNN
@@ -338,10 +338,10 @@ F 3 "" H 6200 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_148
+L power:GND #GND_0148
 U 1 1 58023ECF
 P 2500 5000
-F 0 "GND_148" H 2500 5000 20  0000 C CNN
+F 0 "#GND_0148" H 2500 5000 20  0000 C CNN
 F 1 "+GND" H 2500 4930 30  0000 C CNN
 F 2 "" H 2500 5000 70  0000 C CNN
 F 3 "" H 2500 5000 70  0000 C CNN
@@ -349,10 +349,10 @@ F 3 "" H 2500 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_149
+L power:GND #GND_0149
 U 1 1 58023ECE
 P 3000 5000
-F 0 "GND_149" H 3000 5000 20  0000 C CNN
+F 0 "#GND_0149" H 3000 5000 20  0000 C CNN
 F 1 "+GND" H 3000 4930 30  0000 C CNN
 F 2 "" H 3000 5000 70  0000 C CNN
 F 3 "" H 3000 5000 70  0000 C CNN
@@ -360,10 +360,10 @@ F 3 "" H 3000 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_150
+L power:GND #GND_0150
 U 1 1 58023ECD
 P 2800 5900
-F 0 "GND_150" H 2800 5900 20  0000 C CNN
+F 0 "#GND_0150" H 2800 5900 20  0000 C CNN
 F 1 "+GND" H 2800 5830 30  0000 C CNN
 F 2 "" H 2800 5900 70  0000 C CNN
 F 3 "" H 2800 5900 70  0000 C CNN
@@ -371,10 +371,10 @@ F 3 "" H 2800 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_151
+L power:GND #GND_0151
 U 1 1 58023ECC
 P 2300 5900
-F 0 "GND_151" H 2300 5900 20  0000 C CNN
+F 0 "#GND_0151" H 2300 5900 20  0000 C CNN
 F 1 "+GND" H 2300 5830 30  0000 C CNN
 F 2 "" H 2300 5900 70  0000 C CNN
 F 3 "" H 2300 5900 70  0000 C CNN
@@ -382,10 +382,10 @@ F 3 "" H 2300 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_152
+L power:GND #GND_0152
 U 1 1 58023ECB
 P 1800 5900
-F 0 "GND_152" H 1800 5900 20  0000 C CNN
+F 0 "#GND_0152" H 1800 5900 20  0000 C CNN
 F 1 "+GND" H 1800 5830 30  0000 C CNN
 F 2 "" H 1800 5900 70  0000 C CNN
 F 3 "" H 1800 5900 70  0000 C CNN
@@ -393,10 +393,10 @@ F 3 "" H 1800 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_153
+L power:GND #GND_0153
 U 1 1 58023ECA
 P 1300 5900
-F 0 "GND_153" H 1300 5900 20  0000 C CNN
+F 0 "#GND_0153" H 1300 5900 20  0000 C CNN
 F 1 "+GND" H 1300 5830 30  0000 C CNN
 F 2 "" H 1300 5900 70  0000 C CNN
 F 3 "" H 1300 5900 70  0000 C CNN
@@ -404,10 +404,10 @@ F 3 "" H 1300 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_154
+L power:GND #GND_0154
 U 1 1 58023EC9
 P 2800 6800
-F 0 "GND_154" H 2800 6800 20  0000 C CNN
+F 0 "#GND_0154" H 2800 6800 20  0000 C CNN
 F 1 "+GND" H 2800 6730 30  0000 C CNN
 F 2 "" H 2800 6800 70  0000 C CNN
 F 3 "" H 2800 6800 70  0000 C CNN
@@ -415,10 +415,10 @@ F 3 "" H 2800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_155
+L power:GND #GND_0155
 U 1 1 58023EC8
 P 2300 6800
-F 0 "GND_155" H 2300 6800 20  0000 C CNN
+F 0 "#GND_0155" H 2300 6800 20  0000 C CNN
 F 1 "+GND" H 2300 6730 30  0000 C CNN
 F 2 "" H 2300 6800 70  0000 C CNN
 F 3 "" H 2300 6800 70  0000 C CNN
@@ -426,10 +426,10 @@ F 3 "" H 2300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_156
+L power:GND #GND_0156
 U 1 1 58023EC7
 P 1800 6800
-F 0 "GND_156" H 1800 6800 20  0000 C CNN
+F 0 "#GND_0156" H 1800 6800 20  0000 C CNN
 F 1 "+GND" H 1800 6730 30  0000 C CNN
 F 2 "" H 1800 6800 70  0000 C CNN
 F 3 "" H 1800 6800 70  0000 C CNN
@@ -437,10 +437,10 @@ F 3 "" H 1800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_157
+L power:GND #GND_0157
 U 1 1 58023EC6
 P 1300 6800
-F 0 "GND_157" H 1300 6800 20  0000 C CNN
+F 0 "#GND_0157" H 1300 6800 20  0000 C CNN
 F 1 "+GND" H 1300 6730 30  0000 C CNN
 F 2 "" H 1300 6800 70  0000 C CNN
 F 3 "" H 1300 6800 70  0000 C CNN
@@ -448,10 +448,10 @@ F 3 "" H 1300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_158
+L power:GND #GND_0158
 U 1 1 58023EC5
 P 4800 6800
-F 0 "GND_158" H 4800 6800 20  0000 C CNN
+F 0 "#GND_0158" H 4800 6800 20  0000 C CNN
 F 1 "+GND" H 4800 6730 30  0000 C CNN
 F 2 "" H 4800 6800 70  0000 C CNN
 F 3 "" H 4800 6800 70  0000 C CNN
@@ -459,10 +459,10 @@ F 3 "" H 4800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_159
+L power:GND #GND_0159
 U 1 1 58023EC4
 P 4300 6800
-F 0 "GND_159" H 4300 6800 20  0000 C CNN
+F 0 "#GND_0159" H 4300 6800 20  0000 C CNN
 F 1 "+GND" H 4300 6730 30  0000 C CNN
 F 2 "" H 4300 6800 70  0000 C CNN
 F 3 "" H 4300 6800 70  0000 C CNN
@@ -470,10 +470,10 @@ F 3 "" H 4300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_160
+L power:GND #GND_0160
 U 1 1 58023EC3
 P 3800 6800
-F 0 "GND_160" H 3800 6800 20  0000 C CNN
+F 0 "#GND_0160" H 3800 6800 20  0000 C CNN
 F 1 "+GND" H 3800 6730 30  0000 C CNN
 F 2 "" H 3800 6800 70  0000 C CNN
 F 3 "" H 3800 6800 70  0000 C CNN
@@ -481,10 +481,10 @@ F 3 "" H 3800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_161
+L power:GND #GND_0161
 U 1 1 58023EC2
 P 3300 6800
-F 0 "GND_161" H 3300 6800 20  0000 C CNN
+F 0 "#GND_0161" H 3300 6800 20  0000 C CNN
 F 1 "+GND" H 3300 6730 30  0000 C CNN
 F 2 "" H 3300 6800 70  0000 C CNN
 F 3 "" H 3300 6800 70  0000 C CNN
@@ -492,10 +492,10 @@ F 3 "" H 3300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_162
+L power:GND #GND_0162
 U 1 1 58023EC1
 P 6800 6800
-F 0 "GND_162" H 6800 6800 20  0000 C CNN
+F 0 "#GND_0162" H 6800 6800 20  0000 C CNN
 F 1 "+GND" H 6800 6730 30  0000 C CNN
 F 2 "" H 6800 6800 70  0000 C CNN
 F 3 "" H 6800 6800 70  0000 C CNN
@@ -503,10 +503,10 @@ F 3 "" H 6800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_163
+L power:GND #GND_0163
 U 1 1 58023EC0
 P 6300 6800
-F 0 "GND_163" H 6300 6800 20  0000 C CNN
+F 0 "#GND_0163" H 6300 6800 20  0000 C CNN
 F 1 "+GND" H 6300 6730 30  0000 C CNN
 F 2 "" H 6300 6800 70  0000 C CNN
 F 3 "" H 6300 6800 70  0000 C CNN
@@ -514,10 +514,10 @@ F 3 "" H 6300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_164
+L power:GND #GND_0164
 U 1 1 58023EBF
 P 5800 6800
-F 0 "GND_164" H 5800 6800 20  0000 C CNN
+F 0 "#GND_0164" H 5800 6800 20  0000 C CNN
 F 1 "+GND" H 5800 6730 30  0000 C CNN
 F 2 "" H 5800 6800 70  0000 C CNN
 F 3 "" H 5800 6800 70  0000 C CNN
@@ -525,10 +525,10 @@ F 3 "" H 5800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_165
+L power:GND #GND_0165
 U 1 1 58023EBE
 P 5300 6800
-F 0 "GND_165" H 5300 6800 20  0000 C CNN
+F 0 "#GND_0165" H 5300 6800 20  0000 C CNN
 F 1 "+GND" H 5300 6730 30  0000 C CNN
 F 2 "" H 5300 6800 70  0000 C CNN
 F 3 "" H 5300 6800 70  0000 C CNN
@@ -536,10 +536,10 @@ F 3 "" H 5300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_166
+L power:GND #GND_0166
 U 1 1 58023EBD
 P 7300 6800
-F 0 "GND_166" H 7300 6800 20  0000 C CNN
+F 0 "#GND_0166" H 7300 6800 20  0000 C CNN
 F 1 "+GND" H 7300 6730 30  0000 C CNN
 F 2 "" H 7300 6800 70  0000 C CNN
 F 3 "" H 7300 6800 70  0000 C CNN
@@ -547,10 +547,10 @@ F 3 "" H 7300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_167
+L power:GND #GND_0167
 U 1 1 58023EBC
 P 1600 8400
-F 0 "GND_167" H 1600 8400 20  0000 C CNN
+F 0 "#GND_0167" H 1600 8400 20  0000 C CNN
 F 1 "+GND" H 1600 8330 30  0000 C CNN
 F 2 "" H 1600 8400 70  0000 C CNN
 F 3 "" H 1600 8400 70  0000 C CNN
@@ -558,10 +558,10 @@ F 3 "" H 1600 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_168
+L power:GND #GND_0168
 U 1 1 58023EBB
 P 2300 8400
-F 0 "GND_168" H 2300 8400 20  0000 C CNN
+F 0 "#GND_0168" H 2300 8400 20  0000 C CNN
 F 1 "+GND" H 2300 8330 30  0000 C CNN
 F 2 "" H 2300 8400 70  0000 C CNN
 F 3 "" H 2300 8400 70  0000 C CNN
@@ -569,10 +569,10 @@ F 3 "" H 2300 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_169
+L power:GND #GND_0169
 U 1 1 58023EBA
 P 2800 8400
-F 0 "GND_169" H 2800 8400 20  0000 C CNN
+F 0 "#GND_0169" H 2800 8400 20  0000 C CNN
 F 1 "+GND" H 2800 8330 30  0000 C CNN
 F 2 "" H 2800 8400 70  0000 C CNN
 F 3 "" H 2800 8400 70  0000 C CNN
@@ -580,10 +580,10 @@ F 3 "" H 2800 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_170
+L power:GND #GND_0170
 U 1 1 58023EB9
 P 3300 8400
-F 0 "GND_170" H 3300 8400 20  0000 C CNN
+F 0 "#GND_0170" H 3300 8400 20  0000 C CNN
 F 1 "+GND" H 3300 8330 30  0000 C CNN
 F 2 "" H 3300 8400 70  0000 C CNN
 F 3 "" H 3300 8400 70  0000 C CNN
@@ -591,10 +591,10 @@ F 3 "" H 3300 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_171
+L power:GND #GND_0171
 U 1 1 58023EB8
 P 4000 8400
-F 0 "GND_171" H 4000 8400 20  0000 C CNN
+F 0 "#GND_0171" H 4000 8400 20  0000 C CNN
 F 1 "+GND" H 4000 8330 30  0000 C CNN
 F 2 "" H 4000 8400 70  0000 C CNN
 F 3 "" H 4000 8400 70  0000 C CNN
@@ -602,10 +602,10 @@ F 3 "" H 4000 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_172
+L power:GND #GND_0172
 U 1 1 58023EB7
 P 4500 8400
-F 0 "GND_172" H 4500 8400 20  0000 C CNN
+F 0 "#GND_0172" H 4500 8400 20  0000 C CNN
 F 1 "+GND" H 4500 8330 30  0000 C CNN
 F 2 "" H 4500 8400 70  0000 C CNN
 F 3 "" H 4500 8400 70  0000 C CNN
@@ -613,10 +613,10 @@ F 3 "" H 4500 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_173
+L power:GND #GND_0173
 U 1 1 58023EB6
 P 5000 8400
-F 0 "GND_173" H 5000 8400 20  0000 C CNN
+F 0 "#GND_0173" H 5000 8400 20  0000 C CNN
 F 1 "+GND" H 5000 8330 30  0000 C CNN
 F 2 "" H 5000 8400 70  0000 C CNN
 F 3 "" H 5000 8400 70  0000 C CNN
@@ -624,10 +624,10 @@ F 3 "" H 5000 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_174
+L power:GND #GND_0174
 U 1 1 58023EB5
 P 5500 8400
-F 0 "GND_174" H 5500 8400 20  0000 C CNN
+F 0 "#GND_0174" H 5500 8400 20  0000 C CNN
 F 1 "+GND" H 5500 8330 30  0000 C CNN
 F 2 "" H 5500 8400 70  0000 C CNN
 F 3 "" H 5500 8400 70  0000 C CNN
@@ -635,10 +635,10 @@ F 3 "" H 5500 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_175
+L power:GND #GND_0175
 U 1 1 58023EB4
 P 6000 8400
-F 0 "GND_175" H 6000 8400 20  0000 C CNN
+F 0 "#GND_0175" H 6000 8400 20  0000 C CNN
 F 1 "+GND" H 6000 8330 30  0000 C CNN
 F 2 "" H 6000 8400 70  0000 C CNN
 F 3 "" H 6000 8400 70  0000 C CNN
@@ -646,25 +646,25 @@ F 3 "" H 6000 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FPGA_VCCINT_1V0 FPGA_VCCINT_1V0_2
+L Cryptech_Alpha:FPGA_VCCINT_1V0 #FPGA_VCCINT_1V0_02
 U 1 1 58023EB3
 P 800 4300
-F 0 "FPGA_VCCINT_1V0_2" H 800 4300 20  0000 C CNN
+F 0 "#FPGA_VCCINT_1V0_02" H 800 4300 20  0000 C CNN
 F 1 "+FPGA_VCCINT_1V0" H 800 4230 30  0000 C CNN
 F 2 "" H 800 4300 70  0000 C CNN
 F 3 "" H 800 4300 70  0000 C CNN
-	1    800 4300
+	1    800  4300
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:FPGA_VCCAUX_1V8 FPGA_VCCAUX_1V8_3
+L Cryptech_Alpha:FPGA_VCCAUX_1V8 #FPGA_VCCAUX_1V8_03
 U 1 1 58023EB2
 P 800 7700
-F 0 "FPGA_VCCAUX_1V8_3" H 800 7700 20  0000 C CNN
+F 0 "#FPGA_VCCAUX_1V8_03" H 800 7700 20  0000 C CNN
 F 1 "+FPGA_VCCAUX_1V8" H 800 7630 30  0000 C CNN
 F 2 "" H 800 7700 70  0000 C CNN
 F 3 "" H 800 7700 70  0000 C CNN
-	1    800 7700
+	1    800  7700
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -752,7 +752,7 @@ Wire Wire Line
 Wire Wire Line
 	6000 8300 6000 8400
 Wire Wire Line
-	800 7700 800 7900
+	800  7700 800  7900
 Wire Wire Line
 	6000 7900 6000 8000
 Wire Wire Line
@@ -788,7 +788,7 @@ Wire Wire Line
 Wire Wire Line
 	5500 7900 5500 8000
 Wire Wire Line
-	1600 7900 800 7900
+	1600 7900 800  7900
 Connection ~ 2300 7900
 Connection ~ 2800 7900
 Connection ~ 3300 7900
@@ -798,7 +798,7 @@ Connection ~ 5000 7900
 Connection ~ 5500 7900
 Connection ~ 1600 7900
 Wire Wire Line
-	800 4300 800 4500
+	800  4300 800  4500
 Wire Wire Line
 	1800 4500 1800 4690
 Wire Wire Line
@@ -882,11 +882,11 @@ Wire Wire Line
 Wire Wire Line
 	2800 5400 2800 5500
 Wire Wire Line
-	1300 5400 800 5400
+	1300 5400 800  5400
 Wire Wire Line
-	800 5400 800 6300
+	800  5400 800  6300
 Wire Wire Line
-	1300 6300 800 6300
+	1300 6300 800  6300
 Wire Wire Line
 	1300 6300 1300 6400
 Wire Wire Line
@@ -938,7 +938,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 6300 5800 6400
 Wire Wire Line
-	1300 4500 800 4500
+	1300 4500 800  4500
 Connection ~ 1800 4500
 Connection ~ 2500 4500
 Connection ~ 3000 4500
@@ -976,315 +976,385 @@ L Cryptech_Alpha:C-EUC0603 C140
 U 1 1 58023EB1
 P 3700 4700
 F 0 "C140" H 3780 4510 60  0000 L BNN
-	1    3700 4700
-	1    0    0    -1
+F 1 "~" H 3700 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3780 4510 60  0001 C CNN
+F 3 "" H 3700 4700 50  0001 C CNN
+	1    3700 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C135
 U 1 1 58023EB0
 P 2800 6500
 F 0 "C135" H 2880 6310 60  0000 L BNN
-	1    2800 6500
-	1    0    0    -1
+F 1 "~" H 2800 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2880 6310 60  0001 C CNN
+F 3 "" H 2800 6500 50  0001 C CNN
+	1    2800 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C138
 U 1 1 58023EAF
 P 3300 6500
 F 0 "C138" H 3380 6310 60  0000 L BNN
-	1    3300 6500
-	1    0    0    -1
+F 1 "~" H 3300 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3380 6310 60  0001 C CNN
+F 3 "" H 3300 6500 50  0001 C CNN
+	1    3300 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C142
 U 1 1 58023EAE
 P 3800 6500
 F 0 "C142" H 3880 6310 60  0000 L BNN
-	1    3800 6500
-	1    0    0    -1
+F 1 "~" H 3800 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3880 6310 60  0001 C CNN
+F 3 "" H 3800 6500 50  0001 C CNN
+	1    3800 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C146
 U 1 1 58023EAD
 P 4300 6500
 F 0 "C146" H 4380 6310 60  0000 L BNN
-	1    4300 6500
-	1    0    0    -1
+F 1 "~" H 4300 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4380 6310 60  0001 C CNN
+F 3 "" H 4300 6500 50  0001 C CNN
+	1    4300 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C150
 U 1 1 58023EAC
 P 4800 6500
 F 0 "C150" H 4880 6310 60  0000 L BNN
-	1    4800 6500
-	1    0    0    -1
+F 1 "~" H 4800 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4880 6310 60  0001 C CNN
+F 3 "" H 4800 6500 50  0001 C CNN
+	1    4800 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C154
 U 1 1 58023EAB
 P 5300 6500
 F 0 "C154" H 5380 6310 60  0000 L BNN
-	1    5300 6500
-	1    0    0    -1
+F 1 "~" H 5300 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5380 6310 60  0001 C CNN
+F 3 "" H 5300 6500 50  0001 C CNN
+	1    5300 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C158
 U 1 1 58023EAA
 P 5800 6500
 F 0 "C158" H 5880 6310 60  0000 L BNN
-	1    5800 6500
-	1    0    0    -1
+F 1 "~" H 5800 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5880 6310 60  0001 C CNN
+F 3 "" H 5800 6500 50  0001 C CNN
+	1    5800 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C162
 U 1 1 58023EA9
 P 6300 6500
 F 0 "C162" H 6380 6310 60  0000 L BNN
-	1    6300 6500
-	1    0    0    -1
+F 1 "~" H 6300 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6380 6310 60  0001 C CNN
+F 3 "" H 6300 6500 50  0001 C CNN
+	1    6300 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C163
 U 1 1 58023EA8
 P 6800 6500
 F 0 "C163" H 6880 6310 60  0000 L BNN
-	1    6800 6500
-	1    0    0    -1
+F 1 "~" H 6800 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6880 6310 60  0001 C CNN
+F 3 "" H 6800 6500 50  0001 C CNN
+	1    6800 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C143
 U 1 1 58023EA7
 P 4000 8100
 F 0 "C143" H 4080 7910 60  0000 L BNN
-	1    4000 8100
-	1    0    0    -1
+F 1 "~" H 4000 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4080 7910 60  0001 C CNN
+F 3 "" H 4000 8100 50  0001 C CNN
+	1    4000 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C125
 U 1 1 58023EA6
 P 1300 6500
 F 0 "C125" H 1380 6310 60  0000 L BNN
-	1    1300 6500
-	1    0    0    -1
+F 1 "~" H 1300 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1380 6310 60  0001 C CNN
+F 3 "" H 1300 6500 50  0001 C CNN
+	1    1300 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C147
 U 1 1 58023EA5
 P 4500 8100
 F 0 "C147" H 4580 7910 60  0000 L BNN
-	1    4500 8100
-	1    0    0    -1
+F 1 "~" H 4500 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4580 7910 60  0001 C CNN
+F 3 "" H 4500 8100 50  0001 C CNN
+	1    4500 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C151
 U 1 1 58023EA4
 P 5000 8100
 F 0 "C151" H 5080 7910 60  0000 L BNN
-	1    5000 8100
-	1    0    0    -1
+F 1 "~" H 5000 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5080 7910 60  0001 C CNN
+F 3 "" H 5000 8100 50  0001 C CNN
+	1    5000 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C155
 U 1 1 58023EA3
 P 5500 8100
 F 0 "C155" H 5580 7910 60  0000 L BNN
-	1    5500 8100
-	1    0    0    -1
+F 1 "~" H 5500 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5580 7910 60  0001 C CNN
+F 3 "" H 5500 8100 50  0001 C CNN
+	1    5500 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C159
 U 1 1 58023EA2
 P 6000 8100
 F 0 "C159" H 6080 7910 60  0000 L BNN
-	1    6000 8100
-	1    0    0    -1
+F 1 "~" H 6000 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6080 7910 60  0001 C CNN
+F 3 "" H 6000 8100 50  0001 C CNN
+	1    6000 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C164
 U 1 1 58023EA1
 P 7300 6500
 F 0 "C164" H 7380 6310 60  0000 L BNN
-	1    7300 6500
-	1    0    0    -1
+F 1 "~" H 7300 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7380 6310 60  0001 C CNN
+F 3 "" H 7300 6500 50  0001 C CNN
+	1    7300 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C144
 U 1 1 58023EA0
 P 4200 4700
 F 0 "C144" H 4280 4510 60  0000 L BNN
-	1    4200 4700
-	1    0    0    -1
+F 1 "~" H 4200 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4280 4510 60  0001 C CNN
+F 3 "" H 4200 4700 50  0001 C CNN
+	1    4200 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C148
 U 1 1 58023E9F
 P 4700 4700
 F 0 "C148" H 4780 4510 60  0000 L BNN
-	1    4700 4700
-	1    0    0    -1
+F 1 "~" H 4700 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4780 4510 60  0001 C CNN
+F 3 "" H 4700 4700 50  0001 C CNN
+	1    4700 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C152
 U 1 1 58023E9E
 P 5200 4700
 F 0 "C152" H 5280 4510 60  0000 L BNN
-	1    5200 4700
-	1    0    0    -1
+F 1 "~" H 5200 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5280 4510 60  0001 C CNN
+F 3 "" H 5200 4700 50  0001 C CNN
+	1    5200 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C156
 U 1 1 58023E9D
 P 5700 4700
 F 0 "C156" H 5780 4510 60  0000 L BNN
-	1    5700 4700
-	1    0    0    -1
+F 1 "~" H 5700 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5780 4510 60  0001 C CNN
+F 3 "" H 5700 4700 50  0001 C CNN
+	1    5700 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C160
 U 1 1 58023E9C
 P 6200 4700
 F 0 "C160" H 6280 4510 60  0000 L BNN
-	1    6200 4700
-	1    0    0    -1
+F 1 "~" H 6200 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 6280 4510 60  0001 C CNN
+F 3 "" H 6200 4700 50  0001 C CNN
+	1    6200 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C133
 U 1 1 58023E9B
 P 2500 4700
 F 0 "C133" H 2580 4510 60  0000 L BNN
-	1    2500 4700
-	1    0    0    -1
+F 1 "~" H 2500 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2580 4510 60  0001 C CNN
+F 3 "" H 2500 4700 50  0001 C CNN
+	1    2500 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C141
 U 1 1 58023E9A
 P 3700 5600
 F 0 "C141" H 3780 5410 60  0000 L BNN
-	1    3700 5600
-	1    0    0    -1
+F 1 "~" H 3700 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3780 5410 60  0001 C CNN
+F 3 "" H 3700 5600 50  0001 C CNN
+	1    3700 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C145
 U 1 1 58023E99
 P 4200 5600
 F 0 "C145" H 4280 5410 60  0000 L BNN
-	1    4200 5600
-	1    0    0    -1
+F 1 "~" H 4200 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4280 5410 60  0001 C CNN
+F 3 "" H 4200 5600 50  0001 C CNN
+	1    4200 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C149
 U 1 1 58023E98
 P 4700 5600
 F 0 "C149" H 4780 5410 60  0000 L BNN
-	1    4700 5600
-	1    0    0    -1
+F 1 "~" H 4700 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4780 5410 60  0001 C CNN
+F 3 "" H 4700 5600 50  0001 C CNN
+	1    4700 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C153
 U 1 1 58023E97
 P 5200 5600
 F 0 "C153" H 5280 5410 60  0000 L BNN
-	1    5200 5600
-	1    0    0    -1
+F 1 "~" H 5200 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5280 5410 60  0001 C CNN
+F 3 "" H 5200 5600 50  0001 C CNN
+	1    5200 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C157
 U 1 1 58023E96
 P 5700 5600
 F 0 "C157" H 5780 5410 60  0000 L BNN
-	1    5700 5600
-	1    0    0    -1
+F 1 "~" H 5700 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5780 5410 60  0001 C CNN
+F 3 "" H 5700 5600 50  0001 C CNN
+	1    5700 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C161
 U 1 1 58023E95
 P 6200 5600
 F 0 "C161" H 6280 5410 60  0000 L BNN
-	1    6200 5600
-	1    0    0    -1
+F 1 "~" H 6200 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 6280 5410 60  0001 C CNN
+F 3 "" H 6200 5600 50  0001 C CNN
+	1    6200 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C132
 U 1 1 58023E94
 P 2300 8100
 F 0 "C132" H 2380 7910 60  0000 L BNN
-	1    2300 8100
-	1    0    0    -1
+F 1 "~" H 2300 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 2380 7910 60  0001 C CNN
+F 3 "" H 2300 8100 50  0001 C CNN
+	1    2300 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C136
 U 1 1 58023E93
 P 2800 8100
 F 0 "C136" H 2880 7910 60  0000 L BNN
-	1    2800 8100
-	1    0    0    -1
+F 1 "~" H 2800 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 2880 7910 60  0001 C CNN
+F 3 "" H 2800 8100 50  0001 C CNN
+	1    2800 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C139
 U 1 1 58023E92
 P 3300 8100
 F 0 "C139" H 3380 7910 60  0000 L BNN
-	1    3300 8100
-	1    0    0    -1
+F 1 "~" H 3300 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3380 7910 60  0001 C CNN
+F 3 "" H 3300 8100 50  0001 C CNN
+	1    3300 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C137
 U 1 1 58023E91
 P 3000 4700
 F 0 "C137" H 3080 4510 60  0000 L BNN
-	1    3000 4700
-	1    0    0    -1
+F 1 "~" H 3000 4700 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 3080 4510 60  0001 C CNN
+F 3 "" H 3000 4700 50  0001 C CNN
+	1    3000 4700
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C124
 U 1 1 58023E90
 P 1300 5600
 F 0 "C124" H 1380 5410 60  0000 L BNN
-	1    1300 5600
-	1    0    0    -1
+F 1 "~" H 1300 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1380 5410 60  0001 C CNN
+F 3 "" H 1300 5600 50  0001 C CNN
+	1    1300 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C126
 U 1 1 58023E8F
 P 1600 8100
 F 0 "C126" H 1680 7910 60  0000 L BNN
-	1    1600 8100
-	1    0    0    -1
+F 1 "~" H 1600 8100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1680 7910 60  0001 C CNN
+F 3 "" H 1600 8100 50  0001 C CNN
+	1    1600 8100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:CP_E-035X080 C123
@@ -1295,7 +1365,7 @@ F 1 "330uF" V 1210 4697 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_D" H 1210 4697 60  0001 C CNN
 F 3 "" H 1210 4697 60  0000 C CNN
 	1    1300 4790
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:CP_E-035X080 C127
@@ -1306,51 +1376,61 @@ F 1 "330uF" V 1710 4697 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_D" H 1710 4697 60  0001 C CNN
 F 3 "" H 1710 4697 60  0000 C CNN
 	1    1800 4790
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C128
 U 1 1 58023E8C
 P 1800 5600
 F 0 "C128" H 1880 5410 60  0000 L BNN
-	1    1800 5600
-	1    0    0    -1
+F 1 "~" H 1800 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1880 5410 60  0001 C CNN
+F 3 "" H 1800 5600 50  0001 C CNN
+	1    1800 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C130
 U 1 1 58023E8B
 P 2300 5600
 F 0 "C130" H 2380 5410 60  0000 L BNN
-	1    2300 5600
-	1    0    0    -1
+F 1 "~" H 2300 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2380 5410 60  0001 C CNN
+F 3 "" H 2300 5600 50  0001 C CNN
+	1    2300 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C134
 U 1 1 58023E8A
 P 2800 5600
 F 0 "C134" H 2880 5410 60  0000 L BNN
-	1    2800 5600
-	1    0    0    -1
+F 1 "~" H 2800 5600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2880 5410 60  0001 C CNN
+F 3 "" H 2800 5600 50  0001 C CNN
+	1    2800 5600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C129
 U 1 1 58023E89
 P 1800 6500
 F 0 "C129" H 1880 6310 60  0000 L BNN
-	1    1800 6500
-	1    0    0    -1
+F 1 "~" H 1800 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1880 6310 60  0001 C CNN
+F 3 "" H 1800 6500 50  0001 C CNN
+	1    1800 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C131
 U 1 1 58023E88
 P 2300 6500
 F 0 "C131" H 2380 6310 60  0000 L BNN
-	1    2300 6500
-	1    0    0    -1
+F 1 "~" H 2300 6500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2380 6310 60  0001 C CNN
+F 3 "" H 2300 6500 50  0001 C CNN
+	1    2300 6500
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_23.sch b/rev03-KiCad/rev02_23.sch
index 65cae1d..40f11cc 100644
--- a/rev03-KiCad/rev02_23.sch
+++ b/rev03-KiCad/rev02_23.sch
@@ -17,7 +17,7 @@ Text Notes 6600 5000 0    60   ~ 12
 <-- Place small 0.47 uF caps right under the BGA package\n<-- Place medium 4.7 uF caps very close to the BGA package\n<-- Place large 47 uF caps not far from the BGA package\n<-- Place one of four 47 uF caps on every side of the BGA p.\n<-- Distribute six sets of caps among six FPGA I/O banks
 Text Notes 2500 4100 0    60   ~ 12
 *) Decoupling capacitors for VCCO
-Text Notes 8490 10200 0    54   ~ 12
+Text Notes 8490 10200 0    54   ~ 11
 FPGA VCCO bypass capacitors
 Text Notes 4660 4590 0    60   ~ 12
 C181
@@ -180,10 +180,10 @@ C168
 Text Notes 2560 4790 0    60   ~ 12
 47uF
 $Comp
-L power:GND GND_176
+L power:GND #GND_0176
 U 1 1 58023E87
 P 1000 4900
-F 0 "GND_176" H 1000 4900 20  0000 C CNN
+F 0 "#GND_0176" H 1000 4900 20  0000 C CNN
 F 1 "+GND" H 1000 4830 30  0000 C CNN
 F 2 "" H 1000 4900 70  0000 C CNN
 F 3 "" H 1000 4900 70  0000 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 1000 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_177
+L power:GND #GND_0177
 U 1 1 58023E86
 P 1500 4900
-F 0 "GND_177" H 1500 4900 20  0000 C CNN
+F 0 "#GND_0177" H 1500 4900 20  0000 C CNN
 F 1 "+GND" H 1500 4830 30  0000 C CNN
 F 2 "" H 1500 4900 70  0000 C CNN
 F 3 "" H 1500 4900 70  0000 C CNN
@@ -202,10 +202,10 @@ F 3 "" H 1500 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_178
+L power:GND #GND_0178
 U 1 1 58023E85
 P 2000 4900
-F 0 "GND_178" H 2000 4900 20  0000 C CNN
+F 0 "#GND_0178" H 2000 4900 20  0000 C CNN
 F 1 "+GND" H 2000 4830 30  0000 C CNN
 F 2 "" H 2000 4900 70  0000 C CNN
 F 3 "" H 2000 4900 70  0000 C CNN
@@ -213,10 +213,10 @@ F 3 "" H 2000 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_179
+L power:GND #GND_0179
 U 1 1 58023E84
 P 2500 4900
-F 0 "GND_179" H 2500 4900 20  0000 C CNN
+F 0 "#GND_0179" H 2500 4900 20  0000 C CNN
 F 1 "+GND" H 2500 4830 30  0000 C CNN
 F 2 "" H 2500 4900 70  0000 C CNN
 F 3 "" H 2500 4900 70  0000 C CNN
@@ -224,10 +224,10 @@ F 3 "" H 2500 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_180
+L power:GND #GND_0180
 U 1 1 58023E83
 P 3400 4900
-F 0 "GND_180" H 3400 4900 20  0000 C CNN
+F 0 "#GND_0180" H 3400 4900 20  0000 C CNN
 F 1 "+GND" H 3400 4830 30  0000 C CNN
 F 2 "" H 3400 4900 70  0000 C CNN
 F 3 "" H 3400 4900 70  0000 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 3400 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_181
+L power:GND #GND_0181
 U 1 1 58023E82
 P 3900 4900
-F 0 "GND_181" H 3900 4900 20  0000 C CNN
+F 0 "#GND_0181" H 3900 4900 20  0000 C CNN
 F 1 "+GND" H 3900 4830 30  0000 C CNN
 F 2 "" H 3900 4900 70  0000 C CNN
 F 3 "" H 3900 4900 70  0000 C CNN
@@ -246,10 +246,10 @@ F 3 "" H 3900 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_182
+L power:GND #GND_0182
 U 1 1 58023E81
 P 4600 4900
-F 0 "GND_182" H 4600 4900 20  0000 C CNN
+F 0 "#GND_0182" H 4600 4900 20  0000 C CNN
 F 1 "+GND" H 4600 4830 30  0000 C CNN
 F 2 "" H 4600 4900 70  0000 C CNN
 F 3 "" H 4600 4900 70  0000 C CNN
@@ -257,10 +257,10 @@ F 3 "" H 4600 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_183
+L power:GND #GND_0183
 U 1 1 58023E80
 P 5100 4900
-F 0 "GND_183" H 5100 4900 20  0000 C CNN
+F 0 "#GND_0183" H 5100 4900 20  0000 C CNN
 F 1 "+GND" H 5100 4830 30  0000 C CNN
 F 2 "" H 5100 4900 70  0000 C CNN
 F 3 "" H 5100 4900 70  0000 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 5100 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_184
+L power:GND #GND_0184
 U 1 1 58023E7F
 P 5600 4900
-F 0 "GND_184" H 5600 4900 20  0000 C CNN
+F 0 "#GND_0184" H 5600 4900 20  0000 C CNN
 F 1 "+GND" H 5600 4830 30  0000 C CNN
 F 2 "" H 5600 4900 70  0000 C CNN
 F 3 "" H 5600 4900 70  0000 C CNN
@@ -279,10 +279,10 @@ F 3 "" H 5600 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_185
+L power:GND #GND_0185
 U 1 1 58023E7E
 P 6100 4900
-F 0 "GND_185" H 6100 4900 20  0000 C CNN
+F 0 "#GND_0185" H 6100 4900 20  0000 C CNN
 F 1 "+GND" H 6100 4830 30  0000 C CNN
 F 2 "" H 6100 4900 70  0000 C CNN
 F 3 "" H 6100 4900 70  0000 C CNN
@@ -290,10 +290,10 @@ F 3 "" H 6100 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_186
+L power:GND #GND_0186
 U 1 1 58023E7D
 P 3400 5800
-F 0 "GND_186" H 3400 5800 20  0000 C CNN
+F 0 "#GND_0186" H 3400 5800 20  0000 C CNN
 F 1 "+GND" H 3400 5730 30  0000 C CNN
 F 2 "" H 3400 5800 70  0000 C CNN
 F 3 "" H 3400 5800 70  0000 C CNN
@@ -301,10 +301,10 @@ F 3 "" H 3400 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_187
+L power:GND #GND_0187
 U 1 1 58023E7C
 P 3900 5800
-F 0 "GND_187" H 3900 5800 20  0000 C CNN
+F 0 "#GND_0187" H 3900 5800 20  0000 C CNN
 F 1 "+GND" H 3900 5730 30  0000 C CNN
 F 2 "" H 3900 5800 70  0000 C CNN
 F 3 "" H 3900 5800 70  0000 C CNN
@@ -312,10 +312,10 @@ F 3 "" H 3900 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_188
+L power:GND #GND_0188
 U 1 1 58023E7B
 P 4600 5800
-F 0 "GND_188" H 4600 5800 20  0000 C CNN
+F 0 "#GND_0188" H 4600 5800 20  0000 C CNN
 F 1 "+GND" H 4600 5730 30  0000 C CNN
 F 2 "" H 4600 5800 70  0000 C CNN
 F 3 "" H 4600 5800 70  0000 C CNN
@@ -323,10 +323,10 @@ F 3 "" H 4600 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_189
+L power:GND #GND_0189
 U 1 1 58023E7A
 P 5100 5800
-F 0 "GND_189" H 5100 5800 20  0000 C CNN
+F 0 "#GND_0189" H 5100 5800 20  0000 C CNN
 F 1 "+GND" H 5100 5730 30  0000 C CNN
 F 2 "" H 5100 5800 70  0000 C CNN
 F 3 "" H 5100 5800 70  0000 C CNN
@@ -334,10 +334,10 @@ F 3 "" H 5100 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_190
+L power:GND #GND_0190
 U 1 1 58023E79
 P 5600 5800
-F 0 "GND_190" H 5600 5800 20  0000 C CNN
+F 0 "#GND_0190" H 5600 5800 20  0000 C CNN
 F 1 "+GND" H 5600 5730 30  0000 C CNN
 F 2 "" H 5600 5800 70  0000 C CNN
 F 3 "" H 5600 5800 70  0000 C CNN
@@ -345,10 +345,10 @@ F 3 "" H 5600 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_191
+L power:GND #GND_0191
 U 1 1 58023E78
 P 6100 5800
-F 0 "GND_191" H 6100 5800 20  0000 C CNN
+F 0 "#GND_0191" H 6100 5800 20  0000 C CNN
 F 1 "+GND" H 6100 5730 30  0000 C CNN
 F 2 "" H 6100 5800 70  0000 C CNN
 F 3 "" H 6100 5800 70  0000 C CNN
@@ -356,10 +356,10 @@ F 3 "" H 6100 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_192
+L power:GND #GND_0192
 U 1 1 58023E77
 P 3400 6700
-F 0 "GND_192" H 3400 6700 20  0000 C CNN
+F 0 "#GND_0192" H 3400 6700 20  0000 C CNN
 F 1 "+GND" H 3400 6630 30  0000 C CNN
 F 2 "" H 3400 6700 70  0000 C CNN
 F 3 "" H 3400 6700 70  0000 C CNN
@@ -367,10 +367,10 @@ F 3 "" H 3400 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_193
+L power:GND #GND_0193
 U 1 1 58023E76
 P 3900 6700
-F 0 "GND_193" H 3900 6700 20  0000 C CNN
+F 0 "#GND_0193" H 3900 6700 20  0000 C CNN
 F 1 "+GND" H 3900 6630 30  0000 C CNN
 F 2 "" H 3900 6700 70  0000 C CNN
 F 3 "" H 3900 6700 70  0000 C CNN
@@ -378,10 +378,10 @@ F 3 "" H 3900 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_194
+L power:GND #GND_0194
 U 1 1 58023E75
 P 4600 6700
-F 0 "GND_194" H 4600 6700 20  0000 C CNN
+F 0 "#GND_0194" H 4600 6700 20  0000 C CNN
 F 1 "+GND" H 4600 6630 30  0000 C CNN
 F 2 "" H 4600 6700 70  0000 C CNN
 F 3 "" H 4600 6700 70  0000 C CNN
@@ -389,10 +389,10 @@ F 3 "" H 4600 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_195
+L power:GND #GND_0195
 U 1 1 58023E74
 P 5100 6700
-F 0 "GND_195" H 5100 6700 20  0000 C CNN
+F 0 "#GND_0195" H 5100 6700 20  0000 C CNN
 F 1 "+GND" H 5100 6630 30  0000 C CNN
 F 2 "" H 5100 6700 70  0000 C CNN
 F 3 "" H 5100 6700 70  0000 C CNN
@@ -400,10 +400,10 @@ F 3 "" H 5100 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_196
+L power:GND #GND_0196
 U 1 1 58023E73
 P 5600 6700
-F 0 "GND_196" H 5600 6700 20  0000 C CNN
+F 0 "#GND_0196" H 5600 6700 20  0000 C CNN
 F 1 "+GND" H 5600 6630 30  0000 C CNN
 F 2 "" H 5600 6700 70  0000 C CNN
 F 3 "" H 5600 6700 70  0000 C CNN
@@ -411,10 +411,10 @@ F 3 "" H 5600 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_197
+L power:GND #GND_0197
 U 1 1 58023E72
 P 6100 6700
-F 0 "GND_197" H 6100 6700 20  0000 C CNN
+F 0 "#GND_0197" H 6100 6700 20  0000 C CNN
 F 1 "+GND" H 6100 6630 30  0000 C CNN
 F 2 "" H 6100 6700 70  0000 C CNN
 F 3 "" H 6100 6700 70  0000 C CNN
@@ -422,10 +422,10 @@ F 3 "" H 6100 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_198
+L power:GND #GND_0198
 U 1 1 58023E71
 P 3400 7600
-F 0 "GND_198" H 3400 7600 20  0000 C CNN
+F 0 "#GND_0198" H 3400 7600 20  0000 C CNN
 F 1 "+GND" H 3400 7530 30  0000 C CNN
 F 2 "" H 3400 7600 70  0000 C CNN
 F 3 "" H 3400 7600 70  0000 C CNN
@@ -433,10 +433,10 @@ F 3 "" H 3400 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_199
+L power:GND #GND_0199
 U 1 1 58023E70
 P 3900 7600
-F 0 "GND_199" H 3900 7600 20  0000 C CNN
+F 0 "#GND_0199" H 3900 7600 20  0000 C CNN
 F 1 "+GND" H 3900 7530 30  0000 C CNN
 F 2 "" H 3900 7600 70  0000 C CNN
 F 3 "" H 3900 7600 70  0000 C CNN
@@ -444,10 +444,10 @@ F 3 "" H 3900 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_200
+L power:GND #GND_0200
 U 1 1 58023E6F
 P 4600 7600
-F 0 "GND_200" H 4600 7600 20  0000 C CNN
+F 0 "#GND_0200" H 4600 7600 20  0000 C CNN
 F 1 "+GND" H 4600 7530 30  0000 C CNN
 F 2 "" H 4600 7600 70  0000 C CNN
 F 3 "" H 4600 7600 70  0000 C CNN
@@ -455,10 +455,10 @@ F 3 "" H 4600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_201
+L power:GND #GND_0201
 U 1 1 58023E6E
 P 5100 7600
-F 0 "GND_201" H 5100 7600 20  0000 C CNN
+F 0 "#GND_0201" H 5100 7600 20  0000 C CNN
 F 1 "+GND" H 5100 7530 30  0000 C CNN
 F 2 "" H 5100 7600 70  0000 C CNN
 F 3 "" H 5100 7600 70  0000 C CNN
@@ -466,10 +466,10 @@ F 3 "" H 5100 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_202
+L power:GND #GND_0202
 U 1 1 58023E6D
 P 5600 7600
-F 0 "GND_202" H 5600 7600 20  0000 C CNN
+F 0 "#GND_0202" H 5600 7600 20  0000 C CNN
 F 1 "+GND" H 5600 7530 30  0000 C CNN
 F 2 "" H 5600 7600 70  0000 C CNN
 F 3 "" H 5600 7600 70  0000 C CNN
@@ -477,10 +477,10 @@ F 3 "" H 5600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_203
+L power:GND #GND_0203
 U 1 1 58023E6C
 P 6100 7600
-F 0 "GND_203" H 6100 7600 20  0000 C CNN
+F 0 "#GND_0203" H 6100 7600 20  0000 C CNN
 F 1 "+GND" H 6100 7530 30  0000 C CNN
 F 2 "" H 6100 7600 70  0000 C CNN
 F 3 "" H 6100 7600 70  0000 C CNN
@@ -488,10 +488,10 @@ F 3 "" H 6100 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_204
+L power:GND #GND_0204
 U 1 1 58023E6B
 P 3400 8500
-F 0 "GND_204" H 3400 8500 20  0000 C CNN
+F 0 "#GND_0204" H 3400 8500 20  0000 C CNN
 F 1 "+GND" H 3400 8430 30  0000 C CNN
 F 2 "" H 3400 8500 70  0000 C CNN
 F 3 "" H 3400 8500 70  0000 C CNN
@@ -499,10 +499,10 @@ F 3 "" H 3400 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_205
+L power:GND #GND_0205
 U 1 1 58023E6A
 P 3900 8500
-F 0 "GND_205" H 3900 8500 20  0000 C CNN
+F 0 "#GND_0205" H 3900 8500 20  0000 C CNN
 F 1 "+GND" H 3900 8430 30  0000 C CNN
 F 2 "" H 3900 8500 70  0000 C CNN
 F 3 "" H 3900 8500 70  0000 C CNN
@@ -510,10 +510,10 @@ F 3 "" H 3900 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_206
+L power:GND #GND_0206
 U 1 1 58023E69
 P 4600 8500
-F 0 "GND_206" H 4600 8500 20  0000 C CNN
+F 0 "#GND_0206" H 4600 8500 20  0000 C CNN
 F 1 "+GND" H 4600 8430 30  0000 C CNN
 F 2 "" H 4600 8500 70  0000 C CNN
 F 3 "" H 4600 8500 70  0000 C CNN
@@ -521,10 +521,10 @@ F 3 "" H 4600 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_207
+L power:GND #GND_0207
 U 1 1 58023E68
 P 5100 8500
-F 0 "GND_207" H 5100 8500 20  0000 C CNN
+F 0 "#GND_0207" H 5100 8500 20  0000 C CNN
 F 1 "+GND" H 5100 8430 30  0000 C CNN
 F 2 "" H 5100 8500 70  0000 C CNN
 F 3 "" H 5100 8500 70  0000 C CNN
@@ -532,10 +532,10 @@ F 3 "" H 5100 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_208
+L power:GND #GND_0208
 U 1 1 58023E67
 P 5600 8500
-F 0 "GND_208" H 5600 8500 20  0000 C CNN
+F 0 "#GND_0208" H 5600 8500 20  0000 C CNN
 F 1 "+GND" H 5600 8430 30  0000 C CNN
 F 2 "" H 5600 8500 70  0000 C CNN
 F 3 "" H 5600 8500 70  0000 C CNN
@@ -543,10 +543,10 @@ F 3 "" H 5600 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_209
+L power:GND #GND_0209
 U 1 1 58023E66
 P 6100 8500
-F 0 "GND_209" H 6100 8500 20  0000 C CNN
+F 0 "#GND_0209" H 6100 8500 20  0000 C CNN
 F 1 "+GND" H 6100 8430 30  0000 C CNN
 F 2 "" H 6100 8500 70  0000 C CNN
 F 3 "" H 6100 8500 70  0000 C CNN
@@ -554,10 +554,10 @@ F 3 "" H 6100 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_210
+L power:GND #GND_0210
 U 1 1 58023E65
 P 3400 9400
-F 0 "GND_210" H 3400 9400 20  0000 C CNN
+F 0 "#GND_0210" H 3400 9400 20  0000 C CNN
 F 1 "+GND" H 3400 9330 30  0000 C CNN
 F 2 "" H 3400 9400 70  0000 C CNN
 F 3 "" H 3400 9400 70  0000 C CNN
@@ -565,10 +565,10 @@ F 3 "" H 3400 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_211
+L power:GND #GND_0211
 U 1 1 58023E64
 P 3900 9400
-F 0 "GND_211" H 3900 9400 20  0000 C CNN
+F 0 "#GND_0211" H 3900 9400 20  0000 C CNN
 F 1 "+GND" H 3900 9330 30  0000 C CNN
 F 2 "" H 3900 9400 70  0000 C CNN
 F 3 "" H 3900 9400 70  0000 C CNN
@@ -576,10 +576,10 @@ F 3 "" H 3900 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_212
+L power:GND #GND_0212
 U 1 1 58023E63
 P 4600 9400
-F 0 "GND_212" H 4600 9400 20  0000 C CNN
+F 0 "#GND_0212" H 4600 9400 20  0000 C CNN
 F 1 "+GND" H 4600 9330 30  0000 C CNN
 F 2 "" H 4600 9400 70  0000 C CNN
 F 3 "" H 4600 9400 70  0000 C CNN
@@ -587,10 +587,10 @@ F 3 "" H 4600 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_213
+L power:GND #GND_0213
 U 1 1 58023E62
 P 5100 9400
-F 0 "GND_213" H 5100 9400 20  0000 C CNN
+F 0 "#GND_0213" H 5100 9400 20  0000 C CNN
 F 1 "+GND" H 5100 9330 30  0000 C CNN
 F 2 "" H 5100 9400 70  0000 C CNN
 F 3 "" H 5100 9400 70  0000 C CNN
@@ -598,10 +598,10 @@ F 3 "" H 5100 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_214
+L power:GND #GND_0214
 U 1 1 58023E61
 P 5600 9400
-F 0 "GND_214" H 5600 9400 20  0000 C CNN
+F 0 "#GND_0214" H 5600 9400 20  0000 C CNN
 F 1 "+GND" H 5600 9330 30  0000 C CNN
 F 2 "" H 5600 9400 70  0000 C CNN
 F 3 "" H 5600 9400 70  0000 C CNN
@@ -609,10 +609,10 @@ F 3 "" H 5600 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_215
+L power:GND #GND_0215
 U 1 1 58023E60
 P 6100 9400
-F 0 "GND_215" H 6100 9400 20  0000 C CNN
+F 0 "#GND_0215" H 6100 9400 20  0000 C CNN
 F 1 "+GND" H 6100 9330 30  0000 C CNN
 F 2 "" H 6100 9400 70  0000 C CNN
 F 3 "" H 6100 9400 70  0000 C CNN
@@ -620,14 +620,14 @@ F 3 "" H 6100 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_39
+L Cryptech_Alpha:VCCO_3V3 #VCCO_3V3_039
 U 1 1 58023E5F
 P 600 4200
-F 0 "VCCO_3V3_39" H 600 4200 20  0000 C CNN
+F 0 "#VCCO_3V3_039" H 600 4200 20  0000 C CNN
 F 1 "+VCCO_3V3" H 600 4130 30  0000 C CNN
 F 2 "" H 600 4200 70  0000 C CNN
 F 3 "" H 600 4200 70  0000 C CNN
-	1    600 4200
+	1    600  4200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -711,7 +711,7 @@ Wire Wire Line
 Wire Wire Line
 	6100 9300 6100 9400
 Wire Wire Line
-	600 4200 600 4400
+	600  4200 600  4400
 Wire Wire Line
 	3400 6200 3400 6300
 Wire Wire Line
@@ -883,7 +883,7 @@ Wire Wire Line
 Wire Wire Line
 	3000 8000 3000 8900
 Wire Wire Line
-	1000 4400 600 4400
+	1000 4400 600  4400
 Connection ~ 3900 6200
 Connection ~ 4600 6200
 Connection ~ 5100 6200
@@ -928,359 +928,439 @@ L Cryptech_Alpha:C-EUC0402 C181
 U 1 1 58023E5E
 P 4600 4600
 F 0 "C181" H 4680 4410 60  0000 L BNN
-	1    4600 4600
-	1    0    0    -1
+F 1 "~" H 4600 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 4410 60  0001 C CNN
+F 3 "" H 4600 4600 50  0001 C CNN
+	1    4600 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C189
 U 1 1 58023E5D
 P 5100 6400
 F 0 "C189" H 5180 6210 60  0000 L BNN
-	1    5100 6400
-	1    0    0    -1
+F 1 "~" H 5100 6400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 6210 60  0001 C CNN
+F 3 "" H 5100 6400 50  0001 C CNN
+	1    5100 6400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C195
 U 1 1 58023E5C
 P 5600 6400
 F 0 "C195" H 5680 6210 60  0000 L BNN
-	1    5600 6400
-	1    0    0    -1
+F 1 "~" H 5600 6400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 6210 60  0001 C CNN
+F 3 "" H 5600 6400 50  0001 C CNN
+	1    5600 6400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C201
 U 1 1 58023E5B
 P 6100 6400
 F 0 "C201" H 6180 6210 60  0000 L BNN
-	1    6100 6400
-	1    0    0    -1
+F 1 "~" H 6100 6400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 6210 60  0001 C CNN
+F 3 "" H 6100 6400 50  0001 C CNN
+	1    6100 6400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C184
 U 1 1 58023E5A
 P 4600 7300
 F 0 "C184" H 4680 7110 60  0000 L BNN
-	1    4600 7300
-	1    0    0    -1
+F 1 "~" H 4600 7300 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 7110 60  0001 C CNN
+F 3 "" H 4600 7300 50  0001 C CNN
+	1    4600 7300
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C190
 U 1 1 58023E59
 P 5100 7300
 F 0 "C190" H 5180 7110 60  0000 L BNN
-	1    5100 7300
-	1    0    0    -1
+F 1 "~" H 5100 7300 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 7110 60  0001 C CNN
+F 3 "" H 5100 7300 50  0001 C CNN
+	1    5100 7300
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C196
 U 1 1 58023E58
 P 5600 7300
 F 0 "C196" H 5680 7110 60  0000 L BNN
-	1    5600 7300
-	1    0    0    -1
+F 1 "~" H 5600 7300 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 7110 60  0001 C CNN
+F 3 "" H 5600 7300 50  0001 C CNN
+	1    5600 7300
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C202
 U 1 1 58023E57
 P 6100 7300
 F 0 "C202" H 6180 7110 60  0000 L BNN
-	1    6100 7300
-	1    0    0    -1
+F 1 "~" H 6100 7300 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 7110 60  0001 C CNN
+F 3 "" H 6100 7300 50  0001 C CNN
+	1    6100 7300
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C185
 U 1 1 58023E56
 P 4600 8200
 F 0 "C185" H 4680 8010 60  0000 L BNN
-	1    4600 8200
-	1    0    0    -1
+F 1 "~" H 4600 8200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 8010 60  0001 C CNN
+F 3 "" H 4600 8200 50  0001 C CNN
+	1    4600 8200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C191
 U 1 1 58023E55
 P 5100 8200
 F 0 "C191" H 5180 8010 60  0000 L BNN
-	1    5100 8200
-	1    0    0    -1
+F 1 "~" H 5100 8200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 8010 60  0001 C CNN
+F 3 "" H 5100 8200 50  0001 C CNN
+	1    5100 8200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C197
 U 1 1 58023E54
 P 5600 8200
 F 0 "C197" H 5680 8010 60  0000 L BNN
-	1    5600 8200
-	1    0    0    -1
+F 1 "~" H 5600 8200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 8010 60  0001 C CNN
+F 3 "" H 5600 8200 50  0001 C CNN
+	1    5600 8200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C187
 U 1 1 58023E53
 P 5100 4600
 F 0 "C187" H 5180 4410 60  0000 L BNN
-	1    5100 4600
-	1    0    0    -1
+F 1 "~" H 5100 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 4410 60  0001 C CNN
+F 3 "" H 5100 4600 50  0001 C CNN
+	1    5100 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C203
 U 1 1 58023E52
 P 6100 8200
 F 0 "C203" H 6180 8010 60  0000 L BNN
-	1    6100 8200
-	1    0    0    -1
+F 1 "~" H 6100 8200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 8010 60  0001 C CNN
+F 3 "" H 6100 8200 50  0001 C CNN
+	1    6100 8200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C186
 U 1 1 58023E51
 P 4600 9100
 F 0 "C186" H 4680 8910 60  0000 L BNN
-	1    4600 9100
-	1    0    0    -1
+F 1 "~" H 4600 9100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 8910 60  0001 C CNN
+F 3 "" H 4600 9100 50  0001 C CNN
+	1    4600 9100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C192
 U 1 1 58023E50
 P 5100 9100
 F 0 "C192" H 5180 8910 60  0000 L BNN
-	1    5100 9100
-	1    0    0    -1
+F 1 "~" H 5100 9100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 8910 60  0001 C CNN
+F 3 "" H 5100 9100 50  0001 C CNN
+	1    5100 9100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C198
 U 1 1 58023E4F
 P 5600 9100
 F 0 "C198" H 5680 8910 60  0000 L BNN
-	1    5600 9100
-	1    0    0    -1
+F 1 "~" H 5600 9100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 8910 60  0001 C CNN
+F 3 "" H 5600 9100 50  0001 C CNN
+	1    5600 9100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C204
 U 1 1 58023E4E
 P 6100 9100
 F 0 "C204" H 6180 8910 60  0000 L BNN
-	1    6100 9100
-	1    0    0    -1
+F 1 "~" H 6100 9100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 8910 60  0001 C CNN
+F 3 "" H 6100 9100 50  0001 C CNN
+	1    6100 9100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C169
 U 1 1 58023E4D
 P 3400 4600
 F 0 "C169" H 3480 4410 60  0000 L BNN
-	1    3400 4600
-	1    0    0    -1
+F 1 "~" H 3400 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 4410 60  0001 C CNN
+F 3 "" H 3400 4600 50  0001 C CNN
+	1    3400 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C175
 U 1 1 58023E4C
 P 3900 4600
 F 0 "C175" H 3980 4410 60  0000 L BNN
-	1    3900 4600
-	1    0    0    -1
+F 1 "~" H 3900 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 4410 60  0001 C CNN
+F 3 "" H 3900 4600 50  0001 C CNN
+	1    3900 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C176
 U 1 1 58023E4B
 P 3900 5500
 F 0 "C176" H 3980 5310 60  0000 L BNN
-	1    3900 5500
-	1    0    0    -1
+F 1 "~" H 3900 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 5310 60  0001 C CNN
+F 3 "" H 3900 5500 50  0001 C CNN
+	1    3900 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C170
 U 1 1 58023E4A
 P 3400 5500
 F 0 "C170" H 3480 5310 60  0000 L BNN
-	1    3400 5500
-	1    0    0    -1
+F 1 "~" H 3400 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 5310 60  0001 C CNN
+F 3 "" H 3400 5500 50  0001 C CNN
+	1    3400 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C171
 U 1 1 58023E49
 P 3400 6400
 F 0 "C171" H 3480 6210 60  0000 L BNN
-	1    3400 6400
-	1    0    0    -1
+F 1 "~" H 3400 6400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 6210 60  0001 C CNN
+F 3 "" H 3400 6400 50  0001 C CNN
+	1    3400 6400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C193
 U 1 1 58023E48
 P 5600 4600
 F 0 "C193" H 5680 4410 60  0000 L BNN
-	1    5600 4600
-	1    0    0    -1
+F 1 "~" H 5600 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 4410 60  0001 C CNN
+F 3 "" H 5600 4600 50  0001 C CNN
+	1    5600 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C177
 U 1 1 58023E47
 P 3900 6400
 F 0 "C177" H 3980 6210 60  0000 L BNN
-	1    3900 6400
-	1    0    0    -1
+F 1 "~" H 3900 6400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 6210 60  0001 C CNN
+F 3 "" H 3900 6400 50  0001 C CNN
+	1    3900 6400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C178
 U 1 1 58023E46
 P 3900 7300
 F 0 "C178" H 3980 7110 60  0000 L BNN
-	1    3900 7300
-	1    0    0    -1
+F 1 "~" H 3900 7300 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 7110 60  0001 C CNN
+F 3 "" H 3900 7300 50  0001 C CNN
+	1    3900 7300
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C172
 U 1 1 58023E45
 P 3400 7300
 F 0 "C172" H 3480 7110 60  0000 L BNN
-	1    3400 7300
-	1    0    0    -1
+F 1 "~" H 3400 7300 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 7110 60  0001 C CNN
+F 3 "" H 3400 7300 50  0001 C CNN
+	1    3400 7300
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C173
 U 1 1 58023E44
 P 3400 8200
 F 0 "C173" H 3480 8010 60  0000 L BNN
-	1    3400 8200
-	1    0    0    -1
+F 1 "~" H 3400 8200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 8010 60  0001 C CNN
+F 3 "" H 3400 8200 50  0001 C CNN
+	1    3400 8200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C179
 U 1 1 58023E43
 P 3900 8200
 F 0 "C179" H 3980 8010 60  0000 L BNN
-	1    3900 8200
-	1    0    0    -1
+F 1 "~" H 3900 8200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 8010 60  0001 C CNN
+F 3 "" H 3900 8200 50  0001 C CNN
+	1    3900 8200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C180
 U 1 1 58023E42
 P 3900 9100
 F 0 "C180" H 3980 8910 60  0000 L BNN
-	1    3900 9100
-	1    0    0    -1
+F 1 "~" H 3900 9100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 8910 60  0001 C CNN
+F 3 "" H 3900 9100 50  0001 C CNN
+	1    3900 9100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C174
 U 1 1 58023E41
 P 3400 9100
 F 0 "C174" H 3480 8910 60  0000 L BNN
-	1    3400 9100
-	1    0    0    -1
+F 1 "~" H 3400 9100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 8910 60  0001 C CNN
+F 3 "" H 3400 9100 50  0001 C CNN
+	1    3400 9100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C165
 U 1 1 58023E40
 P 1000 4600
 F 0 "C165" H 1080 4410 60  0000 L BNN
-	1    1000 4600
-	1    0    0    -1
+F 1 "~" H 1000 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1080 4410 60  0001 C CNN
+F 3 "" H 1000 4600 50  0001 C CNN
+	1    1000 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C166
 U 1 1 58023E3F
 P 1500 4600
 F 0 "C166" H 1580 4410 60  0000 L BNN
-	1    1500 4600
-	1    0    0    -1
+F 1 "~" H 1500 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1580 4410 60  0001 C CNN
+F 3 "" H 1500 4600 50  0001 C CNN
+	1    1500 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C167
 U 1 1 58023E3E
 P 2000 4600
 F 0 "C167" H 2080 4410 60  0000 L BNN
-	1    2000 4600
-	1    0    0    -1
+F 1 "~" H 2000 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2080 4410 60  0001 C CNN
+F 3 "" H 2000 4600 50  0001 C CNN
+	1    2000 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C199
 U 1 1 58023E3D
 P 6100 4600
 F 0 "C199" H 6180 4410 60  0000 L BNN
-	1    6100 4600
-	1    0    0    -1
+F 1 "~" H 6100 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 4410 60  0001 C CNN
+F 3 "" H 6100 4600 50  0001 C CNN
+	1    6100 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C168
 U 1 1 58023E3C
 P 2500 4600
 F 0 "C168" H 2580 4410 60  0000 L BNN
-	1    2500 4600
-	1    0    0    -1
+F 1 "~" H 2500 4600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2580 4410 60  0001 C CNN
+F 3 "" H 2500 4600 50  0001 C CNN
+	1    2500 4600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C182
 U 1 1 58023E3B
 P 4600 5500
 F 0 "C182" H 4680 5310 60  0000 L BNN
-	1    4600 5500
-	1    0    0    -1
+F 1 "~" H 4600 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 5310 60  0001 C CNN
+F 3 "" H 4600 5500 50  0001 C CNN
+	1    4600 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C188
 U 1 1 58023E3A
 P 5100 5500
 F 0 "C188" H 5180 5310 60  0000 L BNN
-	1    5100 5500
-	1    0    0    -1
+F 1 "~" H 5100 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 5310 60  0001 C CNN
+F 3 "" H 5100 5500 50  0001 C CNN
+	1    5100 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C194
 U 1 1 58023E39
 P 5600 5500
 F 0 "C194" H 5680 5310 60  0000 L BNN
-	1    5600 5500
-	1    0    0    -1
+F 1 "~" H 5600 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 5310 60  0001 C CNN
+F 3 "" H 5600 5500 50  0001 C CNN
+	1    5600 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C200
 U 1 1 58023E38
 P 6100 5500
 F 0 "C200" H 6180 5310 60  0000 L BNN
-	1    6100 5500
-	1    0    0    -1
+F 1 "~" H 6100 5500 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 5310 60  0001 C CNN
+F 3 "" H 6100 5500 50  0001 C CNN
+	1    6100 5500
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C183
 U 1 1 58023E37
 P 4600 6400
 F 0 "C183" H 4680 6210 60  0000 L BNN
-	1    4600 6400
-	1    0    0    -1
+F 1 "~" H 4600 6400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 6210 60  0001 C CNN
+F 3 "" H 4600 6400 50  0001 C CNN
+	1    4600 6400
+	1    0    0    -1  
 $EndComp
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_24.sch b/rev03-KiCad/rev02_24.sch
index 94dfe10..60d9e91 100644
--- a/rev03-KiCad/rev02_24.sch
+++ b/rev03-KiCad/rev02_24.sch
@@ -17,7 +17,7 @@ Text Notes 4300 4100 0    60   ~ 12
 *) FPGA Power Subsystem -- CORE
 Text Notes 7150 5310 0    60   ~ 12
 *) VCCINT = 0.6V x (1 + 150 / 226) = 0.998V\n*) OCP_ADJ is not used (default over-current threshold)\n*) MARx are not used (output at nominal 100%)\n*) S_IN/S_OUT are not used (single regulator mode)\n*) S_DELAY is not used (single regulator mode)\n*) M/S is not used (parallel operation not needed)\n*) EA_OUT is not used (default control loop)\n*) Minimal load current is 0A, but we still place\nload of 100 Ohms just in case (gives 10 mA)
-Text Notes 8520 10200 0    54   ~ 12
+Text Notes 8520 10200 0    54   ~ 11
 FPGA CORE voltage regulators
 Text Notes 2870 6680 0    60   ~ 12
 R66
@@ -50,10 +50,10 @@ C210
 Text Notes 7160 7290 0    60   ~ 12
 47uF
 $Comp
-L power:GND GND_216
+L power:GND #GND_0216
 U 1 1 58023E36
 P 4200 9500
-F 0 "GND_216" H 4200 9500 20  0000 C CNN
+F 0 "#GND_0216" H 4200 9500 20  0000 C CNN
 F 1 "+GND" H 4200 9430 30  0000 C CNN
 F 2 "" H 4200 9500 70  0000 C CNN
 F 3 "" H 4200 9500 70  0000 C CNN
@@ -61,10 +61,10 @@ F 3 "" H 4200 9500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_217
+L power:GND #GND_0217
 U 1 1 58023E35
 P 4700 9500
-F 0 "GND_217" H 4700 9500 20  0000 C CNN
+F 0 "#GND_0217" H 4700 9500 20  0000 C CNN
 F 1 "+GND" H 4700 9430 30  0000 C CNN
 F 2 "" H 4700 9500 70  0000 C CNN
 F 3 "" H 4700 9500 70  0000 C CNN
@@ -72,10 +72,10 @@ F 3 "" H 4700 9500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_218
+L power:GND #GND_0218
 U 1 1 58023E34
 P 3400 9500
-F 0 "GND_218" H 3400 9500 20  0000 C CNN
+F 0 "#GND_0218" H 3400 9500 20  0000 C CNN
 F 1 "+GND" H 3400 9430 30  0000 C CNN
 F 2 "" H 3400 9500 70  0000 C CNN
 F 3 "" H 3400 9500 70  0000 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 3400 9500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_219
+L power:GND #GND_0219
 U 1 1 58023E33
 P 1800 7000
-F 0 "GND_219" H 1800 7000 20  0000 C CNN
+F 0 "#GND_0219" H 1800 7000 20  0000 C CNN
 F 1 "+GND" H 1800 6930 30  0000 C CNN
 F 2 "" H 1800 7000 70  0000 C CNN
 F 3 "" H 1800 7000 70  0000 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 1800 7000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_220
+L power:GND #GND_0220
 U 1 1 58023E32
 P 2200 7000
-F 0 "GND_220" H 2200 7000 20  0000 C CNN
+F 0 "#GND_0220" H 2200 7000 20  0000 C CNN
 F 1 "+GND" H 2200 6930 30  0000 C CNN
 F 2 "" H 2200 7000 70  0000 C CNN
 F 3 "" H 2200 7000 70  0000 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 2200 7000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_221
+L power:GND #GND_0221
 U 1 1 58023E31
 P 5900 7600
-F 0 "GND_221" H 5900 7600 20  0000 C CNN
+F 0 "#GND_0221" H 5900 7600 20  0000 C CNN
 F 1 "+GND" H 5900 7530 30  0000 C CNN
 F 2 "" H 5900 7600 70  0000 C CNN
 F 3 "" H 5900 7600 70  0000 C CNN
@@ -116,10 +116,10 @@ F 3 "" H 5900 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_222
+L power:GND #GND_0222
 U 1 1 58023E30
 P 6600 7600
-F 0 "GND_222" H 6600 7600 20  0000 C CNN
+F 0 "#GND_0222" H 6600 7600 20  0000 C CNN
 F 1 "+GND" H 6600 7530 30  0000 C CNN
 F 2 "" H 6600 7600 70  0000 C CNN
 F 3 "" H 6600 7600 70  0000 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 6600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_223
+L power:GND #GND_0223
 U 1 1 58023E2F
 P 7100 7600
-F 0 "GND_223" H 7100 7600 20  0000 C CNN
+F 0 "#GND_0223" H 7100 7600 20  0000 C CNN
 F 1 "+GND" H 7100 7530 30  0000 C CNN
 F 2 "" H 7100 7600 70  0000 C CNN
 F 3 "" H 7100 7600 70  0000 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 7100 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_224
+L power:GND #GND_0224
 U 1 1 58023E2E
 P 7600 7600
-F 0 "GND_224" H 7600 7600 20  0000 C CNN
+F 0 "#GND_0224" H 7600 7600 20  0000 C CNN
 F 1 "+GND" H 7600 7530 30  0000 C CNN
 F 2 "" H 7600 7600 70  0000 C CNN
 F 3 "" H 7600 7600 70  0000 C CNN
@@ -149,10 +149,10 @@ F 3 "" H 7600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCC_5V0 VCC_5V0_3
+L Cryptech_Alpha:VCC_5V0 #VCC_5V0_03
 U 1 1 58023E2D
 P 1600 6200
-F 0 "VCC_5V0_3" H 1600 6200 20  0000 C CNN
+F 0 "#VCC_5V0_03" H 1600 6200 20  0000 C CNN
 F 1 "+VCC_5V0" H 1600 6130 30  0000 C CNN
 F 2 "" H 1600 6200 70  0000 C CNN
 F 3 "" H 1600 6200 70  0000 C CNN
@@ -175,7 +175,7 @@ Wire Wire Line
 	7600 7400 7600 7600
 Wire Wire Line
 	8300 6400 8100 6400
-Text Label 8300 6400 0 48 ~ 0
+Text Label 8300 6400 0    48   ~ 0
 FPGA_VCCINT_1V0
 Wire Wire Line
 	1600 6200 1600 6400
@@ -205,7 +205,7 @@ Connection ~ 2800 6400
 Connection ~ 1800 6400
 Wire Wire Line
 	5600 9100 5300 9100
-Text GLabel 5600 9100 2 48 Output ~ 0
+Text GLabel 5600 9100 2    48   Output ~ 0
 POK_VCCINT
 Wire Wire Line
 	3600 9100 3400 9100
@@ -219,7 +219,7 @@ Wire Wire Line
 	3200 5900 3200 6800
 Wire Wire Line
 	3200 5900 2700 5900
-Text GLabel 2700 5900 0 48 Input ~ 0
+Text GLabel 2700 5900 0    48   Input ~ 0
 PWR_ENA_VCCINT
 Wire Wire Line
 	5500 7600 5300 7600
@@ -268,7 +268,7 @@ Wire Wire Line
 Wire Wire Line
 	6200 6800 6200 7000
 Connection ~ 5900 7000
-Text Notes 3900 5400 0    72   ~ 12
+Text Notes 3900 5400 0    72   ~ 14
 U16
 Wire Wire Line
 	3600 5600 3600 5500
@@ -334,25 +334,29 @@ F 1 "4.7k" V 2730 6630 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2730 6630 60  0001 C CNN
 F 3 "" H 2730 6630 60  0000 C CNN
 	1    2800 6700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C209
 U 1 1 58023E2B
 P 6600 7100
 F 0 "C209" H 6680 6910 60  0000 L BNN
-	1    6600 7100
-	1    0    0    -1
+F 1 "~" H 6600 7100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 6680 6910 60  0001 C CNN
+F 3 "" H 6600 7100 50  0001 C CNN
+	1    6600 7100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C210
 U 1 1 58023E2A
 P 7100 7100
 F 0 "C210" H 7180 6910 60  0000 L BNN
-	1    7100 7100
-	1    0    0    -1
+F 1 "~" H 7100 7100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 7180 6910 60  0001 C CNN
+F 3 "" H 7100 7100 50  0001 C CNN
+	1    7100 7100
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:EN5364QI U16
@@ -363,34 +367,40 @@ F 1 "EN5364QI" H 4510 10030 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:QFN68" H 4510 10030 60  0001 C CNN
 F 3 "" H 4510 10030 60  0000 C CNN
 	1    4400 7700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C207
 U 1 1 58023E28
 P 3400 9200
 F 0 "C207" H 2800 9150 60  0000 L BNN
-	1    3400 9200
-	1    0    0    -1
+F 1 "~" H 3400 9200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2800 9150 60  0001 C CNN
+F 3 "" H 3400 9200 50  0001 C CNN
+	1    3400 9200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C205
 U 1 1 58023E27
 P 1800 6600
 F 0 "C205" H 1880 6410 60  0000 L BNN
-	1    1800 6600
-	1    0    0    -1
+F 1 "~" H 1800 6600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1880 6410 60  0001 C CNN
+F 3 "" H 1800 6600 50  0001 C CNN
+	1    1800 6600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C206
 U 1 1 58023E26
 P 2200 6600
 F 0 "C206" H 2280 6410 60  0000 L BNN
-	1    2200 6600
-	1    0    0    -1
+F 1 "~" H 2200 6600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2280 6410 60  0001 C CNN
+F 3 "" H 2200 6600 50  0001 C CNN
+	1    2200 6600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R68
@@ -401,7 +411,7 @@ F 1 "150k" V 5870 6950 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5870 6950 60  0001 C CNN
 F 3 "" H 5870 6950 60  0000 C CNN
 	1    5900 6700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R69
@@ -412,16 +422,18 @@ F 1 "226k" V 5850 7550 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5850 7550 60  0001 C CNN
 F 3 "" H 5850 7550 60  0000 C CNN
 	1    5900 7300
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C208
 U 1 1 58023E23
 P 6200 6600
 F 0 "C208" H 6280 6410 60  0000 L BNN
-	1    6200 6600
-	1    0    0    -1
+F 1 "~" H 6200 6600 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6280 6410 60  0001 C CNN
+F 3 "" H 6200 6600 50  0001 C CNN
+	1    6200 6600
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BLM31PG330SN1_1206 FB7
@@ -432,7 +444,7 @@ F 1 "BLM31PG330SN1" H 7750 6400 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:L_1206" H 7750 6400 60  0001 C CNN
 F 3 "" H 7750 6400 60  0000 C CNN
 	1    7900 6500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R70
@@ -443,7 +455,7 @@ F 1 "100" V 7610 7100 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 7610 7100 60  0001 C CNN
 F 3 "" H 7610 7100 60  0000 C CNN
 	1    7600 7200
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R67
@@ -454,7 +466,7 @@ F 1 "0" V 5440 7540 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5440 7540 60  0001 C CNN
 F 3 "" H 5440 7540 60  0000 C CNN
 	1    5500 7300
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 NoConn ~ 5300 8100
 NoConn ~ 5300 8300
@@ -466,28 +478,28 @@ NoConn ~ 3600 8200
 NoConn ~ 3600 8700
 NoConn ~ 5300 8700
 Wire Wire Line
-      8300 6400 8300 6200
+	8300 6400 8300 6200
 $Comp
-L Cryptech_Alpha:FPGA_VCCINT_1V0 #PWR?
+L Cryptech_Alpha:FPGA_VCCINT_1V0 #PWR0112
 U 1 1 5AF3F25C
 P 8300 6200
-F 0 "#PWR?" H 8300 6050 50  0001 C CNN
+F 0 "#PWR0112" H 8300 6050 50  0001 C CNN
 F 1 "FPGA_VCCINT_1V0" H 8315 6373 50  0000 C CNN
 F 2 "" H 8300 6200 60  0000 C CNN
 F 3 "" H 8300 6200 60  0000 C CNN
-      1    8300 6200
-      1    0    0    -1
+	1    8300 6200
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0111
 U 1 1 5AFA77EC
 P 8150 6400
-F 0 "#FLG?" H 8150 6475 50  0001 C CNN
+F 0 "#FLG0111" H 8150 6475 50  0001 C CNN
 F 1 "PWR_FLAG" H 8150 6574 50  0000 C CNN
 F 2 "" H 8150 6400 50  0001 C CNN
 F 3 "~" H 8150 6400 50  0001 C CNN
-       1    8150 6400
-       1    0    0    -1  
+	1    8150 6400
+	1    0    0    -1  
 $EndComp
 Connection ~ 8150 6400
 $EndSCHEMATC
diff --git a/rev03-KiCad/rev02_25.sch b/rev03-KiCad/rev02_25.sch
index 0f422bf..52a9bec 100644
--- a/rev03-KiCad/rev02_25.sch
+++ b/rev03-KiCad/rev02_25.sch
@@ -19,13 +19,13 @@ Text Notes 4100 5300 0    60   ~ 12
 --->
 Text Notes 8800 5300 0    60   ~ 12
 --->
-Text Notes 600 8700 0    60   ~ 12
+Text Notes 600  8700 0    60   ~ 12
 --->
 Text Notes 5100 8700 0    60   ~ 12
 --->
 Text Notes 6500 9400 0    60   ~ 12
 *) "Power OK" LED, should be of green color
-Text Notes 8700 10220 0    66   ~ 12
+Text Notes 8700 10220 0    66   ~ 13
 FPGA power sequencing
 Text Notes 1950 5250 0    60   ~ 12
 R72
@@ -72,10 +72,10 @@ C213
 Text Notes 7060 5790 0    60   ~ 12
 0.1~uF
 $Comp
-L power:GND GND_225
+L power:GND #GND_0225
 U 1 1 58023E1F
 P 2500 6000
-F 0 "GND_225" H 2500 6000 20  0000 C CNN
+F 0 "#GND_0225" H 2500 6000 20  0000 C CNN
 F 1 "+GND" H 2500 5930 30  0000 C CNN
 F 2 "" H 2500 6000 70  0000 C CNN
 F 3 "" H 2500 6000 70  0000 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 2500 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_226
+L power:GND #GND_0226
 U 1 1 58023E1E
 P 7000 6000
-F 0 "GND_226" H 7000 6000 20  0000 C CNN
+F 0 "#GND_0226" H 7000 6000 20  0000 C CNN
 F 1 "+GND" H 7000 5930 30  0000 C CNN
 F 2 "" H 7000 6000 70  0000 C CNN
 F 3 "" H 7000 6000 70  0000 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 7000 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_227
+L power:GND #GND_0227
 U 1 1 58023E1D
 P 3400 9400
-F 0 "GND_227" H 3400 9400 20  0000 C CNN
+F 0 "#GND_0227" H 3400 9400 20  0000 C CNN
 F 1 "+GND" H 3400 9330 30  0000 C CNN
 F 2 "" H 3400 9400 70  0000 C CNN
 F 3 "" H 3400 9400 70  0000 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 3400 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_228
+L power:GND #GND_0228
 U 1 1 58023E1C
 P 8000 8900
-F 0 "GND_228" H 8000 8900 20  0000 C CNN
+F 0 "#GND_0228" H 8000 8900 20  0000 C CNN
 F 1 "+GND" H 8000 8830 30  0000 C CNN
 F 2 "" H 8000 8900 70  0000 C CNN
 F 3 "" H 8000 8900 70  0000 C CNN
@@ -116,21 +116,21 @@ F 3 "" H 8000 8900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCC_5V0 VCC_5V0_4
+L Cryptech_Alpha:VCC_5V0 #VCC_5V0_04
 U 1 1 58023E1B
 P 900 4500
-F 0 "VCC_5V0_4" H 900 4500 20  0000 C CNN
+F 0 "#VCC_5V0_04" H 900 4500 20  0000 C CNN
 F 1 "+VCC_5V0" H 900 4430 30  0000 C CNN
 F 2 "" H 900 4500 70  0000 C CNN
 F 3 "" H 900 4500 70  0000 C CNN
-	1    900 4500
+	1    900  4500
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCC_5V0 VCC_5V0_5
+L Cryptech_Alpha:VCC_5V0 #VCC_5V0_05
 U 1 1 58023E1A
 P 2200 7800
-F 0 "VCC_5V0_5" H 2200 7800 20  0000 C CNN
+F 0 "#VCC_5V0_05" H 2200 7800 20  0000 C CNN
 F 1 "+VCC_5V0" H 2200 7730 30  0000 C CNN
 F 2 "" H 2200 7800 70  0000 C CNN
 F 3 "" H 2200 7800 70  0000 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 2200 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCC_5V0 VCC_5V0_6
+L Cryptech_Alpha:VCC_5V0 #VCC_5V0_06
 U 1 1 58023E19
 P 6800 7200
-F 0 "VCC_5V0_6" H 6800 7200 20  0000 C CNN
+F 0 "#VCC_5V0_06" H 6800 7200 20  0000 C CNN
 F 1 "+VCC_5V0" H 6800 7130 30  0000 C CNN
 F 2 "" H 6800 7200 70  0000 C CNN
 F 3 "" H 6800 7200 70  0000 C CNN
@@ -149,10 +149,10 @@ F 3 "" H 6800 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:VCC_5V0 VCC_5V0_7
+L Cryptech_Alpha:VCC_5V0 #VCC_5V0_07
 U 1 1 58023E18
 P 5800 4500
-F 0 "VCC_5V0_7" H 5800 4500 20  0000 C CNN
+F 0 "#VCC_5V0_07" H 5800 4500 20  0000 C CNN
 F 1 "+VCC_5V0" H 5800 4430 30  0000 C CNN
 F 2 "" H 5800 4500 70  0000 C CNN
 F 3 "" H 5800 4500 70  0000 C CNN
@@ -170,7 +170,7 @@ Wire Wire Line
 Wire Wire Line
 	8000 8700 8000 8900
 Wire Wire Line
-	900 4500 900 5300
+	900  4500 900  5300
 Wire Wire Line
 	1900 5300 1700 5300
 Wire Wire Line
@@ -178,7 +178,7 @@ Wire Wire Line
 Wire Wire Line
 	2000 4900 1700 4900
 Wire Wire Line
-	1700 5300 900 5300
+	1700 5300 900  5300
 Connection ~ 1700 5300
 Wire Wire Line
 	2200 7800 2200 8100
@@ -203,7 +203,7 @@ Wire Wire Line
 	7000 4900 6700 4900
 Wire Wire Line
 	7000 4900 7000 5300
-Text GLabel 7900 5300 2 48 Output ~ 0
+Text GLabel 7900 5300 2    48   Output ~ 0
 PWR_ENA_VCCAUX
 Connection ~ 7000 5300
 Wire Wire Line
@@ -218,7 +218,7 @@ Wire Wire Line
 	6500 4900 6200 4900
 Wire Wire Line
 	6200 5300 5800 5300
-Text GLabel 5000 5300 0 48 Input ~ 0
+Text GLabel 5000 5300 0    48   Input ~ 0
 POK_VCCINT
 Connection ~ 5800 5300
 Connection ~ 6200 5300
@@ -232,7 +232,7 @@ Wire Wire Line
 	3400 8700 3200 8700
 Wire Wire Line
 	3400 8700 3400 8900
-Text GLabel 4350 8700 2 48 Output ~ 0
+Text GLabel 4350 8700 2    48   Output ~ 0
 PWR_ENA_VCCO
 Connection ~ 3400 8700
 Wire Wire Line
@@ -245,7 +245,7 @@ Wire Wire Line
 	2500 5300 2500 5500
 Wire Wire Line
 	3400 5300 2500 5300
-Text GLabel 3400 5300 2 48 Output ~ 0
+Text GLabel 3400 5300 2    48   Output ~ 0
 PWR_ENA_VCCINT
 Connection ~ 2500 5300
 Wire Wire Line
@@ -260,7 +260,7 @@ Wire Wire Line
 	2900 8300 2600 8300
 Wire Wire Line
 	2600 8700 2200 8700
-Text GLabel 1450 8700 0 48 Input ~ 0
+Text GLabel 1450 8700 0    48   Input ~ 0
 POK_VCCAUX
 Connection ~ 2200 8700
 Connection ~ 2600 8700
@@ -270,7 +270,7 @@ Wire Wire Line
 	6800 8100 6800 8700
 Wire Wire Line
 	7400 8700 6800 8700
-Text GLabel 6050 8700 0 48 Input ~ 0
+Text GLabel 6050 8700 0    48   Input ~ 0
 POK_VCCO
 Connection ~ 6800 8700
 Wire Wire Line
@@ -288,7 +288,7 @@ F 1 "100k" H 1940 5150 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 1940 5150 60  0001 C CNN
 F 3 "" H 1940 5150 60  0000 C CNN
 	1    2100 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:2N7002 Q6
@@ -299,7 +299,7 @@ F 1 "2N7002P,235" H 6980 8530 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 6980 8530 60  0001 C CNN
 F 3 "" H 6980 8530 60  0000 C CNN
 	1    7600 8600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LEDCHIP-LED0603 LED18
@@ -310,7 +310,7 @@ F 1 "LTST-C191KGKT" H 7855 8010 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 7855 8010 60  0001 C CNN
 F 3 "" H 7855 8010 60  0000 C CNN
 	1    8000 8200
-	-1    0    0    -1
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R78
@@ -321,7 +321,7 @@ F 1 "330" V 7930 7710 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 7930 7710 60  0001 C CNN
 F 3 "" H 7930 7710 60  0000 C CNN
 	1    8000 7800
-	0    -1    1    0
+	0    -1   1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C211
@@ -332,7 +332,7 @@ F 1 "0.1uF" H 2840 5620 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2840 5620 60  0001 C CNN
 F 3 "" H 2840 5620 60  0000 C CNN
 	1    2500 5600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C212
@@ -343,7 +343,7 @@ F 1 "0.1uF" H 3730 9020 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3730 9020 60  0001 C CNN
 F 3 "" H 3730 9020 60  0000 C CNN
 	1    3400 9000
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C213
@@ -354,7 +354,7 @@ F 1 "0.1uF" H 7330 5620 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7330 5620 60  0001 C CNN
 F 3 "" H 7330 5620 60  0000 C CNN
 	1    7000 5600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BAT54 D2
@@ -365,7 +365,7 @@ F 1 "BAT54LT1G" H 2090 4980 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 2090 4980 60  0001 C CNN
 F 3 "" H 2090 4980 60  0000 C CNN
 	1    2100 4900
-	-1    0    0    -1
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R75
@@ -376,7 +376,7 @@ F 1 "4.7k" H 5640 4740 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5640 4740 60  0001 C CNN
 F 3 "" H 5640 4740 60  0000 C CNN
 	1    5800 4900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R76
@@ -387,7 +387,7 @@ F 1 "100k" H 6450 5150 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6450 5150 60  0001 C CNN
 F 3 "" H 6450 5150 60  0000 C CNN
 	1    6600 5300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BAT54 D4
@@ -398,7 +398,7 @@ F 1 "BAT54LT1G" H 6720 4720 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 6720 4720 60  0001 C CNN
 F 3 "" H 6720 4720 60  0000 C CNN
 	1    6600 4900
-	-1    0    0    -1
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R73
@@ -409,7 +409,7 @@ F 1 "4.7k" H 2040 8150 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2040 8150 60  0001 C CNN
 F 3 "" H 2040 8150 60  0000 C CNN
 	1    2200 8300
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R74
@@ -420,7 +420,7 @@ F 1 "100k" H 2840 8550 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 2840 8550 60  0001 C CNN
 F 3 "" H 2840 8550 60  0000 C CNN
 	1    3000 8700
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:BAT54 D3
@@ -431,7 +431,7 @@ F 1 "BAT54LT1G" H 3060 8390 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 3060 8390 60  0001 C CNN
 F 3 "" H 3060 8390 60  0000 C CNN
 	1    3000 8300
-	-1    0    0    -1
+	-1   0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R77
@@ -442,6 +442,6 @@ F 1 "4.7k" H 6660 7740 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6660 7740 60  0001 C CNN
 F 3 "" H 6660 7740 60  0000 C CNN
 	1    6800 7900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $EndSCHEMATC



More information about the Commits mailing list