commit all the label changes made by current fix-label.py

21 files changed, 464 insertions, 478 deletions

diff --git a/fix-labels.py b/fix-labels.py
index 039af04..225159d 100755
--- a/fix-labels.py
+++ b/fix-labels.py
@@ -625,7 +625,6 @@ labels = {
     },
 }
 
-
 def update_text_line(text, prev, entrys):
     m = re.match('^Text Label (\d+) +(\d+) +(\d+) +(\d+) +~', prev)
     x, y, orient, dim = m.groups()
@@ -675,7 +674,8 @@ def fix_labels(fn_in, fn_out, file_labels):
     in_ = open(fn_in)
     out = open(fn_out, 'w')
     prev = None
-    print('Fixing labels in {}'.format(fn_in))
+    fn = os.path.basename(fn_in)
+    print('Fixing labels in {}'.format(fn))
     for line in in_.readlines():
         #print('R: {!r}'.format(line))
         if prev is not None:
@@ -700,6 +700,8 @@ def fix_labels(fn_in, fn_out, file_labels):
                     #print("Unknown label: {!r} (not in {})".format(text, file_labels.keys()))
                     print("Unknown label: {!r}".format(text))
                     out.write(prev + '\n')
+            else:
+                out.write(prev + '\n')
             prev = None
         elif line.startswith('Text Label '):
             prev = line
diff --git a/rev03-KiCad/rev02_01.sch b/rev03-KiCad/rev02_01.sch
index f2a0245..cd86c54 100644
--- a/rev03-KiCad/rev02_01.sch
+++ b/rev03-KiCad/rev02_01.sch
@@ -532,7 +532,7 @@ Wire Wire Line
 	12300 6600 11400 6600
 Wire Wire Line
 	9600 6600 9600 6800
-Text Label 11800 6600 0 48 ~
+Text GLabel 12300 6600 2 48 Output ~ 0
 VCC_5V0
 Connection ~ 9200 6600
 Connection ~ 10200 6600
@@ -554,7 +554,7 @@ Wire Wire Line
 	7850 3100 7700 3100
 Wire Wire Line
 	6300 3550 6000 3550
-Text Label 5450 3550 0 48 ~
+Text GLabel 5450 3550 0 48 Input ~ 0
 FPGA_ENTROPY_DISABLE
 Wire Wire Line
 	5450 3550 6000 3550
diff --git a/rev03-KiCad/rev02_02.sch b/rev03-KiCad/rev02_02.sch
index 9fad66d..98972af 100644
--- a/rev03-KiCad/rev02_02.sch
+++ b/rev03-KiCad/rev02_02.sch
@@ -135,7 +135,7 @@ Wire Wire Line
 	8800 4700 8600 4700
 Wire Wire Line
 	9300 4900 9300 5000
-Text Label 9650 5000 0 48 ~
+Text Label 10050 5000 2 48 ~ 0
 AMPLIFIED
 Connection ~ 8800 5000
 Connection ~ 8800 5000
@@ -143,7 +143,7 @@ Connection ~ 8800 4700
 Connection ~ 9300 5000
 Wire Wire Line
 	13400 4800 12900 4800
-Text Label 13400 4800 0 48 ~
+Text GLabel 13400 4800 2 48 Output ~ 0
 DIGITIZED_NOISE
 Wire Wire Line
 	11500 5400 11400 5400
@@ -185,7 +185,7 @@ Wire Wire Line
 	6400 5400 5350 5400
 Wire Wire Line
 	5350 5300 5350 5400
-Text Label 6000 5400 0 48 ~
+Text Label 6400 5400 2 48 ~ 0
 RAW_NOISE
 Connection ~ 5050 5400
 Connection ~ 5350 5400
diff --git a/rev03-KiCad/rev02_03.sch b/rev03-KiCad/rev02_03.sch
index 08e23d5..bf87659 100644
--- a/rev03-KiCad/rev02_03.sch
+++ b/rev03-KiCad/rev02_03.sch
@@ -289,19 +289,19 @@ Wire Wire Line
 	2700 4700 2700 4900
 Wire Wire Line
 	12600 6500 11960 6500
-Text Label 11960 6500 0 48 ~
+Text GLabel 11960 6500 0 48 Input ~ 0
 ARM_LED1
 Wire Wire Line
 	12290 6600 11960 6600
-Text Label 11960 6600 0 48 ~
+Text GLabel 11960 6600 0 48 Input ~ 0
 ARM_LED2
 Wire Wire Line
 	12200 6700 11950 6700
-Text Label 11950 6700 0 48 ~
+Text GLabel 11950 6700 0 48 Input ~ 0
 ARM_LED3
 Wire Wire Line
 	12290 6800 11950 6800
-Text Label 11950 6800 0 48 ~
+Text GLabel 11950 6800 0 48 Input ~ 0
 ARM_LED4
 Wire Wire Line
 	13300 6500 13000 6500
diff --git a/rev03-KiCad/rev02_04.sch b/rev03-KiCad/rev02_04.sch
index 56696d2..d145b68 100644
--- a/rev03-KiCad/rev02_04.sch
+++ b/rev03-KiCad/rev02_04.sch
@@ -430,7 +430,7 @@ Wire Wire Line
 	3500 3700 3500 3900
 Wire Wire Line
 	3700 3700 3500 3700
-Text Label 3500 3700 0 48 ~
+Text Label 3700 3700 2 48 ~ 0
 VCAP2
 Wire Wire Line
 	7600 5500 7600 5600
diff --git a/rev03-KiCad/rev02_05.sch b/rev03-KiCad/rev02_05.sch
index 09ef234..d81561b 100644
--- a/rev03-KiCad/rev02_05.sch
+++ b/rev03-KiCad/rev02_05.sch
@@ -54,551 +54,551 @@ Text Notes 3400 2300 0    60   ~ 12
 STM32F429BIT6
 Wire Wire Line
 	10600 7100 9990 7100
-Text Label 9990 7100 0 48 ~
+Text GLabel 9990 7100 0 48 Output ~ 0
 FMC_CLK
 Wire Wire Line
 	10600 6800 9990 6800
-Text Label 9990 6800 0 48 ~
+Text GLabel 9990 6800 0 48 UnSpc ~ 0
 FMC_NL
 Wire Wire Line
 	10600 7200 9990 7200
-Text Label 9990 7200 0 48 ~
+Text GLabel 9990 7200 0 48 Output ~ 0
 FMC_NOE
 Wire Wire Line
 	10600 7300 9990 7300
-Text Label 9990 7300 0 48 ~
+Text GLabel 9990 7300 0 48 Output ~ 0
 FMC_NWE
 Wire Wire Line
 	10600 7400 9990 7400
-Text Label 9990 7400 0 48 ~
+Text GLabel 9990 7400 0 48 Output ~ 0
 FMC_NWAIT
 Wire Wire Line
 	10600 7500 9990 7500
-Text Label 9990 7500 0 48 ~
+Text GLabel 9990 7500 0 48 Output ~ 0
 FMC_NE1
 Wire Wire Line
 	13490 7700 13000 7700
-Text Label 13110 7700 0 48 ~
+Text GLabel 13490 7700 2 48 Output ~ 0
 FMC_SDNCAS
 Wire Wire Line
 	13490 7800 13000 7800
-Text Label 13110 7800 0 48 ~
+Text GLabel 13490 7800 2 48 Output ~ 0
 FMC_SDNRAS
 Wire Wire Line
 	10600 6200 9990 6200
-Text Label 9990 6200 0 48 ~
+Text GLabel 9990 6200 0 48 Output ~ 0
 FMC_NBL0
 Wire Wire Line
 	10600 6300 9990 6300
-Text Label 9990 6300 0 48 ~
+Text GLabel 9990 6300 0 48 Output ~ 0
 FMC_NBL1
 Wire Wire Line
 	10600 6400 9990 6400
-Text Label 9990 6400 0 48 ~
+Text GLabel 9990 6400 0 48 Output ~ 0
 FMC_NBL2
 Wire Wire Line
 	10600 6500 9990 6500
-Text Label 9990 6500 0 48 ~
+Text GLabel 9990 6500 0 48 Output ~ 0
 FMC_NBL3
 Wire Wire Line
 	13490 7500 13000 7500
-Text Label 13110 7500 0 48 ~
+Text GLabel 13490 7500 2 48 Output ~ 0
 FMC_SDCKE1
 Wire Wire Line
 	13490 7200 13000 7200
-Text Label 13120 7200 0 48 ~
+Text GLabel 13490 7200 2 48 Output ~ 0
 FMC_SDNE1
 Entry Wire Line
  	10040 3400 9990 3450
 Wire Wire Line
 	10600 3400 10040 3400
-Text Label 10160 3400 0 48 ~
+Text GLabel 10160 3400 2 48 Output ~ 0
 FMC_A0
 Entry Wire Line
  	10040 3500 9990 3550
 Wire Wire Line
 	10600 3500 10040 3500
-Text Label 10160 3500 0 48 ~
+Text GLabel 10160 3500 2 48 Output ~ 0
 FMC_A1
 Entry Wire Line
  	10040 3600 9990 3650
 Wire Wire Line
 	10600 3600 10040 3600
-Text Label 10160 3600 0 48 ~
+Text GLabel 10160 3600 2 48 Output ~ 0
 FMC_A2
 Entry Wire Line
  	10040 3700 9990 3750
 Wire Wire Line
 	10600 3700 10040 3700
-Text Label 10160 3700 0 48 ~
+Text GLabel 10160 3700 2 48 Output ~ 0
 FMC_A3
 Entry Wire Line
  	10040 3800 9990 3850
 Wire Wire Line
 	10600 3800 10040 3800
-Text Label 10160 3800 0 48 ~
+Text GLabel 10160 3800 2 48 Output ~ 0
 FMC_A4
 Entry Wire Line
  	10040 3900 9990 3950
 Wire Wire Line
 	10600 3900 10040 3900
-Text Label 10160 3900 0 48 ~
+Text GLabel 10160 3900 2 48 Output ~ 0
 FMC_A5
 Entry Wire Line
  	10040 4000 9990 4050
 Wire Wire Line
 	10600 4000 10040 4000
-Text Label 10160 4000 0 48 ~
+Text GLabel 10160 4000 2 48 Output ~ 0
 FMC_A6
 Entry Wire Line
  	10040 4100 9990 4150
 Wire Wire Line
 	10600 4100 10040 4100
-Text Label 10160 4100 0 48 ~
+Text GLabel 10160 4100 2 48 Output ~ 0
 FMC_A7
 Entry Wire Line
  	10040 4200 9990 4250
 Wire Wire Line
 	10600 4200 10040 4200
-Text Label 10160 4200 0 48 ~
+Text GLabel 10160 4200 2 48 Output ~ 0
 FMC_A8
 Entry Wire Line
  	10040 4300 9990 4350
 Wire Wire Line
 	10600 4300 10040 4300
-Text Label 10160 4300 0 48 ~
+Text GLabel 10160 4300 2 48 Output ~ 0
 FMC_A9
 Entry Wire Line
  	10040 4400 9990 4450
 Wire Wire Line
 	10600 4400 10040 4400
-Text Label 10160 4400 0 48 ~
+Text GLabel 10160 4400 2 48 Output ~ 0
 FMC_A10
 Entry Wire Line
  	10040 4500 9990 4550
 Wire Wire Line
 	10600 4500 10040 4500
-Text Label 10160 4500 0 48 ~
+Text GLabel 10160 4500 2 48 Output ~ 0
 FMC_A11
 Entry Wire Line
  	10040 4600 9990 4650
 Wire Wire Line
 	10600 4600 10040 4600
-Text Label 10160 4600 0 48 ~
+Text GLabel 10160 4600 2 48 Output ~ 0
 FMC_A12
 Entry Wire Line
  	10040 4700 9990 4750
 Wire Wire Line
 	10600 4700 10040 4700
-Text Label 10160 4700 0 48 ~
+Text GLabel 10160 4700 2 48 Output ~ 0
 FMC_A13
 Entry Wire Line
  	10040 4800 9990 4850
 Wire Wire Line
 	10600 4800 10040 4800
-Text Label 10160 4800 0 48 ~
+Text GLabel 10160 4800 2 48 Output ~ 0
 FMC_A14
 Entry Wire Line
  	10040 4900 9990 4950
 Wire Wire Line
 	10600 4900 10040 4900
-Text Label 10160 4900 0 48 ~
+Text GLabel 10160 4900 2 48 Output ~ 0
 FMC_A15
 Entry Wire Line
  	10040 5000 9990 5050
 Wire Wire Line
 	10600 5000 10040 5000
-Text Label 10160 5000 0 48 ~
+Text GLabel 10160 5000 2 48 Output ~ 0
 FMC_A16
 Entry Wire Line
  	10040 5100 9990 5150
 Wire Wire Line
 	10600 5100 10040 5100
-Text Label 10160 5100 0 48 ~
+Text GLabel 10160 5100 2 48 Output ~ 0
 FMC_A17
 Entry Wire Line
  	10040 5200 9990 5250
 Wire Wire Line
 	10600 5200 10040 5200
-Text Label 10160 5200 0 48 ~
+Text GLabel 10160 5200 2 48 Output ~ 0
 FMC_A18
 Entry Wire Line
  	10040 5300 9990 5350
 Wire Wire Line
 	10600 5300 10040 5300
-Text Label 10160 5300 0 48 ~
+Text GLabel 10160 5300 2 48 Output ~ 0
 FMC_A19
 Entry Wire Line
  	10040 5400 9990 5450
 Wire Wire Line
 	10600 5400 10040 5400
-Text Label 10160 5400 0 48 ~
+Text GLabel 10160 5400 2 48 Output ~ 0
 FMC_A20
 Entry Wire Line
  	10040 5500 9990 5550
 Wire Wire Line
 	10600 5500 10040 5500
-Text Label 10160 5500 0 48 ~
+Text GLabel 10160 5500 2 48 Output ~ 0
 FMC_A21
 Entry Wire Line
  	10040 5600 9990 5650
 Wire Wire Line
 	10600 5600 10040 5600
-Text Label 10160 5600 0 48 ~
+Text GLabel 10160 5600 2 48 Output ~ 0
 FMC_A22
 Entry Wire Line
  	10040 5700 9990 5750
 Wire Wire Line
 	10600 5700 10040 5700
-Text Label 10160 5700 0 48 ~
+Text GLabel 10160 5700 2 48 Output ~ 0
 FMC_A23
 Entry Wire Line
  	10040 5800 9990 5850
 Wire Wire Line
 	10600 5800 10040 5800
-Text Label 10160 5800 0 48 ~
+Text GLabel 10160 5800 2 48 Output ~ 0
 FMC_A24
 Entry Wire Line
  	10040 5900 9990 5900
 Wire Wire Line
 	10600 5900 10040 5900
-Text Label 10160 5900 0 48 ~
+Text GLabel 10160 5900 2 48 Output ~ 0
 FMC_A25
 Entry Wire Line
  	13450 3400 13500 3350
 Wire Wire Line
 	13450 3400 13000 3400
-Text Label 13120 3400 0 48 ~
+Text GLabel 13070 3400 2 48 BiDi ~ 0
 FMC_D0
 Entry Wire Line
  	13450 3500 13500 3450
 Wire Wire Line
 	13450 3500 13000 3500
-Text Label 13120 3500 0 48 ~
+Text GLabel 13070 3500 2 48 BiDi ~ 0
 FMC_D1
 Entry Wire Line
  	13450 3600 13500 3550
 Wire Wire Line
 	13450 3600 13000 3600
-Text Label 13120 3600 0 48 ~
+Text GLabel 13070 3600 2 48 BiDi ~ 0
 FMC_D2
 Entry Wire Line
  	13450 3700 13500 3650
 Wire Wire Line
 	13450 3700 13000 3700
-Text Label 13120 3700 0 48 ~
+Text GLabel 13070 3700 2 48 BiDi ~ 0
 FMC_D3
 Entry Wire Line
  	13450 3800 13500 3750
 Wire Wire Line
 	13450 3800 13000 3800
-Text Label 13120 3800 0 48 ~
+Text GLabel 13070 3800 2 48 BiDi ~ 0
 FMC_D4
 Entry Wire Line
  	13450 3900 13500 3850
 Wire Wire Line
 	13450 3900 13000 3900
-Text Label 13120 3900 0 48 ~
+Text GLabel 13070 3900 2 48 BiDi ~ 0
 FMC_D5
 Entry Wire Line
  	13450 4000 13500 3950
 Wire Wire Line
 	13450 4000 13000 4000
-Text Label 13120 4000 0 48 ~
+Text GLabel 13070 4000 2 48 BiDi ~ 0
 FMC_D6
 Entry Wire Line
  	13450 4100 13500 4050
 Wire Wire Line
 	13450 4100 13000 4100
-Text Label 13120 4100 0 48 ~
+Text GLabel 13070 4100 2 48 BiDi ~ 0
 FMC_D7
 Entry Wire Line
  	13450 4200 13500 4150
 Wire Wire Line
 	13450 4200 13000 4200
-Text Label 13120 4200 0 48 ~
+Text GLabel 13070 4200 2 48 BiDi ~ 0
 FMC_D8
 Entry Wire Line
  	13450 4300 13500 4250
 Wire Wire Line
 	13450 4300 13000 4300
-Text Label 13120 4300 0 48 ~
+Text GLabel 13070 4300 2 48 BiDi ~ 0
 FMC_D9
 Entry Wire Line
  	13450 4400 13500 4350
 Wire Wire Line
 	13450 4400 13000 4400
-Text Label 13120 4400 0 48 ~
+Text GLabel 13070 4400 2 48 BiDi ~ 0
 FMC_D10
 Entry Wire Line
  	13450 4500 13500 4450
 Wire Wire Line
 	13450 4500 13000 4500
-Text Label 13120 4500 0 48 ~
+Text GLabel 13070 4500 2 48 BiDi ~ 0
 FMC_D11
 Entry Wire Line
  	13450 4600 13500 4550
 Wire Wire Line
 	13450 4600 13000 4600
-Text Label 13120 4600 0 48 ~
+Text GLabel 13070 4600 2 48 BiDi ~ 0
 FMC_D12
 Entry Wire Line
  	13450 4700 13500 4650
 Wire Wire Line
 	13450 4700 13000 4700
-Text Label 13120 4700 0 48 ~
+Text GLabel 13070 4700 2 48 BiDi ~ 0
 FMC_D13
 Entry Wire Line
  	13450 4800 13500 4750
 Wire Wire Line
 	13450 4800 13000 4800
-Text Label 13120 4800 0 48 ~
+Text GLabel 13070 4800 2 48 BiDi ~ 0
 FMC_D14
 Entry Wire Line
  	13450 4900 13500 4850
 Wire Wire Line
 	13450 4900 13000 4900
-Text Label 13120 4900 0 48 ~
+Text GLabel 13070 4900 2 48 BiDi ~ 0
 FMC_D15
 Entry Wire Line
  	13450 5000 13500 4950
 Wire Wire Line
 	13450 5000 13000 5000
-Text Label 13120 5000 0 48 ~
+Text GLabel 13070 5000 2 48 BiDi ~ 0
 FMC_D16
 Entry Wire Line
  	13450 5100 13500 5050
 Wire Wire Line
 	13450 5100 13000 5100
-Text Label 13120 5100 0 48 ~
+Text GLabel 13070 5100 2 48 BiDi ~ 0
 FMC_D17
 Entry Wire Line
  	13450 5200 13500 5150
 Wire Wire Line
 	13450 5200 13000 5200
-Text Label 13120 5200 0 48 ~
+Text GLabel 13070 5200 2 48 BiDi ~ 0
 FMC_D18
 Entry Wire Line
  	13450 5300 13500 5250
 Wire Wire Line
 	13450 5300 13000 5300
-Text Label 13120 5300 0 48 ~
+Text GLabel 13070 5300 2 48 BiDi ~ 0
 FMC_D19
 Entry Wire Line
  	13450 5400 13500 5350
 Wire Wire Line
 	13450 5400 13000 5400
-Text Label 13120 5400 0 48 ~
+Text GLabel 13070 5400 2 48 BiDi ~ 0
 FMC_D20
 Entry Wire Line
  	13450 5500 13500 5450
 Wire Wire Line
 	13450 5500 13000 5500
-Text Label 13120 5500 0 48 ~
+Text GLabel 13070 5500 2 48 BiDi ~ 0
 FMC_D21
 Entry Wire Line
  	13450 5600 13500 5550
 Wire Wire Line
 	13450 5600 13000 5600
-Text Label 13120 5600 0 48 ~
+Text GLabel 13070 5600 2 48 BiDi ~ 0
 FMC_D22
 Entry Wire Line
  	13450 5700 13500 5650
 Wire Wire Line
 	13450 5700 13000 5700
-Text Label 13120 5700 0 48 ~
+Text GLabel 13070 5700 2 48 BiDi ~ 0
 FMC_D23
 Entry Wire Line
  	13450 5800 13500 5750
 Wire Wire Line
 	13450 5800 13000 5800
-Text Label 13120 5800 0 48 ~
+Text GLabel 13070 5800 2 48 BiDi ~ 0
 FMC_D24
 Entry Wire Line
  	13450 5900 13500 5850
 Wire Wire Line
 	13450 5900 13000 5900
-Text Label 13120 5900 0 48 ~
+Text GLabel 13070 5900 2 48 BiDi ~ 0
 FMC_D25
 Entry Wire Line
  	13450 6000 13500 5950
 Wire Wire Line
 	13450 6000 13000 6000
-Text Label 13120 6000 0 48 ~
+Text GLabel 13070 6000 2 48 BiDi ~ 0
 FMC_D26
 Entry Wire Line
  	13450 6100 13500 6050
 Wire Wire Line
 	13450 6100 13000 6100
-Text Label 13120 6100 0 48 ~
+Text GLabel 13070 6100 2 48 BiDi ~ 0
 FMC_D27
 Entry Wire Line
  	13450 6200 13500 6150
 Wire Wire Line
 	13450 6200 13000 6200
-Text Label 13120 6200 0 48 ~
+Text GLabel 13070 6200 2 48 BiDi ~ 0
 FMC_D28
 Entry Wire Line
  	13450 6300 13500 6250
 Wire Wire Line
 	13450 6300 13000 6300
-Text Label 13120 6300 0 48 ~
+Text GLabel 13070 6300 2 48 BiDi ~ 0
 FMC_D29
 Entry Wire Line
  	13450 6400 13500 6350
 Wire Wire Line
 	13450 6400 13000 6400
-Text Label 13120 6400 0 48 ~
+Text GLabel 13070 6400 2 48 BiDi ~ 0
 FMC_D30
 Entry Wire Line
  	13450 6500 13500 6450
 Wire Wire Line
 	13450 6500 13000 6500
-Text Label 13120 6500 0 48 ~
+Text GLabel 13070 6500 2 48 BiDi ~ 0
 FMC_D31
 Wire Wire Line
 	13490 7400 13000 7400
-Text Label 13110 7400 0 48 ~
+Text GLabel 13490 7400 2 48 Output ~ 0
 FMC_SDCKE0
 Wire Wire Line
 	13490 7100 13000 7100
-Text Label 13120 7100 0 48 ~
+Text GLabel 13490 7100 2 48 Output ~ 0
 FMC_SDNE0
 Wire Wire Line
 	13490 6900 13000 6900
-Text Label 13120 6900 0 48 ~
+Text GLabel 13490 6900 2 48 Output ~ 0
 FMC_SDNWE
 Wire Wire Line
 	13490 6800 13000 6800
-Text Label 13120 6800 0 48 ~
+Text GLabel 13490 6800 2 48 Output ~ 0
 FMC_SDCLK
 Wire Wire Line
 	3100 2900 2250 2900
-Text Label 2250 2900 0 48 ~
+Text GLabel 2250 2900 0 48 Input ~ 0
 FT_TXD
 Wire Wire Line
 	3100 2800 2250 2800
-Text Label 2250 2800 0 48 ~
+Text GLabel 2250 2800 0 48 Output ~ 0
 FT_RXD
 Wire Wire Line
 	7050 4300 6200 4300
-Text Label 6400 4300 0 48 ~
+Text GLabel 7050 4300 2 48 BiDi ~ 0
 AVR_GPIO_ARM_1
 Wire Wire Line
 	7050 4400 6200 4400
-Text Label 6400 4400 0 48 ~
+Text GLabel 7050 4400 2 48 BiDi ~ 0
 AVR_GPIO_ARM_0
 Wire Wire Line
 	3100 6200 2250 6200
-Text Label 2250 6200 0 48 ~
+Text GLabel 2250 6200 0 48 Output ~ 0
 RTC_SCL
 Wire Wire Line
 	3100 6100 2250 6100
-Text Label 2250 6100 0 48 ~
+Text GLabel 2250 6100 0 48 BiDi ~ 0
 RTC_SDA
 Wire Wire Line
 	3100 6300 2250 6300
-Text Label 2250 6300 0 48 ~
+Text GLabel 2250 6300 0 48 UnSpc ~ 0
 RTC_MFP
 Wire Wire Line
 	7000 6500 6200 6500
-Text Label 6400 6500 0 48 ~
+Text GLabel 7000 6500 2 48 UnSpc ~ 0
 FPGA_IRQ_N_0
 Wire Wire Line
 	7000 6600 6200 6600
-Text Label 6400 6600 0 48 ~
+Text GLabel 7000 6600 2 48 UnSpc ~ 0
 FPGA_IRQ_N_1
 Wire Wire Line
 	7000 6700 6200 6700
-Text Label 6400 6700 0 48 ~
+Text GLabel 7000 6700 2 48 UnSpc ~ 0
 FPGA_IRQ_N_2
 Wire Wire Line
 	7000 6800 6200 6800
-Text Label 6400 6800 0 48 ~
+Text GLabel 7000 6800 2 48 UnSpc ~ 0
 FPGA_IRQ_N_3
 Wire Wire Line
 	7000 6300 6200 6300
-Text Label 6400 6300 0 48 ~
+Text GLabel 7000 6300 2 48 UnSpc ~ 0
 FPGA_PROGRAM_B
 Wire Wire Line
 	7000 6200 6200 6200
-Text Label 6400 6200 0 48 ~
+Text GLabel 7000 6200 2 48 UnSpc ~ 0
 FPGA_INIT_B
 Wire Wire Line
 	3100 4200 2250 4200
-Text Label 2250 4200 0 48 ~
+Text GLabel 2250 4200 0 48 Output ~ 0
 ARM_FPGA_CFG_SCLK
 Wire Wire Line
 	3100 4300 2250 4300
-Text Label 2250 4300 0 48 ~
+Text GLabel 2250 4300 0 48 Input ~ 0
 ARM_FPGA_CFG_MISO
 Wire Wire Line
 	3100 4400 2250 4400
-Text Label 2250 4400 0 48 ~
+Text GLabel 2250 4400 0 48 Output ~ 0
 ARM_FPGA_CFG_MOSI
 Wire Wire Line
 	3100 4800 2250 4800
-Text Label 2250 4800 0 48 ~
+Text GLabel 2250 4800 0 48 Output ~ 0
 KSM_PROM_SCLK
 Wire Wire Line
 	3100 4900 2250 4900
-Text Label 2250 4900 0 48 ~
+Text GLabel 2250 4900 0 48 Input ~ 0
 KSM_PROM_MISO
 Wire Wire Line
 	3100 5000 2250 5000
-Text Label 2250 5000 0 48 ~
+Text GLabel 2250 5000 0 48 Output ~ 0
 KSM_PROM_MOSI
 Wire Wire Line
 	3100 3100 2250 3100
-Text Label 2250 3100 0 48 ~
+Text GLabel 2250 3100 0 48 Output ~ 0
 FT_RTS
 Wire Wire Line
 	3100 3000 2250 3000
-Text Label 2250 3000 0 48 ~
+Text GLabel 2250 3000 0 48 UnSpc ~ 0
 FT_CTS
 Wire Wire Line
 	3100 3500 2250 3500
-Text Label 2250 3500 0 48 ~
+Text GLabel 2250 3500 0 48 Output ~ 0
 FT_MGMT_RXD
 Wire Wire Line
 	3100 3600 2250 3600
-Text Label 2250 3600 0 48 ~
+Text GLabel 2250 3600 0 48 Input ~ 0
 FT_MGMT_TXD
 Wire Wire Line
 	3100 3700 2250 3700
-Text Label 2250 3700 0 48 ~
+Text GLabel 2250 3700 0 48 Input ~ 0
 FT_MGMT_CTS
 Wire Wire Line
 	3100 3800 2250 3800
-Text Label 2250 3800 0 48 ~
+Text GLabel 2250 3800 0 48 Output ~ 0
 FT_MGMT_RTS
 Wire Wire Line
 	7000 7000 6200 7000
-Text Label 6400 7000 0 48 ~
+Text GLabel 7000 7000 2 48 UnSpc ~ 0
 FPGA_DONE
 Wire Wire Line
 	3100 2700 2250 2700
-Text Label 2250 2700 0 48 ~
+Text GLabel 2250 2700 0 48 UnSpc ~ 0
 FT_DTR
 Wire Wire Line
 	3100 3400 2250 3400
-Text Label 2250 3400 0 48 ~
+Text GLabel 2250 3400 0 48 Output ~ 0
 FT_MGMT_DTR
 Wire Wire Line
 	3100 4100 2250 4100
-Text Label 2250 4100 0 48 ~
+Text GLabel 2250 4100 0 48 Output ~ 0
 ARM_FPGA_CFG_CS_N
 Wire Wire Line
 	3100 4700 2250 4700
-Text Label 2250 4700 0 48 ~
+Text GLabel 2250 4700 0 48 Output ~ 0
 KSM_PROM_CS_N
 Wire Wire Line
 	3100 7300 2250 7300
-Text Label 2250 7300 0 48 ~
+Text GLabel 2250 7300 0 48 BiDi ~ 0
 AVR_GPIO_ARM_2
 Wire Wire Line
 	3100 7200 2250 7200
-Text Label 2250 7200 0 48 ~
+Text GLabel 2250 7200 0 48 BiDi ~ 0
 AVR_GPIO_ARM_3
 Wire Bus Line
 	14900 3200 13500 3200
@@ -614,27 +614,27 @@ Text Label 8590 3200 0 60 ~
 FMC_D[0..31]FMC_A[0..25]
 Wire Wire Line
 	7000 7700 6200 7700
-Text Label 6400 7700 0 48 ~
+Text GLabel 7000 7700 2 48 Output ~ 0
 ARM_LED1
 Wire Wire Line
 	7000 7800 6200 7800
-Text Label 6400 7800 0 48 ~
+Text GLabel 7000 7800 2 48 Output ~ 0
 ARM_LED2
 Wire Wire Line
 	7000 7900 6200 7900
-Text Label 6400 7900 0 48 ~
+Text GLabel 7000 7900 2 48 Output ~ 0
 ARM_LED3
 Wire Wire Line
 	7000 8000 6200 8000
-Text Label 6400 8000 0 48 ~
+Text GLabel 7000 8000 2 48 Output ~ 0
 ARM_LED4
 Wire Wire Line
 	7000 5100 6200 5100
-Text Label 6400 5100 0 48 ~
+Text GLabel 7000 5100 2 48 Output ~ 0
 FPGA_CFG_CTRL_FPGA_DIS
 Wire Wire Line
 	7000 2700 6200 2700
-Text Label 6400 2700 0 48 ~
+Text GLabel 7000 2700 2 48 Output ~ 0
 FPGA_CFG_CTRL_ARM_ENA
 $Comp
 L STM32F429BIT6_4 U4_3
diff --git a/rev03-KiCad/rev02_06.sch b/rev03-KiCad/rev02_06.sch
index 294c243..095bf8b 100644
--- a/rev03-KiCad/rev02_06.sch
+++ b/rev03-KiCad/rev02_06.sch
@@ -536,9 +536,9 @@ Entry Wire Line
  	9750 2700 9700 2750
 Wire Wire Line
 	10300 2700 9750 2700
-Text Label 2810 2600 0 48 ~
+Text GLabel 2860 2600 2 48 Input ~ 0
 FMC_A0
-Text Label 9800 2700 0 48 ~
+Text GLabel 9850 2700 2 48 Input ~ 0
 FMC_A0
 Entry Wire Line
  	2750 2700 2700 2750
@@ -548,9 +548,9 @@ Entry Wire Line
  	9750 2800 9700 2850
 Wire Wire Line
 	10300 2800 9750 2800
-Text Label 2810 2700 0 48 ~
+Text GLabel 2860 2700 2 48 Input ~ 0
 FMC_A1
-Text Label 9800 2800 0 48 ~
+Text GLabel 9850 2800 2 48 Input ~ 0
 FMC_A1
 Entry Wire Line
  	2750 2800 2700 2850
@@ -560,9 +560,9 @@ Entry Wire Line
  	9750 2900 9700 2950
 Wire Wire Line
 	10300 2900 9750 2900
-Text Label 2810 2800 0 48 ~
+Text GLabel 2860 2800 2 48 Input ~ 0
 FMC_A2
-Text Label 9800 2900 0 48 ~
+Text GLabel 9850 2900 2 48 Input ~ 0
 FMC_A2
 Entry Wire Line
  	2750 2900 2700 2950
@@ -572,9 +572,9 @@ Entry Wire Line
  	9750 3000 9700 3050
 Wire Wire Line
 	10300 3000 9750 3000
-Text Label 2810 2900 0 48 ~
+Text GLabel 2860 2900 2 48 Input ~ 0
 FMC_A3
-Text Label 9800 3000 0 48 ~
+Text GLabel 9850 3000 2 48 Input ~ 0
 FMC_A3
 Entry Wire Line
  	2750 3000 2700 3050
@@ -584,9 +584,9 @@ Entry Wire Line
  	9750 3100 9700 3150
 Wire Wire Line
 	10300 3100 9750 3100
-Text Label 2810 3000 0 48 ~
+Text GLabel 2860 3000 2 48 Input ~ 0
 FMC_A4
-Text Label 9800 3100 0 48 ~
+Text GLabel 9850 3100 2 48 Input ~ 0
 FMC_A4
 Entry Wire Line
  	2750 3100 2700 3150
@@ -596,9 +596,9 @@ Entry Wire Line
  	9750 3200 9700 3250
 Wire Wire Line
 	10300 3200 9750 3200
-Text Label 2810 3100 0 48 ~
+Text GLabel 2860 3100 2 48 Input ~ 0
 FMC_A5
-Text Label 9800 3200 0 48 ~
+Text GLabel 9850 3200 2 48 Input ~ 0
 FMC_A5
 Entry Wire Line
  	2750 3200 2700 3250
@@ -608,9 +608,9 @@ Entry Wire Line
  	9750 3300 9700 3350
 Wire Wire Line
 	10300 3300 9750 3300
-Text Label 2810 3200 0 48 ~
+Text GLabel 2860 3200 2 48 Input ~ 0
 FMC_A6
-Text Label 9800 3300 0 48 ~
+Text GLabel 9850 3300 2 48 Input ~ 0
 FMC_A6
 Entry Wire Line
  	2750 3300 2700 3350
@@ -620,9 +620,9 @@ Entry Wire Line
  	9750 3400 9700 3450
 Wire Wire Line
 	10300 3400 9750 3400
-Text Label 2810 3300 0 48 ~
+Text GLabel 2860 3300 2 48 Input ~ 0
 FMC_A7
-Text Label 9800 3400 0 48 ~
+Text GLabel 9850 3400 2 48 Input ~ 0
 FMC_A7
 Entry Wire Line
  	2750 3400 2700 3450
@@ -632,9 +632,9 @@ Entry Wire Line
  	9750 3500 9700 3550
 Wire Wire Line
 	10300 3500 9750 3500
-Text Label 2810 3400 0 48 ~
+Text GLabel 2860 3400 2 48 Input ~ 0
 FMC_A8
-Text Label 9800 3500 0 48 ~
+Text GLabel 9850 3500 2 48 Input ~ 0
 FMC_A8
 Entry Wire Line
  	2750 3500 2700 3550
@@ -644,9 +644,9 @@ Entry Wire Line
  	9750 3600 9700 3650
 Wire Wire Line
 	10300 3600 9750 3600
-Text Label 2810 3500 0 48 ~
+Text GLabel 2860 3500 2 48 Input ~ 0
 FMC_A9
-Text Label 9800 3600 0 48 ~
+Text GLabel 9850 3600 2 48 Input ~ 0
 FMC_A9
 Entry Wire Line
  	2750 3600 2700 3650
@@ -656,9 +656,9 @@ Entry Wire Line
  	9750 3700 9700 3750
 Wire Wire Line
 	10300 3700 9750 3700
-Text Label 2810 3600 0 48 ~
+Text GLabel 2860 3600 2 48 Input ~ 0
 FMC_A10
-Text Label 9800 3700 0 48 ~
+Text GLabel 9850 3700 2 48 Input ~ 0
 FMC_A10
 Entry Wire Line
  	2750 3700 2700 3750
@@ -668,9 +668,9 @@ Entry Wire Line
  	9750 3800 9700 3850
 Wire Wire Line
 	10300 3800 9750 3800
-Text Label 2810 3700 0 48 ~
+Text GLabel 2860 3700 2 48 Input ~ 0
 FMC_A11
-Text Label 9800 3800 0 48 ~
+Text GLabel 9850 3800 2 48 Input ~ 0
 FMC_A11
 Entry Wire Line
  	2750 3800 2700 3850
@@ -680,9 +680,9 @@ Entry Wire Line
  	9750 3900 9700 3950
 Wire Wire Line
 	10300 3900 9750 3900
-Text Label 2810 3800 0 48 ~
+Text GLabel 2860 3800 2 48 Input ~ 0
 FMC_A12
-Text Label 9800 3900 0 48 ~
+Text GLabel 9850 3900 2 48 Input ~ 0
 FMC_A12
 Entry Wire Line
  	6250 2600 6300 2550
@@ -692,9 +692,9 @@ Entry Wire Line
  	13250 2700 13300 2650
 Wire Wire Line
 	13250 2700 12700 2700
-Text Label 5970 2600 0 48 ~
+Text GLabel 5820 2600 2 48 BiDi ~ 0
 FMC_D0
-Text Label 12970 2700 0 48 ~
+Text GLabel 12820 2700 2 48 BiDi ~ 0
 FMC_D0
 Entry Wire Line
  	6250 2700 6300 2650
@@ -704,9 +704,9 @@ Entry Wire Line
  	13250 2800 13300 2750
 Wire Wire Line
 	13250 2800 12700 2800
-Text Label 5970 2700 0 48 ~
+Text GLabel 5820 2700 2 48 BiDi ~ 0
 FMC_D1
-Text Label 12970 2800 0 48 ~
+Text GLabel 12820 2800 2 48 BiDi ~ 0
 FMC_D1
 Entry Wire Line
  	6250 2800 6300 2750
@@ -716,9 +716,9 @@ Entry Wire Line
  	13250 2900 13300 2850
 Wire Wire Line
 	13250 2900 12700 2900
-Text Label 5970 2800 0 48 ~
+Text GLabel 5820 2800 2 48 BiDi ~ 0
 FMC_D2
-Text Label 12970 2900 0 48 ~
+Text GLabel 12820 2900 2 48 BiDi ~ 0
 FMC_D2
 Entry Wire Line
  	6250 2900 6300 2850
@@ -728,9 +728,9 @@ Entry Wire Line
  	13250 3000 13300 2950
 Wire Wire Line
 	13250 3000 12700 3000
-Text Label 5970 2900 0 48 ~
+Text GLabel 5820 2900 2 48 BiDi ~ 0
 FMC_D3
-Text Label 12970 3000 0 48 ~
+Text GLabel 12820 3000 2 48 BiDi ~ 0
 FMC_D3
 Entry Wire Line
  	6250 3000 6300 2950
@@ -740,9 +740,9 @@ Entry Wire Line
  	13250 3100 13300 3050
 Wire Wire Line
 	13250 3100 12700 3100
-Text Label 5970 3000 0 48 ~
+Text GLabel 5820 3000 2 48 BiDi ~ 0
 FMC_D4
-Text Label 12970 3100 0 48 ~
+Text GLabel 12820 3100 2 48 BiDi ~ 0
 FMC_D4
 Entry Wire Line
  	6250 3100 6300 3050
@@ -752,9 +752,9 @@ Entry Wire Line
  	13250 3200 13300 3150
 Wire Wire Line
 	13250 3200 12700 3200
-Text Label 5970 3100 0 48 ~
+Text GLabel 5820 3100 2 48 BiDi ~ 0
 FMC_D5
-Text Label 12970 3200 0 48 ~
+Text GLabel 12820 3200 2 48 BiDi ~ 0
 FMC_D5
 Entry Wire Line
  	6250 3200 6300 3150
@@ -764,9 +764,9 @@ Entry Wire Line
  	13250 3300 13300 3250
 Wire Wire Line
 	13250 3300 12700 3300
-Text Label 5970 3200 0 48 ~
+Text GLabel 5820 3200 2 48 BiDi ~ 0
 FMC_D6
-Text Label 12970 3300 0 48 ~
+Text GLabel 12820 3300 2 48 BiDi ~ 0
 FMC_D6
 Entry Wire Line
  	6250 3300 6300 3250
@@ -776,9 +776,9 @@ Entry Wire Line
  	13250 3400 13300 3350
 Wire Wire Line
 	13250 3400 12700 3400
-Text Label 5970 3300 0 48 ~
+Text GLabel 5820 3300 2 48 BiDi ~ 0
 FMC_D7
-Text Label 12970 3400 0 48 ~
+Text GLabel 12820 3400 2 48 BiDi ~ 0
 FMC_D7
 Entry Wire Line
  	6250 3400 6300 3350
@@ -788,9 +788,9 @@ Entry Wire Line
  	13250 3500 13300 3450
 Wire Wire Line
 	13250 3500 12700 3500
-Text Label 5970 3400 0 48 ~
+Text GLabel 5820 3400 2 48 BiDi ~ 0
 FMC_D8
-Text Label 12970 3500 0 48 ~
+Text GLabel 12820 3500 2 48 BiDi ~ 0
 FMC_D8
 Entry Wire Line
  	6250 3500 6300 3450
@@ -808,13 +808,13 @@ Entry Wire Line
  	13250 3700 13300 3650
 Wire Wire Line
 	13250 3700 12700 3700
-Text Label 5970 3500 0 48 ~
+Text GLabel 5820 3500 2 48 BiDi ~ 0
 FMC_D9
-Text Label 5970 3600 0 48 ~
+Text GLabel 5820 3600 2 48 BiDi ~ 0
 FMC_D10
-Text Label 12970 3600 0 48 ~
+Text GLabel 12820 3600 2 48 BiDi ~ 0
 FMC_D9
-Text Label 12970 3700 0 48 ~
+Text GLabel 12820 3700 2 48 BiDi ~ 0
 FMC_D10
 Entry Wire Line
  	6250 3700 6300 3650
@@ -824,9 +824,9 @@ Entry Wire Line
  	13250 3800 13300 3750
 Wire Wire Line
 	13250 3800 12700 3800
-Text Label 5970 3700 0 48 ~
+Text GLabel 5820 3700 2 48 BiDi ~ 0
 FMC_D11
-Text Label 12970 3800 0 48 ~
+Text GLabel 12820 3800 2 48 BiDi ~ 0
 FMC_D11
 Entry Wire Line
  	6250 3800 6300 3750
@@ -836,9 +836,9 @@ Entry Wire Line
  	13250 3900 13300 3850
 Wire Wire Line
 	13250 3900 12700 3900
-Text Label 5970 3800 0 48 ~
+Text GLabel 5820 3800 2 48 BiDi ~ 0
 FMC_D12
-Text Label 12970 3900 0 48 ~
+Text GLabel 12820 3900 2 48 BiDi ~ 0
 FMC_D12
 Entry Wire Line
  	6250 3900 6300 3850
@@ -848,9 +848,9 @@ Entry Wire Line
  	13250 4000 13300 3950
 Wire Wire Line
 	13250 4000 12700 4000
-Text Label 5970 3900 0 48 ~
+Text GLabel 5820 3900 2 48 BiDi ~ 0
 FMC_D13
-Text Label 12970 4000 0 48 ~
+Text GLabel 12820 4000 2 48 BiDi ~ 0
 FMC_D13
 Entry Wire Line
  	6250 4000 6300 3950
@@ -860,9 +860,9 @@ Entry Wire Line
  	13250 4100 13300 4050
 Wire Wire Line
 	13250 4100 12700 4100
-Text Label 5970 4000 0 48 ~
+Text GLabel 5820 4000 2 48 BiDi ~ 0
 FMC_D14
-Text Label 12970 4100 0 48 ~
+Text GLabel 12820 4100 2 48 BiDi ~ 0
 FMC_D14
 Entry Wire Line
  	6250 4100 6300 4050
@@ -872,9 +872,9 @@ Entry Wire Line
  	13250 4200 13300 4150
 Wire Wire Line
 	13250 4200 12700 4200
-Text Label 5970 4100 0 48 ~
+Text GLabel 5820 4100 2 48 BiDi ~ 0
 FMC_D15
-Text Label 12970 4200 0 48 ~
+Text GLabel 12820 4200 2 48 BiDi ~ 0
 FMC_D15
 Entry Wire Line
  	6250 4200 6300 4150
@@ -884,9 +884,9 @@ Entry Wire Line
  	13250 4300 13300 4250
 Wire Wire Line
 	13250 4300 12700 4300
-Text Label 5970 4200 0 48 ~
+Text GLabel 5820 4200 2 48 BiDi ~ 0
 FMC_D16
-Text Label 12970 4300 0 48 ~
+Text GLabel 12820 4300 2 48 BiDi ~ 0
 FMC_D16
 Entry Wire Line
  	6250 4300 6300 4250
@@ -896,9 +896,9 @@ Entry Wire Line
  	13250 4400 13300 4350
 Wire Wire Line
 	13250 4400 12700 4400
-Text Label 5970 4300 0 48 ~
+Text GLabel 5820 4300 2 48 BiDi ~ 0
 FMC_D17
-Text Label 12970 4400 0 48 ~
+Text GLabel 12820 4400 2 48 BiDi ~ 0
 FMC_D17
 Entry Wire Line
  	6250 4400 6300 4350
@@ -908,9 +908,9 @@ Entry Wire Line
  	13250 4500 13300 4450
 Wire Wire Line
 	13250 4500 12700 4500
-Text Label 5970 4400 0 48 ~
+Text GLabel 5820 4400 2 48 BiDi ~ 0
 FMC_D18
-Text Label 12970 4500 0 48 ~
+Text GLabel 12820 4500 2 48 BiDi ~ 0
 FMC_D18
 Entry Wire Line
  	6250 4500 6300 4450
@@ -920,9 +920,9 @@ Entry Wire Line
  	13250 4600 13300 4550
 Wire Wire Line
 	13250 4600 12700 4600
-Text Label 5970 4500 0 48 ~
+Text GLabel 5820 4500 2 48 BiDi ~ 0
 FMC_D19
-Text Label 12970 4600 0 48 ~
+Text GLabel 12820 4600 2 48 BiDi ~ 0
 FMC_D19
 Entry Wire Line
  	6250 4600 6300 4550
@@ -932,9 +932,9 @@ Entry Wire Line
  	13250 4700 13300 4650
 Wire Wire Line
 	13250 4700 12700 4700
-Text Label 5970 4600 0 48 ~
+Text GLabel 5820 4600 2 48 BiDi ~ 0
 FMC_D20
-Text Label 12970 4700 0 48 ~
+Text GLabel 12820 4700 2 48 BiDi ~ 0
 FMC_D20
 Entry Wire Line
  	6250 4700 6300 4650
@@ -944,9 +944,9 @@ Entry Wire Line
  	13250 4800 13300 4750
 Wire Wire Line
 	13250 4800 12700 4800
-Text Label 5970 4700 0 48 ~
+Text GLabel 5820 4700 2 48 BiDi ~ 0
 FMC_D21
-Text Label 12970 4800 0 48 ~
+Text GLabel 12820 4800 2 48 BiDi ~ 0
 FMC_D21
 Entry Wire Line
  	6250 4800 6300 4750
@@ -956,9 +956,9 @@ Entry Wire Line
  	13250 4900 13300 4850
 Wire Wire Line
 	13250 4900 12700 4900
-Text Label 5970 4800 0 48 ~
+Text GLabel 5820 4800 2 48 BiDi ~ 0
 FMC_D22
-Text Label 12970 4900 0 48 ~
+Text GLabel 12820 4900 2 48 BiDi ~ 0
 FMC_D22
 Entry Wire Line
  	6250 4900 6300 4850
@@ -968,9 +968,9 @@ Entry Wire Line
  	13250 5000 13300 4950
 Wire Wire Line
 	13250 5000 12700 5000
-Text Label 5970 4900 0 48 ~
+Text GLabel 5820 4900 2 48 BiDi ~ 0
 FMC_D23
-Text Label 12970 5000 0 48 ~
+Text GLabel 12820 5000 2 48 BiDi ~ 0
 FMC_D23
 Entry Wire Line
  	6250 5000 6300 4950
@@ -980,9 +980,9 @@ Entry Wire Line
  	13250 5100 13300 5050
 Wire Wire Line
 	13250 5100 12700 5100
-Text Label 5970 5000 0 48 ~
+Text GLabel 5820 5000 2 48 BiDi ~ 0
 FMC_D24
-Text Label 12970 5100 0 48 ~
+Text GLabel 12820 5100 2 48 BiDi ~ 0
 FMC_D24
 Entry Wire Line
  	6250 5100 6300 5050
@@ -992,9 +992,9 @@ Entry Wire Line
  	13250 5200 13300 5150
 Wire Wire Line
 	13250 5200 12700 5200
-Text Label 5970 5100 0 48 ~
+Text GLabel 5820 5100 2 48 BiDi ~ 0
 FMC_D25
-Text Label 12970 5200 0 48 ~
+Text GLabel 12820 5200 2 48 BiDi ~ 0
 FMC_D25
 Entry Wire Line
  	6250 5200 6300 5150
@@ -1004,9 +1004,9 @@ Entry Wire Line
  	13250 5300 13300 5250
 Wire Wire Line
 	13250 5300 12700 5300
-Text Label 5970 5200 0 48 ~
+Text GLabel 5820 5200 2 48 BiDi ~ 0
 FMC_D26
-Text Label 12970 5300 0 48 ~
+Text GLabel 12820 5300 2 48 BiDi ~ 0
 FMC_D26
 Entry Wire Line
  	6250 5300 6300 5250
@@ -1016,9 +1016,9 @@ Entry Wire Line
  	13250 5400 13300 5350
 Wire Wire Line
 	13250 5400 12700 5400
-Text Label 5970 5300 0 48 ~
+Text GLabel 5820 5300 2 48 BiDi ~ 0
 FMC_D27
-Text Label 12970 5400 0 48 ~
+Text GLabel 12820 5400 2 48 BiDi ~ 0
 FMC_D27
 Entry Wire Line
  	6250 5400 6300 5350
@@ -1028,9 +1028,9 @@ Entry Wire Line
  	13250 5500 13300 5450
 Wire Wire Line
 	13250 5500 12700 5500
-Text Label 5970 5400 0 48 ~
+Text GLabel 5820 5400 2 48 BiDi ~ 0
 FMC_D28
-Text Label 12970 5500 0 48 ~
+Text GLabel 12820 5500 2 48 BiDi ~ 0
 FMC_D28
 Entry Wire Line
  	6250 5500 6300 5450
@@ -1040,9 +1040,9 @@ Entry Wire Line
  	13250 5600 13300 5550
 Wire Wire Line
 	13250 5600 12700 5600
-Text Label 5970 5500 0 48 ~
+Text GLabel 5820 5500 2 48 BiDi ~ 0
 FMC_D29
-Text Label 12970 5600 0 48 ~
+Text GLabel 12820 5600 2 48 BiDi ~ 0
 FMC_D29
 Entry Wire Line
  	6250 5600 6300 5550
@@ -1052,9 +1052,9 @@ Entry Wire Line
  	13250 5700 13300 5650
 Wire Wire Line
 	13250 5700 12700 5700
-Text Label 5970 5600 0 48 ~
+Text GLabel 5820 5600 2 48 BiDi ~ 0
 FMC_D30
-Text Label 12970 5700 0 48 ~
+Text GLabel 12820 5700 2 48 BiDi ~ 0
 FMC_D30
 Entry Wire Line
  	6250 5700 6300 5650
@@ -1064,113 +1064,113 @@ Entry Wire Line
  	13250 5800 13300 5750
 Wire Wire Line
 	13250 5800 12700 5800
-Text Label 5970 5700 0 48 ~
+Text GLabel 5820 5700 2 48 BiDi ~ 0
 FMC_D31
-Text Label 12970 5800 0 48 ~
+Text GLabel 12820 5800 2 48 BiDi ~ 0
 FMC_D31
 Wire Wire Line
 	3300 5500 2700 5500
-Text Label 2700 5500 0 48 ~
+Text GLabel 2700 5500 0 48 Input ~ 0
 FMC_SDCKE0
 Wire Wire Line
 	3300 6000 2700 6000
-Text Label 2700 6000 0 48 ~
+Text GLabel 2700 6000 0 48 Input ~ 0
 FMC_SDNE0
 Wire Wire Line
 	3300 6500 2700 6500
-Text Label 2700 6500 0 48 ~
+Text GLabel 2700 6500 0 48 Input ~ 0
 FMC_SDNWE
 Wire Wire Line
 	10300 6600 9700 6600
-Text Label 9700 6600 0 48 ~
+Text GLabel 9700 6600 0 48 Input ~ 0
 FMC_SDNWE
 Wire Wire Line
 	3300 4400 2700 4400
-Text Label 2700 4400 0 48 ~
+Text GLabel 2700 4400 0 48 Input ~ 0
 FMC_SDNCAS
 Wire Wire Line
 	10300 4500 9700 4500
-Text Label 9700 4500 0 48 ~
+Text GLabel 9700 4500 0 48 Input ~ 0
 FMC_SDNCAS
 Wire Wire Line
 	3300 4500 2700 4500
-Text Label 2700 4500 0 48 ~
+Text GLabel 2700 4500 0 48 Input ~ 0
 FMC_SDNRAS
 Wire Wire Line
 	10300 4600 9700 4600
-Text Label 9700 4600 0 48 ~
+Text GLabel 9700 4600 0 48 Input ~ 0
 FMC_SDNRAS
 Entry Wire Line
  	2750 4100 2700 4150
 Wire Wire Line
 	3300 4100 2750 4100
-Text Label 2800 4100 0 48 ~
+Text GLabel 2850 4100 2 48 Input ~ 0
 FMC_A14
 Entry Wire Line
  	9750 4200 9700 4250
 Wire Wire Line
 	10300 4200 9750 4200
-Text Label 9800 4200 0 48 ~
+Text GLabel 9850 4200 2 48 Input ~ 0
 FMC_A14
 Entry Wire Line
  	2750 4200 2700 4200
 Wire Wire Line
 	3300 4200 2750 4200
-Text Label 2800 4200 0 48 ~
+Text GLabel 2850 4200 2 48 Input ~ 0
 FMC_A15
 Entry Wire Line
  	9750 4300 9700 4300
 Wire Wire Line
 	10300 4300 9750 4300
-Text Label 9800 4300 0 48 ~
+Text GLabel 9850 4300 2 48 Input ~ 0
 FMC_A15
 Wire Wire Line
 	6300 5900 5700 5900
-Text Label 5960 5900 0 48 ~
+Text GLabel 6300 5900 2 48 Input ~ 0
 FMC_NBL0
 Wire Wire Line
 	13300 6000 12700 6000
-Text Label 12980 6000 0 48 ~
+Text GLabel 13300 6000 2 48 Input ~ 0
 FMC_NBL0
 Wire Wire Line
 	6300 6000 5700 6000
-Text Label 5960 6000 0 48 ~
+Text GLabel 6300 6000 2 48 Input ~ 0
 FMC_NBL1
 Wire Wire Line
 	13300 6100 12700 6100
-Text Label 12980 6100 0 48 ~
+Text GLabel 13300 6100 2 48 Input ~ 0
 FMC_NBL1
 Wire Wire Line
 	6300 6100 5700 6100
-Text Label 5960 6100 0 48 ~
+Text GLabel 6300 6100 2 48 Input ~ 0
 FMC_NBL2
 Wire Wire Line
 	13300 6200 12700 6200
-Text Label 12980 6200 0 48 ~
+Text GLabel 13300 6200 2 48 Input ~ 0
 FMC_NBL2
 Wire Wire Line
 	6300 6200 5700 6200
-Text Label 5960 6200 0 48 ~
+Text GLabel 6300 6200 2 48 Input ~ 0
 FMC_NBL3
 Wire Wire Line
 	13300 6300 12700 6300
-Text Label 12980 6300 0 48 ~
+Text GLabel 13300 6300 2 48 Input ~ 0
 FMC_NBL3
 Wire Wire Line
 	3300 5000 2700 5000
-Text Label 2700 5000 0 48 ~
+Text GLabel 2700 5000 0 48 Input ~ 0
 FMC_SDCLK
 Wire Wire Line
 	10300 5100 9700 5100
-Text Label 9700 5100 0 48 ~
+Text GLabel 9700 5100 0 48 Input ~ 0
 FMC_SDCLK
 Wire Wire Line
 	10300 5600 9700 5600
-Text Label 9700 5600 0 48 ~
+Text GLabel 9700 5600 0 48 Input ~ 0
 FMC_SDCKE1
 Wire Wire Line
 	10300 6100 9700 6100
-Text Label 9700 6100 0 48 ~
+Text GLabel 9700 6100 0 48 Input ~ 0
 FMC_SDNE1
 Wire Bus Line
 	2700 2400 2150 2400
diff --git a/rev03-KiCad/rev02_07.sch b/rev03-KiCad/rev02_07.sch
index 873ae6e..90d27ff 100644
--- a/rev03-KiCad/rev02_07.sch
+++ b/rev03-KiCad/rev02_07.sch
@@ -131,20 +131,20 @@ Wire Wire Line
 	7000 5300 7000 5500
 Wire Wire Line
 	6500 5500 6270 5500
-Text Label 6270 5500 0 48 ~
+Text GLabel 6270 5500 0 48 Input ~ 0
 KSM_PROM_CS_N
 Connection ~ 7000 5500
 Wire Wire Line
 	8600 5800 8450 5800
-Text Label 8600 5800 0 48 ~
+Text GLabel 8600 5800 2 48 Input ~ 0
 KSM_PROM_MOSI
 Wire Wire Line
 	8600 5700 8450 5700
-Text Label 8600 5700 0 48 ~
+Text GLabel 8600 5700 2 48 Input ~ 0
 KSM_PROM_SCLK
 Wire Wire Line
 	7000 5600 6270 5600
-Text Label 6270 5600 0 48 ~
+Text GLabel 6270 5600 0 48 Output ~ 0
 KSM_PROM_MISO
 Wire Wire Line
 	7000 5700 6200 5700
diff --git a/rev03-KiCad/rev02_08.sch b/rev03-KiCad/rev02_08.sch
index 536e3bb..5454ebb 100644
--- a/rev03-KiCad/rev02_08.sch
+++ b/rev03-KiCad/rev02_08.sch
@@ -149,7 +149,7 @@ Wire Wire Line
 	9500 5500 9300 5500
 Wire Wire Line
 	9300 5400 9300 5500
-Text Label 9500 5500 0 48 ~
+Text GLabel 9500 5500 2 48 UnSpc ~ 0
 RTC_MFP
 Connection ~ 9300 5500
 Wire Wire Line
@@ -158,7 +158,7 @@ Wire Wire Line
 	9500 5600 9100 5600
 Wire Wire Line
 	9100 5400 9100 5600
-Text Label 9500 5600 0 48 ~
+Text GLabel 9500 5600 2 48 Input ~ 0
 RTC_SCL
 Connection ~ 9100 5600
 Wire Wire Line
@@ -167,7 +167,7 @@ Wire Wire Line
 	9500 5700 8900 5700
 Wire Wire Line
 	8900 5400 8900 5700
-Text Label 9500 5700 0 48 ~
+Text GLabel 9500 5700 2 48 BiDi ~ 0
 RTC_SDA
 Connection ~ 8900 5700
 Wire Wire Line
diff --git a/rev03-KiCad/rev02_09.sch b/rev03-KiCad/rev02_09.sch
index 2b3b630..c16f45b 100644
--- a/rev03-KiCad/rev02_09.sch
+++ b/rev03-KiCad/rev02_09.sch
@@ -602,12 +602,12 @@ Wire Wire Line
 	11200 3400 11000 3400
 Wire Wire Line
 	11000 3100 11000 3400
-Text Label 11200 3400 0 48 ~
+Text GLabel 11200 3400 2 48 Output ~ 0
 FT_TXD
 Connection ~ 11000 3400
 Wire Wire Line
 	11200 3500 10900 3500
-Text Label 11200 3500 0 48 ~
+Text GLabel 11200 3500 2 48 Input ~ 0
 FT_RXD
 Wire Wire Line
 	8200 2800 8200 3100
@@ -647,15 +647,15 @@ Connection ~ 8200 7700
 Connection ~ 8700 7700
 Wire Wire Line
 	9700 3600 9500 3600
-Text Label 9700 3600 0 48 ~
+Text GLabel 9700 3600 2 48 Output ~ 0
 FT_RTS
 Wire Wire Line
 	9700 3700 9500 3700
-Text Label 9700 3700 0 48 ~
+Text GLabel 9700 3700 2 48 Input ~ 0
 FT_CTS
 Wire Wire Line
 	9700 3800 9500 3800
-Text Label 9700 3800 0 48 ~
+Text GLabel 9700 3800 2 48 UnSpc ~ 0
 FT_DTR
 Wire Wire Line
 	2600 3400 2000 3400
@@ -671,7 +671,7 @@ Text Label 9800 3400 0 48 ~
 FT_TXD1
 Wire Wire Line
 	13400 6200 13200 6200
-Text Label 13200 6200 0 48 ~
+Text Label 13400 6200 0 48 ~ 0
 FT_TXD1
 Wire Wire Line
 	10500 3500 9500 3500
@@ -692,19 +692,11 @@ Wire Wire Line
 Connection ~ 13300 5600
 Wire Wire Line
 	11000 2500 11000 2700
-Text Label 2300 3600 0 70 ~
-DIFFPAIR
-Text Label 2270 3400 0 70 ~
-DIFFPAIR
-Text Label 3660 3600 0 70 ~
-DIFFPAIR
-Text Label 3660 3400 0 70 ~
-DIFFPAIR
 Text Label 7090 4000 0 48 ~
 USB_N
 Text Label 7090 4100 0 48 ~
 USB_P
-Text Label 13200 6100 0 48 ~
+Text Label 13400 6100 0 48 ~ 0
 USB_N
 Text Label 12400 6100 0 48 ~
 USB_P
diff --git a/rev03-KiCad/rev02_10.sch b/rev03-KiCad/rev02_10.sch
index 61e6b04..55306f4 100644
--- a/rev03-KiCad/rev02_10.sch
+++ b/rev03-KiCad/rev02_10.sch
@@ -642,24 +642,24 @@ Wire Wire Line
 	11300 3500 11100 3500
 Wire Wire Line
 	11100 3200 11100 3500
-Text Label 11300 3500 0 48 ~
+Text GLabel 11300 3500 2 48 Output ~ 0
 FT_MGMT_TXD
 Connection ~ 11100 3500
 Wire Wire Line
 	11300 3600 11000 3600
-Text Label 11300 3600 0 48 ~
+Text GLabel 11300 3600 2 48 Input ~ 0
 FT_MGMT_RXD
 Wire Wire Line
 	9800 3700 9600 3700
-Text Label 9800 3700 0 48 ~
+Text GLabel 9800 3700 2 48 Output ~ 0
 FT_MGMT_RTS
 Wire Wire Line
 	9800 3800 9600 3800
-Text Label 9800 3800 0 48 ~
+Text GLabel 9800 3800 2 48 Input ~ 0
 FT_MGMT_CTS
 Wire Wire Line
 	9800 3900 9600 3900
-Text Label 9800 3900 0 48 ~
+Text GLabel 9800 3900 2 48 UnSpc ~ 0
 FT_MGMT_DTR
 Wire Wire Line
 	2700 3500 2100 3500
@@ -686,7 +686,7 @@ Text Label 9900 3500 0 48 ~
 FT_MGMT_TXD1
 Wire Wire Line
 	13500 6300 13300 6300
-Text Label 13300 6300 0 48 ~
+Text Label 13500 6300 0 48 ~ 0
 FT_MGMT_TXD1
 Wire Wire Line
 	10600 3600 9600 3600
@@ -696,19 +696,11 @@ Wire Wire Line
 	12700 6300 12050 6300
 Text Label 12050 6300 0 48 ~
 FT_MGMT_RXD1
-Text Label 2400 3700 0 70 ~
-DIFFPAIR
-Text Label 2370 3500 0 70 ~
-DIFFPAIR
-Text Label 3760 3500 0 70 ~
-DIFFPAIR
-Text Label 3760 3700 0 70 ~
-DIFFPAIR
 Text Label 6980 4100 0 48 ~
 USB_MGMT_N
 Text Label 6980 4200 0 48 ~
 USB_MGMT_P
-Text Label 13300 6200 0 48 ~
+Text Label 13500 6200 0 48 ~ 0
 USB_MGMT_N
 Text Label 12050 6200 0 48 ~
 USB_MGMT_P
diff --git a/rev03-KiCad/rev02_11.sch b/rev03-KiCad/rev02_11.sch
index f681be5..aa240cd 100644
--- a/rev03-KiCad/rev02_11.sch
+++ b/rev03-KiCad/rev02_11.sch
@@ -346,7 +346,7 @@ Wire Wire Line
 	12800 4400 12800 4500
 Wire Wire Line
 	3900 5000 3070 5000
-Text Label 3070 5000 0 48 ~
+Text GLabel 3070 5000 0 48 Output ~ 0
 MKM_CONTROL_AVR_ENA
 Wire Wire Line
 	9700 5300 8500 5300
@@ -356,11 +356,11 @@ Wire Wire Line
 	10100 6100 9700 6100
 Wire Wire Line
 	8500 5300 8300 5300
-Text Label 8440 5300 0 48 ~
+Text GLabel 8440 5300 2 48 Output ~ 0
 MKM_AVR_SCK
 Wire Wire Line
 	3900 4900 3070 4900
-Text Label 3070 4900 0 48 ~
+Text GLabel 3070 4900 0 48 Output ~ 0
 MKM_AVR_CS_N
 Wire Wire Line
 	8700 5000 8300 5000
@@ -370,7 +370,7 @@ Wire Wire Line
 	11100 5000 11100 6100
 Wire Wire Line
 	11100 6100 10800 6100
-Text Label 8440 5000 0 48 ~
+Text GLabel 8440 5000 2 48 Output ~ 0
 MKM_AVR_MOSI
 Wire Wire Line
 	10100 6000 9800 6000
@@ -380,7 +380,7 @@ Wire Wire Line
 	9800 5100 8600 5100
 Wire Wire Line
 	8600 5100 8300 5100
-Text Label 8440 5100 0 48 ~
+Text GLabel 8440 5100 2 48 Input ~ 0
 MKM_AVR_MISO
 Wire Wire Line
 	13900 8700 13600 8700
@@ -424,7 +424,7 @@ Text Label 3170 4700 0 48 ~
 AVR_LED4
 Wire Wire Line
 	13900 6600 13500 6600
-Text Label 13500 6600 0 48 ~
+Text Label 13500 6600 2 48 ~ 0
 AVR_GPIO_0
 Wire Wire Line
 	8500 4100 8300 4100
@@ -432,7 +432,7 @@ Text Label 8500 4100 0 48 ~
 AVR_GPIO_0
 Wire Wire Line
 	13900 6700 13500 6700
-Text Label 13500 6700 0 48 ~
+Text Label 13500 6700 2 48 ~ 0
 AVR_GPIO_1
 Wire Wire Line
 	8500 4200 8300 4200
@@ -440,7 +440,7 @@ Text Label 8500 4200 0 48 ~
 AVR_GPIO_1
 Wire Wire Line
 	13900 6800 13500 6800
-Text Label 13500 6800 0 48 ~
+Text Label 13500 6800 2 48 ~ 0
 AVR_GPIO_2
 Wire Wire Line
 	8500 4300 8300 4300
@@ -448,7 +448,7 @@ Text Label 8500 4300 0 48 ~
 AVR_GPIO_2
 Wire Wire Line
 	13900 6900 13500 6900
-Text Label 13500 6900 0 48 ~
+Text Label 13500 6900 2 48 ~ 0
 AVR_GPIO_3
 Wire Wire Line
 	8500 4400 8300 4400
@@ -456,7 +456,7 @@ Text Label 8500 4400 0 48 ~
 AVR_GPIO_3
 Wire Wire Line
 	13900 7000 13500 7000
-Text Label 13500 7000 0 48 ~
+Text Label 13500 7000 2 48 ~ 0
 AVR_GPIO_4
 Wire Wire Line
 	8500 4500 8300 4500
@@ -464,7 +464,7 @@ Text Label 8500 4500 0 48 ~
 AVR_GPIO_4
 Wire Wire Line
 	13900 7100 13500 7100
-Text Label 13500 7100 0 48 ~
+Text Label 13500 7100 2 48 ~ 0
 AVR_GPIO_5
 Wire Wire Line
 	8500 4600 8300 4600
@@ -472,7 +472,7 @@ Text Label 8500 4600 0 48 ~
 AVR_GPIO_5
 Wire Wire Line
 	13900 7200 13500 7200
-Text Label 13500 7200 0 48 ~
+Text Label 13500 7200 2 48 ~ 0
 AVR_GPIO_6
 Wire Wire Line
 	8500 4700 8300 4700
@@ -480,7 +480,7 @@ Text Label 8500 4700 0 48 ~
 AVR_GPIO_6
 Wire Wire Line
 	13900 7300 13500 7300
-Text Label 13500 7300 0 48 ~
+Text Label 13500 7300 2 48 ~ 0
 AVR_GPIO_7
 Wire Wire Line
 	8500 4800 8300 4800
@@ -505,19 +505,19 @@ Wire Wire Line
 	13700 2200 13700 2400
 Wire Wire Line
 	3900 5300 3170 5300
-Text Label 3170 5300 0 48 ~
+Text GLabel 3170 5300 0 48 BiDi ~ 0
 AVR_GPIO_ARM_0
 Wire Wire Line
 	3900 5400 3170 5400
-Text Label 3170 5400 0 48 ~
+Text GLabel 3170 5400 0 48 BiDi ~ 0
 AVR_GPIO_ARM_1
 Wire Wire Line
 	3900 5700 3170 5700
-Text Label 3170 5700 0 48 ~
+Text GLabel 3170 5700 0 48 BiDi ~ 0
 AVR_GPIO_FPGA_0
 Wire Wire Line
 	3900 5800 3170 5800
-Text Label 3170 5800 0 48 ~
+Text GLabel 3170 5800 0 48 BiDi ~ 0
 AVR_GPIO_FPGA_1
 Wire Wire Line
 	12800 6400 12800 6500
@@ -528,23 +528,23 @@ Wire Wire Line
 Connection ~ 12800 6500
 Wire Wire Line
 	3900 5100 3070 5100
-Text Label 3070 5100 0 48 ~
+Text GLabel 3070 5100 0 48 Output ~ 0
 MKM_CONTROL_FPGA_DIS
 Wire Wire Line
 	3900 5500 3170 5500
-Text Label 3170 5500 0 48 ~
+Text GLabel 3170 5500 0 48 BiDi ~ 0
 AVR_GPIO_ARM_2
 Wire Wire Line
 	3900 5600 3170 5600
-Text Label 3170 5600 0 48 ~
+Text GLabel 3170 5600 0 48 BiDi ~ 0
 AVR_GPIO_ARM_3
 Wire Wire Line
 	3900 5900 3170 5900
-Text Label 3170 5900 0 48 ~
+Text GLabel 3170 5900 0 48 BiDi ~ 0
 AVR_GPIO_FPGA_2
 Wire Wire Line
 	3900 6000 3170 6000
-Text Label 3170 6000 0 48 ~
+Text GLabel 3170 6000 0 48 BiDi ~ 0
 AVR_GPIO_FPGA_3
 $Comp
 L VCCO_3V3 #PWR?58023FA0
diff --git a/rev03-KiCad/rev02_12.sch b/rev03-KiCad/rev02_12.sch
index 817a40b..0c3c6b5 100644
--- a/rev03-KiCad/rev02_12.sch
+++ b/rev03-KiCad/rev02_12.sch
@@ -248,7 +248,7 @@ Text Label 7000 5200 0 48 ~
 MKM_CS_N
 Wire Wire Line
 	13150 5200 12800 5200
-Text Label 12800 5200 0 48 ~
+Text Label 13150 5200 2 48 ~ 0
 MKM_MISO
 Wire Wire Line
 	5300 6600 5200 6600
@@ -288,31 +288,31 @@ Wire Wire Line
 	5300 5700 5000 5700
 Wire Wire Line
 	5000 5000 5000 5700
-Text Label 4550 5700 0 48 ~
+Text GLabel 4550 5700 0 48 Input ~ 0
 MKM_CONTROL_AVR_ENA
 Wire Wire Line
 	5300 5300 4800 5300
-Text Label 4800 5300 0 48 ~
+Text GLabel 4800 5300 0 48 Input ~ 0
 MKM_AVR_SCK
 Wire Wire Line
 	5300 6300 4610 6300
-Text Label 4610 6300 0 48 ~
+Text GLabel 4610 6300 0 48 Input ~ 0
 MKM_FPGA_CS_N
 Wire Wire Line
 	5300 5200 4800 5200
-Text Label 4800 5200 0 48 ~
+Text GLabel 4800 5200 0 48 Input ~ 0
 MKM_AVR_CS_N
 Wire Wire Line
 	5300 6500 4610 6500
-Text Label 4610 6500 0 48 ~
+Text GLabel 4610 6500 0 48 Input ~ 0
 MKM_FPGA_MOSI
 Wire Wire Line
 	5300 5400 4800 5400
-Text Label 4800 5400 0 48 ~
+Text GLabel 4800 5400 0 48 Input ~ 0
 MKM_AVR_MOSI
 Wire Wire Line
 	6500 6600 6300 6600
-Text Label 6500 6600 0 48 ~
+Text GLabel 6500 6600 2 48 Output ~ 0
 MKM_FPGA_MISO
 Wire Wire Line
 	7600 5500 6300 5500
@@ -320,11 +320,11 @@ Wire Wire Line
 	7800 5500 7600 5500
 Wire Wire Line
 	7600 5500 7600 5700
-Text Label 7800 5500 0 48 ~
+Text GLabel 7800 5500 2 48 Output ~ 0
 MKM_AVR_MISO
 Wire Wire Line
 	5300 6400 4610 6400
-Text Label 4610 6400 0 48 ~
+Text GLabel 4610 6400 0 48 Input ~ 0
 MKM_FPGA_SCK
 Wire Wire Line
 	5300 6800 5000 6800
@@ -332,7 +332,7 @@ Wire Wire Line
 	5000 6800 5000 7000
 Wire Wire Line
 	5000 6800 4480 6800
-Text Label 4480 6800 0 48 ~
+Text GLabel 4480 6800 0 48 Input ~ 0
 MKM_CONTROL_FPGA_DIS
 Wire Wire Line
 	10100 5400 10100 5020
diff --git a/rev03-KiCad/rev02_13.sch b/rev03-KiCad/rev02_13.sch
index 7ad0c66..5219803 100644
--- a/rev03-KiCad/rev02_13.sch
+++ b/rev03-KiCad/rev02_13.sch
@@ -294,23 +294,23 @@ Connection ~ 2400 4800
 Connection ~ 2400 4900
 Wire Wire Line
 	3400 5700 2000 5700
-Text Label 2900 5700 0 48 ~
+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 1000 9000 0 48 ~
+Text Label 900 9000 0 48 ~ 0
 FPGA_M2
 Wire Wire Line
 	3400 5800 2000 5800
-Text Label 2900 5800 0 48 ~
+Text Label 3400 5800 2 48 ~ 0
 FPGA_JTAG_TCK
 Text Label 8430 8500 0 48 ~
 FPGA_JTAG_TCK
 Wire Wire Line
 	3400 5900 2000 5900
-Text Label 2900 5900 0 48 ~
+Text Label 3400 5900 2 48 ~ 0
 FPGA_JTAG_TDI
 Wire Wire Line
 	9000 8700 8800 8700
@@ -322,7 +322,7 @@ Text Label 8430 8700 0 48 ~
 FPGA_JTAG_TDI
 Wire Wire Line
 	3400 6000 2000 6000
-Text Label 2900 6000 0 48 ~
+Text Label 3400 6000 2 48 ~ 0
 FPGA_JTAG_TDO
 Wire Wire Line
 	9300 8800 8430 8800
@@ -330,7 +330,7 @@ Text Label 8430 8800 0 48 ~
 FPGA_JTAG_TDO
 Wire Wire Line
 	3400 6100 2000 6100
-Text Label 2900 6100 0 48 ~
+Text Label 3400 6100 2 48 ~ 0
 FPGA_JTAG_TMS
 Wire Wire Line
 	9100 8600 8900 8600
@@ -344,15 +344,15 @@ Wire Wire Line
 	6200 4900 6200 5100
 Wire Wire Line
 	7600 5100 6200 5100
-Text Label 7010 5100 0 48 ~
+Text GLabel 7600 5100 2 48 Input ~ 0
 FPGA_PROGRAM_B
 Wire Wire Line
 	3940 5300 3240 5300
-Text Label 3340 5300 0 48 ~
+Text GLabel 3940 5300 2 48 Input ~ 0
 FPGA_PROGRAM_B
 Wire Wire Line
 	3400 5100 2000 5100
-Text Label 2900 5100 0 48 ~
+Text Label 3400 5100 2 48 ~ 0
 FPGA_DONE_INT
 Wire Wire Line
 	4700 9400 4700 9500
@@ -365,23 +365,23 @@ FPGA_DONE_INT
 Connection ~ 4700 9500
 Wire Wire Line
 	3400 5500 2000 5500
-Text Label 2900 5500 0 48 ~
+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 2600 9000 0 48 ~
+Text Label 2500 9000 0 48 ~ 0
 FPGA_M0
 Wire Wire Line
 	3400 5600 2000 5600
-Text Label 2900 5600 0 48 ~
+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 1750 9000 0 48 ~
+Text Label 1700 9000 0 48 ~ 0
 FPGA_M1
 Wire Wire Line
 	5800 4900 5800 5400
@@ -394,7 +394,7 @@ FPGA_INIT_B_INT
 Connection ~ 5800 5400
 Wire Wire Line
 	3940 5200 3240 5200
-Text Label 3340 5200 0 48 ~
+Text Label 3940 5200 2 48 ~ 0
 FPGA_INIT_B_INT
 Wire Wire Line
 	6600 5600 6400 5600
@@ -402,18 +402,18 @@ Wire Wire Line
 	6600 5600 6600 5800
 Wire Wire Line
 	7600 5600 6600 5600
-Text Label 7130 5600 0 48 ~
+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 Label 5400 9500 0 48 ~
+Text GLabel 5700 9500 2 48 Output ~ 0
 FPGA_DONE
 Wire Wire Line
 	3940 5400 3240 5400
-Text Label 3340 5400 0 48 ~
+Text GLabel 3940 5400 2 48 Output ~ 0
 FPGA_CFG_SCLK
 Wire Wire Line
 	2840 5200 2000 5200
diff --git a/rev03-KiCad/rev02_15.sch b/rev03-KiCad/rev02_15.sch
index e3b70e0..b5912c2 100644
--- a/rev03-KiCad/rev02_15.sch
+++ b/rev03-KiCad/rev02_15.sch
@@ -341,7 +341,7 @@ Text Label 6900 6500 0 48 ~
 FPGA_PROM_W_N
 Wire Wire Line
 	7000 9500 6700 9500
-Text Label 6700 9500 0 48 ~
+Text GLabel 6700 9500 0 48 Input ~ 0
 FPGA_GCLK
 Wire Wire Line
 	6200 9300 6100 9300
@@ -351,41 +351,41 @@ Wire Wire Line
 	6200 8900 5800 8900
 Wire Wire Line
 	3660 6830 3090 6830
-Text Label 3090 6830 0 48 ~
+Text GLabel 3090 6830 0 48 Input ~ 0
 FPGA_CFG_SCLK
 Wire Wire Line
 	3660 6930 3090 6930
-Text Label 3090 6930 0 48 ~
+Text GLabel 3090 6930 0 48 Input ~ 0
 FPGA_CFG_MOSI
 Wire Wire Line
 	3660 6730 3090 6730
-Text Label 3090 6730 0 48 ~
+Text GLabel 3090 6730 0 48 Input ~ 0
 FPGA_CFG_CS_N
 Wire Wire Line
 	5160 7030 4660 7030
-Text Label 5160 7030 0 48 ~
+Text GLabel 5160 7030 2 48 Output ~ 0
 FPGA_CFG_MISO
 Wire Wire Line
 	3660 5630 2980 5630
-Text Label 2980 5630 0 48 ~
+Text GLabel 2980 5630 0 48 Input ~ 0
 ARM_FPGA_CFG_CS_N
 Wire Wire Line
 	3660 5830 2980 5830
-Text Label 2980 5830 0 48 ~
+Text GLabel 2980 5830 0 48 Input ~ 0
 ARM_FPGA_CFG_MOSI
 Wire Wire Line
 	5160 5930 4660 5930
-Text Label 5160 5930 0 48 ~
+Text GLabel 5160 5930 2 48 Output ~ 0
 ARM_FPGA_CFG_MISO
 Wire Wire Line
 	3660 5730 2980 5730
-Text Label 2980 5730 0 48 ~
+Text GLabel 2980 5730 0 48 Input ~ 0
 ARM_FPGA_CFG_SCLK
 Text Label 3360 5510 1 48 ~
 SPI_A_TRISTATE
 Text Label 3060 7230 0 48 ~
 SPI_B_TRISTATE
-Text Label 430 6430 0 48 ~
+Text GLabel 430 6430 0 48 Input ~ 0
 FPGA_CFG_CTRL_FPGA_DIS
 Wire Wire Line
 	6300 9500 6100 9500
@@ -445,7 +445,7 @@ Wire Wire Line
 	3660 6130 3360 6130
 Wire Wire Line
 	430 6130 1760 6130
-Text Label 430 6130 0 48 ~
+Text GLabel 430 6130 0 48 Input ~ 0
 FPGA_CFG_CTRL_ARM_ENA
 Connection ~ 3360 4420
 $Comp
diff --git a/rev03-KiCad/rev02_17.sch b/rev03-KiCad/rev02_17.sch
index bbf8572..e152065 100644
--- a/rev03-KiCad/rev02_17.sch
+++ b/rev03-KiCad/rev02_17.sch
@@ -124,7 +124,7 @@ Wire Wire Line
 	7000 5300 7000 5400
 Wire Wire Line
 	7890 7800 6750 7800
-Text Label 7200 7800 0 48 ~
+Text GLabel 7890 7800 2 48 Output ~ 0
 FMC_CLK
 Wire Wire Line
 	2950 5200 1800 5200
@@ -132,23 +132,23 @@ Wire Wire Line
 	2950 5300 1800 5300
 Wire Wire Line
 	2950 5400 1800 5400
-Text Label 2220 5400 0 48 ~
+Text GLabel 2950 5400 2 48 BiDi ~ 0
 FMC_D2
 Wire Wire Line
 	2950 5500 1800 5500
-Text Label 2220 5500 0 48 ~
+Text GLabel 2950 5500 2 48 BiDi ~ 0
 FMC_D3
 Wire Wire Line
 	2950 5600 1800 5600
-Text Label 7200 6800 0 48 ~
+Text GLabel 7900 6800 2 48 BiDi ~ 0
 FMC_D4
-Text Label 7200 7300 0 48 ~
+Text GLabel 7900 7300 2 48 BiDi ~ 0
 FMC_D5
-Text Label 7200 7600 0 48 ~
+Text GLabel 7900 7600 2 48 BiDi ~ 0
 FMC_D6
 Wire Wire Line
 	2950 5900 1800 5900
-Text Label 7200 7700 0 48 ~
+Text GLabel 7900 7700 2 48 BiDi ~ 0
 FMC_D7
 Wire Wire Line
 	2950 6100 1800 6100
@@ -160,135 +160,135 @@ Wire Wire Line
 	2950 6400 1800 6400
 Wire Wire Line
 	2950 6500 1800 6500
-Text Label 2220 6500 0 48 ~
+Text GLabel 2950 6500 2 48 BiDi ~ 0
 FMC_D13
 Wire Wire Line
 	2950 6600 1800 6600
-Text Label 2220 6600 0 48 ~
+Text GLabel 2950 6600 2 48 BiDi ~ 0
 FMC_D14
 Wire Wire Line
 	2950 6700 1800 6700
-Text Label 2220 6800 0 48 ~
+Text GLabel 2950 6800 2 48 BiDi ~ 0
 FMC_D15
 Wire Wire Line
 	2950 6800 1800 6800
-Text Label 2220 6700 0 48 ~
+Text GLabel 2950 6700 2 48 BiDi ~ 0
 FMC_D16
 Wire Wire Line
 	2950 6900 1800 6900
-Text Label 2220 6900 0 48 ~
+Text GLabel 2950 6900 2 48 BiDi ~ 0
 FMC_D17
 Wire Wire Line
 	2950 7000 1800 7000
-Text Label 2220 7000 0 48 ~
+Text GLabel 2950 7000 2 48 BiDi ~ 0
 FMC_D18
 Wire Wire Line
 	2950 7100 1800 7100
-Text Label 2220 7100 0 48 ~
+Text GLabel 2950 7100 2 48 BiDi ~ 0
 FMC_D19
 Wire Wire Line
 	2950 7200 1800 7200
-Text Label 2220 7200 0 48 ~
+Text GLabel 2950 7200 2 48 BiDi ~ 0
 FMC_D20
 Wire Wire Line
 	2950 7300 1800 7300
-Text Label 2220 7300 0 48 ~
+Text GLabel 2950 7300 2 48 BiDi ~ 0
 FMC_D21
 Wire Wire Line
 	2950 7400 1800 7400
-Text Label 2220 7400 0 48 ~
+Text GLabel 2950 7400 2 48 BiDi ~ 0
 FMC_D22
 Wire Wire Line
 	2950 7500 1800 7500
-Text Label 2220 7500 0 48 ~
+Text GLabel 2950 7500 2 48 BiDi ~ 0
 FMC_D23
 Wire Wire Line
 	2950 7700 1800 7700
-Text Label 2220 7700 0 48 ~
+Text GLabel 2950 7700 2 48 BiDi ~ 0
 FMC_D25
-Text Label 2220 8400 0 48 ~
+Text GLabel 2950 8400 2 48 Input ~ 0
 FMC_NE1
 Wire Wire Line
 	2960 8700 1800 8700
-Text Label 2220 8700 0 48 ~
+Text GLabel 2960 8700 2 48 Output ~ 0
 FMC_NWAIT
 Wire Wire Line
 	2960 8800 1800 8800
-Text Label 2220 8800 0 48 ~
+Text GLabel 2960 8800 2 48 Input ~ 0
 FMC_NWE
 Wire Wire Line
 	7900 5500 6750 5500
-Text Label 7200 5500 0 48 ~
+Text GLabel 7900 5500 2 48 Input ~ 0
 FMC_A0
 Wire Wire Line
 	7900 5600 6750 5600
-Text Label 7200 5800 0 48 ~
+Text GLabel 7900 5800 2 48 Input ~ 0
 FMC_A1
 Wire Wire Line
 	7900 5700 6750 5700
-Text Label 7200 5700 0 48 ~
+Text GLabel 7900 5700 2 48 Input ~ 0
 FMC_A2
 Wire Wire Line
 	7900 5800 6750 5800
-Text Label 7200 5600 0 48 ~
+Text GLabel 7900 5600 2 48 Input ~ 0
 FMC_A3
 Wire Wire Line
 	7900 5900 6750 5900
-Text Label 7200 5900 0 48 ~
+Text GLabel 7900 5900 2 48 Input ~ 0
 FMC_A4
 Wire Wire Line
 	7900 6000 6750 6000
-Text Label 7200 6000 0 48 ~
+Text GLabel 7900 6000 2 48 Input ~ 0
 FMC_A5
 Wire Wire Line
 	7900 6100 6750 6100
-Text Label 7200 6100 0 48 ~
+Text GLabel 7900 6100 2 48 Input ~ 0
 FMC_A6
 Wire Wire Line
 	7900 6200 6750 6200
-Text Label 7200 6200 0 48 ~
+Text GLabel 7900 6200 2 48 Input ~ 0
 FMC_A7
 Wire Wire Line
 	7900 6300 6750 6300
-Text Label 7200 6300 0 48 ~
+Text GLabel 7900 6300 2 48 Input ~ 0
 FMC_A8
 Wire Wire Line
 	7900 6400 6750 6400
-Text Label 7200 6400 0 48 ~
+Text GLabel 7900 6400 2 48 Input ~ 0
 FMC_A9
 Wire Wire Line
 	7900 6500 6750 6500
-Text Label 7200 6500 0 48 ~
+Text GLabel 7900 6500 2 48 Input ~ 0
 FMC_A10
 Wire Wire Line
 	7900 6600 6750 6600
-Text Label 7200 6700 0 48 ~
+Text GLabel 7900 6700 2 48 Input ~ 0
 FMC_A11
 Wire Wire Line
 	7900 6700 6750 6700
-Text Label 7200 7100 0 48 ~
+Text GLabel 7900 7100 2 48 Input ~ 0
 FMC_A12
 Wire Wire Line
 	7900 6800 6750 6800
-Text Label 2220 5600 0 48 ~
+Text GLabel 2950 5600 2 48 Input ~ 0
 FMC_A13
 Wire Wire Line
 	7900 6900 6750 6900
-Text Label 7200 6900 0 48 ~
+Text GLabel 7900 6900 2 48 Input ~ 0
 FMC_A14
 Wire Wire Line
 	7900 7000 6750 7000
-Text Label 2220 9600 0 48 ~
+Text GLabel 2970 9600 2 48 Input ~ 0
 FMC_A15
 Wire Wire Line
 	7900 7100 6750 7100
-Text Label 7200 7000 0 48 ~
+Text GLabel 7900 7000 2 48 Input ~ 0
 FMC_A16
-Text Label 2220 9500 0 48 ~
+Text GLabel 2970 9500 2 48 Input ~ 0
 FMC_A17
 Wire Wire Line
 	7900 7300 6750 7300
-Text Label 2220 9800 0 48 ~
+Text GLabel 2970 9800 2 48 Input ~ 0
 FMC_A18
 Wire Wire Line
 	7900 7500 6750 7500
@@ -314,39 +314,39 @@ Wire Wire Line
 	2970 9600 1800 9600
 Wire Wire Line
 	2970 9200 1800 9200
-Text Label 2220 9100 0 48 ~
+Text GLabel 2970 9100 2 48 BiDi ~ 0
 FMC_D0
 Wire Wire Line
 	2970 9100 1800 9100
-Text Label 2220 9200 0 48 ~
+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 Label 7200 7500 0 48 ~
+Text GLabel 7900 7500 2 48 BiDi ~ 0
 FMC_D24
-Text Label 7200 7900 0 48 ~
+Text GLabel 7900 7900 2 48 BiDi ~ 0
 FMC_D26
-Text Label 7200 6600 0 48 ~
+Text GLabel 7900 6600 2 48 BiDi ~ 0
 FMC_D27
-Text Label 7200 8700 0 48 ~
+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 Label 2230 5900 0 48 ~
+Text GLabel 2950 5900 2 48 Output ~ 0
 MKM_FPGA_CS_N
-Text Label 2230 6400 0 48 ~
+Text GLabel 2950 6400 2 48 Output ~ 0
 MKM_FPGA_SCK
-Text Label 2230 6100 0 48 ~
+Text GLabel 2950 6100 2 48 Output ~ 0
 MKM_FPGA_MOSI
-Text Label 2230 6200 0 48 ~
+Text GLabel 2950 6200 2 48 Input ~ 0
 MKM_FPGA_MISO
-Text Label 2220 6300 0 48 ~
+Text GLabel 2950 6300 2 48 Output ~ 0
 FPGA_GPIO_LED_0
-Text Label 2230 5300 0 48 ~
+Text GLabel 2950 5300 2 48 Output ~ 0
 FPGA_GPIO_LED_1
 $Comp
 L XC7A200TFBG484_2 U13_9
diff --git a/rev03-KiCad/rev02_18.sch b/rev03-KiCad/rev02_18.sch
index b862c6f..4acd2fd 100644
--- a/rev03-KiCad/rev02_18.sch
+++ b/rev03-KiCad/rev02_18.sch
@@ -334,11 +334,11 @@ Wire Wire Line
 	5500 9000 5500 9200
 Wire Wire Line
 	7000 4800 6000 4800
-Text Label 6100 4800 0 48 ~
+Text GLabel 7000 4800 2 48 Output ~ 0
 FPGA_VCCAUX_1V8
 Wire Wire Line
 	7000 8000 6000 8000
-Text Label 6100 8000 0 48 ~
+Text GLabel 7000 8000 2 48 Output ~ 0
 VCCO_3V3
 Wire Wire Line
 	2100 6200 2100 6300
@@ -386,7 +386,7 @@ Wire Wire Line
 	2300 5200 1900 5200
 Wire Wire Line
 	1900 4150 1900 5200
-Text Label 1900 4740 1 48 ~
+Text GLabel 1900 4150 0 48 Input ~ 0
 PWR_ENA_VCCAUX
 Wire Wire Line
 	1600 5800 1600 6200
@@ -482,19 +482,19 @@ Wire Wire Line
 	1900 7500 1900 8400
 Wire Wire Line
 	1900 7500 1800 7500
-Text Label 1400 7500 0 48 ~
+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 Label 4000 6200 3 48 ~
+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 Label 4000 9700 0 48 ~
+Text GLabel 4000 9700 2 48 Output ~ 0
 POK_VCCO
 Text Notes 2700 4440 0    60   ~ 12
 U14
diff --git a/rev03-KiCad/rev02_19.sch b/rev03-KiCad/rev02_19.sch
index b76308c..0bd510a 100644
--- a/rev03-KiCad/rev02_19.sch
+++ b/rev03-KiCad/rev02_19.sch
@@ -306,167 +306,167 @@ Wire Wire Line
 	8500 6600 8400 6600
 Wire Wire Line
 	3100 8100 1900 8100
-Text Label 2100 8100 0 48 ~
+Text GLabel 3100 8100 2 48 UnSpc ~ 0
 AVR_GPIO_FPGA_0
 Wire Wire Line
 	3100 8200 1900 8200
-Text Label 2100 8200 0 48 ~
+Text GLabel 3100 8200 2 48 UnSpc ~ 0
 AVR_GPIO_FPGA_1
 Wire Wire Line
 	3100 5200 1900 5200
-Text Label 2100 5200 0 48 ~
+Text GLabel 3100 5200 2 48 UnSpc ~ 0
 FPGA_IRQ_N_0
 Wire Wire Line
 	3100 5300 1900 5300
-Text Label 2100 5300 0 48 ~
+Text GLabel 3100 5300 2 48 UnSpc ~ 0
 FPGA_IRQ_N_1
 Wire Wire Line
 	3100 5400 1900 5400
-Text Label 2100 5400 0 48 ~
+Text GLabel 3100 5400 2 48 UnSpc ~ 0
 FPGA_IRQ_N_2
 Wire Wire Line
 	3100 5500 1900 5500
-Text Label 2100 5500 0 48 ~
+Text GLabel 3100 5500 2 48 UnSpc ~ 0
 FPGA_IRQ_N_3
 Wire Wire Line
 	3100 5600 1900 5600
-Text Label 2100 5800 0 48 ~
+Text GLabel 3100 5800 2 48 BiDi ~ 0
 FPGA_GPIO_A_0
 Wire Wire Line
 	8500 5000 7600 5000
-Text Label 7600 5000 0 48 ~
+Text GLabel 7600 5000 0 48 BiDi ~ 0
 FPGA_GPIO_A_0
 Wire Wire Line
 	3100 5700 1900 5700
-Text Label 2100 5700 0 48 ~
+Text GLabel 3100 5700 2 48 BiDi ~ 0
 FPGA_GPIO_A_1
 Wire Wire Line
 	10000 5000 9100 5000
-Text Label 9300 5000 0 48 ~
+Text GLabel 10000 5000 2 48 BiDi ~ 0
 FPGA_GPIO_A_1
 Wire Wire Line
 	3100 5800 1900 5800
-Text Label 2100 6900 0 48 ~
+Text GLabel 3100 6900 2 48 BiDi ~ 0
 FPGA_GPIO_A_2
 Wire Wire Line
 	8500 5100 7600 5100
-Text Label 7600 5100 0 48 ~
+Text GLabel 7600 5100 0 48 BiDi ~ 0
 FPGA_GPIO_A_2
-Text Label 2100 7000 0 48 ~
+Text GLabel 3100 7000 2 48 BiDi ~ 0
 FPGA_GPIO_A_3
 Wire Wire Line
 	10000 5100 9100 5100
-Text Label 9300 5100 0 48 ~
+Text GLabel 10000 5100 2 48 BiDi ~ 0
 FPGA_GPIO_A_3
-Text Label 2100 6500 0 48 ~
+Text GLabel 3100 6500 2 48 BiDi ~ 0
 FPGA_GPIO_A_4
 Wire Wire Line
 	8500 5300 7600 5300
-Text Label 7600 5300 0 48 ~
+Text GLabel 7600 5300 0 48 BiDi ~ 0
 FPGA_GPIO_A_4
 Wire Wire Line
 	3100 6100 1900 6100
-Text Label 2100 6600 0 48 ~
+Text GLabel 3100 6600 2 48 BiDi ~ 0
 FPGA_GPIO_A_5
 Wire Wire Line
 	10000 5300 9100 5300
-Text Label 9300 5300 0 48 ~
+Text GLabel 10000 5300 2 48 BiDi ~ 0
 FPGA_GPIO_A_5
-Text Label 2110 6700 0 48 ~
+Text GLabel 3100 6700 2 48 BiDi ~ 0
 FPGA_GPIO_A_6
 Wire Wire Line
 	8500 5400 7600 5400
-Text Label 7600 5400 0 48 ~
+Text GLabel 7600 5400 0 48 BiDi ~ 0
 FPGA_GPIO_A_6
 Wire Wire Line
 	3100 6300 1900 6300
-Text Label 2100 6300 0 48 ~
+Text GLabel 3100 6300 2 48 BiDi ~ 0
 FPGA_GPIO_A_7
 Wire Wire Line
 	10000 5400 9100 5400
-Text Label 9300 5400 0 48 ~
+Text GLabel 10000 5400 2 48 BiDi ~ 0
 FPGA_GPIO_A_7
 Wire Wire Line
 	3100 6400 1900 6400
-Text Label 2110 6800 0 48 ~
+Text GLabel 3100 6800 2 48 BiDi ~ 0
 FPGA_GPIO_B_0
 Wire Wire Line
 	8500 6900 7600 6900
-Text Label 7600 6900 0 48 ~
+Text GLabel 7600 6900 0 48 BiDi ~ 0
 FPGA_GPIO_B_0
 Wire Wire Line
 	3100 6500 1900 6500
-Text Label 2100 5600 0 48 ~
+Text GLabel 3100 5600 2 48 BiDi ~ 0
 FPGA_GPIO_B_1
 Wire Wire Line
 	10000 6900 9100 6900
-Text Label 9300 6900 0 48 ~
+Text GLabel 10000 6900 2 48 BiDi ~ 0
 FPGA_GPIO_B_1
 Wire Wire Line
 	3100 6600 1900 6600
-Text Label 2100 6400 0 48 ~
+Text GLabel 3100 6400 2 48 BiDi ~ 0
 FPGA_GPIO_B_2
 Wire Wire Line
 	8500 7000 7600 7000
-Text Label 7600 7000 0 48 ~
+Text GLabel 7600 7000 0 48 BiDi ~ 0
 FPGA_GPIO_B_2
 Wire Wire Line
 	3100 6700 1900 6700
-Text Label 2110 6100 0 48 ~
+Text GLabel 3100 6100 2 48 BiDi ~ 0
 FPGA_GPIO_B_3
 Wire Wire Line
 	10000 7000 9100 7000
-Text Label 9300 7000 0 48 ~
+Text GLabel 10000 7000 2 48 BiDi ~ 0
 FPGA_GPIO_B_3
 Wire Wire Line
 	3100 6800 1900 6800
-Text Label 2100 7500 0 48 ~
+Text GLabel 3100 7500 2 48 BiDi ~ 0
 FPGA_GPIO_B_4
 Wire Wire Line
 	8500 7200 7600 7200
-Text Label 7600 7200 0 48 ~
+Text GLabel 7600 7200 0 48 BiDi ~ 0
 FPGA_GPIO_B_4
 Wire Wire Line
 	3100 6900 1900 6900
-Text Label 2100 9200 0 48 ~
+Text GLabel 3100 9200 2 48 BiDi ~ 0
 FPGA_GPIO_B_5
 Wire Wire Line
 	10000 7200 9100 7200
-Text Label 9300 7200 0 48 ~
+Text GLabel 10000 7200 2 48 BiDi ~ 0
 FPGA_GPIO_B_5
 Wire Wire Line
 	3100 7000 1900 7000
-Text Label 2100 8800 0 48 ~
+Text GLabel 3100 8800 2 48 BiDi ~ 0
 FPGA_GPIO_B_6
 Wire Wire Line
 	8500 7300 7600 7300
-Text Label 7600 7300 0 48 ~
+Text GLabel 7600 7300 0 48 BiDi ~ 0
 FPGA_GPIO_B_6
-Text Label 2100 8900 0 48 ~
+Text GLabel 3100 8900 2 48 BiDi ~ 0
 FPGA_GPIO_B_7
 Wire Wire Line
 	10000 7300 9100 7300
-Text Label 9300 7300 0 48 ~
+Text GLabel 10000 7300 2 48 BiDi ~ 0
 FPGA_GPIO_B_7
 Wire Wire Line
 	3100 7300 1900 7300
-Text Label 2100 7300 0 48 ~
+Text GLabel 3100 7300 2 48 UnSpc ~ 0
 FPGA_GCLK
 Wire Wire Line
 	7890 8700 7300 8700
-Text Label 7300 8700 0 48 ~
+Text GLabel 7300 8700 0 48 Input ~ 0
 FPGA_GPIO_LED_2
 Wire Wire Line
 	8200 8600 7300 8600
-Text Label 7300 8600 0 48 ~
+Text GLabel 7300 8600 0 48 Input ~ 0
 FPGA_GPIO_LED_3
 Wire Wire Line
 	7890 8900 7300 8900
-Text Label 7300 8900 0 48 ~
+Text GLabel 7300 8900 0 48 Input ~ 0
 FPGA_GPIO_LED_0
 Wire Wire Line
 	8200 8800 7300 8800
-Text Label 7300 8800 0 48 ~
+Text GLabel 7300 8800 0 48 Input ~ 0
 FPGA_GPIO_LED_1
 Wire Wire Line
 	8900 8900 8290 8900
@@ -478,15 +478,15 @@ Wire Wire Line
 	8700 8600 8600 8600
 Wire Wire Line
 	3100 7200 1900 7200
-Text Label 2100 7200 0 48 ~
+Text GLabel 3100 7200 2 48 Output ~ 0
 FPGA_ENTROPY_DISABLE
 Wire Wire Line
 	3100 8300 1900 8300
-Text Label 2100 8300 0 48 ~
+Text GLabel 3100 8300 2 48 UnSpc ~ 0
 AVR_GPIO_FPGA_2
 Wire Wire Line
 	3100 8400 1900 8400
-Text Label 2100 8400 0 48 ~
+Text GLabel 3100 8400 2 48 UnSpc ~ 0
 AVR_GPIO_FPGA_3
 Wire Wire Line
 	3100 7500 1900 7500
diff --git a/rev03-KiCad/rev02_20.sch b/rev03-KiCad/rev02_20.sch
index c0b5a99..e566b58 100644
--- a/rev03-KiCad/rev02_20.sch
+++ b/rev03-KiCad/rev02_20.sch
@@ -69,15 +69,15 @@ F 3 "" H 4200 4300 70  0000 C CNN
 $EndComp
 Wire Wire Line
 	3600 7400 2400 7400
-Text Label 2460 7400 0 48 ~
+Text GLabel 3600 7400 2 48 Input ~ 0
 DIGITIZED_NOISE
 Wire Wire Line
 	3600 6500 2400 6500
-Text Label 2470 6500 0 48 ~
+Text GLabel 3600 6500 2 48 Output ~ 0
 FPGA_GPIO_LED_2
 Wire Wire Line
 	3600 6600 2400 6600
-Text Label 2470 6600 0 48 ~
+Text GLabel 3600 6600 2 48 Output ~ 0
 FPGA_GPIO_LED_3
 Wire Wire Line
 	3600 6400 2400 6400
@@ -111,93 +111,93 @@ Wire Wire Line
 	2600 5000 2400 5000
 Wire Wire Line
 	3600 5200 3500 5200
-Text Label 3600 5200 0 48 ~
+Text GLabel 3600 5200 2 48 UnSpc ~ 0
 FPGA_CFG_MOSI
 Wire Wire Line
 	3600 5300 3500 5300
-Text Label 3600 5300 0 48 ~
+Text GLabel 3600 5300 2 48 Input ~ 0
 FPGA_CFG_MISO
 Wire Wire Line
 	3600 6200 3500 6200
-Text Label 3600 6200 0 48 ~
+Text GLabel 3600 6200 2 48 Output ~ 0
 FPGA_CFG_CS_N
 Wire Wire Line
 	3100 5300 2400 5300
-Text Label 2460 5300 0 48 ~
+Text Label 2460 5300 2 48 ~ 0
 FPGA_CFG_MISO1
 Wire Wire Line
 	3100 5200 2400 5200
-Text Label 2460 5200 0 48 ~
+Text Label 2460 5200 2 48 ~ 0
 FPGA_CFG_MOSI1
 Wire Wire Line
 	3100 6200 2400 6200
-Text Label 2460 6200 0 48 ~
+Text Label 2460 6200 2 48 ~ 0
 FPGA_CFG_CS_N1
-Text Label 2460 7000 0 48 ~
+Text GLabel 3600 7000 2 48 Input ~ 0
 FMC_A19
-Text Label 2460 7100 0 48 ~
+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 Label 2460 8100 0 48 ~
+Text GLabel 3610 8100 2 48 Input ~ 0
 FMC_A21
 Wire Wire Line
 	3610 8100 2400 8100
-Text Label 2460 6800 0 48 ~
+Text GLabel 3600 6800 2 48 Input ~ 0
 FMC_A22
-Text Label 2460 6900 0 48 ~
+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 Label 2460 8500 0 48 ~
+Text GLabel 3600 8500 2 48 Input ~ 0
 FMC_A24
 Wire Wire Line
 	3600 8500 2400 8500
-Text Label 2460 8000 0 48 ~
+Text GLabel 3600 8000 2 48 Input ~ 0
 FMC_A25
 Wire Wire Line
 	3600 8000 2400 8000
-Text Label 2460 7600 0 48 ~
+Text GLabel 3600 7600 2 48 BiDi ~ 0
 FMC_D8
 Wire Wire Line
 	3600 7600 2400 7600
-Text Label 2460 6700 0 48 ~
+Text GLabel 3600 6700 2 48 BiDi ~ 0
 FMC_D9
 Wire Wire Line
 	3600 6700 2400 6700
-Text Label 2460 7500 0 48 ~
+Text GLabel 3600 7500 2 48 BiDi ~ 0
 FMC_D10
 Wire Wire Line
 	3600 7500 2400 7500
-Text Label 2460 7200 0 48 ~
+Text GLabel 3600 7200 2 48 BiDi ~ 0
 FMC_D12
 Wire Wire Line
 	3600 7200 2400 7200
-Text Label 2460 7300 0 48 ~
+Text GLabel 3600 7300 2 48 BiDi ~ 0
 FMC_D28
 Wire Wire Line
 	3600 7300 2400 7300
-Text Label 2460 7800 0 48 ~
+Text GLabel 3600 7800 2 48 BiDi ~ 0
 FMC_D29
 Wire Wire Line
 	3600 7800 2400 7800
-Text Label 2460 5500 0 48 ~
+Text GLabel 3100 5500 2 48 BiDi ~ 0
 FMC_D30
 Wire Wire Line
 	3100 5500 2400 5500
-Text Label 2460 5400 0 48 ~
+Text GLabel 3100 5400 2 48 BiDi ~ 0
 FMC_D31
 Wire Wire Line
 	3100 5400 2400 5400
-Text Label 2460 8300 0 48 ~
+Text GLabel 3600 8300 2 48 UnSpc ~ 0
 FMC_NL
 Wire Wire Line
 	3600 8300 2400 8300
-Text Label 2450 10000 0 48 ~
+Text GLabel 3600 10000 2 48 BiDi ~ 0
 FMC_D11
 Wire Wire Line
 	3600 10000 2400 10000
diff --git a/rev03-KiCad/rev02_24.sch b/rev03-KiCad/rev02_24.sch
index a0cdd92..f2da38d 100644
--- a/rev03-KiCad/rev02_24.sch
+++ b/rev03-KiCad/rev02_24.sch
@@ -204,7 +204,7 @@ Wire Wire Line
 	7600 7400 7600 7600
 Wire Wire Line
 	8300 6400 8100 6400
-Text Label 8300 6400 0 48 ~
+Text GLabel 8300 6400 2 48 Output ~ 0
 FPGA_VCCINT_1V0
 Wire Wire Line
 	1600 6200 1600 6400
@@ -234,7 +234,7 @@ Connection ~ 2800 6400
 Connection ~ 1800 6400
 Wire Wire Line
 	5600 9100 5300 9100
-Text Label 5350 9100 0 48 ~
+Text GLabel 5600 9100 2 48 Output ~ 0
 POK_VCCINT
 Wire Wire Line
 	3600 9100 3400 9100
@@ -248,7 +248,7 @@ Wire Wire Line
 	3200 5900 3200 6800
 Wire Wire Line
 	3200 5900 2700 5900
-Text Label 2700 5900 0 48 ~
+Text GLabel 2700 5900 0 48 Input ~ 0
 PWR_ENA_VCCINT
 Wire Wire Line
 	5500 7600 5300 7600
diff --git a/rev03-KiCad/rev02_25.sch b/rev03-KiCad/rev02_25.sch
index f208e24..19d4990 100644
--- a/rev03-KiCad/rev02_25.sch
+++ b/rev03-KiCad/rev02_25.sch
@@ -232,7 +232,7 @@ Wire Wire Line
 	7000 4900 6700 4900
 Wire Wire Line
 	7000 4900 7000 5300
-Text Label 7250 5300 0 48 ~
+Text GLabel 7900 5300 2 48 Output ~ 0
 PWR_ENA_VCCAUX
 Connection ~ 7000 5300
 Wire Wire Line
@@ -247,7 +247,7 @@ Wire Wire Line
 	6500 4900 6200 4900
 Wire Wire Line
 	6200 5300 5800 5300
-Text Label 5100 5300 0 48 ~
+Text GLabel 5000 5300 0 48 Input ~ 0
 POK_VCCINT
 Connection ~ 5800 5300
 Connection ~ 6200 5300
@@ -261,7 +261,7 @@ Wire Wire Line
 	3400 8700 3200 8700
 Wire Wire Line
 	3400 8700 3400 8900
-Text Label 3690 8700 0 48 ~
+Text GLabel 4350 8700 2 48 Output ~ 0
 PWR_ENA_VCCO
 Connection ~ 3400 8700
 Wire Wire Line
@@ -274,7 +274,7 @@ Wire Wire Line
 	2500 5300 2500 5500
 Wire Wire Line
 	3400 5300 2500 5300
-Text Label 2660 5300 0 48 ~
+Text GLabel 3400 5300 2 48 Output ~ 0
 PWR_ENA_VCCINT
 Connection ~ 2500 5300
 Wire Wire Line
@@ -289,7 +289,7 @@ Wire Wire Line
 	2900 8300 2600 8300
 Wire Wire Line
 	2600 8700 2200 8700
-Text Label 1540 8700 0 48 ~
+Text GLabel 1450 8700 0 48 Input ~ 0
 POK_VCCAUX
 Connection ~ 2200 8700
 Connection ~ 2600 8700
@@ -299,7 +299,7 @@ Wire Wire Line
 	6800 8100 6800 8700
 Wire Wire Line
 	7400 8700 6800 8700
-Text Label 6110 8700 0 48 ~
+Text GLabel 6050 8700 0 48 Input ~ 0
 POK_VCCO
 Connection ~ 6800 8700
 Wire Wire Line