[Cryptech-Commits] [user/ft/alpha_to_kicad] 09/15: remap symbols to suit KiCad-nightly

git at cryptech.is git at cryptech.is
Wed May 9 15:07:56 UTC 2018


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

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

commit 0951574c194641f2bc189b193d955b98277d1ea9
Author: Fredrik Thulin <fredrik at thulin.net>
AuthorDate: Wed May 9 11:14:13 2018 +0200

    remap symbols to suit KiCad-nightly
---
 .gitignore                     |   3 +
 Cryptech Alpha.pro.template    |   9 +-
 Cryptech Alpha.sch.template    |  34 +-----
 convert.sh                     |   6 +-
 rev03-KiCad/Cryptech Alpha.pro |  33 ------
 rev03-KiCad/Cryptech Alpha.sch | 262 -----------------------------------------
 rev03-KiCad/rev02_00.sch       |  35 +-----
 rev03-KiCad/rev02_01.sch       | 135 +++++++++------------
 rev03-KiCad/rev02_02.sch       |  77 ++++--------
 rev03-KiCad/rev02_03.sch       |  89 +++++---------
 rev03-KiCad/rev02_04.sch       | 109 +++++++----------
 rev03-KiCad/rev02_05.sch       |  37 +-----
 rev03-KiCad/rev02_06.sch       | 101 ++++++----------
 rev03-KiCad/rev02_07.sch       |  47 ++------
 rev03-KiCad/rev02_08.sch       |  59 +++-------
 rev03-KiCad/rev02_09.sch       | 141 +++++++++-------------
 rev03-KiCad/rev02_10.sch       | 141 +++++++++-------------
 rev03-KiCad/rev02_11.sch       | 101 ++++++----------
 rev03-KiCad/rev02_12.sch       |  75 ++++--------
 rev03-KiCad/rev02_13.sch       |  97 ++++++---------
 rev03-KiCad/rev02_14.sch       |  53 ++-------
 rev03-KiCad/rev02_15.sch       |  85 +++++--------
 rev03-KiCad/rev02_16.sch       |  41 +------
 rev03-KiCad/rev02_17.sch       |  41 +------
 rev03-KiCad/rev02_18.sch       | 113 +++++++-----------
 rev03-KiCad/rev02_19.sch       |  79 ++++---------
 rev03-KiCad/rev02_20.sch       |  45 ++-----
 rev03-KiCad/rev02_21.sch       |  51 ++------
 rev03-KiCad/rev02_22.sch       | 205 ++++++++++++++------------------
 rev03-KiCad/rev02_23.sch       | 195 +++++++++++++-----------------
 rev03-KiCad/rev02_24.sch       |  81 ++++---------
 rev03-KiCad/rev02_25.sch       |  79 ++++---------
 sym-lib-table.template         |   3 +
 33 files changed, 795 insertions(+), 1867 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee9856f..0475efb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@ altium2kicad
 altium2kicad?*
 hardware
 rev03-KiCad/Cryptech Alpha.kicad_pcb.*
+rev03-KiCad/Cryptech Alpha.pro
+rev03-KiCad/Cryptech Alpha.sch
+rev03-KiCad/sym-lib-table
 .idea
 rev03-KiCad/wrlshp
 rev03-KiCad?*
diff --git a/Cryptech Alpha.pro.template b/Cryptech Alpha.pro.template
index 186610e..3c93a1f 100644
--- a/Cryptech Alpha.pro.template	
+++ b/Cryptech Alpha.pro.template	
@@ -1,4 +1,4 @@
-update=ons 25 apr 2018 10:29:32
+update=ons  9 maj 2018 10:36:52
 version=1
 last_client=kicad
 [pcbnew]
@@ -23,11 +23,8 @@ ModuleOutlineThickness=0.150000000000
 [cvpcb]
 version=1
 NetIExt=net
+[general]
+version=1
 [eeschema]
 version=1
 LibDir=
-[eeschema/libraries]
-LibName1=Cryptech_Alpha
-LibName2=power
-[general]
-version=1
diff --git a/Cryptech Alpha.sch.template b/Cryptech Alpha.sch.template
index 975a559..8964d0e 100644
--- a/Cryptech Alpha.sch.template	
+++ b/Cryptech Alpha.sch.template	
@@ -1,35 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:Cryptech Alpha
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
diff --git a/convert.sh b/convert.sh
index fb59cf7..19fd2fd 100755
--- a/convert.sh
+++ b/convert.sh
@@ -100,6 +100,10 @@ done
 # Turn some labels into global labels. All labels seem to be global in Altium?
 ../fix-labels.py rev02*sch
 
+# KiCad nightly has changed how symbols are located
+../remap-symbols.py rev02*sch
+cp ../sym-lib-table.template sym-lib-table
+
 # Segments on non-copper layer Eco2.User are not visible, and causes ERC warnings.
 # Turn them into graphical lines instead.
 sed -i -e 's/segment \(.*\)layer Eco2.User.*/gr_line \1layer Eco2.User\)\)/g' Cryptech\ Alpha.kicad_pcb
@@ -112,7 +116,7 @@ test -d ../tmp || mkdir ../tmp
 cp "Cryptech Alpha.kicad_pcb" "../tmp/Cryptech Alpha.kicad_pcb.a2k-out"
 ../fix-pcb.py "Cryptech Alpha.kicad_pcb" "Cryptech Alpha.kicad_pcb"
 mv "Cryptech Alpha.kicad_pcb.before-fix-pcb" ../tmp
-diff -u "../tmp/Cryptech Alpha.kicad_pcb.before-fix-pcb" "Cryptech Alpha.kicad_pcb" || true
+#diff -u "../tmp/Cryptech Alpha.kicad_pcb.before-fix-pcb" "Cryptech Alpha.kicad_pcb" || true
 
 echo ""
 echo "Done. The leftovers from conversion is in ${altiumdir}, and you can start KiCad like this:"
diff --git a/rev03-KiCad/Cryptech Alpha.pro b/rev03-KiCad/Cryptech Alpha.pro
deleted file mode 100644
index 186610e..0000000
--- a/rev03-KiCad/Cryptech Alpha.pro	
+++ /dev/null
@@ -1,33 +0,0 @@
-update=ons 25 apr 2018 10:29:32
-version=1
-last_client=kicad
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[eeschema]
-version=1
-LibDir=
-[eeschema/libraries]
-LibName1=Cryptech_Alpha
-LibName2=power
-[general]
-version=1
diff --git a/rev03-KiCad/Cryptech Alpha.sch b/rev03-KiCad/Cryptech Alpha.sch
deleted file mode 100644
index 975a559..0000000
--- a/rev03-KiCad/Cryptech Alpha.sch	
+++ /dev/null
@@ -1,262 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:Cryptech Alpha
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 27
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Sheet
-S 7100 6650 500  300 
-U 57D8469B
-F0 "Introduction" 60
-F1 "rev02_00.sch" 60
-$EndSheet
-$Sheet
-S 9900 850  750  400 
-U 57D84708
-F0 "Power" 60
-F1 "rev02_01.sch" 60
-$EndSheet
-$Sheet
-S 750  5200 750  400 
-U 57D8488D
-F0 "Entropy source" 60
-F1 "rev02_02.sch" 60
-$EndSheet
-$Sheet
-S 6950 3100 750  400 
-U 57D84936
-F0 "STM32 configuration" 60
-F1 "rev02_03.sch" 60
-$EndSheet
-$Sheet
-S 6950 2400 750  400 
-U 57D849FD
-F0 "STM32 power" 60
-F1 "rev02_04.sch" 60
-$EndSheet
-$Sheet
-S 8700 2400 750  400 
-U 57D84B22
-F0 "SDRAM" 60
-F1 "rev02_06.sch" 60
-$EndSheet
-$Sheet
-S 8700 3100 750  400 
-U 57D84C13
-F0 "Keystore memory" 60
-F1 "rev02_07.sch" 60
-$EndSheet
-$Sheet
-S 8700 3800 750  400 
-U 57D84C55
-F0 "Real Time Clock" 60
-F1 "rev02_08.sch" 60
-$EndSheet
-$Sheet
-S 7550 1200 750  400 
-U 57D84CB3
-F0 "User USB UART" 60
-F1 "rev02_09.sch" 60
-$EndSheet
-$Sheet
-S 6350 1200 750  400 
-U 57D84E30
-F0 "MGMT USB UART" 60
-F1 "rev02_10.sch" 60
-$EndSheet
-$Sheet
-S 5350 5250 750  450 
-U 57D84FAD
-F0 "Tamper MCU" 60
-F1 "rev02_11.sch" 60
-$EndSheet
-$Sheet
-S 5350 6100 750  400 
-U 57D8509E
-F0 "Master Key Memory" 60
-F1 "rev02_12.sch" 60
-$EndSheet
-$Sheet
-S 2100 2100 750  400 
-U 57D85134
-F0 "Config interface" 60
-F1 "rev02_13.sch" 60
-$EndSheet
-$Sheet
-S 2100 2700 750  400 
-U 57D85217
-F0 "Unused" 60
-F1 "rev02_14.sch" 60
-$EndSheet
-$Sheet
-S 650  1300 750  400 
-U 57D85260
-F0 "Config memory" 60
-F1 "rev02_15.sch" 60
-$EndSheet
-$Sheet
-S 2100 3350 750  400 
-U 57D85319
-F0 "Unused banks" 60
-F1 "rev02_16.sch" 60
-$EndSheet
-$Sheet
-S 4900 3350 750  400 
-U 57D85338
-F0 "FMC interface" 60
-F1 "rev02_17.sch" 60
-$EndSheet
-$Sheet
-S 6950 3800 750  400 
-U 57D85391
-F0 "STM32 IO" 60
-F1 "rev02_05.sch" 60
-$EndSheet
-$Sheet
-S 9900 2100 750  400 
-U 57D853B0
-F0 "Power: 1V8 3V3" 60
-F1 "rev02_18.sch" 60
-$EndSheet
-$Sheet
-S 2100 4050 750  400 
-U 57D854CB
-F0 "GPIO" 60
-F1 "rev02_19.sch" 60
-$EndSheet
-$Sheet
-S 4900 4050 750  400 
-U 57D8556F
-F0 "MKM interface" 60
-F1 "rev02_20.sch" 60
-$EndSheet
-$Sheet
-S 3500 4050 750  400 
-U 57D8559C
-F0 "PWR and GND" 60
-F1 "rev02_21.sch" 60
-$EndSheet
-$Sheet
-S 3500 2700 750  400 
-U 57D855DE
-F0 "Core and AUX bypass" 60
-F1 "rev02_22.sch" 60
-$EndSheet
-$Sheet
-S 3500 3350 750  400 
-U 57D8583B
-F0 "VCCO bypass" 60
-F1 "rev02_23.sch" 60
-$EndSheet
-$Sheet
-S 9900 1500 750  400 
-U 57D85A75
-F0 "Power: 1V0" 60
-F1 "rev02_24.sch" 60
-$EndSheet
-$Sheet
-S 3500 2100 750  400 
-U 57D85B19
-F0 "Power sequencing" 60
-F1 "rev02_25.sch" 60
-$EndSheet
-Wire Notes Line
-	6400 2200 6400 4400
-Wire Notes Line
-	6400 4400 8300 4400
-Wire Notes Line
-	8300 4400 8300 2200
-Wire Notes Line
-	8300 2200 6400 2200
-Text Notes 6450 2350 0    98   ~ 20
-STM32
-Wire Wire Line
-	8700 3300 8300 3300
-Wire Wire Line
-	8700 4000 8300 4000
-Wire Wire Line
-	7950 1700 7950 2200
-Wire Wire Line
-	6750 1700 6750 2200
-Wire Bus Line
-	8200 2600 8700 2600
-Text Label 8350 2600 0    60   ~ 0
-FMC
-Wire Notes Line
-	1950 1800 1950 4700
-Wire Notes Line
-	1950 4700 6000 4700
-Wire Notes Line
-	6000 4700 6000 1800
-Wire Notes Line
-	6000 1800 1950 1800
-Text Notes 2050 1950 0    98   ~ 20
-FPGA
-Wire Wire Line
-	1400 1500 1650 1500
-Wire Wire Line
-	1650 1500 1650 2300
-Wire Wire Line
-	1650 2300 2100 2300
-Wire Wire Line
-	1500 5400 3150 5400
-Wire Wire Line
-	3150 5400 3150 4700
-Wire Wire Line
-	5200 4550 5200 5450
-Wire Wire Line
-	5200 5450 5350 5450
-Wire Wire Line
-	5700 5800 5700 6000
-Wire Bus Line
-	8200 2600 8200 4000
-Wire Bus Line
-	8200 4000 7700 4000
-Wire Bus Line
-	5650 3550 6500 3550
-Wire Bus Line
-	6500 3550 6500 4000
-Wire Bus Line
-	6500 4000 6950 4000
-Text Label 6100 3550 0    60   ~ 0
-FMC
-$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_00.sch b/rev03-KiCad/rev02_00.sch
index c1f940c..0622457 100644
--- a/rev03-KiCad/rev02_00.sch
+++ b/rev03-KiCad/rev02_00.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -45,7 +16,7 @@ $EndDescr
 Text Notes 1500 7500 0    168   ~ 12
 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 OSHW-LOGOL-COPPER LOGO1
+L Cryptech_Alpha:OSHW-LOGOL-COPPER LOGO1
 U 1 1 580240DE
 P 11840 10320
 F 0 "LOGO1" H 11388 9865 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_01.sch b/rev03-KiCad/rev02_01.sch
index cd86c54..a635c2d 100644
--- a/rev03-KiCad/rev02_01.sch
+++ b/rev03-KiCad/rev02_01.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -99,7 +70,7 @@ JP2
 Text Notes 8350 2930 2    60   ~ 12
 JP1Q
 $Comp
-L GND #PWR?580240DD
+L power:GND GND
 U 1 1 580240DD
 P 2500 3700
 F 0 "GND" H 2500 3700 20  0000 C CNN
@@ -110,7 +81,7 @@ F 3 "" H 2500 3700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240DC
+L power:GND GND_2
 U 1 1 580240DC
 P 10600 3800
 F 0 "GND_2" H 10600 3800 20  0000 C CNN
@@ -121,7 +92,7 @@ F 3 "" H 10600 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240DB
+L power:GND GND_3
 U 1 1 580240DB
 P 12000 3800
 F 0 "GND_3" H 12000 3800 20  0000 C CNN
@@ -132,7 +103,7 @@ F 3 "" H 12000 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240DA
+L power:GND GND_4
 U 1 1 580240DA
 P 12500 3800
 F 0 "GND_4" H 12500 3800 20  0000 C CNN
@@ -143,7 +114,7 @@ F 3 "" H 12500 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_18V #PWR?580240D9
+L Cryptech_Alpha:PWR_18V PWR_18V
 U 1 1 580240D9
 P 2500 3000
 F 0 "PWR_18V" H 2500 3000 20  0000 C CNN
@@ -154,7 +125,7 @@ F 3 "" H 2500 3000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_18V #PWR?580240D8
+L Cryptech_Alpha:PWR_18V PWR_18V_2
 U 1 1 580240D8
 P 10100 2500
 F 0 "PWR_18V_2" H 10100 2500 20  0000 C CNN
@@ -165,7 +136,7 @@ F 3 "" H 10100 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 15V_STABLE #PWR?580240D7
+L Cryptech_Alpha:15V_STABLE 15V_STABLE
 U 1 1 580240D7
 P 12800 2500
 F 0 "15V_STABLE" H 12800 2500 20  0000 C CNN
@@ -176,7 +147,7 @@ F 3 "" H 12800 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240D6
+L power:GND GND_5
 U 1 1 580240D6
 P 7700 8800
 F 0 "GND_5" H 7700 8800 20  0000 C CNN
@@ -187,7 +158,7 @@ F 3 "" H 7700 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240D5
+L power:GND GND_6
 U 1 1 580240D5
 P 7900 8800
 F 0 "GND_6" H 7900 8800 20  0000 C CNN
@@ -198,7 +169,7 @@ F 3 "" H 7900 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240D4
+L power:GND GND_7
 U 1 1 580240D4
 P 6700 8800
 F 0 "GND_7" H 6700 8800 20  0000 C CNN
@@ -209,7 +180,7 @@ F 3 "" H 6700 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240D3
+L power:GND GND_8
 U 1 1 580240D3
 P 5600 7800
 F 0 "GND_8" H 5600 7800 20  0000 C CNN
@@ -220,7 +191,7 @@ F 3 "" H 5600 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240D2
+L power:GND GND_9
 U 1 1 580240D2
 P 5000 7800
 F 0 "GND_9" H 5000 7800 20  0000 C CNN
@@ -231,7 +202,7 @@ F 3 "" H 5000 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240D1
+L power:GND GND_10
 U 1 1 580240D1
 P 4400 7800
 F 0 "GND_10" H 4400 7800 20  0000 C CNN
@@ -242,7 +213,7 @@ F 3 "" H 4400 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240D0
+L power:GND GND_11
 U 1 1 580240D0
 P 4000 7800
 F 0 "GND_11" H 4000 7800 20  0000 C CNN
@@ -253,7 +224,7 @@ F 3 "" H 4000 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240CF
+L power:GND GND_12
 U 1 1 580240CF
 P 3600 7800
 F 0 "GND_12" H 3600 7800 20  0000 C CNN
@@ -264,7 +235,7 @@ F 3 "" H 3600 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240CE
+L power:GND GND_13
 U 1 1 580240CE
 P 9200 8000
 F 0 "GND_13" H 9200 8000 20  0000 C CNN
@@ -275,7 +246,7 @@ F 3 "" H 9200 8000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240CD
+L power:GND GND_14
 U 1 1 580240CD
 P 9600 7300
 F 0 "GND_14" H 9600 7300 20  0000 C CNN
@@ -286,7 +257,7 @@ F 3 "" H 9600 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240CC
+L power:GND GND_15
 U 1 1 580240CC
 P 10200 7300
 F 0 "GND_15" H 10200 7300 20  0000 C CNN
@@ -297,7 +268,7 @@ F 3 "" H 10200 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240CB
+L power:GND GND_16
 U 1 1 580240CB
 P 10800 7300
 F 0 "GND_16" H 10800 7300 20  0000 C CNN
@@ -308,7 +279,7 @@ F 3 "" H 10800 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240CA
+L power:GND GND_17
 U 1 1 580240CA
 P 11400 7300
 F 0 "GND_17" H 11400 7300 20  0000 C CNN
@@ -319,7 +290,7 @@ F 3 "" H 11400 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_18V #PWR?580240C9
+L Cryptech_Alpha:PWR_18V PWR_18V_3
 U 1 1 580240C9
 P 3400 6300
 F 0 "PWR_18V_3" H 3400 6300 20  0000 C CNN
@@ -330,7 +301,7 @@ F 3 "" H 3400 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_18V #PWR?580240C8
+L Cryptech_Alpha:PWR_18V PWR_18V_4
 U 1 1 580240C8
 P 8700 2500
 F 0 "PWR_18V_4" H 8700 2500 20  0000 C CNN
@@ -341,7 +312,7 @@ F 3 "" H 8700 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240C7
+L power:GND GND_18
 U 1 1 580240C7
 P 6900 4350
 F 0 "GND_18" H 6900 4350 20  0000 C CNN
@@ -352,7 +323,7 @@ F 3 "" H 6900 4350 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240C6
+L power:GND GND_19
 U 1 1 580240C6
 P 7700 4350
 F 0 "GND_19" H 7700 4350 20  0000 C CNN
@@ -363,7 +334,7 @@ F 3 "" H 7700 4350 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240C5
+L power:GND GND_20
 U 1 1 580240C5
 P 10100 3800
 F 0 "GND_20" H 10100 3800 20  0000 C CNN
@@ -584,7 +555,7 @@ Connection ~ 8700 6600
 Connection ~ 10600 3600
 Connection ~ 10600 3500
 $Comp
-L C-EUC0402 C11
+L Cryptech_Alpha:C-EUC0402 C11
 U 1 1 580240C4
 P 12000 3000
 F 0 "C11" H 11900 3000 60  0000 R TNN
@@ -595,7 +566,7 @@ F 3 "" H 11900 3100 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C6
+L Cryptech_Alpha:C-EUC0402 C6
 U 1 1 580240C3
 P 9600 6900
 F 0 "C6" H 9680 6710 60  0000 L BNN
@@ -604,7 +575,7 @@ F 0 "C6" H 9680 6710 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 9680 6710 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C4
+L Cryptech_Alpha:C-EUC0402 C4
 U 1 1 580240C2
 P 5000 7200
 F 0 "C4" H 5080 7010 60  0000 L BNN
@@ -613,7 +584,7 @@ F 0 "C4" H 5080 7010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5080 7010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C2
+L Cryptech_Alpha:C-EUC1210 C2
 U 1 1 580240C1
 P 4000 7200
 F 0 "C2" H 4080 7010 60  0000 L BNN
@@ -622,7 +593,7 @@ F 0 "C2" H 4080 7010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 4080 7010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C3
+L Cryptech_Alpha:C-EUC1210 C3
 U 1 1 580240C0
 P 4400 7200
 F 0 "C3" H 4480 7010 60  0000 L BNN
@@ -631,7 +602,7 @@ F 0 "C3" H 4480 7010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 4480 7010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C8
+L Cryptech_Alpha:C-EUC1210 C8
 U 1 1 580240BF
 P 10200 6900
 F 0 "C8" H 10280 6710 60  0000 L BNN
@@ -640,7 +611,7 @@ F 0 "C8" H 10280 6710 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 10280 6710 60  0001 C CNN
 $EndComp
 $Comp
-L 2N7002 Q1
+L Cryptech_Alpha:2N7002 Q1
 U 1 1 580240BE
 P 7300 3450
 F 0 "Q1" H 7190 3195 60  0000 L BNN
@@ -651,7 +622,7 @@ F 3 "" H 7100 3600 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R6
+L Cryptech_Alpha:R-EU_R0402 R6
 U 1 1 580240BD
 P 6900 3950
 F 0 "R6" V 6990 3995 60  0000 L BNN
@@ -662,7 +633,7 @@ F 3 "" H 6900 3890 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L R-EU_R0402 R5
+L Cryptech_Alpha:R-EU_R0402 R5
 U 1 1 580240BC
 P 6500 3550
 F 0 "R5" H 6350 3600 60  0000 L BNN
@@ -673,7 +644,7 @@ F 3 "" H 6500 3600 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L JP1Q JP2
+L Cryptech_Alpha:JP1Q JP2
 U 1 1 580240BB
 P 8150 3100
 F 0 "JP2" V 7945 3330 60  0000 R TNN
@@ -682,7 +653,7 @@ F 0 "JP2" V 7945 3330 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:PLS-2" H 7945 3330 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C7
+L Cryptech_Alpha:C-EUC0603 C7
 U 1 1 580240BA
 P 10100 3500
 F 0 "C7" H 10200 3400 60  0000 L BNN
@@ -693,7 +664,7 @@ F 3 "" H 10200 3300 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0603 C13
+L Cryptech_Alpha:C-EUC0603 C13
 U 1 1 580240B9
 P 12500 3300
 F 0 "C13" H 12600 3200 60  0000 L BNN
@@ -704,7 +675,7 @@ F 3 "" H 12600 3100 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L LT3060ITS8-15 U2
+L Cryptech_Alpha:LT3060ITS8-15 U2
 U 1 1 580240B8
 P 11300 3100
 F 0 "U2" H 10890 3510 60  0000 L BNN
@@ -715,7 +686,7 @@ F 3 "" H 10890 2390 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L LMZ13608 U1
+L Cryptech_Alpha:LMZ13608 U1
 U 1 1 580240B7
 P 7800 7300
 F 0 "U1" H 7090 8210 60  0000 L BNN
@@ -726,7 +697,7 @@ F 3 "" H 7300 8200 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C5
+L Cryptech_Alpha:C-EUC0402 C5
 U 1 1 580240B6
 P 6700 8400
 F 0 "C5" H 6800 8350 60  0000 L BNN
@@ -735,7 +706,7 @@ F 0 "C5" H 6800 8350 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6800 8350 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C12
+L Cryptech_Alpha:C-EUC0402 C12
 U 1 1 580240B5
 P 12000 3600
 F 0 "C12" H 11900 3600 60  0000 R TNN
@@ -746,7 +717,7 @@ F 3 "" H 11900 3700 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L POWER_JACKSMD JP1
+L Cryptech_Alpha:POWER_JACKSMD JP1
 U 1 1 580240B4
 P 1700 3600
 F 0 "JP1" H 1290 3930 60  0000 L BNN
@@ -757,7 +728,7 @@ F 3 "" H 1290 3570 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L CP_E-035X080 C9
+L Cryptech_Alpha:CP_E-035X080 C9
 U 1 1 580240B3
 P 10800 7000
 F 0 "C9" V 10825 6875 60  0000 R TNN
@@ -768,7 +739,7 @@ F 3 "" H 10710 6907 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L CP_E-035X080 C10
+L Cryptech_Alpha:CP_E-035X080 C10
 U 1 1 580240B2
 P 11400 7000
 F 0 "C10" V 11425 6875 60  0000 R TNN
@@ -779,7 +750,7 @@ F 3 "" H 11310 6907 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R7
+L Cryptech_Alpha:R-EU_R0402 R7
 U 1 1 580240B1
 P 8700 2800
 F 0 "R7" V 8790 2845 60  0000 L BNN
@@ -790,7 +761,7 @@ F 3 "" H 8750 2900 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L R-EU_R0402 R3
+L Cryptech_Alpha:R-EU_R0402 R3
 U 1 1 580240B0
 P 6100 7200
 F 0 "R3" H 5990 7055 60  0000 L BNN
@@ -801,7 +772,7 @@ F 3 "" H 6100 7250 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R2
+L Cryptech_Alpha:R-EU_R0402 R2
 U 1 1 580240AF
 P 5600 7500
 F 0 "R2" V 5700 7380 60  0000 R TNN
@@ -812,7 +783,7 @@ F 3 "" H 5600 7400 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R1
+L Cryptech_Alpha:R-EU_R0402 R1
 U 1 1 580240AE
 P 5600 6900
 F 0 "R1" V 5700 6800 60  0000 R TNN
@@ -823,7 +794,7 @@ F 3 "" H 5600 6800 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC1210 C1
+L Cryptech_Alpha:C-EUC1210 C1
 U 1 1 580240AD
 P 3600 7200
 F 0 "C1" H 3680 7010 60  0000 L BNN
@@ -832,7 +803,7 @@ F 0 "C1" H 3680 7010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 3680 7010 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R8
+L Cryptech_Alpha:R-EU_R0402 R8
 U 1 1 580240AC
 P 9200 7000
 F 0 "R8" H 9050 7059 60  0000 R TNN
@@ -843,7 +814,7 @@ F 3 "" H 9210 7070 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R9
+L Cryptech_Alpha:R-EU_R0402 R9
 U 1 1 580240AB
 P 9200 7700
 F 0 "R9" H 9050 7759 60  0000 R TNN
diff --git a/rev03-KiCad/rev02_02.sch b/rev03-KiCad/rev02_02.sch
index 98972af..b15c91e 100644
--- a/rev03-KiCad/rev02_02.sch
+++ b/rev03-KiCad/rev02_02.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -61,7 +32,7 @@ U3
 Text Notes 11790 5790 0    60   ~ 12
 MC74HC1G14DTT1G
 $Comp
-L VCCO_3V3 #PWR?580240AA
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3
 U 1 1 580240AA
 P 11400 4100
 F 0 "VCCO_3V3" H 11400 4100 20  0000 C CNN
@@ -72,7 +43,7 @@ F 3 "" H 11400 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240A9
+L power:GND GND_21
 U 1 1 580240A9
 P 5050 6550
 F 0 "GND_21" H 5050 6550 20  0000 C CNN
@@ -83,7 +54,7 @@ F 3 "" H 5050 6550 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?580240A8
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_2
 U 1 1 580240A8
 P 8800 4100
 F 0 "VCCO_3V3_2" H 8800 4100 20  0000 C CNN
@@ -94,7 +65,7 @@ F 3 "" H 8800 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 15V_STABLE #PWR?580240A7
+L Cryptech_Alpha:15V_STABLE 15V_STABLE_2
 U 1 1 580240A7
 P 5050 4350
 F 0 "15V_STABLE_2" H 5050 4350 20  0000 C CNN
@@ -221,7 +192,7 @@ Wire Wire Line
 Wire Wire Line
 	3150 5750 3150 4950
 $Comp
-L GND #PWR?580240A6
+L power:GND GND_22
 U 1 1 580240A6
 P 3150 5750
 F 0 "GND_22" H 3150 5750 20  0000 C CNN
@@ -232,7 +203,7 @@ F 3 "" H 3150 5750 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240A5
+L power:GND GND_23
 U 1 1 580240A5
 P 8800 5700
 F 0 "GND_23" H 8800 5700 20  0000 C CNN
@@ -243,7 +214,7 @@ F 3 "" H 8800 5700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?580240A4
+L power:GND GND_24
 U 1 1 580240A4
 P 11400 5900
 F 0 "GND_24" H 11400 5900 20  0000 C CNN
@@ -254,7 +225,7 @@ F 3 "" H 11400 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C-EUC0603 C16
+L Cryptech_Alpha:C-EUC0603 C16
 U 1 1 580240A3
 P 11100 5300
 F 0 "C16" H 11500 5260 60  0000 R TNN
@@ -265,7 +236,7 @@ F 3 "" H 11510 5350 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L WE-SHC S1
+L Cryptech_Alpha:WE-SHC S1
 U 1 1 580240A2
 P 3600 5050
 F 0 "S1" H 3300 5500 60  0000 L BNN
@@ -276,7 +247,7 @@ F 3 "" H 3600 5450 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L BC818*SMD Q2
+L Cryptech_Alpha:BC818*SMD Q2
 U 1 1 580240A1
 P 4350 6000
 F 0 "Q2" H 4420 5680 60  0000 R TNN
@@ -287,7 +258,7 @@ F 3 "" H 4420 5780 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L BC818*SMD T1
+L Cryptech_Alpha:BC818*SMD T1
 U 1 1 580240A0
 P 4950 6000
 F 0 "T1" H 5200 6250 60  0000 R TNN
@@ -298,7 +269,7 @@ F 3 "" H 5620 6150 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L BC818*SMD T2
+L Cryptech_Alpha:BC818*SMD T2
 U 1 1 5802409F
 P 8700 5400
 F 0 "T2" H 8950 5650 60  0000 R TNN
@@ -309,7 +280,7 @@ F 3 "" H 9370 5550 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L TPB1,27 TP1
+L Cryptech_Alpha:TPB1,27 TP1
 U 1 1 5802409E
 P 5350 5200
 F 0 "TP1" H 5250 4900 60  0000 L BNN
@@ -318,7 +289,7 @@ F 0 "TP1" H 5250 4900 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:B1,27" H 5250 4900 60  0001 C CNN
 $EndComp
 $Comp
-L TPB1,27 TP2
+L Cryptech_Alpha:TPB1,27 TP2
 U 1 1 5802409D
 P 9300 4800
 F 0 "TP2" H 9200 4500 60  0000 L BNN
@@ -327,7 +298,7 @@ F 0 "TP2" H 9200 4500 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:B1,27" H 9200 4500 60  0001 C CNN
 $EndComp
 $Comp
-L MC74HC1G14DTT1G U3
+L Cryptech_Alpha:MC74HC1G14DTT1G U3
 U 1 1 5802409C
 P 12200 5000
 F 0 "U3" H 11670 4270 60  0000 L BNN
@@ -336,7 +307,7 @@ F 0 "U3" H 11670 4270 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23-5" H 11670 4270 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C14
+L Cryptech_Alpha:C-EUC0603 C14
 U 1 1 5802409B
 P 3950 6400
 F 0 "C14" H 4400 6300 60  0000 R TNN
@@ -347,7 +318,7 @@ F 3 "" H 4410 6420 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R10
+L Cryptech_Alpha:R-EU_R0402 R10
 U 1 1 5802409A
 P 4650 5400
 F 0 "R10" H 4797 5270 60  0000 R TNN
@@ -358,7 +329,7 @@ F 3 "" H 4800 5350 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R11
+L Cryptech_Alpha:R-EU_R0402 R11
 U 1 1 58024099
 P 5050 5100
 F 0 "R11" V 4950 5250 60  0000 L BNN
@@ -369,7 +340,7 @@ F 3 "" H 5060 5240 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L C-EUC0603 C15
+L Cryptech_Alpha:C-EUC0603 C15
 U 1 1 58024098
 P 7800 5400
 F 0 "C15" V 7600 5500 60  0000 R TNN
@@ -380,7 +351,7 @@ F 3 "" H 7510 5500 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R12
+L Cryptech_Alpha:R-EU_R0402 R12
 U 1 1 58024097
 P 8500 5000
 F 0 "R12" H 8270 4850 60  0000 L BNN
@@ -391,7 +362,7 @@ F 3 "" H 8470 4850 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R13
+L Cryptech_Alpha:R-EU_R0402 R13
 U 1 1 58024096
 P 8800 4400
 F 0 "R13" V 8800 4300 60  0000 R TNN
@@ -402,7 +373,7 @@ F 3 "" H 8710 4310 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L BAT54 D1
+L Cryptech_Alpha:BAT54 D1
 U 1 1 58024095
 P 8500 4700
 F 0 "D1" H 8410 4775 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_03.sch b/rev03-KiCad/rev02_03.sch
index bf87659..b50d6aa 100644
--- a/rev03-KiCad/rev02_03.sch
+++ b/rev03-KiCad/rev02_03.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -69,7 +40,7 @@ XTAL-4-3225
 Text Notes 3100 5000 0    60   ~ 12
 Gnd
 $Comp
-L GND #PWR?58024094
+L power:GND GND_25
 U 1 1 58024094
 P 2400 5100
 F 0 "GND_25" H 2400 5100 20  0000 C CNN
@@ -80,7 +51,7 @@ F 3 "" H 2400 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024093
+L power:GND GND_26
 U 1 1 58024093
 P 4000 5100
 F 0 "GND_26" H 4000 5100 20  0000 C CNN
@@ -91,7 +62,7 @@ F 3 "" H 4000 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024092
+L power:GND GND_27
 U 1 1 58024092
 P 6440 6300
 F 0 "GND_27" H 6440 6300 20  0000 C CNN
@@ -102,7 +73,7 @@ F 3 "" H 6440 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024091
+L power:GND GND_28
 U 1 1 58024091
 P 12860 4800
 F 0 "GND_28" H 12860 4800 20  0000 C CNN
@@ -113,7 +84,7 @@ F 3 "" H 12860 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024090
+L power:GND GND_29
 U 1 1 58024090
 P 12100 4800
 F 0 "GND_29" H 12100 4800 20  0000 C CNN
@@ -124,7 +95,7 @@ F 3 "" H 12100 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?5802408F
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_3
 U 1 1 5802408F
 P 11800 3500
 F 0 "VCCO_3V3_3" H 11800 3500 20  0000 C CNN
@@ -135,7 +106,7 @@ F 3 "" H 11800 3500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?5802408E
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_4
 U 1 1 5802408E
 P 6500 3600
 F 0 "VCCO_3V3_4" H 6500 3600 20  0000 C CNN
@@ -146,7 +117,7 @@ F 3 "" H 6500 3600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802408D
+L power:GND GND_30
 U 1 1 5802408D
 P 13700 6900
 F 0 "GND_30" H 13700 6900 20  0000 C CNN
@@ -157,7 +128,7 @@ F 3 "" H 13700 6900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802408C
+L power:GND GND_31
 U 1 1 5802408C
 P 3000 5100
 F 0 "GND_31" H 3000 5100 20  0000 C CNN
@@ -168,7 +139,7 @@ F 3 "" H 3000 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802408B
+L power:GND GND_32
 U 1 1 5802408B
 P 3400 5100
 F 0 "GND_32" H 3400 5100 20  0000 C CNN
@@ -179,7 +150,7 @@ F 3 "" H 3400 5100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802408A
+L power:GND GND_33
 U 1 1 5802408A
 P 11800 4800
 F 0 "GND_33" H 11800 4800 20  0000 C CNN
@@ -328,7 +299,7 @@ Wire Wire Line
 Connection ~ 11800 3830
 Connection ~ 12860 4230
 $Comp
-L C-EUC0402 C18
+L Cryptech_Alpha:C-EUC0402 C18
 U 1 1 58024089
 P 4000 4900
 F 0 "C18" H 3900 4800 60  0000 R TNN
@@ -339,7 +310,7 @@ F 3 "" H 3880 4890 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L XTAL-4-3225 Q3
+L Cryptech_Alpha:XTAL-4-3225 Q3
 U 1 1 58024088
 P 3200 4700
 F 0 "Q3" H 3090 4270 60  0000 L BNN
@@ -350,7 +321,7 @@ F 3 "" H 2730 4930 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C19
+L Cryptech_Alpha:C-EUC0402 C19
 U 1 1 58024087
 P 11800 4100
 F 0 "C19" H 11350 4150 60  0000 L BNN
@@ -361,7 +332,7 @@ F 3 "" H 11340 4050 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L STM32F429BIT6_2 U4
+L Cryptech_Alpha:STM32F429BIT6_2 U4
 U 1 1 58024086
 P 8000 4900
 F 0 "U4" H 6890 3890 60  0000 L BNN
@@ -370,7 +341,7 @@ F 0 "U4" H 6890 3890 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TSQFP50P3000X3000X160-208N" H 6890 3890 60  0001 C CNN
 $EndComp
 $Comp
-L STM32-SWD J1
+L Cryptech_Alpha:STM32-SWD J1
 U 1 1 58024085
 P 13440 4130
 F 0 "J1" H 13588 3700 60  0000 R TNN
@@ -379,7 +350,7 @@ F 0 "J1" H 13588 3700 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:PLS-6" H 13588 3700 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R93
+L Cryptech_Alpha:R-EU_R0402 R93
 U 1 1 58024084
 P 12800 6500
 F 0 "R93" H 12890 6320 60  0000 R TNN
@@ -390,7 +361,7 @@ F 3 "" H 12900 6410 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R92
+L Cryptech_Alpha:R-EU_R0402 R92
 U 1 1 58024083
 P 12490 6600
 F 0 "R92" H 12620 6320 60  0000 R TNN
@@ -401,7 +372,7 @@ F 3 "" H 12630 6410 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R16
+L Cryptech_Alpha:R-EU_R0402 R16
 U 1 1 58024082
 P 12800 6700
 F 0 "R16" H 12480 6310 60  0000 R TNN
@@ -412,7 +383,7 @@ F 3 "" H 12490 6400 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R94
+L Cryptech_Alpha:R-EU_R0402 R94
 U 1 1 58024081
 P 12490 6800
 F 0 "R94" H 12580 6970 60  0000 R TNN
@@ -423,7 +394,7 @@ F 3 "" H 12590 7060 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C17
+L Cryptech_Alpha:C-EUC0402 C17
 U 1 1 58024080
 P 2400 4900
 F 0 "C17" H 2800 4800 60  0000 R TNN
@@ -434,7 +405,7 @@ F 3 "" H 2800 4900 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R15
+L Cryptech_Alpha:R-EU_R0402 R15
 U 1 1 5802407F
 P 6440 6000
 F 0 "R15" V 6350 5955 60  0000 R TNN
@@ -445,7 +416,7 @@ F 3 "" H 6380 5880 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC0402 C20
+L Cryptech_Alpha:C-EUC0402 C20
 U 1 1 5802407E
 P 12860 4600
 F 0 "C20" H 12410 4650 60  0000 L BNN
@@ -456,7 +427,7 @@ F 3 "" H 12410 4550 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R14
+L Cryptech_Alpha:R-EU_R0402 R14
 U 1 1 5802407D
 P 2700 5100
 F 0 "R14" V 2610 5055 60  0000 R TNN
@@ -467,7 +438,7 @@ F 3 "" H 2640 5230 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED3
+L Cryptech_Alpha:LEDCHIP-LED0603 LED3
 U 1 1 5802407C
 P 13400 6500
 F 0 "LED3" V 13370 6067 60  0000 R TNN
@@ -478,7 +449,7 @@ F 3 "" H 13350 5460 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED1
+L Cryptech_Alpha:LEDCHIP-LED0603 LED1
 U 1 1 5802407B
 P 13200 6600
 F 0 "LED1" V 13170 5967 60  0000 R TNN
@@ -489,7 +460,7 @@ F 3 "" H 13160 5360 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED4
+L Cryptech_Alpha:LEDCHIP-LED0603 LED4
 U 1 1 5802407A
 P 13400 6700
 F 0 "LED4" V 13370 6267 60  0000 R TNN
@@ -500,7 +471,7 @@ F 3 "" H 13355 5666 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED2
+L Cryptech_Alpha:LEDCHIP-LED0603 LED2
 U 1 1 58024079
 P 13200 6800
 F 0 "LED2" V 13170 6167 60  0000 R TNN
diff --git a/rev03-KiCad/rev02_04.sch b/rev03-KiCad/rev02_04.sch
index d145b68..c3ffe41 100644
--- a/rev03-KiCad/rev02_04.sch
+++ b/rev03-KiCad/rev02_04.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -53,7 +24,7 @@ Power and bypass capacitors, STM32
 Text Notes 13930 10220 0    84   ~ 12
 ARM power
 $Comp
-L GND #PWR?58024078
+L power:GND GND_34
 U 1 1 58024078
 P 10100 6300
 F 0 "GND_34" H 10100 6300 20  0000 C CNN
@@ -64,7 +35,7 @@ F 3 "" H 10100 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58024077
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_5
 U 1 1 58024077
 P 10100 5400
 F 0 "VCCO_3V3_5" H 10100 5400 20  0000 C CNN
@@ -75,7 +46,7 @@ F 3 "" H 10100 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58024076
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_6
 U 1 1 58024076
 P 12200 4850
 F 0 "VCCO_3V3_6" H 12200 4850 20  0000 C CNN
@@ -86,7 +57,7 @@ F 3 "" H 12200 4850 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024075
+L power:GND GND_35
 U 1 1 58024075
 P 12200 6300
 F 0 "GND_35" H 12200 6300 20  0000 C CNN
@@ -97,7 +68,7 @@ F 3 "" H 12200 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024074
+L power:GND GND_36
 U 1 1 58024074
 P 2400 7200
 F 0 "GND_36" H 2400 7200 20  0000 C CNN
@@ -108,7 +79,7 @@ F 3 "" H 2400 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58024073
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_7
 U 1 1 58024073
 P 2300 4250
 F 0 "VCCO_3V3_7" H 2300 4250 20  0000 C CNN
@@ -119,7 +90,7 @@ F 3 "" H 2300 4250 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024072
+L power:GND GND_37
 U 1 1 58024072
 P 4400 7200
 F 0 "GND_37" H 4400 7200 20  0000 C CNN
@@ -130,7 +101,7 @@ F 3 "" H 4400 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024071
+L power:GND GND_38
 U 1 1 58024071
 P 7600 6200
 F 0 "GND_38" H 7600 6200 20  0000 C CNN
@@ -141,7 +112,7 @@ F 3 "" H 7600 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024070
+L power:GND GND_39
 U 1 1 58024070
 P 6300 6200
 F 0 "GND_39" H 6300 6200 20  0000 C CNN
@@ -152,7 +123,7 @@ F 3 "" H 6300 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?5802406F
+L Cryptech_Alpha:3V3_BATT 3V3_BATT
 U 1 1 5802406F
 P 2600 3500
 F 0 "3V3_BATT" H 2600 3500 20  0000 C CNN
@@ -461,7 +432,7 @@ Wire Wire Line
 Wire Wire Line
 	2300 4250 2300 4500
 $Comp
-L C-EUC0805 C26
+L Cryptech_Alpha:C-EUC0805 C26
 U 1 1 5802406E
 P 9900 5800
 F 0 "C26" H 9510 5780 60  0000 L BNN
@@ -472,7 +443,7 @@ F 3 "" H 9500 5680 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C31
+L Cryptech_Alpha:C-EUC0402 C31
 U 1 1 5802406D
 P 12600 5300
 F 0 "C31" H 12520 5490 60  0000 L BNN
@@ -483,7 +454,7 @@ F 3 "" H 12480 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C32
+L Cryptech_Alpha:C-EUC0402 C32
 U 1 1 5802406C
 P 12600 5800
 F 0 "C32" H 12550 5990 60  0000 L BNN
@@ -494,7 +465,7 @@ F 3 "" H 12960 5930 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C30
+L Cryptech_Alpha:C-EUC0402 C30
 U 1 1 5802406B
 P 12400 5800
 F 0 "C30" H 12300 5500 60  0000 L BNN
@@ -505,7 +476,7 @@ F 3 "" H 12240 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C29
+L Cryptech_Alpha:C-EUC0402 C29
 U 1 1 5802406A
 P 12400 5300
 F 0 "C29" H 12250 5490 60  0000 L BNN
@@ -516,7 +487,7 @@ F 3 "" H 12240 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C28
+L Cryptech_Alpha:C-EUC0402 C28
 U 1 1 58024069
 P 12200 5300
 F 0 "C28" H 11880 5330 60  0000 L BNN
@@ -527,7 +498,7 @@ F 3 "" H 11870 5210 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C46
+L Cryptech_Alpha:C-EUC0402 C46
 U 1 1 58024068
 P 14000 5800
 F 0 "C46" H 14110 5790 60  0000 L BNN
@@ -538,7 +509,7 @@ F 3 "" H 14120 5690 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C44
+L Cryptech_Alpha:C-EUC0402 C44
 U 1 1 58024067
 P 13800 5800
 F 0 "C44" H 13760 5490 60  0000 L BNN
@@ -549,7 +520,7 @@ F 3 "" H 13760 5400 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C42
+L Cryptech_Alpha:C-EUC0402 C42
 U 1 1 58024066
 P 13600 5800
 F 0 "C42" H 13540 5510 60  0000 L BNN
@@ -560,7 +531,7 @@ F 3 "" H 13530 5420 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C40
+L Cryptech_Alpha:C-EUC0402 C40
 U 1 1 58024065
 P 13400 5800
 F 0 "C40" H 13330 5490 60  0000 L BNN
@@ -571,7 +542,7 @@ F 3 "" H 13290 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C38
+L Cryptech_Alpha:C-EUC0402 C38
 U 1 1 58024064
 P 13200 5800
 F 0 "C38" H 13150 5350 60  0000 L BNN
@@ -582,7 +553,7 @@ F 3 "" H 13110 5260 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0805 C27
+L Cryptech_Alpha:C-EUC0805 C27
 U 1 1 58024063
 P 10300 5800
 F 0 "C27" H 10390 5800 60  0000 L BNN
@@ -593,7 +564,7 @@ F 3 "" H 10400 5710 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C36
+L Cryptech_Alpha:C-EUC0402 C36
 U 1 1 58024062
 P 13000 5800
 F 0 "C36" H 12960 5500 60  0000 L BNN
@@ -604,7 +575,7 @@ F 3 "" H 12950 5430 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C34
+L Cryptech_Alpha:C-EUC0402 C34
 U 1 1 58024061
 P 12800 5800
 F 0 "C34" H 12740 5500 60  0000 L BNN
@@ -615,7 +586,7 @@ F 3 "" H 12700 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0603 C21
+L Cryptech_Alpha:C-EUC0603 C21
 U 1 1 58024060
 P 2400 6900
 F 0 "C21" H 2100 7000 60  0000 L BNN
@@ -626,7 +597,7 @@ F 3 "" H 2090 6870 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0603 C24
+L Cryptech_Alpha:C-EUC0603 C24
 U 1 1 5802405F
 P 6300 5800
 F 0 "C24" H 6140 5785 60  0000 R TNN
@@ -637,7 +608,7 @@ F 3 "" H 6130 5870 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0603 C22
+L Cryptech_Alpha:C-EUC0603 C22
 U 1 1 5802405E
 P 7800 5800
 F 0 "C22" H 7640 5785 60  0000 R TNN
@@ -648,7 +619,7 @@ F 3 "" H 7630 5870 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0603 C23
+L Cryptech_Alpha:C-EUC0603 C23
 U 1 1 5802405D
 P 7600 5800
 F 0 "C23" H 7897 5770 60  0000 R TNN
@@ -659,7 +630,7 @@ F 3 "" H 7940 5870 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0603 C25
+L Cryptech_Alpha:C-EUC0603 C25
 U 1 1 5802405C
 P 6100 5800
 F 0 "C25" H 6457 5785 60  0000 R TNN
@@ -670,7 +641,7 @@ F 3 "" H 6460 5880 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R32
+L Cryptech_Alpha:R-EU_R0402 R32
 U 1 1 5802405B
 P 2600 3800
 F 0 "R32" V 2500 3500 60  0000 L BNN
@@ -681,7 +652,7 @@ F 3 "" H 2580 3600 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L STM32F429BIT6_3 U4_2
+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
@@ -690,7 +661,7 @@ F 0 "U4_2" H 2690 3890 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TSQFP50P3000X3000X160-208N" H 2690 3890 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C45
+L Cryptech_Alpha:C-EUC0402 C45
 U 1 1 58024059
 P 14000 5300
 F 0 "C45" H 13990 5480 60  0000 L BNN
@@ -701,7 +672,7 @@ F 3 "" H 13960 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C43
+L Cryptech_Alpha:C-EUC0402 C43
 U 1 1 58024058
 P 13800 5300
 F 0 "C43" H 13790 5010 60  0000 L BNN
@@ -712,7 +683,7 @@ F 3 "" H 13780 4930 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C41
+L Cryptech_Alpha:C-EUC0402 C41
 U 1 1 58024057
 P 13600 5300
 F 0 "C41" H 13570 5490 60  0000 L BNN
@@ -723,7 +694,7 @@ F 3 "" H 13540 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C39
+L Cryptech_Alpha:C-EUC0402 C39
 U 1 1 58024056
 P 13400 5300
 F 0 "C39" H 13390 5010 60  0000 L BNN
@@ -734,7 +705,7 @@ F 3 "" H 13390 4920 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C37
+L Cryptech_Alpha:C-EUC0402 C37
 U 1 1 58024055
 P 13200 5300
 F 0 "C37" H 13120 5490 60  0000 L BNN
@@ -745,7 +716,7 @@ F 3 "" H 13120 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C35
+L Cryptech_Alpha:C-EUC0402 C35
 U 1 1 58024054
 P 13000 5300
 F 0 "C35" H 12990 5010 60  0000 L BNN
@@ -756,7 +727,7 @@ F 3 "" H 12760 5410 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C33
+L Cryptech_Alpha:C-EUC0402 C33
 U 1 1 58024053
 P 12800 5300
 F 0 "C33" H 12780 5490 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_05.sch b/rev03-KiCad/rev02_05.sch
index d81561b..06866b5 100644
--- a/rev03-KiCad/rev02_05.sch
+++ b/rev03-KiCad/rev02_05.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -637,7 +608,7 @@ Wire Wire Line
 Text GLabel 7000 2700 2 48 Output ~ 0
 FPGA_CFG_CTRL_ARM_ENA
 $Comp
-L STM32F429BIT6_4 U4_3
+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
@@ -646,7 +617,7 @@ F 0 "U4_3" H 10690 2690 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TSQFP50P3000X3000X160-208N" H 10690 2690 60  0001 C CNN
 $EndComp
 $Comp
-L STM32F429BIT6_1 U4_4
+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
diff --git a/rev03-KiCad/rev02_06.sch b/rev03-KiCad/rev02_06.sch
index 095bf8b..a2ca561 100644
--- a/rev03-KiCad/rev02_06.sch
+++ b/rev03-KiCad/rev02_06.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -57,7 +28,7 @@ U6
 Text Notes 10900 4600 0    60   ~ 12
 IS45S32160F
 $Comp
-L VCCO_3V3 #PWR?58024050
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_8
 U 1 1 58024050
 P 3900 2050
 F 0 "VCCO_3V3_8" H 3900 2050 20  0000 C CNN
@@ -68,7 +39,7 @@ F 3 "" H 3900 2050 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?5802404F
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_9
 U 1 1 5802404F
 P 4400 2050
 F 0 "VCCO_3V3_9" H 4400 2050 20  0000 C CNN
@@ -79,7 +50,7 @@ F 3 "" H 4400 2050 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802404E
+L power:GND GND_40
 U 1 1 5802404E
 P 4500 7200
 F 0 "GND_40" H 4500 7200 20  0000 C CNN
@@ -90,7 +61,7 @@ F 3 "" H 4500 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?5802404D
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_10
 U 1 1 5802404D
 P 3500 7650
 F 0 "VCCO_3V3_10" H 3500 7650 20  0000 C CNN
@@ -101,7 +72,7 @@ F 3 "" H 3500 7650 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802404C
+L power:GND GND_41
 U 1 1 5802404C
 P 3500 9000
 F 0 "GND_41" H 3500 9000 20  0000 C CNN
@@ -112,7 +83,7 @@ F 3 "" H 3500 9000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?5802404B
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_11
 U 1 1 5802404B
 P 10900 2150
 F 0 "VCCO_3V3_11" H 10900 2150 20  0000 C CNN
@@ -123,7 +94,7 @@ F 3 "" H 10900 2150 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?5802404A
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_12
 U 1 1 5802404A
 P 11400 2150
 F 0 "VCCO_3V3_12" H 11400 2150 20  0000 C CNN
@@ -134,7 +105,7 @@ F 3 "" H 11400 2150 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024049
+L power:GND GND_42
 U 1 1 58024049
 P 11500 7300
 F 0 "GND_42" H 11500 7300 20  0000 C CNN
@@ -145,7 +116,7 @@ F 3 "" H 11500 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58024048
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_13
 U 1 1 58024048
 P 10500 7750
 F 0 "VCCO_3V3_13" H 10500 7750 20  0000 C CNN
@@ -156,7 +127,7 @@ F 3 "" H 10500 7750 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024047
+L power:GND GND_43
 U 1 1 58024047
 P 10500 9100
 F 0 "GND_43" H 10500 9100 20  0000 C CNN
@@ -1197,7 +1168,7 @@ Wire Bus Line
 Text Label 13300 2500 0 60 ~
 FMC_D[0..31]
 $Comp
-L IS45S32160F U5
+L Cryptech_Alpha:IS45S32160F U5
 U 1 1 58024046
 P 4500 4600
 F 0 "U5" H 5720 6710 60  0000 L BNN
@@ -1208,7 +1179,7 @@ F 3 "" H 3160 6830 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C57
+L Cryptech_Alpha:C-EUC0402 C57
 U 1 1 58024045
 P 4500 8500
 F 0 "C57" H 4610 8460 60  0000 L BNN
@@ -1219,7 +1190,7 @@ F 3 "" H 4470 9160 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C55
+L Cryptech_Alpha:C-EUC0402 C55
 U 1 1 58024044
 P 4300 8500
 F 0 "C55" H 4290 8200 60  0000 L BNN
@@ -1230,7 +1201,7 @@ F 3 "" H 4610 8400 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C53
+L Cryptech_Alpha:C-EUC0402 C53
 U 1 1 58024043
 P 4100 8500
 F 0 "C53" H 4000 8200 60  0000 L BNN
@@ -1241,7 +1212,7 @@ F 3 "" H 4290 8130 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L IS45S32160F U6
+L Cryptech_Alpha:IS45S32160F U6
 U 1 1 58024042
 P 11500 4700
 F 0 "U6" H 12720 6810 60  0000 L BNN
@@ -1252,7 +1223,7 @@ F 3 "" H 10140 6950 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C67
+L Cryptech_Alpha:C-EUC0402 C67
 U 1 1 58024041
 P 11500 8100
 F 0 "C67" H 11490 8300 60  0000 L BNN
@@ -1263,7 +1234,7 @@ F 3 "" H 11480 8240 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C65
+L Cryptech_Alpha:C-EUC0402 C65
 U 1 1 58024040
 P 11300 8100
 F 0 "C65" H 11260 8290 60  0000 L BNN
@@ -1274,7 +1245,7 @@ F 3 "" H 11240 8240 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C63
+L Cryptech_Alpha:C-EUC0402 C63
 U 1 1 5802403F
 P 11100 8100
 F 0 "C63" H 11070 8380 60  0000 L BNN
@@ -1285,7 +1256,7 @@ F 3 "" H 11030 8320 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C61
+L Cryptech_Alpha:C-EUC0402 C61
 U 1 1 5802403E
 P 10900 8100
 F 0 "C61" H 10840 8290 60  0000 L BNN
@@ -1296,7 +1267,7 @@ F 3 "" H 10830 8230 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C62
+L Cryptech_Alpha:C-EUC0402 C62
 U 1 1 5802403D
 P 10900 8600
 F 0 "C62" H 10780 8780 60  0000 L BNN
@@ -1307,7 +1278,7 @@ F 3 "" H 10780 8720 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C60
+L Cryptech_Alpha:C-EUC0402 C60
 U 1 1 5802403C
 P 10700 8600
 F 0 "C60" H 10600 8300 60  0000 L BNN
@@ -1318,7 +1289,7 @@ F 3 "" H 10600 8240 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C56
+L Cryptech_Alpha:C-EUC0402 C56
 U 1 1 5802403B
 P 4500 8000
 F 0 "C56" H 4470 8220 60  0000 L BNN
@@ -1329,7 +1300,7 @@ F 3 "" H 4070 8150 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C59
+L Cryptech_Alpha:C-EUC0402 C59
 U 1 1 5802403A
 P 10700 8100
 F 0 "C59" H 10600 8290 60  0000 L BNN
@@ -1340,7 +1311,7 @@ F 3 "" H 10600 8230 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C58
+L Cryptech_Alpha:C-EUC0402 C58
 U 1 1 58024039
 P 10500 8100
 F 0 "C58" H 10160 8080 60  0000 L BNN
@@ -1351,7 +1322,7 @@ F 3 "" H 10160 8020 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C68
+L Cryptech_Alpha:C-EUC0402 C68
 U 1 1 58024038
 P 11500 8600
 F 0 "C68" H 11620 8560 60  0000 L BNN
@@ -1362,7 +1333,7 @@ F 3 "" H 11620 8500 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C66
+L Cryptech_Alpha:C-EUC0402 C66
 U 1 1 58024037
 P 11300 8600
 F 0 "C66" H 11220 8780 60  0000 L BNN
@@ -1373,7 +1344,7 @@ F 3 "" H 11220 8720 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C64
+L Cryptech_Alpha:C-EUC0402 C64
 U 1 1 58024036
 P 11100 8600
 F 0 "C64" H 11000 8300 60  0000 L BNN
@@ -1384,7 +1355,7 @@ F 3 "" H 11000 8240 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C54
+L Cryptech_Alpha:C-EUC0402 C54
 U 1 1 58024035
 P 4300 8000
 F 0 "C54" H 4280 7700 60  0000 L BNN
@@ -1395,7 +1366,7 @@ F 3 "" H 4280 7640 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C52
+L Cryptech_Alpha:C-EUC0402 C52
 U 1 1 58024034
 P 4100 8000
 F 0 "C52" H 4070 8210 60  0000 L BNN
@@ -1406,7 +1377,7 @@ F 3 "" H 3790 7630 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C50
+L Cryptech_Alpha:C-EUC0402 C50
 U 1 1 58024033
 P 3900 8000
 F 0 "C50" H 3810 8210 60  0000 L BNN
@@ -1417,7 +1388,7 @@ F 3 "" H 3810 8150 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C51
+L Cryptech_Alpha:C-EUC0402 C51
 U 1 1 58024032
 P 3900 8500
 F 0 "C51" H 3790 8690 60  0000 L BNN
@@ -1428,7 +1399,7 @@ F 3 "" H 3990 8130 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C49
+L Cryptech_Alpha:C-EUC0402 C49
 U 1 1 58024031
 P 3700 8500
 F 0 "C49" H 3530 8210 60  0000 L BNN
@@ -1439,7 +1410,7 @@ F 3 "" H 3530 8140 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C48
+L Cryptech_Alpha:C-EUC0402 C48
 U 1 1 58024030
 P 3700 8000
 F 0 "C48" H 3540 8210 60  0000 L BNN
@@ -1450,7 +1421,7 @@ F 3 "" H 3540 8150 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C47
+L Cryptech_Alpha:C-EUC0402 C47
 U 1 1 5802402F
 P 3500 8000
 F 0 "C47" H 3130 7980 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_07.sch b/rev03-KiCad/rev02_07.sch
index 90d27ff..91dcde1 100644
--- a/rev03-KiCad/rev02_07.sch
+++ b/rev03-KiCad/rev02_07.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -59,7 +30,7 @@ C69
 Text Notes 9760 6190 0    60   ~ 12
 0.1~uF
 $Comp
-L GND #PWR?5802402E
+L power:GND GND_44
 U 1 1 5802402E
 P 6800 6500
 F 0 "GND_44" H 6800 6500 20  0000 C CNN
@@ -70,7 +41,7 @@ F 3 "" H 6800 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802402D
+L power:GND GND_45
 U 1 1 5802402D
 P 9700 6500
 F 0 "GND_45" H 9700 6500 20  0000 C CNN
@@ -81,7 +52,7 @@ F 3 "" H 9700 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?5802402C
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_14
 U 1 1 5802402C
 P 6200 4400
 F 0 "VCCO_3V3_14" H 6200 4400 20  0000 C CNN
@@ -151,7 +122,7 @@ Wire Wire Line
 Wire Wire Line
 	6200 5300 6200 5700
 $Comp
-L N25Q128A13ES IC1
+L Cryptech_Alpha:N25Q128A13ES IC1
 U 1 1 5802402B
 P 7700 5750
 F 0 "IC1" H 7190 5490 60  0000 L BNN
@@ -162,7 +133,7 @@ F 3 "" H 7470 6120 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R18
+L Cryptech_Alpha:R-EU_R0402 R18
 U 1 1 5802402A
 P 7000 5100
 F 0 "R18" V 6941 5250 60  0000 L BNN
@@ -173,7 +144,7 @@ F 3 "" H 7040 5240 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L C-EUC0402 C69
+L Cryptech_Alpha:C-EUC0402 C69
 U 1 1 58024029
 P 9700 6000
 F 0 "C69" H 9780 5810 60  0000 L BNN
@@ -184,7 +155,7 @@ F 3 "" H 9990 6010 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R17
+L Cryptech_Alpha:R-EU_R0402 R17
 U 1 1 58024028
 P 6200 5100
 F 0 "R17" V 6140 4780 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_08.sch b/rev03-KiCad/rev02_08.sch
index 5454ebb..ac3c592 100644
--- a/rev03-KiCad/rev02_08.sch
+++ b/rev03-KiCad/rev02_08.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -61,7 +32,7 @@ X1
 Text Notes 6250 6200 0    60   ~ 12
 XTAL-3.2X1.5
 $Comp
-L GND #PWR?58024027
+L power:GND GND_46
 U 1 1 58024027
 P 7200 6400
 F 0 "GND_46" H 7200 6400 20  0000 C CNN
@@ -72,7 +43,7 @@ F 3 "" H 7200 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58024026
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_2
 U 1 1 58024026
 P 6900 4800
 F 0 "3V3_BATT_2" H 6900 4800 20  0000 C CNN
@@ -83,7 +54,7 @@ F 3 "" H 6900 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58024025
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_15
 U 1 1 58024025
 P 7400 4800
 F 0 "VCCO_3V3_15" H 7400 4800 20  0000 C CNN
@@ -94,7 +65,7 @@ F 3 "" H 7400 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024024
+L power:GND GND_47
 U 1 1 58024024
 P 6100 6400
 F 0 "GND_47" H 6100 6400 20  0000 C CNN
@@ -105,7 +76,7 @@ F 3 "" H 6100 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024023
+L power:GND GND_48
 U 1 1 58024023
 P 6700 6400
 F 0 "GND_48" H 6700 6400 20  0000 C CNN
@@ -184,7 +155,7 @@ Wire Wire Line
 	9300 4900 9300 5000
 Connection ~ 9100 4900
 $Comp
-L VCCO_3V3 #PWR?58024022
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_16
 U 1 1 58024022
 P 9100 4800
 F 0 "VCCO_3V3_16" H 9100 4800 20  0000 C CNN
@@ -195,7 +166,7 @@ F 3 "" H 9100 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L MCP79412-I_SN U7
+L Cryptech_Alpha:MCP79412-I_SN U7
 U 1 1 58024021
 P 8000 5600
 F 0 "U7" H 7570 4870 60  0000 L BNN
@@ -206,7 +177,7 @@ F 3 "" H 7580 6030 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C71
+L Cryptech_Alpha:C-EUC0402 C71
 U 1 1 58024020
 P 6700 6200
 F 0 "C71" H 6570 6110 60  0000 R TNN
@@ -217,7 +188,7 @@ F 3 "" H 6570 6200 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C70
+L Cryptech_Alpha:C-EUC0402 C70
 U 1 1 5802401F
 P 6100 6200
 F 0 "C70" H 6440 6120 60  0000 R TNN
@@ -228,7 +199,7 @@ F 3 "" H 6440 6220 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L XTAL-3.2X1.5 X1
+L Cryptech_Alpha:XTAL-3.2X1.5 X1
 U 1 1 5802401E
 P 6400 6000
 F 0 "X1" H 6290 5790 60  0000 L BNN
@@ -239,7 +210,7 @@ F 3 "" H 6230 5250 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R21
+L Cryptech_Alpha:R-EU_R0402 R21
 U 1 1 5802401D
 P 9300 5200
 F 0 "R21" V 9300 5500 60  0000 L BNN
@@ -250,7 +221,7 @@ F 3 "" H 9290 5700 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L R-EU_R0402 R20
+L Cryptech_Alpha:R-EU_R0402 R20
 U 1 1 5802401C
 P 9100 5200
 F 0 "R20" V 9000 5700 60  0000 L BNN
@@ -261,7 +232,7 @@ F 3 "" H 8990 5900 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L R-EU_R0402 R19
+L Cryptech_Alpha:R-EU_R0402 R19
 U 1 1 5802401B
 P 8900 5200
 F 0 "R19" V 8700 5900 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_09.sch b/rev03-KiCad/rev02_09.sch
index c16f45b..6ee6d36 100644
--- a/rev03-KiCad/rev02_09.sch
+++ b/rev03-KiCad/rev02_09.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -85,7 +56,7 @@ Text Notes 12730 6190 0    60   ~ 12
 Text Notes 13030 6190 0    60   ~ 12
 6
 $Comp
-L GND #PWR?5802401A
+L power:GND GND_49
 U 1 1 5802401A
 P 6100 4600
 F 0 "GND_49" H 6100 4600 20  0000 C CNN
@@ -96,7 +67,7 @@ F 3 "" H 6100 4600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024019
+L power:GND GND_50
 U 1 1 58024019
 P 8400 6200
 F 0 "GND_50" H 8400 6200 20  0000 C CNN
@@ -107,7 +78,7 @@ F 3 "" H 8400 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024018
+L power:GND GND_51
 U 1 1 58024018
 P 7300 6200
 F 0 "GND_51" H 7300 6200 20  0000 C CNN
@@ -118,7 +89,7 @@ F 3 "" H 7300 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024017
+L power:GND GND_52
 U 1 1 58024017
 P 6000 6200
 F 0 "GND_52" H 6000 6200 20  0000 C CNN
@@ -129,7 +100,7 @@ F 3 "" H 6000 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024016
+L power:GND GND_53
 U 1 1 58024016
 P 6600 6200
 F 0 "GND_53" H 6600 6200 20  0000 C CNN
@@ -140,7 +111,7 @@ F 3 "" H 6600 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VCC3V3 #PWR?58024015
+L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3
 U 1 1 58024015
 P 8500 2500
 F 0 "FT_VCC3V3" H 8500 2500 20  0000 C CNN
@@ -151,7 +122,7 @@ F 3 "" H 8500 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024014
+L power:GND GND_54
 U 1 1 58024014
 P 4900 8400
 F 0 "GND_54" H 4900 8400 20  0000 C CNN
@@ -162,7 +133,7 @@ F 3 "" H 4900 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024013
+L power:GND GND_55
 U 1 1 58024013
 P 10100 8400
 F 0 "GND_55" H 10100 8400 20  0000 C CNN
@@ -173,7 +144,7 @@ F 3 "" H 10100 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024012
+L power:GND GND_56
 U 1 1 58024012
 P 6900 8400
 F 0 "GND_56" H 6900 8400 20  0000 C CNN
@@ -184,7 +155,7 @@ F 3 "" H 6900 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024011
+L power:GND GND_57
 U 1 1 58024011
 P 8700 8400
 F 0 "GND_57" H 8700 8400 20  0000 C CNN
@@ -195,7 +166,7 @@ F 3 "" H 8700 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024010
+L power:GND GND_58
 U 1 1 58024010
 P 11500 8400
 F 0 "GND_58" H 11500 8400 20  0000 C CNN
@@ -206,7 +177,7 @@ F 3 "" H 11500 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VCC3V3 #PWR?5802400F
+L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_2
 U 1 1 5802400F
 P 11500 7300
 F 0 "FT_VCC3V3_2" H 11500 7300 20  0000 C CNN
@@ -217,7 +188,7 @@ F 3 "" H 11500 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?5802400E
+L power:GND GND_59
 U 1 1 5802400E
 P 2150 3850
 F 0 "GND_59" H 2150 3850 20  0000 C CNN
@@ -228,7 +199,7 @@ F 3 "" H 2150 3850 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VCC3V3 #PWR?5802400D
+L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_3
 U 1 1 5802400D
 P 9800 7300
 F 0 "FT_VCC3V3_3" H 9800 7300 20  0000 C CNN
@@ -239,7 +210,7 @@ F 3 "" H 9800 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VREGIN #PWR?5802400C
+L Cryptech_Alpha:FT_VREGIN FT_VREGIN
 U 1 1 5802400C
 P 4600 7300
 F 0 "FT_VREGIN" H 4600 7300 20  0000 C CNN
@@ -250,7 +221,7 @@ F 3 "" H 4600 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VCC3V3 #PWR?5802400B
+L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_4
 U 1 1 5802400B
 P 5900 7300
 F 0 "FT_VCC3V3_4" H 5900 7300 20  0000 C CNN
@@ -261,7 +232,7 @@ F 3 "" H 5900 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VPHY #PWR?5802400A
+L Cryptech_Alpha:FT_VPHY FT_VPHY
 U 1 1 5802400A
 P 6900 7300
 F 0 "FT_VPHY" H 6900 7300 20  0000 C CNN
@@ -272,7 +243,7 @@ F 3 "" H 6900 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VCC3V3 #PWR?58024009
+L Cryptech_Alpha:FT_VCC3V3 FT_VCC3V3_5
 U 1 1 58024009
 P 7700 7300
 F 0 "FT_VCC3V3_5" H 7700 7300 20  0000 C CNN
@@ -283,7 +254,7 @@ F 3 "" H 7700 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VPLL #PWR?58024008
+L Cryptech_Alpha:FT_VPLL FT_VPLL
 U 1 1 58024008
 P 8700 7300
 F 0 "FT_VPLL" H 8700 7300 20  0000 C CNN
@@ -294,7 +265,7 @@ F 3 "" H 8700 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024007
+L power:GND GND_60
 U 1 1 58024007
 P 3900 3900
 F 0 "GND_60" H 3900 3900 20  0000 C CNN
@@ -305,7 +276,7 @@ F 3 "" H 3900 3900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_VREGIN #PWR?58024006
+L Cryptech_Alpha:FT_VREGIN FT_VREGIN_2
 U 1 1 58024006
 P 13300 5400
 F 0 "FT_VREGIN_2" H 13300 5400 20  0000 C CNN
@@ -316,7 +287,7 @@ F 3 "" H 13300 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024005
+L power:GND GND_61
 U 1 1 58024005
 P 12350 6400
 F 0 "GND_61" H 12350 6400 20  0000 C CNN
@@ -327,7 +298,7 @@ F 3 "" H 12350 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58024004
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_17
 U 1 1 58024004
 P 11000 2500
 F 0 "VCCO_3V3_17" H 11000 2500 20  0000 C CNN
@@ -705,7 +676,7 @@ D1_P
 Text Label 2050 3500 0 60 ~
 D1_N
 $Comp
-L FT_VREGIN #PWR?58024003
+L Cryptech_Alpha:FT_VREGIN FT_VREGIN_3
 U 1 1 58024003
 P 2500 3300
 F 0 "FT_VREGIN_3" H 2500 3300 20  0000 C CNN
@@ -716,7 +687,7 @@ F 3 "" H 2500 3300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024002
+L power:GND GND_62
 U 1 1 58024002
 P 6200 5700
 F 0 "GND_62" H 6200 5700 20  0000 C CNN
@@ -727,7 +698,7 @@ F 3 "" H 6200 5700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58024001
+L power:GND GND_63
 U 1 1 58024001
 P 6400 5700
 F 0 "GND_63" H 6400 5700 20  0000 C CNN
@@ -740,7 +711,7 @@ $EndComp
 Connection ~ 2500 3300
 Connection ~ 6570 3600
 $Comp
-L FT232H_SERIAL U8
+L Cryptech_Alpha:FT232H_SERIAL U8
 U 1 1 58024000
 P 8400 4600
 F 0 "U8" H 9520 5810 60  0000 L BNN
@@ -751,7 +722,7 @@ F 3 "" H 7280 6120 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0603 C82
+L Cryptech_Alpha:C-EUC0603 C82
 U 1 1 58023FFF
 P 9800 8000
 F 0 "C82" H 9513 8084 60  0000 L BNN
@@ -762,7 +733,7 @@ F 3 "" H 9510 7990 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C83
+L Cryptech_Alpha:C-EUC0402 C83
 U 1 1 58023FFE
 P 10100 8000
 F 0 "C83" H 10200 8100 60  0000 L BNN
@@ -773,7 +744,7 @@ F 3 "" H 10210 8010 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C79
+L Cryptech_Alpha:C-EUC0402 C79
 U 1 1 58023FFD
 P 6900 8000
 F 0 "C79" H 7000 7900 60  0000 L BNN
@@ -784,7 +755,7 @@ F 3 "" H 7000 7820 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0805 C77
+L Cryptech_Alpha:C-EUC0805 C77
 U 1 1 58023FFC
 P 6400 8000
 F 0 "C77" H 6113 7884 60  0000 L BNN
@@ -795,7 +766,7 @@ F 3 "" H 6070 7790 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C81
+L Cryptech_Alpha:C-EUC0402 C81
 U 1 1 58023FFB
 P 8700 8000
 F 0 "C81" H 8800 7900 60  0000 L BNN
@@ -806,7 +777,7 @@ F 3 "" H 8800 7820 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0805 C80
+L Cryptech_Alpha:C-EUC0805 C80
 U 1 1 58023FFA
 P 8200 8000
 F 0 "C80" H 7913 7934 60  0000 L BNN
@@ -817,7 +788,7 @@ F 3 "" H 7880 7840 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C84
+L Cryptech_Alpha:C-EUC0402 C84
 U 1 1 58023FF9
 P 11100 8000
 F 0 "C84" H 10762 7915 60  0000 L BNN
@@ -828,7 +799,7 @@ F 3 "" H 10750 7820 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C85
+L Cryptech_Alpha:C-EUC0402 C85
 U 1 1 58023FF8
 P 11500 8000
 F 0 "C85" H 11220 8110 60  0000 L BNN
@@ -839,7 +810,7 @@ F 3 "" H 11210 8020 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C86
+L Cryptech_Alpha:C-EUC0402 C86
 U 1 1 58023FF7
 P 11900 8000
 F 0 "C86" H 12000 7900 60  0000 L BNN
@@ -850,7 +821,7 @@ F 3 "" H 12000 7820 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L FERRITE_0603MP FB2
+L Cryptech_Alpha:FERRITE_0603MP FB2
 U 1 1 58023FF6
 P 7900 7700
 F 0 "FB2" H 7820 7532 60  0000 L BNN
@@ -859,7 +830,7 @@ F 0 "FB2" H 7820 7532 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 7820 7532 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R23
+L Cryptech_Alpha:R-EU_R0402 R23
 U 1 1 58023FF5
 P 6770 4300
 F 0 "R23" H 6880 4445 60  0000 R TNN
@@ -870,7 +841,7 @@ F 3 "" H 6880 4240 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L FERRITE_0603MP FB1
+L Cryptech_Alpha:FERRITE_0603MP FB1
 U 1 1 58023FF4
 P 6100 7700
 F 0 "FB1" H 6020 7532 60  0000 L BNN
@@ -879,7 +850,7 @@ F 0 "FB1" H 6020 7532 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 6020 7532 60  0001 C CNN
 $EndComp
 $Comp
-L USBMINIB CN1
+L Cryptech_Alpha:USBMINIB CN1
 U 1 1 58023FF3
 P 1600 3500
 F 0 "CN1" H 1188 3090 60  0000 L BNN
@@ -890,7 +861,7 @@ F 3 "" H 1188 3810 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L RCLAMP0502ASC-89 IC5
+L Cryptech_Alpha:RCLAMP0502ASC-89 IC5
 U 1 1 58023FF2
 P 3100 3500
 F 0 "IC5" H 2690 3190 60  0000 L BNN
@@ -901,7 +872,7 @@ F 3 "" H 2700 3170 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R86
+L Cryptech_Alpha:R-EU_R0402 R86
 U 1 1 58023FF1
 P 10700 3400
 F 0 "R86" H 10797 3170 60  0000 R TNN
@@ -912,7 +883,7 @@ F 3 "" H 10780 3270 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R87
+L Cryptech_Alpha:R-EU_R0402 R87
 U 1 1 58023FF0
 P 10700 3500
 F 0 "R87" H 10840 3660 60  0000 R TNN
@@ -923,7 +894,7 @@ F 3 "" H 10840 3750 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L M03X2NO_SILK J2
+L Cryptech_Alpha:M03X2NO_SILK J2
 U 1 1 58023FEF
 P 12900 6100
 F 0 "J2" H 12690 5790 60  0000 L BNN
@@ -932,7 +903,7 @@ F 0 "J2" H 12690 5790 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:PLD-6" H 12690 5790 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C214
+L Cryptech_Alpha:C-EUC0402 C214
 U 1 1 58023FEE
 P 12350 5700
 F 0 "C214" H 11950 5600 60  0000 L BNN
@@ -943,7 +914,7 @@ F 3 "" H 11950 5500 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R91
+L Cryptech_Alpha:R-EU_R0402 R91
 U 1 1 58023FED
 P 11000 2900
 F 0 "R91" V 10900 3000 60  0000 L BNN
@@ -954,7 +925,7 @@ F 3 "" H 10990 3000 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L CRYSTALTHIN Y1
+L Cryptech_Alpha:CRYSTALTHIN Y1
 U 1 1 58023FEC
 P 6300 5600
 F 0 "Y1" H 6400 5720 60  0000 R BNN
@@ -965,7 +936,7 @@ F 3 "" H 5480 5740 60  0000 C CNN
 	-1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C76
+L Cryptech_Alpha:C-EUC0402 C76
 U 1 1 58023FEB
 P 6200 4100
 F 0 "C76" H 6300 4100 60  0000 L BNN
@@ -976,7 +947,7 @@ F 3 "" H 6310 4000 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C74
+L Cryptech_Alpha:C-EUC0402 C74
 U 1 1 58023FEA
 P 6000 4100
 F 0 "C74" H 5660 4100 60  0000 L BNN
@@ -987,7 +958,7 @@ F 3 "" H 5640 3990 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R22
+L Cryptech_Alpha:R-EU_R0402 R22
 U 1 1 58023FE9
 P 6600 4500
 F 0 "R22" H 6700 4660 60  0000 R TNN
@@ -998,7 +969,7 @@ F 3 "" H 6710 4750 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C78
+L Cryptech_Alpha:C-EUC0402 C78
 U 1 1 58023FE8
 P 6600 5900
 F 0 "C78" H 6500 5900 60  0000 R TNN
@@ -1009,7 +980,7 @@ F 3 "" H 6480 6000 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C75
+L Cryptech_Alpha:C-EUC0402 C75
 U 1 1 58023FE7
 P 6000 5900
 F 0 "C75" H 6300 5900 60  0000 R TNN
@@ -1020,7 +991,7 @@ F 3 "" H 6290 6000 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0603 C72
+L Cryptech_Alpha:C-EUC0603 C72
 U 1 1 58023FE6
 P 4600 8000
 F 0 "C72" H 4313 8084 60  0000 L BNN
@@ -1031,7 +1002,7 @@ F 3 "" H 4310 8000 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C73
+L Cryptech_Alpha:C-EUC0402 C73
 U 1 1 58023FE5
 P 4900 8000
 F 0 "C73" H 5000 8100 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_10.sch b/rev03-KiCad/rev02_10.sch
index 55306f4..7fdd729 100644
--- a/rev03-KiCad/rev02_10.sch
+++ b/rev03-KiCad/rev02_10.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -89,7 +60,7 @@ Text Notes 12830 6290 0    60   ~ 12
 Text Notes 13130 6290 0    60   ~ 12
 6
 $Comp
-L GND #PWR?58023FE4
+L power:GND GND_64
 U 1 1 58023FE4
 P 6200 4700
 F 0 "GND_64" H 6200 4700 20  0000 C CNN
@@ -100,7 +71,7 @@ F 3 "" H 6200 4700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FE3
+L power:GND GND_65
 U 1 1 58023FE3
 P 8700 6300
 F 0 "GND_65" H 8700 6300 20  0000 C CNN
@@ -111,7 +82,7 @@ F 3 "" H 8700 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FE2
+L power:GND GND_66
 U 1 1 58023FE2
 P 7400 6300
 F 0 "GND_66" H 7400 6300 20  0000 C CNN
@@ -122,7 +93,7 @@ F 3 "" H 7400 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FE1
+L power:GND GND_67
 U 1 1 58023FE1
 P 6100 6300
 F 0 "GND_67" H 6100 6300 20  0000 C CNN
@@ -133,7 +104,7 @@ F 3 "" H 6100 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FE0
+L power:GND GND_68
 U 1 1 58023FE0
 P 6700 6300
 F 0 "GND_68" H 6700 6300 20  0000 C CNN
@@ -144,7 +115,7 @@ F 3 "" H 6700 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VCC3V3 #PWR?58023FDF
+L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3
 U 1 1 58023FDF
 P 8600 2600
 F 0 "FT_MGMT_VCC3V3" H 8600 2600 20  0000 C CNN
@@ -155,7 +126,7 @@ F 3 "" H 8600 2600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FDE
+L power:GND GND_69
 U 1 1 58023FDE
 P 5000 8500
 F 0 "GND_69" H 5000 8500 20  0000 C CNN
@@ -166,7 +137,7 @@ F 3 "" H 5000 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FDD
+L power:GND GND_70
 U 1 1 58023FDD
 P 10200 8500
 F 0 "GND_70" H 10200 8500 20  0000 C CNN
@@ -177,7 +148,7 @@ F 3 "" H 10200 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FDC
+L power:GND GND_71
 U 1 1 58023FDC
 P 7000 8500
 F 0 "GND_71" H 7000 8500 20  0000 C CNN
@@ -188,7 +159,7 @@ F 3 "" H 7000 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FDB
+L power:GND GND_72
 U 1 1 58023FDB
 P 8800 8500
 F 0 "GND_72" H 8800 8500 20  0000 C CNN
@@ -199,7 +170,7 @@ F 3 "" H 8800 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FDA
+L power:GND GND_73
 U 1 1 58023FDA
 P 11700 8500
 F 0 "GND_73" H 11700 8500 20  0000 C CNN
@@ -210,7 +181,7 @@ F 3 "" H 11700 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VCC3V3 #PWR?58023FD9
+L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_2
 U 1 1 58023FD9
 P 11700 7400
 F 0 "FT_MGMT_VCC3V3_2" H 11700 7400 20  0000 C CNN
@@ -221,7 +192,7 @@ F 3 "" H 11700 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FD8
+L power:GND GND_74
 U 1 1 58023FD8
 P 2200 4000
 F 0 "GND_74" H 2200 4000 20  0000 C CNN
@@ -232,7 +203,7 @@ F 3 "" H 2200 4000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VCC3V3 #PWR?58023FD7
+L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_3
 U 1 1 58023FD7
 P 9900 7400
 F 0 "FT_MGMT_VCC3V3_3" H 9900 7400 20  0000 C CNN
@@ -243,7 +214,7 @@ F 3 "" H 9900 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VREGIN #PWR?58023FD6
+L Cryptech_Alpha:FT_MGMT_VREGIN FT_MGMT_VREGIN
 U 1 1 58023FD6
 P 4700 7400
 F 0 "FT_MGMT_VREGIN" H 4700 7400 20  0000 C CNN
@@ -254,7 +225,7 @@ F 3 "" H 4700 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VCC3V3 #PWR?58023FD5
+L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_4
 U 1 1 58023FD5
 P 6000 7400
 F 0 "FT_MGMT_VCC3V3_4" H 6000 7400 20  0000 C CNN
@@ -265,7 +236,7 @@ F 3 "" H 6000 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VPHY #PWR?58023FD4
+L Cryptech_Alpha:FT_MGMT_VPHY FT_MGMT_VPHY
 U 1 1 58023FD4
 P 7000 7400
 F 0 "FT_MGMT_VPHY" H 7000 7400 20  0000 C CNN
@@ -276,7 +247,7 @@ F 3 "" H 7000 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VCC3V3 #PWR?58023FD3
+L Cryptech_Alpha:FT_MGMT_VCC3V3 FT_MGMT_VCC3V3_5
 U 1 1 58023FD3
 P 7800 7400
 F 0 "FT_MGMT_VCC3V3_5" H 7800 7400 20  0000 C CNN
@@ -287,7 +258,7 @@ F 3 "" H 7800 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VPLL #PWR?58023FD2
+L Cryptech_Alpha:FT_MGMT_VPLL FT_MGMT_VPLL
 U 1 1 58023FD2
 P 8800 7400
 F 0 "FT_MGMT_VPLL" H 8800 7400 20  0000 C CNN
@@ -298,7 +269,7 @@ F 3 "" H 8800 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FD1
+L power:GND GND_75
 U 1 1 58023FD1
 P 4000 4000
 F 0 "GND_75" H 4000 4000 20  0000 C CNN
@@ -309,7 +280,7 @@ F 3 "" H 4000 4000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT_MGMT_VREGIN #PWR?58023FD0
+L Cryptech_Alpha:FT_MGMT_VREGIN FT_MGMT_VREGIN_2
 U 1 1 58023FD0
 P 13400 5500
 F 0 "FT_MGMT_VREGIN_2" H 13400 5500 20  0000 C CNN
@@ -320,7 +291,7 @@ F 3 "" H 13400 5500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FCF
+L power:GND GND_76
 U 1 1 58023FCF
 P 12600 6500
 F 0 "GND_76" H 12600 6500 20  0000 C CNN
@@ -331,7 +302,7 @@ F 3 "" H 12600 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023FCE
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_18
 U 1 1 58023FCE
 P 11100 2600
 F 0 "VCCO_3V3_18" H 11100 2600 20  0000 C CNN
@@ -709,7 +680,7 @@ DM_N
 Text Label 2100 3500 0 60 ~
 DM_P
 $Comp
-L FT_MGMT_VREGIN #PWR?58023FCD
+L Cryptech_Alpha:FT_MGMT_VREGIN FT_MGMT_VREGIN_3
 U 1 1 58023FCD
 P 2600 3400
 F 0 "FT_MGMT_VREGIN_3" H 2600 3400 20  0000 C CNN
@@ -720,7 +691,7 @@ F 3 "" H 2600 3400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FCC
+L power:GND GND_77
 U 1 1 58023FCC
 P 6300 5800
 F 0 "GND_77" H 6300 5800 20  0000 C CNN
@@ -731,7 +702,7 @@ F 3 "" H 6300 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FCB
+L power:GND GND_78
 U 1 1 58023FCB
 P 6500 5800
 F 0 "GND_78" H 6500 5800 20  0000 C CNN
@@ -744,7 +715,7 @@ $EndComp
 Connection ~ 2600 3400
 Connection ~ 6620 3700
 $Comp
-L FT232H_SERIAL U9
+L Cryptech_Alpha:FT232H_SERIAL U9
 U 1 1 58023FCA
 P 8500 4700
 F 0 "U9" H 9620 5910 60  0000 L BNN
@@ -755,7 +726,7 @@ F 3 "" H 7380 6220 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0603 C97
+L Cryptech_Alpha:C-EUC0603 C97
 U 1 1 58023FC9
 P 9900 8100
 F 0 "C97" H 9590 8180 60  0000 L BNN
@@ -766,7 +737,7 @@ F 3 "" H 9590 8080 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C98
+L Cryptech_Alpha:C-EUC0402 C98
 U 1 1 58023FC8
 P 10200 8100
 F 0 "C98" H 10300 8200 60  0000 L BNN
@@ -777,7 +748,7 @@ F 3 "" H 10300 8110 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C94
+L Cryptech_Alpha:C-EUC0402 C94
 U 1 1 58023FC7
 P 7000 8100
 F 0 "C94" H 7100 8000 60  0000 L BNN
@@ -788,7 +759,7 @@ F 3 "" H 7100 7900 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0805 C92
+L Cryptech_Alpha:C-EUC0805 C92
 U 1 1 58023FC6
 P 6500 8100
 F 0 "C92" H 6213 7984 60  0000 L BNN
@@ -799,7 +770,7 @@ F 3 "" H 6190 7910 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C96
+L Cryptech_Alpha:C-EUC0402 C96
 U 1 1 58023FC5
 P 8800 8100
 F 0 "C96" H 8900 8000 60  0000 L BNN
@@ -810,7 +781,7 @@ F 3 "" H 8900 7910 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0805 C95
+L Cryptech_Alpha:C-EUC0805 C95
 U 1 1 58023FC4
 P 8300 8100
 F 0 "C95" H 8013 8034 60  0000 L BNN
@@ -821,7 +792,7 @@ F 3 "" H 7979 7930 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C99
+L Cryptech_Alpha:C-EUC0402 C99
 U 1 1 58023FC3
 P 11300 8100
 F 0 "C99" H 11000 8000 60  0000 L BNN
@@ -832,7 +803,7 @@ F 3 "" H 10950 7910 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C100
+L Cryptech_Alpha:C-EUC0402 C100
 U 1 1 58023FC2
 P 11700 8100
 F 0 "C100" H 11400 8230 60  0000 L BNN
@@ -843,7 +814,7 @@ F 3 "" H 11400 8130 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C101
+L Cryptech_Alpha:C-EUC0402 C101
 U 1 1 58023FC1
 P 12100 8100
 F 0 "C101" H 12200 8000 60  0000 L BNN
@@ -854,7 +825,7 @@ F 3 "" H 12210 7910 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L FERRITE_0603MP FB4
+L Cryptech_Alpha:FERRITE_0603MP FB4
 U 1 1 58023FC0
 P 8000 7800
 F 0 "FB4" H 7920 7632 60  0000 L BNN
@@ -863,7 +834,7 @@ F 0 "FB4" H 7920 7632 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 7920 7632 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R27
+L Cryptech_Alpha:R-EU_R0402 R27
 U 1 1 58023FBF
 P 6820 4400
 F 0 "R27" H 6930 4545 60  0000 R TNN
@@ -874,7 +845,7 @@ F 3 "" H 6930 4360 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L FERRITE_0603MP FB3
+L Cryptech_Alpha:FERRITE_0603MP FB3
 U 1 1 58023FBE
 P 6200 7800
 F 0 "FB3" H 6120 7632 60  0000 L BNN
@@ -883,7 +854,7 @@ F 0 "FB3" H 6120 7632 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:L_0603" H 6120 7632 60  0001 C CNN
 $EndComp
 $Comp
-L USBMINIB CN2
+L Cryptech_Alpha:USBMINIB CN2
 U 1 1 58023FBD
 P 1700 3600
 F 0 "CN2" H 1288 3190 60  0000 L BNN
@@ -894,7 +865,7 @@ F 3 "" H 1288 3910 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L RCLAMP0502ASC-89 IC6
+L Cryptech_Alpha:RCLAMP0502ASC-89 IC6
 U 1 1 58023FBC
 P 3200 3600
 F 0 "IC6" H 2790 3290 60  0000 L BNN
@@ -905,7 +876,7 @@ F 3 "" H 2790 3280 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R88
+L Cryptech_Alpha:R-EU_R0402 R88
 U 1 1 58023FBB
 P 10800 3500
 F 0 "R88" H 10897 3270 60  0000 R TNN
@@ -916,7 +887,7 @@ F 3 "" H 10890 3360 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R89
+L Cryptech_Alpha:R-EU_R0402 R89
 U 1 1 58023FBA
 P 10800 3600
 F 0 "R89" H 11140 3730 60  0000 R TNN
@@ -927,7 +898,7 @@ F 3 "" H 11150 3820 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L M03X2NO_SILK J3
+L Cryptech_Alpha:M03X2NO_SILK J3
 U 1 1 58023FB9
 P 13000 6200
 F 0 "J3" H 12790 5890 60  0000 L BNN
@@ -936,7 +907,7 @@ F 0 "J3" H 12790 5890 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:PLD-6" H 12790 5890 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C215
+L Cryptech_Alpha:C-EUC0402 C215
 U 1 1 58023FB8
 P 12600 5800
 F 0 "C215" H 12200 5700 60  0000 L BNN
@@ -947,7 +918,7 @@ F 3 "" H 12200 5600 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R90
+L Cryptech_Alpha:R-EU_R0402 R90
 U 1 1 58023FB7
 P 11100 3000
 F 0 "R90" V 11000 3100 60  0000 L BNN
@@ -958,7 +929,7 @@ F 3 "" H 11100 3090 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L CRYSTALTHIN Y2
+L Cryptech_Alpha:CRYSTALTHIN Y2
 U 1 1 58023FB6
 P 6400 5700
 F 0 "Y2" H 6470 5800 60  0000 R BNN
@@ -969,7 +940,7 @@ F 3 "" H 5610 5820 60  0000 C CNN
 	-1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C91
+L Cryptech_Alpha:C-EUC0402 C91
 U 1 1 58023FB5
 P 6300 4200
 F 0 "C91" H 6380 4010 60  0000 L BNN
@@ -980,7 +951,7 @@ F 3 "" H 6350 3990 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C89
+L Cryptech_Alpha:C-EUC0402 C89
 U 1 1 58023FB4
 P 6100 4200
 F 0 "C89" H 5660 4215 60  0000 L BNN
@@ -991,7 +962,7 @@ F 3 "" H 5660 4100 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R26
+L Cryptech_Alpha:R-EU_R0402 R26
 U 1 1 58023FB3
 P 6700 4600
 F 0 "R26" H 6850 4791 60  0000 R TNN
@@ -1002,7 +973,7 @@ F 3 "" H 6850 4870 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C93
+L Cryptech_Alpha:C-EUC0402 C93
 U 1 1 58023FB2
 P 6700 6000
 F 0 "C93" H 6600 6000 60  0000 R TNN
@@ -1013,7 +984,7 @@ F 3 "" H 6580 6090 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C90
+L Cryptech_Alpha:C-EUC0402 C90
 U 1 1 58023FB1
 P 6100 6000
 F 0 "C90" H 6400 6000 60  0000 R TNN
@@ -1024,7 +995,7 @@ F 3 "" H 6400 6100 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0603 C87
+L Cryptech_Alpha:C-EUC0603 C87
 U 1 1 58023FB0
 P 4700 8100
 F 0 "C87" H 4413 8184 60  0000 L BNN
@@ -1035,7 +1006,7 @@ F 3 "" H 4400 8080 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C88
+L Cryptech_Alpha:C-EUC0402 C88
 U 1 1 58023FAF
 P 5000 8100
 F 0 "C88" H 5100 8200 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_11.sch b/rev03-KiCad/rev02_11.sch
index aa240cd..8dd8b65 100644
--- a/rev03-KiCad/rev02_11.sch
+++ b/rev03-KiCad/rev02_11.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -71,7 +42,7 @@ M03LOCK
 Text Notes 14300 2730 2    60   ~ 12
 JP4
 $Comp
-L 3V3_BATT #PWR?58023FAE
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_3
 U 1 1 58023FAE
 P 3500 3600
 F 0 "3V3_BATT_3" H 3500 3600 20  0000 C CNN
@@ -82,7 +53,7 @@ F 3 "" H 3500 3600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FAD
+L power:GND GND_79
 U 1 1 58023FAD
 P 3500 6700
 F 0 "GND_79" H 3500 6700 20  0000 C CNN
@@ -93,7 +64,7 @@ F 3 "" H 3500 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023FAC
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_4
 U 1 1 58023FAC
 P 10900 5700
 F 0 "3V3_BATT_4" H 10900 5700 20  0000 C CNN
@@ -104,7 +75,7 @@ F 3 "" H 10900 5700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023FAB
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_5
 U 1 1 58023FAB
 P 9600 4100
 F 0 "3V3_BATT_5" H 9600 4100 20  0000 C CNN
@@ -115,7 +86,7 @@ F 3 "" H 9600 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FAA
+L power:GND GND_80
 U 1 1 58023FAA
 P 10900 6700
 F 0 "GND_80" H 10900 6700 20  0000 C CNN
@@ -126,7 +97,7 @@ F 3 "" H 10900 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FA9
+L power:GND GND_81
 U 1 1 58023FA9
 P 2200 4800
 F 0 "GND_81" H 2200 4800 20  0000 C CNN
@@ -137,7 +108,7 @@ F 3 "" H 2200 4800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FA8
+L power:GND GND_82
 U 1 1 58023FA8
 P 14300 9200
 F 0 "GND_82" H 14300 9200 20  0000 C CNN
@@ -148,7 +119,7 @@ F 3 "" H 14300 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FA7
+L power:GND GND_83
 U 1 1 58023FA7
 P 13700 7500
 F 0 "GND_83" H 13700 7500 20  0000 C CNN
@@ -159,7 +130,7 @@ F 3 "" H 13700 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FA6
+L power:GND GND_84
 U 1 1 58023FA6
 P 14200 5300
 F 0 "GND_84" H 14200 5300 20  0000 C CNN
@@ -170,7 +141,7 @@ F 3 "" H 14200 5300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FA5
+L power:GND GND_85
 U 1 1 58023FA5
 P 13700 2800
 F 0 "GND_85" H 13700 2800 20  0000 C CNN
@@ -181,7 +152,7 @@ F 3 "" H 13700 2800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023FA4
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_6
 U 1 1 58023FA4
 P 13200 2200
 F 0 "3V3_BATT_6" H 13200 2200 20  0000 C CNN
@@ -192,7 +163,7 @@ F 3 "" H 13200 2200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023FA3
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_19
 U 1 1 58023FA3
 P 13700 2200
 F 0 "VCCO_3V3_19" H 13700 2200 20  0000 C CNN
@@ -203,7 +174,7 @@ F 3 "" H 13700 2200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023FA2
+L power:GND GND_86
 U 1 1 58023FA2
 P 12800 7500
 F 0 "GND_86" H 12800 7500 20  0000 C CNN
@@ -214,7 +185,7 @@ F 3 "" H 12800 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023FA1
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_7
 U 1 1 58023FA1
 P 12800 4400
 F 0 "3V3_BATT_7" H 12800 4400 20  0000 C CNN
@@ -547,7 +518,7 @@ Wire Wire Line
 Text GLabel 3170 6000 0 48 BiDi ~ 0
 AVR_GPIO_FPGA_3
 $Comp
-L VCCO_3V3 #PWR?58023FA0
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_20
 U 1 1 58023FA0
 P 12800 6400
 F 0 "VCCO_3V3_20" H 12800 6400 20  0000 C CNN
@@ -558,7 +529,7 @@ F 3 "" H 12800 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ATTINY828R-AU U10
+L Cryptech_Alpha:ATTINY828R-AU U10
 U 1 1 58023F9F
 P 6100 5100
 F 0 "U10" H 4070 3570 60  0000 L BNN
@@ -567,7 +538,7 @@ F 0 "U10" H 4070 3570 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:LQFP-32" H 4070 3570 60  0001 C CNN
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED10
+L Cryptech_Alpha:LEDCHIP-LED0603 LED10
 U 1 1 58023F9E
 P 13800 9000
 F 0 "LED10" V 13770 8316 60  0000 R TNN
@@ -578,7 +549,7 @@ F 3 "" H 13760 7810 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L M10LOCK JP5
+L Cryptech_Alpha:M10LOCK JP5
 U 1 1 58023F9D
 P 14300 7200
 F 0 "JP5" H 14580 7630 60  0000 R TNN
@@ -587,7 +558,7 @@ F 0 "JP5" H 14580 7630 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:HDR1X10" H 14580 7630 60  0001 C CNN
 $EndComp
 $Comp
-L TACTILE_SWITCH S2
+L Cryptech_Alpha:TACTILE_SWITCH S2
 U 1 1 58023F9C
 P 13500 4700
 F 0 "S2" H 14120 4810 60  0000 L BNN
@@ -598,7 +569,7 @@ F 3 "" H 13200 5170 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L M03LOCK JP4
+L Cryptech_Alpha:M03LOCK JP4
 U 1 1 58023F9B
 P 14200 2500
 F 0 "JP4" H 14380 2830 60  0000 R TNN
@@ -607,7 +578,7 @@ F 0 "JP4" H 14380 2830 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:PLS-3" H 14380 2830 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C105
+L Cryptech_Alpha:C-EUC0402 C105
 U 1 1 58023F9A
 P 12800 6900
 F 0 "C105" H 12390 6850 60  0000 L BNN
@@ -618,7 +589,7 @@ F 3 "" H 12380 6740 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R82
+L Cryptech_Alpha:R-EU_R0402 R82
 U 1 1 58023F99
 P 12800 4700
 F 0 "R82" V 12771 5047 60  0000 R TNN
@@ -629,7 +600,7 @@ F 3 "" H 12660 5050 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R96
+L Cryptech_Alpha:R-EU_R0402 R96
 U 1 1 58023F98
 P 13400 8700
 F 0 "R96" H 13490 8520 60  0000 R TNN
@@ -640,7 +611,7 @@ F 3 "" H 13500 8610 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R95
+L Cryptech_Alpha:R-EU_R0402 R95
 U 1 1 58023F97
 P 13090 8800
 F 0 "R95" H 13220 8520 60  0000 R TNN
@@ -651,7 +622,7 @@ F 3 "" H 13230 8610 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R31
+L Cryptech_Alpha:R-EU_R0402 R31
 U 1 1 58023F96
 P 13400 8900
 F 0 "R31" H 13080 8510 60  0000 R TNN
@@ -662,7 +633,7 @@ F 3 "" H 13090 8600 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R97
+L Cryptech_Alpha:R-EU_R0402 R97
 U 1 1 58023F95
 P 13090 9000
 F 0 "R97" H 13180 9170 60  0000 R TNN
@@ -673,7 +644,7 @@ F 3 "" H 13190 9260 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L AVR_SPI_PRG_62X3_LOCK JP3
+L Cryptech_Alpha:AVR_SPI_PRG_62X3_LOCK JP3
 U 1 1 58023F94
 P 10400 6100
 F 0 "JP3" H 10230 6330 60  0000 L BNN
@@ -684,7 +655,7 @@ F 3 "" H 9440 5700 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R30
+L Cryptech_Alpha:R-EU_R0402 R30
 U 1 1 58023F93
 P 9600 4600
 F 0 "R30" V 9510 4555 60  0000 R TNN
@@ -695,7 +666,7 @@ F 3 "" H 9540 4510 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC0805 C102
+L Cryptech_Alpha:C-EUC0805 C102
 U 1 1 58023F92
 P 1900 4400
 F 0 "C102" H 1580 4400 60  0000 L BNN
@@ -706,7 +677,7 @@ F 3 "" H 1570 4290 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C104
+L Cryptech_Alpha:C-EUC0402 C104
 U 1 1 58023F91
 P 2500 4400
 F 0 "C104" H 2630 4400 60  0000 L BNN
@@ -717,7 +688,7 @@ F 3 "" H 2620 4300 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C103
+L Cryptech_Alpha:C-EUC0402 C103
 U 1 1 58023F90
 P 2200 4400
 F 0 "C103" H 2230 4490 60  0000 L BNN
@@ -728,7 +699,7 @@ F 3 "" H 2220 4400 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED11
+L Cryptech_Alpha:LEDCHIP-LED0603 LED11
 U 1 1 58023F8F
 P 14000 8700
 F 0 "LED11" V 13970 8216 60  0000 R TNN
@@ -739,7 +710,7 @@ F 3 "" H 13960 7710 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED9
+L Cryptech_Alpha:LEDCHIP-LED0603 LED9
 U 1 1 58023F8E
 P 13800 8800
 F 0 "LED9" V 13770 8110 60  0000 R TNN
@@ -750,7 +721,7 @@ F 3 "" H 13755 7616 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED12
+L Cryptech_Alpha:LEDCHIP-LED0603 LED12
 U 1 1 58023F8D
 P 14000 8900
 F 0 "LED12" V 13970 8416 60  0000 R TNN
diff --git a/rev03-KiCad/rev02_12.sch b/rev03-KiCad/rev02_12.sch
index 0c3c6b5..3f79ae4 100644
--- a/rev03-KiCad/rev02_12.sch
+++ b/rev03-KiCad/rev02_12.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -73,7 +44,7 @@ IC4
 Text Notes 5500 5900 0    60   ~ 12
 74*244DW
 $Comp
-L GND #PWR?58023F8C
+L power:GND GND_87
 U 1 1 58023F8C
 P 11300 6500
 F 0 "GND_87" H 11300 6500 20  0000 C CNN
@@ -84,7 +55,7 @@ F 3 "" H 11300 6500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023F8B
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_8
 U 1 1 58023F8B
 P 11300 4200
 F 0 "3V3_BATT_8" H 11300 4200 20  0000 C CNN
@@ -95,7 +66,7 @@ F 3 "" H 11300 4200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023F8A
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_9
 U 1 1 58023F8A
 P 3300 4100
 F 0 "3V3_BATT_9" H 3300 4100 20  0000 C CNN
@@ -106,7 +77,7 @@ F 3 "" H 3300 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023F89
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_10
 U 1 1 58023F89
 P 10800 4200
 F 0 "3V3_BATT_10" H 10800 4200 20  0000 C CNN
@@ -117,7 +88,7 @@ F 3 "" H 10800 4200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F88
+L power:GND GND_88
 U 1 1 58023F88
 P 11500 4700
 F 0 "GND_88" H 11500 4700 20  0000 C CNN
@@ -128,7 +99,7 @@ F 3 "" H 11500 4700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F87
+L power:GND GND_89
 U 1 1 58023F87
 P 7600 6400
 F 0 "GND_89" H 7600 6400 20  0000 C CNN
@@ -139,7 +110,7 @@ F 3 "" H 7600 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F86
+L power:GND GND_90
 U 1 1 58023F86
 P 3300 5200
 F 0 "GND_90" H 3300 5200 20  0000 C CNN
@@ -150,7 +121,7 @@ F 3 "" H 3300 5200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F85
+L power:GND GND_91
 U 1 1 58023F85
 P 5000 7500
 F 0 "GND_91" H 5000 7500 20  0000 C CNN
@@ -161,7 +132,7 @@ F 3 "" H 5000 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023F84
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_11
 U 1 1 58023F84
 P 5000 4100
 F 0 "3V3_BATT_11" H 5000 4100 20  0000 C CNN
@@ -172,7 +143,7 @@ F 3 "" H 5000 4100 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3_BATT #PWR?58023F83
+L Cryptech_Alpha:3V3_BATT 3V3_BATT_12
 U 1 1 58023F83
 P 10100 4220
 F 0 "3V3_BATT_12" H 10100 4220 20  0000 C CNN
@@ -339,7 +310,7 @@ Wire Wire Line
 Wire Wire Line
 	10500 5400 10100 5400
 $Comp
-L 23K640-I_SN U12
+L Cryptech_Alpha:23K640-I_SN U12
 U 1 1 58023F82
 P 12100 5600
 F 0 "U12" H 11570 4670 60  0000 L BNN
@@ -348,7 +319,7 @@ F 0 "U12" H 11570 4670 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOIC127P600X175-8N" H 11570 4670 60  0001 C CNN
 $EndComp
 $Comp
-L 74*244DW_2 IC4_2
+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
@@ -359,7 +330,7 @@ F 3 "" H 5510 6920 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L 74*244DW_3 IC4_3
+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
@@ -370,7 +341,7 @@ F 3 "" H 3480 4680 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R33
+L Cryptech_Alpha:R-EU_R0402 R33
 U 1 1 58023F7F
 P 10800 4800
 F 0 "R33" V 10741 4550 60  0000 L BNN
@@ -381,7 +352,7 @@ F 3 "" H 10830 4540 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L R-EU_R0402 R34
+L Cryptech_Alpha:R-EU_R0402 R34
 U 1 1 58023F7E
 P 10100 4820
 F 0 "R34" V 10171 5167 60  0000 R TNN
@@ -392,7 +363,7 @@ F 3 "" H 10080 5180 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC0402 C106
+L Cryptech_Alpha:C-EUC0402 C106
 U 1 1 58023F7D
 P 2900 4700
 F 0 "C106" H 2500 4600 60  0000 L BNN
@@ -403,7 +374,7 @@ F 3 "" H 2490 4500 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C107
+L Cryptech_Alpha:C-EUC0402 C107
 U 1 1 58023F7C
 P 11500 4400
 F 0 "C107" H 11600 4500 60  0000 L BNN
@@ -414,7 +385,7 @@ F 3 "" H 11600 4400 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L JP1Q JP6
+L Cryptech_Alpha:JP1Q JP6
 U 1 1 58023F7B
 P 7600 6000
 F 0 "JP6" H 7705 6030 60  0000 L BNN
@@ -423,7 +394,7 @@ F 0 "JP6" H 7705 6030 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:PLS-2" H 7705 6030 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R80
+L Cryptech_Alpha:R-EU_R0402 R80
 U 1 1 58023F7A
 P 5000 4800
 F 0 "R80" V 4910 4755 60  0000 R TNN
@@ -434,7 +405,7 @@ F 3 "" H 4990 4690 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R81
+L Cryptech_Alpha:R-EU_R0402 R81
 U 1 1 58023F79
 P 5000 7200
 F 0 "R81" V 5090 7245 60  0000 L BNN
@@ -445,7 +416,7 @@ F 3 "" H 5060 7310 60  0000 C CNN
 	0    1    1    0
 $EndComp
 $Comp
-L 74*244DW_1 IC4
+L Cryptech_Alpha:74*244DW_1 IC4
 U 1 1 58023F78
 P 5800 5400
 F 0 "IC4" H 5470 4870 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_13.sch b/rev03-KiCad/rev02_13.sch
index 5219803..adb2c1e 100644
--- a/rev03-KiCad/rev02_13.sch
+++ b/rev03-KiCad/rev02_13.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -71,7 +42,7 @@ U13
 Text Notes 1050 6300 0    60   ~ 12
 XC7A200TFBG484
 $Comp
-L GND #PWR?58023F77
+L power:GND GND_92
 U 1 1 58023F77
 P 2200 6300
 F 0 "GND_92" H 2200 6300 20  0000 C CNN
@@ -82,7 +53,7 @@ F 3 "" H 2200 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F76
+L power:GND GND_93
 U 1 1 58023F76
 P 1500 9800
 F 0 "GND_93" H 1500 9800 20  0000 C CNN
@@ -93,7 +64,7 @@ F 3 "" H 1500 9800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F75
+L power:GND GND_94
 U 1 1 58023F75
 P 2300 9800
 F 0 "GND_94" H 2300 9800 20  0000 C CNN
@@ -104,7 +75,7 @@ F 3 "" H 2300 9800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F74
+L power:GND GND_95
 U 1 1 58023F74
 P 5800 6400
 F 0 "GND_95" H 5800 6400 20  0000 C CNN
@@ -115,7 +86,7 @@ F 3 "" H 5800 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F73
+L power:GND GND_96
 U 1 1 58023F73
 P 6600 6400
 F 0 "GND_96" H 6600 6400 20  0000 C CNN
@@ -126,7 +97,7 @@ F 3 "" H 6600 6400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F72
+L power:GND GND_97
 U 1 1 58023F72
 P 9100 9300
 F 0 "GND_97" H 9100 9300 20  0000 C CNN
@@ -137,7 +108,7 @@ F 3 "" H 9100 9300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F71
+L power:GND GND_98
 U 1 1 58023F71
 P 7700 9300
 F 0 "GND_98" H 7700 9300 20  0000 C CNN
@@ -148,7 +119,7 @@ F 3 "" H 7700 9300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F70
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_21
 U 1 1 58023F70
 P 3100 8200
 F 0 "VCCO_3V3_21" H 3100 8200 20  0000 C CNN
@@ -159,7 +130,7 @@ F 3 "" H 3100 8200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F6F
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_22
 U 1 1 58023F6F
 P 4700 8200
 F 0 "VCCO_3V3_22" H 4700 8200 20  0000 C CNN
@@ -170,7 +141,7 @@ F 3 "" H 4700 8200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F6E
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_23
 U 1 1 58023F6E
 P 7700 8200
 F 0 "VCCO_3V3_23" H 7700 8200 20  0000 C CNN
@@ -181,7 +152,7 @@ F 3 "" H 7700 8200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F6D
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_24
 U 1 1 58023F6D
 P 9100 7400
 F 0 "VCCO_3V3_24" H 9100 7400 20  0000 C CNN
@@ -192,7 +163,7 @@ F 3 "" H 9100 7400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F6C
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_25
 U 1 1 58023F6C
 P 2400 4500
 F 0 "VCCO_3V3_25" H 2400 4500 20  0000 C CNN
@@ -203,7 +174,7 @@ F 3 "" H 2400 4500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F6B
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_26
 U 1 1 58023F6B
 P 6000 4100
 F 0 "VCCO_3V3_26" H 6000 4100 20  0000 C CNN
@@ -441,7 +412,7 @@ Connection ~ 9000 8700
 Connection ~ 9100 8600
 Connection ~ 9200 8500
 $Comp
-L R-EU_R0402 R35
+L Cryptech_Alpha:R-EU_R0402 R35
 U 1 1 58023F6A
 P 1500 9400
 F 0 "R35" V 1410 9355 60  0000 R TNN
@@ -452,7 +423,7 @@ F 3 "" H 1430 9310 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R39
+L Cryptech_Alpha:R-EU_R0402 R39
 U 1 1 58023F69
 P 5200 9500
 F 0 "R39" H 5310 9645 60  0000 R TNN
@@ -463,7 +434,7 @@ F 3 "" H 5220 9650 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L MA08-1 SV1
+L Cryptech_Alpha:MA08-1 SV1
 U 1 1 58023F68
 P 9600 8700
 F 0 "SV1" H 9780 9330 60  0000 R TNN
@@ -474,7 +445,7 @@ F 3 "" H 9560 9330 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C108
+L Cryptech_Alpha:C-EUC0402 C108
 U 1 1 58023F67
 P 7700 8800
 F 0 "C108" H 7780 8610 60  0000 L BNN
@@ -485,7 +456,7 @@ F 3 "" H 7860 8710 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R43
+L Cryptech_Alpha:R-EU_R0402 R43
 U 1 1 58023F66
 P 9000 8000
 F 0 "R43" V 9159 7650 60  0000 R TNN
@@ -496,7 +467,7 @@ F 3 "" H 9170 7450 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R44
+L Cryptech_Alpha:R-EU_R0402 R44
 U 1 1 58023F65
 P 9100 8000
 F 0 "R44" V 9159 7750 60  0000 R TNN
@@ -507,7 +478,7 @@ F 3 "" H 9170 7550 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R45
+L Cryptech_Alpha:R-EU_R0402 R45
 U 1 1 58023F64
 P 9200 8000
 F 0 "R45" V 9159 7850 60  0000 R TNN
@@ -518,7 +489,7 @@ F 3 "" H 9170 7650 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0603 R62
+L Cryptech_Alpha:R-EU_R0603 R62
 U 1 1 58023F63
 P 3040 5200
 F 0 "R62" H 3150 4890 60  0000 R TNN
@@ -529,7 +500,7 @@ F 3 "" H 2940 4890 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0603 R63
+L Cryptech_Alpha:R-EU_R0603 R63
 U 1 1 58023F62
 P 3040 5300
 F 0 "R63" H 3150 4960 60  0000 R TNN
@@ -540,7 +511,7 @@ F 3 "" H 2940 4950 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0603 R71
+L Cryptech_Alpha:R-EU_R0603 R71
 U 1 1 58023F61
 P 3040 5400
 F 0 "R71" H 3150 5030 60  0000 R TNN
@@ -551,7 +522,7 @@ F 3 "" H 2940 5020 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L XC7A200TFBG484_1 U13
+L Cryptech_Alpha:XC7A200TFBG484_1 U13
 U 1 1 58023F60
 P 1800 5400
 F 0 "U13" H 1390 4490 60  0000 L BNN
@@ -560,7 +531,7 @@ F 0 "U13" H 1390 4490 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1390 4490 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R36
+L Cryptech_Alpha:R-EU_R0402 R36
 U 1 1 58023F5F
 P 2300 9400
 F 0 "R36" V 2210 9355 60  0000 R TNN
@@ -571,7 +542,7 @@ F 3 "" H 2240 9310 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R37
+L Cryptech_Alpha:R-EU_R0402 R37
 U 1 1 58023F5E
 P 3100 8600
 F 0 "R37" V 3159 8450 60  0000 R TNN
@@ -582,7 +553,7 @@ F 3 "" H 3060 8460 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R41
+L Cryptech_Alpha:R-EU_R0402 R41
 U 1 1 58023F5D
 P 6200 4700
 F 0 "R41" V 6271 4547 60  0000 R TNN
@@ -593,7 +564,7 @@ F 3 "" H 6190 4550 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R40
+L Cryptech_Alpha:R-EU_R0402 R40
 U 1 1 58023F5C
 P 5800 4700
 F 0 "R40" V 5871 5047 60  0000 R TNN
@@ -604,7 +575,7 @@ F 3 "" H 5780 5050 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L 2N7002 Q4
+L Cryptech_Alpha:2N7002 Q4
 U 1 1 58023F5B
 P 6200 5500
 F 0 "Q4" H 6310 5245 60  0000 R BNN
@@ -615,7 +586,7 @@ F 3 "" H 6420 5655 60  0000 C CNN
 	-1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R42
+L Cryptech_Alpha:R-EU_R0402 R42
 U 1 1 58023F5A
 P 6600 6000
 F 0 "R42" V 6559 5850 60  0000 R TNN
@@ -626,7 +597,7 @@ F 3 "" H 6470 5850 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED13
+L Cryptech_Alpha:LEDCHIP-LED0603 LED13
 U 1 1 58023F59
 P 4700 9200
 F 0 "LED13" H 4820 9260 60  0000 L BNN
@@ -637,7 +608,7 @@ F 3 "" H 4820 9075 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R38
+L Cryptech_Alpha:R-EU_R0402 R38
 U 1 1 58023F58
 P 4700 8700
 F 0 "R38" V 4759 8550 60  0000 R TNN
diff --git a/rev03-KiCad/rev02_14.sch b/rev03-KiCad/rev02_14.sch
index 0973994..4995812 100644
--- a/rev03-KiCad/rev02_14.sch
+++ b/rev03-KiCad/rev02_14.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -55,7 +26,7 @@ C109
 Text Notes 6160 5190 0    60   ~ 12
 0.1~uF
 $Comp
-L GND #PWR?58023F57
+L power:GND GND_99
 U 1 1 58023F57
 P 8700 5000
 F 0 "GND_99" H 8700 5000 20  0000 C CNN
@@ -66,7 +37,7 @@ F 3 "" H 8700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F56
+L power:GND GND_100
 U 1 1 58023F56
 P 5700 5400
 F 0 "GND_100" H 5700 5400 20  0000 C CNN
@@ -77,7 +48,7 @@ F 3 "" H 5700 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F55
+L power:GND GND_101
 U 1 1 58023F55
 P 6100 5400
 F 0 "GND_101" H 6100 5400 20  0000 C CNN
@@ -88,7 +59,7 @@ F 3 "" H 6100 5400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FPGA_VCCAUX_1V8 #PWR?58023F54
+L Cryptech_Alpha:FPGA_VCCAUX_1V8 FPGA_VCCAUX_1V8
 U 1 1 58023F54
 P 6100 4500
 F 0 "FPGA_VCCAUX_1V8" H 6100 4500 20  0000 C CNN
@@ -127,7 +98,7 @@ Wire Wire Line
 Wire Wire Line
 	6100 4500 6100 4700
 $Comp
-L C-EUC0402 C109
+L Cryptech_Alpha:C-EUC0402 C109
 U 1 1 58023F53
 P 6100 5000
 F 0 "C109" H 6180 4810 60  0000 L BNN
@@ -138,7 +109,7 @@ F 3 "" H 6420 5020 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L XC7A200TFBG484_8 U13_2
+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
@@ -147,7 +118,7 @@ F 0 "U13_2" H 1490 6690 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 6690 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_11 U13_3
+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
@@ -156,7 +127,7 @@ F 0 "U13_3" H 1490 4590 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 4590 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_12 U13_4
+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
@@ -165,7 +136,7 @@ F 0 "U13_4" H 1490 5490 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 5490 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_13 U13_5
+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
@@ -174,7 +145,7 @@ F 0 "U13_5" H 7890 4390 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 7890 4390 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_17 U13_6
+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
diff --git a/rev03-KiCad/rev02_15.sch b/rev03-KiCad/rev02_15.sch
index b5912c2..542dc6e 100644
--- a/rev03-KiCad/rev02_15.sch
+++ b/rev03-KiCad/rev02_15.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -85,7 +56,7 @@ IC2
 Text Notes 3860 6330 0    60   ~ 12
 74*244DW
 $Comp
-L GND #PWR?58023F4D
+L power:GND GND_102
 U 1 1 58023F4D
 P 7600 7300
 F 0 "GND_102" H 7600 7300 20  0000 C CNN
@@ -96,7 +67,7 @@ F 3 "" H 7600 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F4C
+L power:GND GND_103
 U 1 1 58023F4C
 P 6700 7300
 F 0 "GND_103" H 6700 7300 20  0000 C CNN
@@ -107,7 +78,7 @@ F 3 "" H 6700 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F4B
+L power:GND GND_104
 U 1 1 58023F4B
 P 10000 7300
 F 0 "GND_104" H 10000 7300 20  0000 C CNN
@@ -118,7 +89,7 @@ F 3 "" H 10000 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F4A
+L power:GND GND_105
 U 1 1 58023F4A
 P 5000 10000
 F 0 "GND_105" H 5000 10000 20  0000 C CNN
@@ -129,7 +100,7 @@ F 3 "" H 5000 10000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F49
+L power:GND GND_106
 U 1 1 58023F49
 P 4400 10000
 F 0 "GND_106" H 4400 10000 20  0000 C CNN
@@ -140,7 +111,7 @@ F 3 "" H 4400 10000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F48
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_27
 U 1 1 58023F48
 P 6700 5200
 F 0 "VCCO_3V3_27" H 6700 5200 20  0000 C CNN
@@ -151,7 +122,7 @@ F 3 "" H 6700 5200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F47
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_28
 U 1 1 58023F47
 P 4400 8900
 F 0 "VCCO_3V3_28" H 4400 8900 20  0000 C CNN
@@ -162,7 +133,7 @@ F 3 "" H 4400 8900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F46
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_29
 U 1 1 58023F46
 P 1660 4630
 F 0 "VCCO_3V3_29" H 1660 4630 20  0000 C CNN
@@ -173,7 +144,7 @@ F 3 "" H 1660 4630 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F45
+L power:GND GND_107
 U 1 1 58023F45
 P 1660 5630
 F 0 "GND_107" H 1660 5630 20  0000 C CNN
@@ -184,7 +155,7 @@ F 3 "" H 1660 5630 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F44
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_30
 U 1 1 58023F44
 P 3360 4300
 F 0 "VCCO_3V3_30" H 3360 4300 20  0000 C CNN
@@ -195,7 +166,7 @@ F 3 "" H 3360 4300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F43
+L power:GND GND_108
 U 1 1 58023F43
 P 2960 7930
 F 0 "GND_108" H 2960 7930 20  0000 C CNN
@@ -449,7 +420,7 @@ Text GLabel 430 6130 0 48 Input ~ 0
 FPGA_CFG_CTRL_ARM_ENA
 Connection ~ 3360 4420
 $Comp
-L N25Q128A13ES IC3
+L Cryptech_Alpha:N25Q128A13ES IC3
 U 1 1 58023F42
 P 8400 6550
 F 0 "IC3" H 7890 6290 60  0000 L BNN
@@ -460,7 +431,7 @@ F 3 "" H 8100 6920 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R4
+L Cryptech_Alpha:R-EU_R0402 R4
 U 1 1 58023F41
 P 6500 9500
 F 0 "R4" H 6610 9645 60  0000 R TNN
@@ -471,7 +442,7 @@ F 3 "" H 6460 9660 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L 74*244DW_1 IC2
+L Cryptech_Alpha:74*244DW_1 IC2
 U 1 1 58023F40
 P 4160 5830
 F 0 "IC2" H 3830 5300 60  0000 L BNN
@@ -482,7 +453,7 @@ F 3 "" H 3850 5300 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L 74*244DW_2 IC2_2
+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
@@ -493,7 +464,7 @@ F 3 "" H 3860 6390 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L 74*244DW_3 IC2_3
+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
@@ -504,7 +475,7 @@ F 3 "" H 1860 5110 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L ASF* Q5
+L Cryptech_Alpha:ASF* Q5
 U 1 1 58023F3D
 P 5600 9500
 F 0 "Q5" H 5270 9070 60  0000 L BNN
@@ -515,7 +486,7 @@ F 3 "" H 5080 9830 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L M03X2NO_SILK JP7
+L Cryptech_Alpha:M03X2NO_SILK JP7
 U 1 1 58023F3C
 P 2060 6230
 F 0 "JP7" H 1850 5920 60  0000 L BNN
@@ -524,7 +495,7 @@ F 0 "JP7" H 1850 5920 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:PLD-6" H 1850 5920 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R51
+L Cryptech_Alpha:R-EU_R0402 R51
 U 1 1 58023F3B
 P 7600 5900
 F 0 "R51" V 7510 5855 60  0000 R TNN
@@ -535,7 +506,7 @@ F 3 "" H 7510 5810 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R50
+L Cryptech_Alpha:R-EU_R0402 R50
 U 1 1 58023F3A
 P 6700 6900
 F 0 "R50" V 6610 6855 60  0000 R TNN
@@ -546,7 +517,7 @@ F 3 "" H 6620 6800 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC0402 C111
+L Cryptech_Alpha:C-EUC0402 C111
 U 1 1 58023F39
 P 4400 9600
 F 0 "C111" H 4480 9410 60  0000 L BNN
@@ -555,7 +526,7 @@ F 0 "C111" H 4480 9410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4480 9410 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R49
+L Cryptech_Alpha:R-EU_R0402 R49
 U 1 1 58023F38
 P 5600 8900
 F 0 "R49" H 5710 9045 60  0000 R TNN
@@ -566,7 +537,7 @@ F 3 "" H 5710 9060 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L C-EUC0402 C112
+L Cryptech_Alpha:C-EUC0402 C112
 U 1 1 58023F37
 P 10000 6800
 F 0 "C112" H 9660 6615 60  0000 L BNN
@@ -577,7 +548,7 @@ F 3 "" H 9660 6530 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C110
+L Cryptech_Alpha:C-EUC0402 C110
 U 1 1 58023F36
 P 1260 5130
 F 0 "C110" H 1320 5145 60  0000 L BNN
@@ -588,7 +559,7 @@ F 3 "" H 1320 4920 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R46
+L Cryptech_Alpha:R-EU_R0402 R46
 U 1 1 58023F35
 P 3360 4700
 F 0 "R46" V 3270 4655 60  0000 R TNN
@@ -599,7 +570,7 @@ F 3 "" H 3340 4590 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R47
+L Cryptech_Alpha:R-EU_R0402 R47
 U 1 1 58023F34
 P 2960 7630
 F 0 "R47" V 3050 7675 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_16.sch b/rev03-KiCad/rev02_16.sch
index 0f1e1ba..fb9db7c 100644
--- a/rev03-KiCad/rev02_16.sch
+++ b/rev03-KiCad/rev02_16.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -53,7 +24,7 @@ Text Notes 5900 4700 0    60   ~ 12
 Text Notes 8600 10230 0    84   ~ 12
 FPGA unused banks
 $Comp
-L VCCO_3V3 #PWR?58023F33
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_31
 U 1 1 58023F33
 P 2300 4300
 F 0 "VCCO_3V3_31" H 2300 4300 20  0000 C CNN
@@ -64,7 +35,7 @@ F 3 "" H 2300 4300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F32
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_32
 U 1 1 58023F32
 P 5800 4200
 F 0 "VCCO_3V3_32" H 5800 4200 20  0000 C CNN
@@ -123,7 +94,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 4800 5600 4800
 $Comp
-L XC7A200TFBG484_4 U13_7
+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
@@ -132,7 +103,7 @@ F 0 "U13_7" H 1490 4190 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1490 4190 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_7 U13_8
+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
diff --git a/rev03-KiCad/rev02_17.sch b/rev03-KiCad/rev02_17.sch
index e152065..4ddc072 100644
--- a/rev03-KiCad/rev02_17.sch
+++ b/rev03-KiCad/rev02_17.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -57,7 +28,7 @@ Text Notes 2900 8700 0    60   ~ 12
 Text Notes 8580 10230 0    84   ~ 12
 FPGA FMC interface
 $Comp
-L VCCO_3V3 #PWR?58023F2F
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_33
 U 1 1 58023F2F
 P 2000 4400
 F 0 "VCCO_3V3_33" H 2000 4400 20  0000 C CNN
@@ -68,7 +39,7 @@ F 3 "" H 2000 4400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023F2E
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_34
 U 1 1 58023F2E
 P 7000 4700
 F 0 "VCCO_3V3_34" H 7000 4700 20  0000 C CNN
@@ -349,7 +320,7 @@ FPGA_GPIO_LED_0
 Text GLabel 2950 5300 2 48 Output ~ 0
 FPGA_GPIO_LED_1
 $Comp
-L XC7A200TFBG484_2 U13_9
+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
@@ -358,7 +329,7 @@ F 0 "U13_9" H 6140 4690 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 6140 4690 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_6 U13_10
+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
diff --git a/rev03-KiCad/rev02_18.sch b/rev03-KiCad/rev02_18.sch
index 4acd2fd..634d960 100644
--- a/rev03-KiCad/rev02_18.sch
+++ b/rev03-KiCad/rev02_18.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -103,7 +74,7 @@ C120
 Text Notes 5060 8890 0    60   ~ 12
 47uF
 $Comp
-L GND #PWR?58023F2B
+L power:GND GND_109
 U 1 1 58023F2B
 P 2800 6700
 F 0 "GND_109" H 2800 6700 20  0000 C CNN
@@ -114,7 +85,7 @@ F 3 "" H 2800 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F2A
+L power:GND GND_110
 U 1 1 58023F2A
 P 3300 6700
 F 0 "GND_110" H 3300 6700 20  0000 C CNN
@@ -125,7 +96,7 @@ F 3 "" H 3300 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F29
+L power:GND GND_111
 U 1 1 58023F29
 P 2100 6700
 F 0 "GND_111" H 2100 6700 20  0000 C CNN
@@ -136,7 +107,7 @@ F 3 "" H 2100 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F28
+L power:GND GND_112
 U 1 1 58023F28
 P 1100 5600
 F 0 "GND_112" H 1100 5600 20  0000 C CNN
@@ -147,7 +118,7 @@ F 3 "" H 1100 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F27
+L power:GND GND_113
 U 1 1 58023F27
 P 1600 6700
 F 0 "GND_113" H 1600 6700 20  0000 C CNN
@@ -158,7 +129,7 @@ F 3 "" H 1600 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F26
+L power:GND GND_114
 U 1 1 58023F26
 P 4300 6000
 F 0 "GND_114" H 4300 6000 20  0000 C CNN
@@ -169,7 +140,7 @@ F 3 "" H 4300 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F25
+L power:GND GND_115
 U 1 1 58023F25
 P 5000 6000
 F 0 "GND_115" H 5000 6000 20  0000 C CNN
@@ -180,7 +151,7 @@ F 3 "" H 5000 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F24
+L power:GND GND_116
 U 1 1 58023F24
 P 5500 6000
 F 0 "GND_116" H 5500 6000 20  0000 C CNN
@@ -191,7 +162,7 @@ F 3 "" H 5500 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F23
+L power:GND GND_117
 U 1 1 58023F23
 P 2800 9900
 F 0 "GND_117" H 2800 9900 20  0000 C CNN
@@ -202,7 +173,7 @@ F 3 "" H 2800 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F22
+L power:GND GND_118
 U 1 1 58023F22
 P 3300 9900
 F 0 "GND_118" H 3300 9900 20  0000 C CNN
@@ -213,7 +184,7 @@ F 3 "" H 3300 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F21
+L power:GND GND_119
 U 1 1 58023F21
 P 2100 9900
 F 0 "GND_119" H 2100 9900 20  0000 C CNN
@@ -224,7 +195,7 @@ F 3 "" H 2100 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F20
+L power:GND GND_120
 U 1 1 58023F20
 P 1100 8800
 F 0 "GND_120" H 1100 8800 20  0000 C CNN
@@ -235,7 +206,7 @@ F 3 "" H 1100 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F1F
+L power:GND GND_121
 U 1 1 58023F1F
 P 1600 9900
 F 0 "GND_121" H 1600 9900 20  0000 C CNN
@@ -246,7 +217,7 @@ F 3 "" H 1600 9900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F1E
+L power:GND GND_122
 U 1 1 58023F1E
 P 4300 9200
 F 0 "GND_122" H 4300 9200 20  0000 C CNN
@@ -257,7 +228,7 @@ F 3 "" H 4300 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F1D
+L power:GND GND_123
 U 1 1 58023F1D
 P 5000 9200
 F 0 "GND_123" H 5000 9200 20  0000 C CNN
@@ -268,7 +239,7 @@ F 3 "" H 5000 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F1C
+L power:GND GND_124
 U 1 1 58023F1C
 P 5500 9200
 F 0 "GND_124" H 5500 9200 20  0000 C CNN
@@ -279,7 +250,7 @@ F 3 "" H 5500 9200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC_5V0 #PWR?58023F1B
+L Cryptech_Alpha:VCC_5V0 VCC_5V0
 U 1 1 58023F1B
 P 1100 4600
 F 0 "VCC_5V0" H 1100 4600 20  0000 C CNN
@@ -290,7 +261,7 @@ F 3 "" H 1100 4600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC_5V0 #PWR?58023F1A
+L Cryptech_Alpha:VCC_5V0 VCC_5V0_2
 U 1 1 58023F1A
 P 1100 7800
 F 0 "VCC_5V0_2" H 1100 7800 20  0000 C CNN
@@ -568,7 +539,7 @@ Connection ~ 4010 8100
 Connection ~ 4010 8000
 Connection ~ 4010 7900
 $Comp
-L C-EUC1210 C113
+L Cryptech_Alpha:C-EUC1210 C113
 U 1 1 58023F19
 P 1100 5200
 F 0 "C113" H 1180 5010 60  0000 L BNN
@@ -577,7 +548,7 @@ F 0 "C113" H 1180 5010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1180 5010 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R54
+L Cryptech_Alpha:R-EU_R0402 R54
 U 1 1 58023F18
 P 1600 8400
 F 0 "R54" V 1510 8355 60  0000 R TNN
@@ -588,7 +559,7 @@ F 3 "" H 1490 8350 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R58
+L Cryptech_Alpha:R-EU_R0402 R58
 U 1 1 58023F17
 P 4300 8300
 F 0 "R58" V 4210 8255 60  0000 R TNN
@@ -599,7 +570,7 @@ F 3 "" H 4250 8560 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R59
+L Cryptech_Alpha:R-EU_R0402 R59
 U 1 1 58023F16
 P 4300 8900
 F 0 "R59" V 4210 8855 60  0000 R TNN
@@ -610,7 +581,7 @@ F 3 "" H 4240 9130 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R61
+L Cryptech_Alpha:R-EU_R0402 R61
 U 1 1 58023F15
 P 5500 8800
 F 0 "R61" V 5410 8755 60  0000 R TNN
@@ -621,7 +592,7 @@ F 3 "" H 5520 8700 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L BLM31PG330SN1_1206 FB6
+L Cryptech_Alpha:BLM31PG330SN1_1206 FB6
 U 1 1 58023F14
 P 5800 8100
 F 0 "FB6" H 5650 8300 60  0000 L BNN
@@ -632,7 +603,7 @@ F 3 "" H 5630 8010 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C115
+L Cryptech_Alpha:C-EUC0402 C115
 U 1 1 58023F13
 P 2100 6400
 F 0 "C115" H 2180 6210 60  0000 L BNN
@@ -641,7 +612,7 @@ F 0 "C115" H 2180 6210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2180 6210 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C116
+L Cryptech_Alpha:C-EUC0402 C116
 U 1 1 58023F12
 P 2100 9600
 F 0 "C116" H 2180 9410 60  0000 L BNN
@@ -650,7 +621,7 @@ F 0 "C116" H 2180 9410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2180 9410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C118
+L Cryptech_Alpha:C-EUC0402 C118
 U 1 1 58023F11
 P 4600 8200
 F 0 "C118" H 4680 8010 60  0000 L BNN
@@ -659,7 +630,7 @@ F 0 "C118" H 4680 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 8010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C117
+L Cryptech_Alpha:C-EUC0402 C117
 U 1 1 58023F10
 P 4600 5000
 F 0 "C117" H 4680 4810 60  0000 L BNN
@@ -668,7 +639,7 @@ F 0 "C117" H 4680 4810 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 4810 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C119
+L Cryptech_Alpha:C-EUC1210 C119
 U 1 1 58023F0F
 P 5000 5500
 F 0 "C119" H 5080 5310 60  0000 L BNN
@@ -677,7 +648,7 @@ F 0 "C119" H 5080 5310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 5080 5310 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R53
+L Cryptech_Alpha:R-EU_R0402 R53
 U 1 1 58023F0E
 P 1600 6400
 F 0 "R53" V 1510 6355 60  0000 R TNN
@@ -688,7 +659,7 @@ F 3 "" H 1550 6290 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC1210 C120
+L Cryptech_Alpha:C-EUC1210 C120
 U 1 1 58023F0D
 P 5000 8700
 F 0 "C120" H 5080 8510 60  0000 L BNN
@@ -697,7 +668,7 @@ F 0 "C120" H 5080 8510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 5080 8510 60  0001 C CNN
 $EndComp
 $Comp
-L EN6347QI U14
+L Cryptech_Alpha:EN6347QI U14
 U 1 1 58023F0C
 P 3100 5500
 F 0 "U14" H 2740 6590 60  0000 L BNN
@@ -706,7 +677,7 @@ F 0 "U14" H 2740 6590 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:QFN38" H 2740 6590 60  0001 C CNN
 $EndComp
 $Comp
-L EN6347QI U15
+L Cryptech_Alpha:EN6347QI U15
 U 1 1 58023F0B
 P 3100 8700
 F 0 "U15" H 2740 9790 60  0000 L BNN
@@ -715,7 +686,7 @@ F 0 "U15" H 2740 9790 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:QFN38" H 2740 9790 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R52
+L Cryptech_Alpha:R-EU_R0402 R52
 U 1 1 58023F0A
 P 1600 5200
 F 0 "R52" V 1510 5155 60  0000 R TNN
@@ -726,7 +697,7 @@ F 3 "" H 1540 5120 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R56
+L Cryptech_Alpha:R-EU_R0402 R56
 U 1 1 58023F09
 P 4300 5100
 F 0 "R56" V 4210 5055 60  0000 R TNN
@@ -737,7 +708,7 @@ F 3 "" H 4220 5360 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R57
+L Cryptech_Alpha:R-EU_R0402 R57
 U 1 1 58023F08
 P 4300 5700
 F 0 "R57" V 4210 5655 60  0000 R TNN
@@ -748,7 +719,7 @@ F 3 "" H 4210 5610 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R60
+L Cryptech_Alpha:R-EU_R0402 R60
 U 1 1 58023F07
 P 5500 5600
 F 0 "R60" V 5410 5555 60  0000 R TNN
@@ -759,7 +730,7 @@ F 3 "" H 5450 5470 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L BLM31PG330SN1_1206 FB5
+L Cryptech_Alpha:BLM31PG330SN1_1206 FB5
 U 1 1 58023F06
 P 5800 4900
 F 0 "FB5" H 5650 5100 60  0000 L BNN
@@ -770,7 +741,7 @@ F 3 "" H 5640 4810 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC1210 C114
+L Cryptech_Alpha:C-EUC1210 C114
 U 1 1 58023F05
 P 1100 8400
 F 0 "C114" H 1180 8210 60  0000 L BNN
@@ -779,7 +750,7 @@ F 0 "C114" H 1180 8210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1180 8210 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R55
+L Cryptech_Alpha:R-EU_R0402 R55
 U 1 1 58023F04
 P 1600 9600
 F 0 "R55" V 1510 9555 60  0000 R TNN
diff --git a/rev03-KiCad/rev02_19.sch b/rev03-KiCad/rev02_19.sch
index 0bd510a..f29921c 100644
--- a/rev03-KiCad/rev02_19.sch
+++ b/rev03-KiCad/rev02_19.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -71,7 +42,7 @@ C122
 Text Notes 7260 7190 0    60   ~ 12
 0.1~uF
 $Comp
-L GND #PWR?58023F03
+L power:GND GND_125
 U 1 1 58023F03
 P 7200 5600
 F 0 "GND_125" H 7200 5600 20  0000 C CNN
@@ -82,7 +53,7 @@ F 3 "" H 7200 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F02
+L power:GND GND_126
 U 1 1 58023F02
 P 8400 5600
 F 0 "GND_126" H 8400 5600 20  0000 C CNN
@@ -93,7 +64,7 @@ F 3 "" H 8400 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F01
+L power:GND GND_127
 U 1 1 58023F01
 P 9200 5600
 F 0 "GND_127" H 9200 5600 20  0000 C CNN
@@ -104,7 +75,7 @@ F 3 "" H 9200 5600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023F00
+L power:GND GND_128
 U 1 1 58023F00
 P 7200 7500
 F 0 "GND_128" H 7200 7500 20  0000 C CNN
@@ -115,7 +86,7 @@ F 3 "" H 7200 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EFF
+L power:GND GND_129
 U 1 1 58023EFF
 P 8400 7500
 F 0 "GND_129" H 8400 7500 20  0000 C CNN
@@ -126,7 +97,7 @@ F 3 "" H 8400 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EFE
+L power:GND GND_130
 U 1 1 58023EFE
 P 9200 7500
 F 0 "GND_130" H 9200 7500 20  0000 C CNN
@@ -137,7 +108,7 @@ F 3 "" H 9200 7500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023EFD
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_35
 U 1 1 58023EFD
 P 2100 4200
 F 0 "VCCO_3V3_35" H 2100 4200 20  0000 C CNN
@@ -148,7 +119,7 @@ F 3 "" H 2100 4200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023EFC
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_36
 U 1 1 58023EFC
 P 7200 4300
 F 0 "VCCO_3V3_36" H 7200 4300 20  0000 C CNN
@@ -159,7 +130,7 @@ F 3 "" H 7200 4300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023EFB
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_37
 U 1 1 58023EFB
 P 7200 6200
 F 0 "VCCO_3V3_37" H 7200 6200 20  0000 C CNN
@@ -170,7 +141,7 @@ F 3 "" H 7200 6200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EFA
+L power:GND GND_131
 U 1 1 58023EFA
 P 9300 9100
 F 0 "GND_131" H 9300 9100 20  0000 C CNN
@@ -497,7 +468,7 @@ Wire Wire Line
 Wire Wire Line
 	3100 9200 1900 9200
 $Comp
-L MA08-2 SV2
+L Cryptech_Alpha:MA08-2 SV2
 U 1 1 58023EF9
 P 8800 5000
 F 0 "SV2" H 8980 5630 60  0000 R TNN
@@ -506,7 +477,7 @@ F 0 "SV2" H 8980 5630 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:PLD-16" H 8980 5630 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R99
+L Cryptech_Alpha:R-EU_R0402 R99
 U 1 1 58023EF8
 P 8400 8600
 F 0 "R99" H 8490 8420 60  0000 R TNN
@@ -517,7 +488,7 @@ F 3 "" H 8500 8510 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R98
+L Cryptech_Alpha:R-EU_R0402 R98
 U 1 1 58023EF7
 P 8090 8700
 F 0 "R98" H 8220 8420 60  0000 R TNN
@@ -528,7 +499,7 @@ F 3 "" H 8230 8510 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R64
+L Cryptech_Alpha:R-EU_R0402 R64
 U 1 1 58023EF6
 P 8400 8800
 F 0 "R64" H 8080 8410 60  0000 R TNN
@@ -539,7 +510,7 @@ F 3 "" H 8090 8500 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0402 R100
+L Cryptech_Alpha:R-EU_R0402 R100
 U 1 1 58023EF5
 P 8090 8900
 F 0 "R100" H 8180 9070 60  0000 R TNN
@@ -550,7 +521,7 @@ F 3 "" H 8190 9160 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L MA08-2 SV3
+L Cryptech_Alpha:MA08-2 SV3
 U 1 1 58023EF4
 P 8800 6900
 F 0 "SV3" H 8980 7530 60  0000 R TNN
@@ -559,7 +530,7 @@ F 0 "SV3" H 8980 7530 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:PLD-16" H 8980 7530 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C121
+L Cryptech_Alpha:C-EUC0402 C121
 U 1 1 58023EF3
 P 7200 5100
 F 0 "C121" H 7280 4910 60  0000 L BNN
@@ -570,7 +541,7 @@ F 3 "" H 7320 5010 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C122
+L Cryptech_Alpha:C-EUC0402 C122
 U 1 1 58023EF2
 P 7200 7000
 F 0 "C122" H 7280 6810 60  0000 L BNN
@@ -581,7 +552,7 @@ F 3 "" H 7330 6910 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED17
+L Cryptech_Alpha:LEDCHIP-LED0603 LED17
 U 1 1 58023EF1
 P 9000 8900
 F 0 "LED17" V 8960 8526 60  0000 R TNN
@@ -592,7 +563,7 @@ F 3 "" H 8960 8220 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED15
+L Cryptech_Alpha:LEDCHIP-LED0603 LED15
 U 1 1 58023EF0
 P 8800 8800
 F 0 "LED15" V 8760 8226 60  0000 R TNN
@@ -603,7 +574,7 @@ F 3 "" H 8760 7920 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED16
+L Cryptech_Alpha:LEDCHIP-LED0603 LED16
 U 1 1 58023EEF
 P 9000 8700
 F 0 "LED16" V 8960 8326 60  0000 R TNN
@@ -614,7 +585,7 @@ F 3 "" H 8960 8030 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED14
+L Cryptech_Alpha:LEDCHIP-LED0603 LED14
 U 1 1 58023EEE
 P 8800 8600
 F 0 "LED14" V 8760 8026 60  0000 R TNN
@@ -625,7 +596,7 @@ F 3 "" H 8760 7720 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L XC7A200TFBG484_5 U13_11
+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
diff --git a/rev03-KiCad/rev02_20.sch b/rev03-KiCad/rev02_20.sch
index e566b58..0922162 100644
--- a/rev03-KiCad/rev02_20.sch
+++ b/rev03-KiCad/rev02_20.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -57,7 +28,7 @@ FPGA MKM interface
 Text Notes 4280 4890 0    60   ~ 12
 R65
 $Comp
-L VCCO_3V3 #PWR?58023EEC
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_38
 U 1 1 58023EEC
 P 4200 4300
 F 0 "VCCO_3V3_38" H 4200 4300 20  0000 C CNN
@@ -210,7 +181,7 @@ Wire Wire Line
 Wire Wire Line
 	4200 4600 4200 4500
 $Comp
-L R-EU_R0402 R65
+L Cryptech_Alpha:R-EU_R0402 R65
 U 1 1 58023EEB
 P 4200 4800
 F 0 "R65" V 4110 4755 60  0000 R TNN
@@ -221,7 +192,7 @@ F 3 "" H 4030 4730 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0603 R83
+L Cryptech_Alpha:R-EU_R0603 R83
 U 1 1 58023EEA
 P 3300 5200
 F 0 "R83" H 3410 5120 60  0000 R TNN
@@ -232,7 +203,7 @@ F 3 "" H 3220 5120 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0603 R84
+L Cryptech_Alpha:R-EU_R0603 R84
 U 1 1 58023EE9
 P 3300 5300
 F 0 "R84" H 3400 5480 60  0000 R TNN
@@ -243,7 +214,7 @@ F 3 "" H 3210 5470 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L R-EU_R0603 R85
+L Cryptech_Alpha:R-EU_R0603 R85
 U 1 1 58023EE8
 P 3300 6200
 F 0 "R85" H 3180 6200 60  0000 R TNN
@@ -254,7 +225,7 @@ F 3 "" H 3170 6300 60  0000 C CNN
 	-1   0    0    1
 $EndComp
 $Comp
-L XC7A200TFBG484_3 U13_12
+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
diff --git a/rev03-KiCad/rev02_21.sch b/rev03-KiCad/rev02_21.sch
index ab6c7e0..02dc358 100644
--- a/rev03-KiCad/rev02_21.sch
+++ b/rev03-KiCad/rev02_21.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -51,7 +22,7 @@ Text Notes 2000 4500 0    60   ~ 12
 Text Notes 8460 10210 0    66   ~ 12
 FPGA power and ground
 $Comp
-L GND #PWR?58023EE6
+L power:GND GND_132
 U 1 1 58023EE6
 P 2000 9700
 F 0 "GND_132" H 2000 9700 20  0000 C CNN
@@ -62,7 +33,7 @@ F 3 "" H 2000 9700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EE5
+L power:GND GND_133
 U 1 1 58023EE5
 P 3800 9600
 F 0 "GND_133" H 3800 9600 20  0000 C CNN
@@ -73,7 +44,7 @@ F 3 "" H 3800 9600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FPGA_VCCINT_1V0 #PWR?58023EE4
+L Cryptech_Alpha:FPGA_VCCINT_1V0 FPGA_VCCINT_1V0
 U 1 1 58023EE4
 P 6000 4900
 F 0 "FPGA_VCCINT_1V0" H 6000 4900 20  0000 C CNN
@@ -84,7 +55,7 @@ F 3 "" H 6000 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FPGA_VCCAUX_1V8 #PWR?58023EE3
+L Cryptech_Alpha:FPGA_VCCAUX_1V8 FPGA_VCCAUX_1V8_2
 U 1 1 58023EE3
 P 9000 4900
 F 0 "FPGA_VCCAUX_1V8_2" H 9000 4900 20  0000 C CNN
@@ -531,7 +502,7 @@ Wire Wire Line
 Wire Wire Line
 	9000 4900 9000 5100
 $Comp
-L XC7A200TFBG484_9 U13_13
+L Cryptech_Alpha:XC7A200TFBG484_9 U13_13
 U 1 1 58023EE2
 P 1600 7300
 F 0 "U13_13" H 1190 4890 60  0000 L BNN
@@ -540,7 +511,7 @@ F 0 "U13_13" H 1190 4890 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 1190 4890 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_10 U13_14
+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
@@ -549,7 +520,7 @@ F 0 "U13_14" H 2990 4990 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 2990 4990 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_14 U13_15
+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
@@ -558,7 +529,7 @@ F 0 "U13_15" H 8190 4890 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 8190 4890 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_15 U13_16
+L Cryptech_Alpha:XC7A200TFBG484_15 U13_16
 U 1 1 58023EDF
 P 5600 5200
 F 0 "U13_16" H 5190 4890 60  0000 L BNN
@@ -567,7 +538,7 @@ F 0 "U13_16" H 5190 4890 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:BGA484C100P22X22_2300X2300X254" H 5190 4890 60  0001 C CNN
 $EndComp
 $Comp
-L XC7A200TFBG484_16 U13_17
+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
diff --git a/rev03-KiCad/rev02_22.sch b/rev03-KiCad/rev02_22.sch
index add3c08..01071c3 100644
--- a/rev03-KiCad/rev02_22.sch
+++ b/rev03-KiCad/rev02_22.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -213,7 +184,7 @@ C126
 Text Notes 1660 8290 0    60   ~ 12
 47uF
 $Comp
-L GND #PWR?58023EDD
+L power:GND GND_134
 U 1 1 58023EDD
 P 1300 5000
 F 0 "GND_134" H 1300 5000 20  0000 C CNN
@@ -224,7 +195,7 @@ F 3 "" H 1300 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EDC
+L power:GND GND_135
 U 1 1 58023EDC
 P 1800 5000
 F 0 "GND_135" H 1800 5000 20  0000 C CNN
@@ -235,7 +206,7 @@ F 3 "" H 1800 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EDB
+L power:GND GND_136
 U 1 1 58023EDB
 P 3700 5900
 F 0 "GND_136" H 3700 5900 20  0000 C CNN
@@ -246,7 +217,7 @@ F 3 "" H 3700 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EDA
+L power:GND GND_137
 U 1 1 58023EDA
 P 4200 5900
 F 0 "GND_137" H 4200 5900 20  0000 C CNN
@@ -257,7 +228,7 @@ F 3 "" H 4200 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED9
+L power:GND GND_138
 U 1 1 58023ED9
 P 4700 5900
 F 0 "GND_138" H 4700 5900 20  0000 C CNN
@@ -268,7 +239,7 @@ F 3 "" H 4700 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED8
+L power:GND GND_139
 U 1 1 58023ED8
 P 5200 5900
 F 0 "GND_139" H 5200 5900 20  0000 C CNN
@@ -279,7 +250,7 @@ F 3 "" H 5200 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED7
+L power:GND GND_140
 U 1 1 58023ED7
 P 5700 5900
 F 0 "GND_140" H 5700 5900 20  0000 C CNN
@@ -290,7 +261,7 @@ F 3 "" H 5700 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED6
+L power:GND GND_141
 U 1 1 58023ED6
 P 6200 5900
 F 0 "GND_141" H 6200 5900 20  0000 C CNN
@@ -301,7 +272,7 @@ F 3 "" H 6200 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED5
+L power:GND GND_142
 U 1 1 58023ED5
 P 3700 5000
 F 0 "GND_142" H 3700 5000 20  0000 C CNN
@@ -312,7 +283,7 @@ F 3 "" H 3700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED4
+L power:GND GND_143
 U 1 1 58023ED4
 P 4200 5000
 F 0 "GND_143" H 4200 5000 20  0000 C CNN
@@ -323,7 +294,7 @@ F 3 "" H 4200 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED3
+L power:GND GND_144
 U 1 1 58023ED3
 P 4700 5000
 F 0 "GND_144" H 4700 5000 20  0000 C CNN
@@ -334,7 +305,7 @@ F 3 "" H 4700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED2
+L power:GND GND_145
 U 1 1 58023ED2
 P 5200 5000
 F 0 "GND_145" H 5200 5000 20  0000 C CNN
@@ -345,7 +316,7 @@ F 3 "" H 5200 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED1
+L power:GND GND_146
 U 1 1 58023ED1
 P 5700 5000
 F 0 "GND_146" H 5700 5000 20  0000 C CNN
@@ -356,7 +327,7 @@ F 3 "" H 5700 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ED0
+L power:GND GND_147
 U 1 1 58023ED0
 P 6200 5000
 F 0 "GND_147" H 6200 5000 20  0000 C CNN
@@ -367,7 +338,7 @@ F 3 "" H 6200 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ECF
+L power:GND GND_148
 U 1 1 58023ECF
 P 2500 5000
 F 0 "GND_148" H 2500 5000 20  0000 C CNN
@@ -378,7 +349,7 @@ F 3 "" H 2500 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ECE
+L power:GND GND_149
 U 1 1 58023ECE
 P 3000 5000
 F 0 "GND_149" H 3000 5000 20  0000 C CNN
@@ -389,7 +360,7 @@ F 3 "" H 3000 5000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ECD
+L power:GND GND_150
 U 1 1 58023ECD
 P 2800 5900
 F 0 "GND_150" H 2800 5900 20  0000 C CNN
@@ -400,7 +371,7 @@ F 3 "" H 2800 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ECC
+L power:GND GND_151
 U 1 1 58023ECC
 P 2300 5900
 F 0 "GND_151" H 2300 5900 20  0000 C CNN
@@ -411,7 +382,7 @@ F 3 "" H 2300 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ECB
+L power:GND GND_152
 U 1 1 58023ECB
 P 1800 5900
 F 0 "GND_152" H 1800 5900 20  0000 C CNN
@@ -422,7 +393,7 @@ F 3 "" H 1800 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023ECA
+L power:GND GND_153
 U 1 1 58023ECA
 P 1300 5900
 F 0 "GND_153" H 1300 5900 20  0000 C CNN
@@ -433,7 +404,7 @@ F 3 "" H 1300 5900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC9
+L power:GND GND_154
 U 1 1 58023EC9
 P 2800 6800
 F 0 "GND_154" H 2800 6800 20  0000 C CNN
@@ -444,7 +415,7 @@ F 3 "" H 2800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC8
+L power:GND GND_155
 U 1 1 58023EC8
 P 2300 6800
 F 0 "GND_155" H 2300 6800 20  0000 C CNN
@@ -455,7 +426,7 @@ F 3 "" H 2300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC7
+L power:GND GND_156
 U 1 1 58023EC7
 P 1800 6800
 F 0 "GND_156" H 1800 6800 20  0000 C CNN
@@ -466,7 +437,7 @@ F 3 "" H 1800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC6
+L power:GND GND_157
 U 1 1 58023EC6
 P 1300 6800
 F 0 "GND_157" H 1300 6800 20  0000 C CNN
@@ -477,7 +448,7 @@ F 3 "" H 1300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC5
+L power:GND GND_158
 U 1 1 58023EC5
 P 4800 6800
 F 0 "GND_158" H 4800 6800 20  0000 C CNN
@@ -488,7 +459,7 @@ F 3 "" H 4800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC4
+L power:GND GND_159
 U 1 1 58023EC4
 P 4300 6800
 F 0 "GND_159" H 4300 6800 20  0000 C CNN
@@ -499,7 +470,7 @@ F 3 "" H 4300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC3
+L power:GND GND_160
 U 1 1 58023EC3
 P 3800 6800
 F 0 "GND_160" H 3800 6800 20  0000 C CNN
@@ -510,7 +481,7 @@ F 3 "" H 3800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC2
+L power:GND GND_161
 U 1 1 58023EC2
 P 3300 6800
 F 0 "GND_161" H 3300 6800 20  0000 C CNN
@@ -521,7 +492,7 @@ F 3 "" H 3300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC1
+L power:GND GND_162
 U 1 1 58023EC1
 P 6800 6800
 F 0 "GND_162" H 6800 6800 20  0000 C CNN
@@ -532,7 +503,7 @@ F 3 "" H 6800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EC0
+L power:GND GND_163
 U 1 1 58023EC0
 P 6300 6800
 F 0 "GND_163" H 6300 6800 20  0000 C CNN
@@ -543,7 +514,7 @@ F 3 "" H 6300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EBF
+L power:GND GND_164
 U 1 1 58023EBF
 P 5800 6800
 F 0 "GND_164" H 5800 6800 20  0000 C CNN
@@ -554,7 +525,7 @@ F 3 "" H 5800 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EBE
+L power:GND GND_165
 U 1 1 58023EBE
 P 5300 6800
 F 0 "GND_165" H 5300 6800 20  0000 C CNN
@@ -565,7 +536,7 @@ F 3 "" H 5300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EBD
+L power:GND GND_166
 U 1 1 58023EBD
 P 7300 6800
 F 0 "GND_166" H 7300 6800 20  0000 C CNN
@@ -576,7 +547,7 @@ F 3 "" H 7300 6800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EBC
+L power:GND GND_167
 U 1 1 58023EBC
 P 1600 8400
 F 0 "GND_167" H 1600 8400 20  0000 C CNN
@@ -587,7 +558,7 @@ F 3 "" H 1600 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EBB
+L power:GND GND_168
 U 1 1 58023EBB
 P 2300 8400
 F 0 "GND_168" H 2300 8400 20  0000 C CNN
@@ -598,7 +569,7 @@ F 3 "" H 2300 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EBA
+L power:GND GND_169
 U 1 1 58023EBA
 P 2800 8400
 F 0 "GND_169" H 2800 8400 20  0000 C CNN
@@ -609,7 +580,7 @@ F 3 "" H 2800 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EB9
+L power:GND GND_170
 U 1 1 58023EB9
 P 3300 8400
 F 0 "GND_170" H 3300 8400 20  0000 C CNN
@@ -620,7 +591,7 @@ F 3 "" H 3300 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EB8
+L power:GND GND_171
 U 1 1 58023EB8
 P 4000 8400
 F 0 "GND_171" H 4000 8400 20  0000 C CNN
@@ -631,7 +602,7 @@ F 3 "" H 4000 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EB7
+L power:GND GND_172
 U 1 1 58023EB7
 P 4500 8400
 F 0 "GND_172" H 4500 8400 20  0000 C CNN
@@ -642,7 +613,7 @@ F 3 "" H 4500 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EB6
+L power:GND GND_173
 U 1 1 58023EB6
 P 5000 8400
 F 0 "GND_173" H 5000 8400 20  0000 C CNN
@@ -653,7 +624,7 @@ F 3 "" H 5000 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EB5
+L power:GND GND_174
 U 1 1 58023EB5
 P 5500 8400
 F 0 "GND_174" H 5500 8400 20  0000 C CNN
@@ -664,7 +635,7 @@ F 3 "" H 5500 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023EB4
+L power:GND GND_175
 U 1 1 58023EB4
 P 6000 8400
 F 0 "GND_175" H 6000 8400 20  0000 C CNN
@@ -675,7 +646,7 @@ F 3 "" H 6000 8400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FPGA_VCCINT_1V0 #PWR?58023EB3
+L Cryptech_Alpha:FPGA_VCCINT_1V0 FPGA_VCCINT_1V0_2
 U 1 1 58023EB3
 P 800 4300
 F 0 "FPGA_VCCINT_1V0_2" H 800 4300 20  0000 C CNN
@@ -686,7 +657,7 @@ F 3 "" H 800 4300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FPGA_VCCAUX_1V8 #PWR?58023EB2
+L Cryptech_Alpha:FPGA_VCCAUX_1V8 FPGA_VCCAUX_1V8_3
 U 1 1 58023EB2
 P 800 7700
 F 0 "FPGA_VCCAUX_1V8_3" H 800 7700 20  0000 C CNN
@@ -1001,7 +972,7 @@ Connection ~ 5300 6300
 Connection ~ 5800 6300
 Connection ~ 1300 4500
 $Comp
-L C-EUC0603 C140
+L Cryptech_Alpha:C-EUC0603 C140
 U 1 1 58023EB1
 P 3700 4700
 F 0 "C140" H 3780 4510 60  0000 L BNN
@@ -1010,7 +981,7 @@ F 0 "C140" H 3780 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3780 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C135
+L Cryptech_Alpha:C-EUC0402 C135
 U 1 1 58023EB0
 P 2800 6500
 F 0 "C135" H 2880 6310 60  0000 L BNN
@@ -1019,7 +990,7 @@ F 0 "C135" H 2880 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2880 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C138
+L Cryptech_Alpha:C-EUC0402 C138
 U 1 1 58023EAF
 P 3300 6500
 F 0 "C138" H 3380 6310 60  0000 L BNN
@@ -1028,7 +999,7 @@ F 0 "C138" H 3380 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3380 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C142
+L Cryptech_Alpha:C-EUC0402 C142
 U 1 1 58023EAE
 P 3800 6500
 F 0 "C142" H 3880 6310 60  0000 L BNN
@@ -1037,7 +1008,7 @@ F 0 "C142" H 3880 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 3880 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C146
+L Cryptech_Alpha:C-EUC0402 C146
 U 1 1 58023EAD
 P 4300 6500
 F 0 "C146" H 4380 6310 60  0000 L BNN
@@ -1046,7 +1017,7 @@ F 0 "C146" H 4380 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4380 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C150
+L Cryptech_Alpha:C-EUC0402 C150
 U 1 1 58023EAC
 P 4800 6500
 F 0 "C150" H 4880 6310 60  0000 L BNN
@@ -1055,7 +1026,7 @@ F 0 "C150" H 4880 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4880 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C154
+L Cryptech_Alpha:C-EUC0402 C154
 U 1 1 58023EAB
 P 5300 6500
 F 0 "C154" H 5380 6310 60  0000 L BNN
@@ -1064,7 +1035,7 @@ F 0 "C154" H 5380 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5380 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C158
+L Cryptech_Alpha:C-EUC0402 C158
 U 1 1 58023EAA
 P 5800 6500
 F 0 "C158" H 5880 6310 60  0000 L BNN
@@ -1073,7 +1044,7 @@ F 0 "C158" H 5880 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5880 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C162
+L Cryptech_Alpha:C-EUC0402 C162
 U 1 1 58023EA9
 P 6300 6500
 F 0 "C162" H 6380 6310 60  0000 L BNN
@@ -1082,7 +1053,7 @@ F 0 "C162" H 6380 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6380 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C163
+L Cryptech_Alpha:C-EUC0402 C163
 U 1 1 58023EA8
 P 6800 6500
 F 0 "C163" H 6880 6310 60  0000 L BNN
@@ -1091,7 +1062,7 @@ F 0 "C163" H 6880 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6880 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C143
+L Cryptech_Alpha:C-EUC0402 C143
 U 1 1 58023EA7
 P 4000 8100
 F 0 "C143" H 4080 7910 60  0000 L BNN
@@ -1100,7 +1071,7 @@ F 0 "C143" H 4080 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4080 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C125
+L Cryptech_Alpha:C-EUC0402 C125
 U 1 1 58023EA6
 P 1300 6500
 F 0 "C125" H 1380 6310 60  0000 L BNN
@@ -1109,7 +1080,7 @@ F 0 "C125" H 1380 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1380 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C147
+L Cryptech_Alpha:C-EUC0402 C147
 U 1 1 58023EA5
 P 4500 8100
 F 0 "C147" H 4580 7910 60  0000 L BNN
@@ -1118,7 +1089,7 @@ F 0 "C147" H 4580 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4580 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C151
+L Cryptech_Alpha:C-EUC0402 C151
 U 1 1 58023EA4
 P 5000 8100
 F 0 "C151" H 5080 7910 60  0000 L BNN
@@ -1127,7 +1098,7 @@ F 0 "C151" H 5080 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5080 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C155
+L Cryptech_Alpha:C-EUC0402 C155
 U 1 1 58023EA3
 P 5500 8100
 F 0 "C155" H 5580 7910 60  0000 L BNN
@@ -1136,7 +1107,7 @@ F 0 "C155" H 5580 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5580 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C159
+L Cryptech_Alpha:C-EUC0402 C159
 U 1 1 58023EA2
 P 6000 8100
 F 0 "C159" H 6080 7910 60  0000 L BNN
@@ -1145,7 +1116,7 @@ F 0 "C159" H 6080 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6080 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C164
+L Cryptech_Alpha:C-EUC0402 C164
 U 1 1 58023EA1
 P 7300 6500
 F 0 "C164" H 7380 6310 60  0000 L BNN
@@ -1154,7 +1125,7 @@ F 0 "C164" H 7380 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 7380 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C144
+L Cryptech_Alpha:C-EUC0603 C144
 U 1 1 58023EA0
 P 4200 4700
 F 0 "C144" H 4280 4510 60  0000 L BNN
@@ -1163,7 +1134,7 @@ F 0 "C144" H 4280 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4280 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C148
+L Cryptech_Alpha:C-EUC0603 C148
 U 1 1 58023E9F
 P 4700 4700
 F 0 "C148" H 4780 4510 60  0000 L BNN
@@ -1172,7 +1143,7 @@ F 0 "C148" H 4780 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4780 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C152
+L Cryptech_Alpha:C-EUC0603 C152
 U 1 1 58023E9E
 P 5200 4700
 F 0 "C152" H 5280 4510 60  0000 L BNN
@@ -1181,7 +1152,7 @@ F 0 "C152" H 5280 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5280 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C156
+L Cryptech_Alpha:C-EUC0603 C156
 U 1 1 58023E9D
 P 5700 4700
 F 0 "C156" H 5780 4510 60  0000 L BNN
@@ -1190,7 +1161,7 @@ F 0 "C156" H 5780 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5780 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C160
+L Cryptech_Alpha:C-EUC0603 C160
 U 1 1 58023E9C
 P 6200 4700
 F 0 "C160" H 6280 4510 60  0000 L BNN
@@ -1199,7 +1170,7 @@ F 0 "C160" H 6280 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 6280 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C133
+L Cryptech_Alpha:C-EUC1210 C133
 U 1 1 58023E9B
 P 2500 4700
 F 0 "C133" H 2580 4510 60  0000 L BNN
@@ -1208,7 +1179,7 @@ F 0 "C133" H 2580 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2580 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C141
+L Cryptech_Alpha:C-EUC0603 C141
 U 1 1 58023E9A
 P 3700 5600
 F 0 "C141" H 3780 5410 60  0000 L BNN
@@ -1217,7 +1188,7 @@ F 0 "C141" H 3780 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3780 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C145
+L Cryptech_Alpha:C-EUC0603 C145
 U 1 1 58023E99
 P 4200 5600
 F 0 "C145" H 4280 5410 60  0000 L BNN
@@ -1226,7 +1197,7 @@ F 0 "C145" H 4280 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4280 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C149
+L Cryptech_Alpha:C-EUC0603 C149
 U 1 1 58023E98
 P 4700 5600
 F 0 "C149" H 4780 5410 60  0000 L BNN
@@ -1235,7 +1206,7 @@ F 0 "C149" H 4780 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 4780 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C153
+L Cryptech_Alpha:C-EUC0603 C153
 U 1 1 58023E97
 P 5200 5600
 F 0 "C153" H 5280 5410 60  0000 L BNN
@@ -1244,7 +1215,7 @@ F 0 "C153" H 5280 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5280 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C157
+L Cryptech_Alpha:C-EUC0603 C157
 U 1 1 58023E96
 P 5700 5600
 F 0 "C157" H 5780 5410 60  0000 L BNN
@@ -1253,7 +1224,7 @@ F 0 "C157" H 5780 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 5780 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C161
+L Cryptech_Alpha:C-EUC0603 C161
 U 1 1 58023E95
 P 6200 5600
 F 0 "C161" H 6280 5410 60  0000 L BNN
@@ -1262,7 +1233,7 @@ F 0 "C161" H 6280 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 6280 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C132
+L Cryptech_Alpha:C-EUC0603 C132
 U 1 1 58023E94
 P 2300 8100
 F 0 "C132" H 2380 7910 60  0000 L BNN
@@ -1271,7 +1242,7 @@ F 0 "C132" H 2380 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 2380 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C136
+L Cryptech_Alpha:C-EUC0603 C136
 U 1 1 58023E93
 P 2800 8100
 F 0 "C136" H 2880 7910 60  0000 L BNN
@@ -1280,7 +1251,7 @@ F 0 "C136" H 2880 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 2880 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C139
+L Cryptech_Alpha:C-EUC0603 C139
 U 1 1 58023E92
 P 3300 8100
 F 0 "C139" H 3380 7910 60  0000 L BNN
@@ -1289,7 +1260,7 @@ F 0 "C139" H 3380 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3380 7910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C137
+L Cryptech_Alpha:C-EUC1210 C137
 U 1 1 58023E91
 P 3000 4700
 F 0 "C137" H 3080 4510 60  0000 L BNN
@@ -1298,7 +1269,7 @@ F 0 "C137" H 3080 4510 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 3080 4510 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C124
+L Cryptech_Alpha:C-EUC0402 C124
 U 1 1 58023E90
 P 1300 5600
 F 0 "C124" H 1380 5410 60  0000 L BNN
@@ -1307,7 +1278,7 @@ F 0 "C124" H 1380 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1380 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C126
+L Cryptech_Alpha:C-EUC1210 C126
 U 1 1 58023E8F
 P 1600 8100
 F 0 "C126" H 1680 7910 60  0000 L BNN
@@ -1316,7 +1287,7 @@ F 0 "C126" H 1680 7910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1680 7910 60  0001 C CNN
 $EndComp
 $Comp
-L CP_E-035X080 C123
+L Cryptech_Alpha:CP_E-035X080 C123
 U 1 1 58023E8E
 P 1300 4790
 F 0 "C123" V 1325 4665 60  0000 R TNN
@@ -1327,7 +1298,7 @@ F 3 "" H 1210 4697 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L CP_E-035X080 C127
+L Cryptech_Alpha:CP_E-035X080 C127
 U 1 1 58023E8D
 P 1800 4790
 F 0 "C127" V 1825 4665 60  0000 R TNN
@@ -1338,7 +1309,7 @@ F 3 "" H 1710 4697 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC0402 C128
+L Cryptech_Alpha:C-EUC0402 C128
 U 1 1 58023E8C
 P 1800 5600
 F 0 "C128" H 1880 5410 60  0000 L BNN
@@ -1347,7 +1318,7 @@ F 0 "C128" H 1880 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1880 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C130
+L Cryptech_Alpha:C-EUC0402 C130
 U 1 1 58023E8B
 P 2300 5600
 F 0 "C130" H 2380 5410 60  0000 L BNN
@@ -1356,7 +1327,7 @@ F 0 "C130" H 2380 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2380 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C134
+L Cryptech_Alpha:C-EUC0402 C134
 U 1 1 58023E8A
 P 2800 5600
 F 0 "C134" H 2880 5410 60  0000 L BNN
@@ -1365,7 +1336,7 @@ F 0 "C134" H 2880 5410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2880 5410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C129
+L Cryptech_Alpha:C-EUC0402 C129
 U 1 1 58023E89
 P 1800 6500
 F 0 "C129" H 1880 6310 60  0000 L BNN
@@ -1374,7 +1345,7 @@ F 0 "C129" H 1880 6310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 1880 6310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C131
+L Cryptech_Alpha:C-EUC0402 C131
 U 1 1 58023E88
 P 2300 6500
 F 0 "C131" H 2380 6310 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_23.sch b/rev03-KiCad/rev02_23.sch
index f68be27..65cae1d 100644
--- a/rev03-KiCad/rev02_23.sch
+++ b/rev03-KiCad/rev02_23.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -209,7 +180,7 @@ C168
 Text Notes 2560 4790 0    60   ~ 12
 47uF
 $Comp
-L GND #PWR?58023E87
+L power:GND GND_176
 U 1 1 58023E87
 P 1000 4900
 F 0 "GND_176" H 1000 4900 20  0000 C CNN
@@ -220,7 +191,7 @@ F 3 "" H 1000 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E86
+L power:GND GND_177
 U 1 1 58023E86
 P 1500 4900
 F 0 "GND_177" H 1500 4900 20  0000 C CNN
@@ -231,7 +202,7 @@ F 3 "" H 1500 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E85
+L power:GND GND_178
 U 1 1 58023E85
 P 2000 4900
 F 0 "GND_178" H 2000 4900 20  0000 C CNN
@@ -242,7 +213,7 @@ F 3 "" H 2000 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E84
+L power:GND GND_179
 U 1 1 58023E84
 P 2500 4900
 F 0 "GND_179" H 2500 4900 20  0000 C CNN
@@ -253,7 +224,7 @@ F 3 "" H 2500 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E83
+L power:GND GND_180
 U 1 1 58023E83
 P 3400 4900
 F 0 "GND_180" H 3400 4900 20  0000 C CNN
@@ -264,7 +235,7 @@ F 3 "" H 3400 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E82
+L power:GND GND_181
 U 1 1 58023E82
 P 3900 4900
 F 0 "GND_181" H 3900 4900 20  0000 C CNN
@@ -275,7 +246,7 @@ F 3 "" H 3900 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E81
+L power:GND GND_182
 U 1 1 58023E81
 P 4600 4900
 F 0 "GND_182" H 4600 4900 20  0000 C CNN
@@ -286,7 +257,7 @@ F 3 "" H 4600 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E80
+L power:GND GND_183
 U 1 1 58023E80
 P 5100 4900
 F 0 "GND_183" H 5100 4900 20  0000 C CNN
@@ -297,7 +268,7 @@ F 3 "" H 5100 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E7F
+L power:GND GND_184
 U 1 1 58023E7F
 P 5600 4900
 F 0 "GND_184" H 5600 4900 20  0000 C CNN
@@ -308,7 +279,7 @@ F 3 "" H 5600 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E7E
+L power:GND GND_185
 U 1 1 58023E7E
 P 6100 4900
 F 0 "GND_185" H 6100 4900 20  0000 C CNN
@@ -319,7 +290,7 @@ F 3 "" H 6100 4900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E7D
+L power:GND GND_186
 U 1 1 58023E7D
 P 3400 5800
 F 0 "GND_186" H 3400 5800 20  0000 C CNN
@@ -330,7 +301,7 @@ F 3 "" H 3400 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E7C
+L power:GND GND_187
 U 1 1 58023E7C
 P 3900 5800
 F 0 "GND_187" H 3900 5800 20  0000 C CNN
@@ -341,7 +312,7 @@ F 3 "" H 3900 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E7B
+L power:GND GND_188
 U 1 1 58023E7B
 P 4600 5800
 F 0 "GND_188" H 4600 5800 20  0000 C CNN
@@ -352,7 +323,7 @@ F 3 "" H 4600 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E7A
+L power:GND GND_189
 U 1 1 58023E7A
 P 5100 5800
 F 0 "GND_189" H 5100 5800 20  0000 C CNN
@@ -363,7 +334,7 @@ F 3 "" H 5100 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E79
+L power:GND GND_190
 U 1 1 58023E79
 P 5600 5800
 F 0 "GND_190" H 5600 5800 20  0000 C CNN
@@ -374,7 +345,7 @@ F 3 "" H 5600 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E78
+L power:GND GND_191
 U 1 1 58023E78
 P 6100 5800
 F 0 "GND_191" H 6100 5800 20  0000 C CNN
@@ -385,7 +356,7 @@ F 3 "" H 6100 5800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E77
+L power:GND GND_192
 U 1 1 58023E77
 P 3400 6700
 F 0 "GND_192" H 3400 6700 20  0000 C CNN
@@ -396,7 +367,7 @@ F 3 "" H 3400 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E76
+L power:GND GND_193
 U 1 1 58023E76
 P 3900 6700
 F 0 "GND_193" H 3900 6700 20  0000 C CNN
@@ -407,7 +378,7 @@ F 3 "" H 3900 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E75
+L power:GND GND_194
 U 1 1 58023E75
 P 4600 6700
 F 0 "GND_194" H 4600 6700 20  0000 C CNN
@@ -418,7 +389,7 @@ F 3 "" H 4600 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E74
+L power:GND GND_195
 U 1 1 58023E74
 P 5100 6700
 F 0 "GND_195" H 5100 6700 20  0000 C CNN
@@ -429,7 +400,7 @@ F 3 "" H 5100 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E73
+L power:GND GND_196
 U 1 1 58023E73
 P 5600 6700
 F 0 "GND_196" H 5600 6700 20  0000 C CNN
@@ -440,7 +411,7 @@ F 3 "" H 5600 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E72
+L power:GND GND_197
 U 1 1 58023E72
 P 6100 6700
 F 0 "GND_197" H 6100 6700 20  0000 C CNN
@@ -451,7 +422,7 @@ F 3 "" H 6100 6700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E71
+L power:GND GND_198
 U 1 1 58023E71
 P 3400 7600
 F 0 "GND_198" H 3400 7600 20  0000 C CNN
@@ -462,7 +433,7 @@ F 3 "" H 3400 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E70
+L power:GND GND_199
 U 1 1 58023E70
 P 3900 7600
 F 0 "GND_199" H 3900 7600 20  0000 C CNN
@@ -473,7 +444,7 @@ F 3 "" H 3900 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E6F
+L power:GND GND_200
 U 1 1 58023E6F
 P 4600 7600
 F 0 "GND_200" H 4600 7600 20  0000 C CNN
@@ -484,7 +455,7 @@ F 3 "" H 4600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E6E
+L power:GND GND_201
 U 1 1 58023E6E
 P 5100 7600
 F 0 "GND_201" H 5100 7600 20  0000 C CNN
@@ -495,7 +466,7 @@ F 3 "" H 5100 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E6D
+L power:GND GND_202
 U 1 1 58023E6D
 P 5600 7600
 F 0 "GND_202" H 5600 7600 20  0000 C CNN
@@ -506,7 +477,7 @@ F 3 "" H 5600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E6C
+L power:GND GND_203
 U 1 1 58023E6C
 P 6100 7600
 F 0 "GND_203" H 6100 7600 20  0000 C CNN
@@ -517,7 +488,7 @@ F 3 "" H 6100 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E6B
+L power:GND GND_204
 U 1 1 58023E6B
 P 3400 8500
 F 0 "GND_204" H 3400 8500 20  0000 C CNN
@@ -528,7 +499,7 @@ F 3 "" H 3400 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E6A
+L power:GND GND_205
 U 1 1 58023E6A
 P 3900 8500
 F 0 "GND_205" H 3900 8500 20  0000 C CNN
@@ -539,7 +510,7 @@ F 3 "" H 3900 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E69
+L power:GND GND_206
 U 1 1 58023E69
 P 4600 8500
 F 0 "GND_206" H 4600 8500 20  0000 C CNN
@@ -550,7 +521,7 @@ F 3 "" H 4600 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E68
+L power:GND GND_207
 U 1 1 58023E68
 P 5100 8500
 F 0 "GND_207" H 5100 8500 20  0000 C CNN
@@ -561,7 +532,7 @@ F 3 "" H 5100 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E67
+L power:GND GND_208
 U 1 1 58023E67
 P 5600 8500
 F 0 "GND_208" H 5600 8500 20  0000 C CNN
@@ -572,7 +543,7 @@ F 3 "" H 5600 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E66
+L power:GND GND_209
 U 1 1 58023E66
 P 6100 8500
 F 0 "GND_209" H 6100 8500 20  0000 C CNN
@@ -583,7 +554,7 @@ F 3 "" H 6100 8500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E65
+L power:GND GND_210
 U 1 1 58023E65
 P 3400 9400
 F 0 "GND_210" H 3400 9400 20  0000 C CNN
@@ -594,7 +565,7 @@ F 3 "" H 3400 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E64
+L power:GND GND_211
 U 1 1 58023E64
 P 3900 9400
 F 0 "GND_211" H 3900 9400 20  0000 C CNN
@@ -605,7 +576,7 @@ F 3 "" H 3900 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E63
+L power:GND GND_212
 U 1 1 58023E63
 P 4600 9400
 F 0 "GND_212" H 4600 9400 20  0000 C CNN
@@ -616,7 +587,7 @@ F 3 "" H 4600 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E62
+L power:GND GND_213
 U 1 1 58023E62
 P 5100 9400
 F 0 "GND_213" H 5100 9400 20  0000 C CNN
@@ -627,7 +598,7 @@ F 3 "" H 5100 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E61
+L power:GND GND_214
 U 1 1 58023E61
 P 5600 9400
 F 0 "GND_214" H 5600 9400 20  0000 C CNN
@@ -638,7 +609,7 @@ F 3 "" H 5600 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E60
+L power:GND GND_215
 U 1 1 58023E60
 P 6100 9400
 F 0 "GND_215" H 6100 9400 20  0000 C CNN
@@ -649,7 +620,7 @@ F 3 "" H 6100 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCCO_3V3 #PWR?58023E5F
+L Cryptech_Alpha:VCCO_3V3 VCCO_3V3_39
 U 1 1 58023E5F
 P 600 4200
 F 0 "VCCO_3V3_39" H 600 4200 20  0000 C CNN
@@ -953,7 +924,7 @@ Connection ~ 3400 8900
 Connection ~ 3000 8000
 Connection ~ 1000 4400
 $Comp
-L C-EUC0402 C181
+L Cryptech_Alpha:C-EUC0402 C181
 U 1 1 58023E5E
 P 4600 4600
 F 0 "C181" H 4680 4410 60  0000 L BNN
@@ -962,7 +933,7 @@ F 0 "C181" H 4680 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C189
+L Cryptech_Alpha:C-EUC0402 C189
 U 1 1 58023E5D
 P 5100 6400
 F 0 "C189" H 5180 6210 60  0000 L BNN
@@ -971,7 +942,7 @@ F 0 "C189" H 5180 6210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 6210 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C195
+L Cryptech_Alpha:C-EUC0402 C195
 U 1 1 58023E5C
 P 5600 6400
 F 0 "C195" H 5680 6210 60  0000 L BNN
@@ -980,7 +951,7 @@ F 0 "C195" H 5680 6210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 6210 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C201
+L Cryptech_Alpha:C-EUC0402 C201
 U 1 1 58023E5B
 P 6100 6400
 F 0 "C201" H 6180 6210 60  0000 L BNN
@@ -989,7 +960,7 @@ F 0 "C201" H 6180 6210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 6210 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C184
+L Cryptech_Alpha:C-EUC0402 C184
 U 1 1 58023E5A
 P 4600 7300
 F 0 "C184" H 4680 7110 60  0000 L BNN
@@ -998,7 +969,7 @@ F 0 "C184" H 4680 7110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 7110 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C190
+L Cryptech_Alpha:C-EUC0402 C190
 U 1 1 58023E59
 P 5100 7300
 F 0 "C190" H 5180 7110 60  0000 L BNN
@@ -1007,7 +978,7 @@ F 0 "C190" H 5180 7110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 7110 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C196
+L Cryptech_Alpha:C-EUC0402 C196
 U 1 1 58023E58
 P 5600 7300
 F 0 "C196" H 5680 7110 60  0000 L BNN
@@ -1016,7 +987,7 @@ F 0 "C196" H 5680 7110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 7110 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C202
+L Cryptech_Alpha:C-EUC0402 C202
 U 1 1 58023E57
 P 6100 7300
 F 0 "C202" H 6180 7110 60  0000 L BNN
@@ -1025,7 +996,7 @@ F 0 "C202" H 6180 7110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 7110 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C185
+L Cryptech_Alpha:C-EUC0402 C185
 U 1 1 58023E56
 P 4600 8200
 F 0 "C185" H 4680 8010 60  0000 L BNN
@@ -1034,7 +1005,7 @@ F 0 "C185" H 4680 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 8010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C191
+L Cryptech_Alpha:C-EUC0402 C191
 U 1 1 58023E55
 P 5100 8200
 F 0 "C191" H 5180 8010 60  0000 L BNN
@@ -1043,7 +1014,7 @@ F 0 "C191" H 5180 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 8010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C197
+L Cryptech_Alpha:C-EUC0402 C197
 U 1 1 58023E54
 P 5600 8200
 F 0 "C197" H 5680 8010 60  0000 L BNN
@@ -1052,7 +1023,7 @@ F 0 "C197" H 5680 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 8010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C187
+L Cryptech_Alpha:C-EUC0402 C187
 U 1 1 58023E53
 P 5100 4600
 F 0 "C187" H 5180 4410 60  0000 L BNN
@@ -1061,7 +1032,7 @@ F 0 "C187" H 5180 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C203
+L Cryptech_Alpha:C-EUC0402 C203
 U 1 1 58023E52
 P 6100 8200
 F 0 "C203" H 6180 8010 60  0000 L BNN
@@ -1070,7 +1041,7 @@ F 0 "C203" H 6180 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 8010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C186
+L Cryptech_Alpha:C-EUC0402 C186
 U 1 1 58023E51
 P 4600 9100
 F 0 "C186" H 4680 8910 60  0000 L BNN
@@ -1079,7 +1050,7 @@ F 0 "C186" H 4680 8910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 8910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C192
+L Cryptech_Alpha:C-EUC0402 C192
 U 1 1 58023E50
 P 5100 9100
 F 0 "C192" H 5180 8910 60  0000 L BNN
@@ -1088,7 +1059,7 @@ F 0 "C192" H 5180 8910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 8910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C198
+L Cryptech_Alpha:C-EUC0402 C198
 U 1 1 58023E4F
 P 5600 9100
 F 0 "C198" H 5680 8910 60  0000 L BNN
@@ -1097,7 +1068,7 @@ F 0 "C198" H 5680 8910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 8910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C204
+L Cryptech_Alpha:C-EUC0402 C204
 U 1 1 58023E4E
 P 6100 9100
 F 0 "C204" H 6180 8910 60  0000 L BNN
@@ -1106,7 +1077,7 @@ F 0 "C204" H 6180 8910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 8910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C169
+L Cryptech_Alpha:C-EUC0603 C169
 U 1 1 58023E4D
 P 3400 4600
 F 0 "C169" H 3480 4410 60  0000 L BNN
@@ -1115,7 +1086,7 @@ F 0 "C169" H 3480 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C175
+L Cryptech_Alpha:C-EUC0603 C175
 U 1 1 58023E4C
 P 3900 4600
 F 0 "C175" H 3980 4410 60  0000 L BNN
@@ -1124,7 +1095,7 @@ F 0 "C175" H 3980 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C176
+L Cryptech_Alpha:C-EUC0603 C176
 U 1 1 58023E4B
 P 3900 5500
 F 0 "C176" H 3980 5310 60  0000 L BNN
@@ -1133,7 +1104,7 @@ F 0 "C176" H 3980 5310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 5310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C170
+L Cryptech_Alpha:C-EUC0603 C170
 U 1 1 58023E4A
 P 3400 5500
 F 0 "C170" H 3480 5310 60  0000 L BNN
@@ -1142,7 +1113,7 @@ F 0 "C170" H 3480 5310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 5310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C171
+L Cryptech_Alpha:C-EUC0603 C171
 U 1 1 58023E49
 P 3400 6400
 F 0 "C171" H 3480 6210 60  0000 L BNN
@@ -1151,7 +1122,7 @@ F 0 "C171" H 3480 6210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 6210 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C193
+L Cryptech_Alpha:C-EUC0402 C193
 U 1 1 58023E48
 P 5600 4600
 F 0 "C193" H 5680 4410 60  0000 L BNN
@@ -1160,7 +1131,7 @@ F 0 "C193" H 5680 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C177
+L Cryptech_Alpha:C-EUC0603 C177
 U 1 1 58023E47
 P 3900 6400
 F 0 "C177" H 3980 6210 60  0000 L BNN
@@ -1169,7 +1140,7 @@ F 0 "C177" H 3980 6210 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 6210 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C178
+L Cryptech_Alpha:C-EUC0603 C178
 U 1 1 58023E46
 P 3900 7300
 F 0 "C178" H 3980 7110 60  0000 L BNN
@@ -1178,7 +1149,7 @@ F 0 "C178" H 3980 7110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 7110 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C172
+L Cryptech_Alpha:C-EUC0603 C172
 U 1 1 58023E45
 P 3400 7300
 F 0 "C172" H 3480 7110 60  0000 L BNN
@@ -1187,7 +1158,7 @@ F 0 "C172" H 3480 7110 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 7110 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C173
+L Cryptech_Alpha:C-EUC0603 C173
 U 1 1 58023E44
 P 3400 8200
 F 0 "C173" H 3480 8010 60  0000 L BNN
@@ -1196,7 +1167,7 @@ F 0 "C173" H 3480 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 8010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C179
+L Cryptech_Alpha:C-EUC0603 C179
 U 1 1 58023E43
 P 3900 8200
 F 0 "C179" H 3980 8010 60  0000 L BNN
@@ -1205,7 +1176,7 @@ F 0 "C179" H 3980 8010 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 8010 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C180
+L Cryptech_Alpha:C-EUC0603 C180
 U 1 1 58023E42
 P 3900 9100
 F 0 "C180" H 3980 8910 60  0000 L BNN
@@ -1214,7 +1185,7 @@ F 0 "C180" H 3980 8910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3980 8910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0603 C174
+L Cryptech_Alpha:C-EUC0603 C174
 U 1 1 58023E41
 P 3400 9100
 F 0 "C174" H 3480 8910 60  0000 L BNN
@@ -1223,7 +1194,7 @@ F 0 "C174" H 3480 8910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 3480 8910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C165
+L Cryptech_Alpha:C-EUC1210 C165
 U 1 1 58023E40
 P 1000 4600
 F 0 "C165" H 1080 4410 60  0000 L BNN
@@ -1232,7 +1203,7 @@ F 0 "C165" H 1080 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1080 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C166
+L Cryptech_Alpha:C-EUC1210 C166
 U 1 1 58023E3F
 P 1500 4600
 F 0 "C166" H 1580 4410 60  0000 L BNN
@@ -1241,7 +1212,7 @@ F 0 "C166" H 1580 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1580 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C167
+L Cryptech_Alpha:C-EUC1210 C167
 U 1 1 58023E3E
 P 2000 4600
 F 0 "C167" H 2080 4410 60  0000 L BNN
@@ -1250,7 +1221,7 @@ F 0 "C167" H 2080 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2080 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C199
+L Cryptech_Alpha:C-EUC0402 C199
 U 1 1 58023E3D
 P 6100 4600
 F 0 "C199" H 6180 4410 60  0000 L BNN
@@ -1259,7 +1230,7 @@ F 0 "C199" H 6180 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C168
+L Cryptech_Alpha:C-EUC1210 C168
 U 1 1 58023E3C
 P 2500 4600
 F 0 "C168" H 2580 4410 60  0000 L BNN
@@ -1268,7 +1239,7 @@ F 0 "C168" H 2580 4410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2580 4410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C182
+L Cryptech_Alpha:C-EUC0402 C182
 U 1 1 58023E3B
 P 4600 5500
 F 0 "C182" H 4680 5310 60  0000 L BNN
@@ -1277,7 +1248,7 @@ F 0 "C182" H 4680 5310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 4680 5310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C188
+L Cryptech_Alpha:C-EUC0402 C188
 U 1 1 58023E3A
 P 5100 5500
 F 0 "C188" H 5180 5310 60  0000 L BNN
@@ -1286,7 +1257,7 @@ F 0 "C188" H 5180 5310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5180 5310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C194
+L Cryptech_Alpha:C-EUC0402 C194
 U 1 1 58023E39
 P 5600 5500
 F 0 "C194" H 5680 5310 60  0000 L BNN
@@ -1295,7 +1266,7 @@ F 0 "C194" H 5680 5310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5680 5310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C200
+L Cryptech_Alpha:C-EUC0402 C200
 U 1 1 58023E38
 P 6100 5500
 F 0 "C200" H 6180 5310 60  0000 L BNN
@@ -1304,7 +1275,7 @@ F 0 "C200" H 6180 5310 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6180 5310 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC0402 C183
+L Cryptech_Alpha:C-EUC0402 C183
 U 1 1 58023E37
 P 4600 6400
 F 0 "C183" H 4680 6210 60  0000 L BNN
diff --git a/rev03-KiCad/rev02_24.sch b/rev03-KiCad/rev02_24.sch
index f2da38d..95cca53 100644
--- a/rev03-KiCad/rev02_24.sch
+++ b/rev03-KiCad/rev02_24.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -79,7 +50,7 @@ C210
 Text Notes 7160 7290 0    60   ~ 12
 47uF
 $Comp
-L GND #PWR?58023E36
+L power:GND GND_216
 U 1 1 58023E36
 P 4200 9500
 F 0 "GND_216" H 4200 9500 20  0000 C CNN
@@ -90,7 +61,7 @@ F 3 "" H 4200 9500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E35
+L power:GND GND_217
 U 1 1 58023E35
 P 4700 9500
 F 0 "GND_217" H 4700 9500 20  0000 C CNN
@@ -101,7 +72,7 @@ F 3 "" H 4700 9500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E34
+L power:GND GND_218
 U 1 1 58023E34
 P 3400 9500
 F 0 "GND_218" H 3400 9500 20  0000 C CNN
@@ -112,7 +83,7 @@ F 3 "" H 3400 9500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E33
+L power:GND GND_219
 U 1 1 58023E33
 P 1800 7000
 F 0 "GND_219" H 1800 7000 20  0000 C CNN
@@ -123,7 +94,7 @@ F 3 "" H 1800 7000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E32
+L power:GND GND_220
 U 1 1 58023E32
 P 2200 7000
 F 0 "GND_220" H 2200 7000 20  0000 C CNN
@@ -134,7 +105,7 @@ F 3 "" H 2200 7000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E31
+L power:GND GND_221
 U 1 1 58023E31
 P 5900 7600
 F 0 "GND_221" H 5900 7600 20  0000 C CNN
@@ -145,7 +116,7 @@ F 3 "" H 5900 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E30
+L power:GND GND_222
 U 1 1 58023E30
 P 6600 7600
 F 0 "GND_222" H 6600 7600 20  0000 C CNN
@@ -156,7 +127,7 @@ F 3 "" H 6600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E2F
+L power:GND GND_223
 U 1 1 58023E2F
 P 7100 7600
 F 0 "GND_223" H 7100 7600 20  0000 C CNN
@@ -167,7 +138,7 @@ F 3 "" H 7100 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E2E
+L power:GND GND_224
 U 1 1 58023E2E
 P 7600 7600
 F 0 "GND_224" H 7600 7600 20  0000 C CNN
@@ -178,7 +149,7 @@ F 3 "" H 7600 7600 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC_5V0 #PWR?58023E2D
+L Cryptech_Alpha:VCC_5V0 VCC_5V0_3
 U 1 1 58023E2D
 P 1600 6200
 F 0 "VCC_5V0_3" H 1600 6200 20  0000 C CNN
@@ -204,7 +175,7 @@ Wire Wire Line
 	7600 7400 7600 7600
 Wire Wire Line
 	8300 6400 8100 6400
-Text GLabel 8300 6400 2 48 Output ~ 0
+Text Label 8300 6400 2 48 ~ 0
 FPGA_VCCINT_1V0
 Wire Wire Line
 	1600 6200 1600 6400
@@ -355,7 +326,7 @@ Connection ~ 5300 5900
 Connection ~ 5300 5800
 Connection ~ 5300 5700
 $Comp
-L R-EU_R0402 R66
+L Cryptech_Alpha:R-EU_R0402 R66
 U 1 1 58023E2C
 P 2800 6700
 F 0 "R66" V 2710 6655 60  0000 R TNN
@@ -366,7 +337,7 @@ F 3 "" H 2730 6630 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC1210 C209
+L Cryptech_Alpha:C-EUC1210 C209
 U 1 1 58023E2B
 P 6600 7100
 F 0 "C209" H 6680 6910 60  0000 L BNN
@@ -375,7 +346,7 @@ F 0 "C209" H 6680 6910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 6680 6910 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C210
+L Cryptech_Alpha:C-EUC1210 C210
 U 1 1 58023E2A
 P 7100 7100
 F 0 "C210" H 7180 6910 60  0000 L BNN
@@ -384,7 +355,7 @@ F 0 "C210" H 7180 6910 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 7180 6910 60  0001 C CNN
 $EndComp
 $Comp
-L EN5364QI U16
+L Cryptech_Alpha:EN5364QI U16
 U 1 1 58023E29
 P 4400 7700
 F 0 "U16" H 3950 10020 60  0000 L BNN
@@ -395,7 +366,7 @@ F 3 "" H 4510 10030 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C207
+L Cryptech_Alpha:C-EUC0402 C207
 U 1 1 58023E28
 P 3400 9200
 F 0 "C207" H 2800 9150 60  0000 L BNN
@@ -404,7 +375,7 @@ F 0 "C207" H 2800 9150 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 2800 9150 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C205
+L Cryptech_Alpha:C-EUC1210 C205
 U 1 1 58023E27
 P 1800 6600
 F 0 "C205" H 1880 6410 60  0000 L BNN
@@ -413,7 +384,7 @@ F 0 "C205" H 1880 6410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 1880 6410 60  0001 C CNN
 $EndComp
 $Comp
-L C-EUC1210 C206
+L Cryptech_Alpha:C-EUC1210 C206
 U 1 1 58023E26
 P 2200 6600
 F 0 "C206" H 2280 6410 60  0000 L BNN
@@ -422,7 +393,7 @@ F 0 "C206" H 2280 6410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 2280 6410 60  0001 C CNN
 $EndComp
 $Comp
-L R-EU_R0402 R68
+L Cryptech_Alpha:R-EU_R0402 R68
 U 1 1 58023E25
 P 5900 6700
 F 0 "R68" V 5810 6655 60  0000 R TNN
@@ -433,7 +404,7 @@ F 3 "" H 5870 6950 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R69
+L Cryptech_Alpha:R-EU_R0402 R69
 U 1 1 58023E24
 P 5900 7300
 F 0 "R69" V 5810 7255 60  0000 R TNN
@@ -444,7 +415,7 @@ F 3 "" H 5850 7550 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L C-EUC0402 C208
+L Cryptech_Alpha:C-EUC0402 C208
 U 1 1 58023E23
 P 6200 6600
 F 0 "C208" H 6280 6410 60  0000 L BNN
@@ -453,7 +424,7 @@ F 0 "C208" H 6280 6410 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6280 6410 60  0001 C CNN
 $EndComp
 $Comp
-L BLM31PG330SN1_1206 FB7
+L Cryptech_Alpha:BLM31PG330SN1_1206 FB7
 U 1 1 58023E22
 P 7900 6500
 F 0 "FB7" H 7750 6700 60  0000 L BNN
@@ -464,7 +435,7 @@ F 3 "" H 7750 6400 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R70
+L Cryptech_Alpha:R-EU_R0402 R70
 U 1 1 58023E21
 P 7600 7200
 F 0 "R70" V 7510 7155 60  0000 R TNN
@@ -475,7 +446,7 @@ F 3 "" H 7610 7100 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R67
+L Cryptech_Alpha:R-EU_R0402 R67
 U 1 1 58023E20
 P 5500 7300
 F 0 "R67" V 5410 7255 60  0000 R TNN
diff --git a/rev03-KiCad/rev02_25.sch b/rev03-KiCad/rev02_25.sch
index 19d4990..0f422bf 100644
--- a/rev03-KiCad/rev02_25.sch
+++ b/rev03-KiCad/rev02_25.sch
@@ -1,34 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
+EESchema Schematic File Version 4
+EELAYER 26 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -101,7 +72,7 @@ C213
 Text Notes 7060 5790 0    60   ~ 12
 0.1~uF
 $Comp
-L GND #PWR?58023E1F
+L power:GND GND_225
 U 1 1 58023E1F
 P 2500 6000
 F 0 "GND_225" H 2500 6000 20  0000 C CNN
@@ -112,7 +83,7 @@ F 3 "" H 2500 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E1E
+L power:GND GND_226
 U 1 1 58023E1E
 P 7000 6000
 F 0 "GND_226" H 7000 6000 20  0000 C CNN
@@ -123,7 +94,7 @@ F 3 "" H 7000 6000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E1D
+L power:GND GND_227
 U 1 1 58023E1D
 P 3400 9400
 F 0 "GND_227" H 3400 9400 20  0000 C CNN
@@ -134,7 +105,7 @@ F 3 "" H 3400 9400 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?58023E1C
+L power:GND GND_228
 U 1 1 58023E1C
 P 8000 8900
 F 0 "GND_228" H 8000 8900 20  0000 C CNN
@@ -145,7 +116,7 @@ F 3 "" H 8000 8900 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC_5V0 #PWR?58023E1B
+L Cryptech_Alpha:VCC_5V0 VCC_5V0_4
 U 1 1 58023E1B
 P 900 4500
 F 0 "VCC_5V0_4" H 900 4500 20  0000 C CNN
@@ -156,7 +127,7 @@ F 3 "" H 900 4500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC_5V0 #PWR?58023E1A
+L Cryptech_Alpha:VCC_5V0 VCC_5V0_5
 U 1 1 58023E1A
 P 2200 7800
 F 0 "VCC_5V0_5" H 2200 7800 20  0000 C CNN
@@ -167,7 +138,7 @@ F 3 "" H 2200 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC_5V0 #PWR?58023E19
+L Cryptech_Alpha:VCC_5V0 VCC_5V0_6
 U 1 1 58023E19
 P 6800 7200
 F 0 "VCC_5V0_6" H 6800 7200 20  0000 C CNN
@@ -178,7 +149,7 @@ F 3 "" H 6800 7200 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC_5V0 #PWR?58023E18
+L Cryptech_Alpha:VCC_5V0 VCC_5V0_7
 U 1 1 58023E18
 P 5800 4500
 F 0 "VCC_5V0_7" H 5800 4500 20  0000 C CNN
@@ -309,7 +280,7 @@ Wire Wire Line
 Wire Wire Line
 	8000 8000 8000 8100
 $Comp
-L R-EU_R0402 R72
+L Cryptech_Alpha:R-EU_R0402 R72
 U 1 1 58023E17
 P 2100 5300
 F 0 "R72" H 1990 5155 60  0000 L BNN
@@ -320,7 +291,7 @@ F 3 "" H 1940 5150 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L 2N7002 Q6
+L Cryptech_Alpha:2N7002 Q6
 U 1 1 58023E16
 P 7600 8600
 F 0 "Q6" H 7490 8345 60  0000 L BNN
@@ -331,7 +302,7 @@ F 3 "" H 6980 8530 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L LEDCHIP-LED0603 LED18
+L Cryptech_Alpha:LEDCHIP-LED0603 LED18
 U 1 1 58023E15
 P 8000 8200
 F 0 "LED18" H 7855 8110 60  0000 R BNN
@@ -342,7 +313,7 @@ F 3 "" H 7855 8010 60  0000 C CNN
 	-1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R78
+L Cryptech_Alpha:R-EU_R0402 R78
 U 1 1 58023E14
 P 8000 7800
 F 0 "R78" V 8090 7755 60  0000 L TNN
@@ -353,7 +324,7 @@ F 3 "" H 7930 7710 60  0000 C CNN
 	0    -1    1    0
 $EndComp
 $Comp
-L C-EUC0402 C211
+L Cryptech_Alpha:C-EUC0402 C211
 U 1 1 58023E13
 P 2500 5600
 F 0 "C211" H 2580 5410 60  0000 L BNN
@@ -364,7 +335,7 @@ F 3 "" H 2840 5620 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C212
+L Cryptech_Alpha:C-EUC0402 C212
 U 1 1 58023E12
 P 3400 9000
 F 0 "C212" H 3480 8810 60  0000 L BNN
@@ -375,7 +346,7 @@ F 3 "" H 3730 9020 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L C-EUC0402 C213
+L Cryptech_Alpha:C-EUC0402 C213
 U 1 1 58023E11
 P 7000 5600
 F 0 "C213" H 7080 5410 60  0000 L BNN
@@ -386,7 +357,7 @@ F 3 "" H 7330 5620 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L BAT54 D2
+L Cryptech_Alpha:BAT54 D2
 U 1 1 58023E10
 P 2100 4900
 F 0 "D2" H 2185 4740 60  0000 R BNN
@@ -397,7 +368,7 @@ F 3 "" H 2090 4980 60  0000 C CNN
 	-1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R75
+L Cryptech_Alpha:R-EU_R0402 R75
 U 1 1 58023E0F
 P 5800 4900
 F 0 "R75" V 5710 4855 60  0000 R TNN
@@ -408,7 +379,7 @@ F 3 "" H 5640 4740 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R76
+L Cryptech_Alpha:R-EU_R0402 R76
 U 1 1 58023E0E
 P 6600 5300
 F 0 "R76" H 6490 5155 60  0000 L BNN
@@ -419,7 +390,7 @@ F 3 "" H 6450 5150 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L BAT54 D4
+L Cryptech_Alpha:BAT54 D4
 U 1 1 58023E0D
 P 6600 4900
 F 0 "D4" H 6685 4740 60  0000 R BNN
@@ -430,7 +401,7 @@ F 3 "" H 6720 4720 60  0000 C CNN
 	-1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R73
+L Cryptech_Alpha:R-EU_R0402 R73
 U 1 1 58023E0C
 P 2200 8300
 F 0 "R73" V 2110 8255 60  0000 R TNN
@@ -441,7 +412,7 @@ F 3 "" H 2040 8150 60  0000 C CNN
 	0    -1   -1   0
 $EndComp
 $Comp
-L R-EU_R0402 R74
+L Cryptech_Alpha:R-EU_R0402 R74
 U 1 1 58023E0B
 P 3000 8700
 F 0 "R74" H 2890 8555 60  0000 L BNN
@@ -452,7 +423,7 @@ F 3 "" H 2840 8550 60  0000 C CNN
 	1    0    0    -1
 $EndComp
 $Comp
-L BAT54 D3
+L Cryptech_Alpha:BAT54 D3
 U 1 1 58023E0A
 P 3000 8300
 F 0 "D3" H 3085 8140 60  0000 R BNN
@@ -463,7 +434,7 @@ F 3 "" H 3060 8390 60  0000 C CNN
 	-1    0    0    -1
 $EndComp
 $Comp
-L R-EU_R0402 R77
+L Cryptech_Alpha:R-EU_R0402 R77
 U 1 1 58023E09
 P 6800 7900
 F 0 "R77" V 6710 7855 60  0000 R TNN
diff --git a/sym-lib-table.template b/sym-lib-table.template
new file mode 100644
index 0000000..dfa111d
--- /dev/null
+++ b/sym-lib-table.template
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name Cryptech_Alpha)(type Legacy)(uri ${KIPRJMOD}/Cryptech_Alpha.lib)(options "")(descr ""))
+)



More information about the Commits mailing list