diff --git a/crocus-cache.lib b/crocus-cache.lib
index dbf2116..5e105ea 100644
--- a/crocus-cache.lib
+++ b/crocus-cache.lib
@@ -1,342 +1,363 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# BALUN
+# Connector_Conn_Coaxial
 #
-DEF BALUN T 0 40 Y N 1 F N
-F0 "T" 0 250 70 H V C CNN
-F1 "BALUN" 0 -300 70 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+DEF Connector_Conn_Coaxial J 0 40 Y N 1 F N
+F0 "J" 10 120 50 H V C CNN
+F1 "Connector_Conn_Coaxial" 115 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ *BNC*
+ *SMA*
+ *SMB*
+ *SMC*
+ *Cinch*
+$ENDFPLIST
 DRAW
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
-A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
-A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
-A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
-A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
-P 2 0 1 0 -25 200 -25 -200 N
-P 2 0 1 0 25 -200 25 200 N
-X S1 1 400 -200 300 L 60 60 1 1 P
-X S2 2 400 200 300 L 60 60 1 1 P
-X PR1 3 -400 200 300 R 60 60 1 1 P
-X PR2 4 -400 -200 300 R 60 60 1 1 P
-X PM 5 -400 0 300 R 60 60 1 1 P
+A -2 0 71 1636 0 0 1 10 N -70 20 70 0
+A -1 0 71 0 -1638 0 1 10 N 70 0 -70 -20
+C 0 0 20 0 1 8 N
+P 2 0 1 0 -100 0 -20 0 N
+P 2 0 1 0 0 -100 0 -70 N
+X In 1 -200 0 100 R 50 50 1 1 P
+X Ext 2 0 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# BNC
+# Connector_Generic_Conn_01x01
 #
-DEF BNC P 0 40 Y N 1 F N
-F0 "P" 10 120 50 H V C CNN
-F1 "BNC" 110 -60 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF Connector_Generic_Conn_01x01 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector_Generic_Conn_01x01" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- BNC_*
- bnc
- bnc-*
+ Connector*:*_1x??_*
 $ENDFPLIST
 DRAW
-C 0 0 20 0 1 8 N
-C 0 0 70 0 1 12 N
-X In 1 -150 0 130 R 40 40 1 1 P
-X Ext 2 0 -200 130 U 40 40 1 1 P
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -50 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# C
+# Connector_Generic_Conn_01x20
 #
-DEF C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF Connector_Generic_Conn_01x20 J 0 40 Y N 1 F N
+F0 "J" 0 1000 50 H V C CNN
+F1 "Connector_Generic_Conn_01x20" 0 -1100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- C?
- C_????_*
- C_????
- SMD*_c
- Capacitor*
+ Connector*:*_1x??_*
 $ENDFPLIST
 DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
+S -50 -995 0 -1005 1 1 6 N
+S -50 -895 0 -905 1 1 6 N
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 805 0 795 1 1 6 N
+S -50 905 0 895 1 1 6 N
+S -50 950 50 -1050 1 1 10 f
+X Pin_1 1 -200 900 150 R 50 50 1 1 P
+X Pin_10 10 -200 0 150 R 50 50 1 1 P
+X Pin_11 11 -200 -100 150 R 50 50 1 1 P
+X Pin_12 12 -200 -200 150 R 50 50 1 1 P
+X Pin_13 13 -200 -300 150 R 50 50 1 1 P
+X Pin_14 14 -200 -400 150 R 50 50 1 1 P
+X Pin_15 15 -200 -500 150 R 50 50 1 1 P
+X Pin_16 16 -200 -600 150 R 50 50 1 1 P
+X Pin_17 17 -200 -700 150 R 50 50 1 1 P
+X Pin_18 18 -200 -800 150 R 50 50 1 1 P
+X Pin_19 19 -200 -900 150 R 50 50 1 1 P
+X Pin_2 2 -200 800 150 R 50 50 1 1 P
+X Pin_20 20 -200 -1000 150 R 50 50 1 1 P
+X Pin_3 3 -200 700 150 R 50 50 1 1 P
+X Pin_4 4 -200 600 150 R 50 50 1 1 P
+X Pin_5 5 -200 500 150 R 50 50 1 1 P
+X Pin_6 6 -200 400 150 R 50 50 1 1 P
+X Pin_7 7 -200 300 150 R 50 50 1 1 P
+X Pin_8 8 -200 200 150 R 50 50 1 1 P
+X Pin_9 9 -200 100 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_01X01
+# Connector_Generic_Conn_02x06_Odd_Even
 #
-DEF CONN_01X01 P 0 40 Y N 1 F N
-F0 "P" 0 100 50 H V C CNN
-F1 "CONN_01X01" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF Connector_Generic_Conn_02x06_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 300 50 H V C CNN
+F1 "Connector_Generic_Conn_02x06_Odd_Even" 50 -400 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- Pin_Header_Straight_1X01
- Pin_Header_Angled_1X01
- Socket_Strip_Straight_1X01
- Socket_Strip_Angled_1X01
+ Connector*:*_2x??_*
 $ENDFPLIST
 DRAW
-S -50 5 10 -5 0 1 0 N
-S -50 50 50 -50 0 1 0 N
-X P1 1 -200 0 150 R 50 50 1 1 P
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 150 -350 1 1 10 f
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+X Pin_1 1 -200 200 150 R 50 50 1 1 P
+X Pin_10 10 300 -200 150 L 50 50 1 1 P
+X Pin_11 11 -200 -300 150 R 50 50 1 1 P
+X Pin_12 12 300 -300 150 L 50 50 1 1 P
+X Pin_2 2 300 200 150 L 50 50 1 1 P
+X Pin_3 3 -200 100 150 R 50 50 1 1 P
+X Pin_4 4 300 100 150 L 50 50 1 1 P
+X Pin_5 5 -200 0 150 R 50 50 1 1 P
+X Pin_6 6 300 0 150 L 50 50 1 1 P
+X Pin_7 7 -200 -100 150 R 50 50 1 1 P
+X Pin_8 8 300 -100 150 L 50 50 1 1 P
+X Pin_9 9 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_01X20
+# Connector_Generic_Conn_02x20_Odd_Even
 #
-DEF CONN_01X20 P 0 40 Y N 1 F N
-F0 "P" 0 1050 50 H V C CNN
-F1 "CONN_01X20" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF Connector_Generic_Conn_02x20_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 1000 50 H V C CNN
+F1 "Connector_Generic_Conn_02x20_Odd_Even" 50 -1100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- Pin_Header_Straight_1X20
- Pin_Header_Angled_1X20
- Socket_Strip_Straight_1X20
- Socket_Strip_Angled_1X20
+ Connector*:*_2x??_*
 $ENDFPLIST
 DRAW
-S -50 -1000 50 1000 0 1 0 N
-S -50 -945 10 -955 0 1 0 N
-S -50 -845 10 -855 0 1 0 N
-S -50 -745 10 -755 0 1 0 N
-S -50 -645 10 -655 0 1 0 N
-S -50 -545 10 -555 0 1 0 N
-S -50 -445 10 -455 0 1 0 N
-S -50 -345 10 -355 0 1 0 N
-S -50 -245 10 -255 0 1 0 N
-S -50 -145 10 -155 0 1 0 N
-S -50 -45 10 -55 0 1 0 N
-S -50 55 10 45 0 1 0 N
-S -50 155 10 145 0 1 0 N
-S -50 255 10 245 0 1 0 N
-S -50 355 10 345 0 1 0 N
-S -50 455 10 445 0 1 0 N
-S -50 555 10 545 0 1 0 N
-S -50 655 10 645 0 1 0 N
-S -50 755 10 745 0 1 0 N
-S -50 855 10 845 0 1 0 N
-S -50 955 10 945 0 1 0 N
-X P1 1 -200 950 150 R 50 50 1 1 P
-X P2 2 -200 850 150 R 50 50 1 1 P
-X P3 3 -200 750 150 R 50 50 1 1 P
-X P4 4 -200 650 150 R 50 50 1 1 P
-X P5 5 -200 550 150 R 50 50 1 1 P
-X P6 6 -200 450 150 R 50 50 1 1 P
-X P7 7 -200 350 150 R 50 50 1 1 P
-X P8 8 -200 250 150 R 50 50 1 1 P
-X P9 9 -200 150 150 R 50 50 1 1 P
-X P10 10 -200 50 150 R 50 50 1 1 P
-X P20 20 -200 -950 150 R 50 50 1 1 P
-X P11 11 -200 -50 150 R 50 50 1 1 P
-X P12 12 -200 -150 150 R 50 50 1 1 P
-X P13 13 -200 -250 150 R 50 50 1 1 P
-X P14 14 -200 -350 150 R 50 50 1 1 P
-X P15 15 -200 -450 150 R 50 50 1 1 P
-X P16 16 -200 -550 150 R 50 50 1 1 P
-X P17 17 -200 -650 150 R 50 50 1 1 P
-X P18 18 -200 -750 150 R 50 50 1 1 P
-X P19 19 -200 -850 150 R 50 50 1 1 P
+S -50 -995 0 -1005 1 1 6 N
+S -50 -895 0 -905 1 1 6 N
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 805 0 795 1 1 6 N
+S -50 905 0 895 1 1 6 N
+S -50 950 150 -1050 1 1 10 f
+S 150 -995 100 -1005 1 1 6 N
+S 150 -895 100 -905 1 1 6 N
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+S 150 805 100 795 1 1 6 N
+S 150 905 100 895 1 1 6 N
+X Pin_1 1 -200 900 150 R 50 50 1 1 P
+X Pin_10 10 300 500 150 L 50 50 1 1 P
+X Pin_11 11 -200 400 150 R 50 50 1 1 P
+X Pin_12 12 300 400 150 L 50 50 1 1 P
+X Pin_13 13 -200 300 150 R 50 50 1 1 P
+X Pin_14 14 300 300 150 L 50 50 1 1 P
+X Pin_15 15 -200 200 150 R 50 50 1 1 P
+X Pin_16 16 300 200 150 L 50 50 1 1 P
+X Pin_17 17 -200 100 150 R 50 50 1 1 P
+X Pin_18 18 300 100 150 L 50 50 1 1 P
+X Pin_19 19 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 300 900 150 L 50 50 1 1 P
+X Pin_20 20 300 0 150 L 50 50 1 1 P
+X Pin_21 21 -200 -100 150 R 50 50 1 1 P
+X Pin_22 22 300 -100 150 L 50 50 1 1 P
+X Pin_23 23 -200 -200 150 R 50 50 1 1 P
+X Pin_24 24 300 -200 150 L 50 50 1 1 P
+X Pin_25 25 -200 -300 150 R 50 50 1 1 P
+X Pin_26 26 300 -300 150 L 50 50 1 1 P
+X Pin_27 27 -200 -400 150 R 50 50 1 1 P
+X Pin_28 28 300 -400 150 L 50 50 1 1 P
+X Pin_29 29 -200 -500 150 R 50 50 1 1 P
+X Pin_3 3 -200 800 150 R 50 50 1 1 P
+X Pin_30 30 300 -500 150 L 50 50 1 1 P
+X Pin_31 31 -200 -600 150 R 50 50 1 1 P
+X Pin_32 32 300 -600 150 L 50 50 1 1 P
+X Pin_33 33 -200 -700 150 R 50 50 1 1 P
+X Pin_34 34 300 -700 150 L 50 50 1 1 P
+X Pin_35 35 -200 -800 150 R 50 50 1 1 P
+X Pin_36 36 300 -800 150 L 50 50 1 1 P
+X Pin_37 37 -200 -900 150 R 50 50 1 1 P
+X Pin_38 38 300 -900 150 L 50 50 1 1 P
+X Pin_39 39 -200 -1000 150 R 50 50 1 1 P
+X Pin_4 4 300 800 150 L 50 50 1 1 P
+X Pin_40 40 300 -1000 150 L 50 50 1 1 P
+X Pin_5 5 -200 700 150 R 50 50 1 1 P
+X Pin_6 6 300 700 150 L 50 50 1 1 P
+X Pin_7 7 -200 600 150 R 50 50 1 1 P
+X Pin_8 8 300 600 150 L 50 50 1 1 P
+X Pin_9 9 -200 500 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_02X06
+# Connector_TestPoint_2Pole
 #
-DEF CONN_02X06 P 0 1 Y N 1 F N
-F0 "P" 0 350 50 H V C CNN
-F1 "CONN_02X06" 0 -350 50 H V C CNN
-F2 "" 0 -1200 50 H V C CNN
-F3 "" 0 -1200 50 H V C CNN
+DEF Connector_TestPoint_2Pole TP 0 30 Y N 1 F N
+F0 "TP" 0 60 50 H V C CNN
+F1 "Connector_TestPoint_2Pole" 0 -70 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- Pin_Header_Straight_2X06
- Pin_Header_Angled_2X06
- Socket_Strip_Straight_2X06
- Socket_Strip_Angled_2X06
+ Pin*
+ Test*
 $ENDFPLIST
 DRAW
-S -100 -245 -50 -255 0 1 0 N
-S -100 -145 -50 -155 0 1 0 N
-S -100 -45 -50 -55 0 1 0 N
-S -100 55 -50 45 0 1 0 N
-S -100 155 -50 145 0 1 0 N
-S -100 255 -50 245 0 1 0 N
-S -100 300 100 -300 0 1 0 N
-S 50 -245 100 -255 0 1 0 N
-S 50 -145 100 -155 0 1 0 N
-S 50 -45 100 -55 0 1 0 N
-S 50 55 100 45 0 1 0 N
-S 50 155 100 145 0 1 0 N
-S 50 255 100 245 0 1 0 N
-X P1 1 -250 250 150 R 50 50 1 1 P
-X P2 2 250 250 150 L 50 50 1 1 P
-X P3 3 -250 150 150 R 50 50 1 1 P
-X P4 4 250 150 150 L 50 50 1 1 P
-X P5 5 -250 50 150 R 50 50 1 1 P
-X P6 6 250 50 150 L 50 50 1 1 P
-X P7 7 -250 -50 150 R 50 50 1 1 P
-X P8 8 250 -50 150 L 50 50 1 1 P
-X P9 9 -250 -150 150 R 50 50 1 1 P
-X P10 10 250 -150 150 L 50 50 1 1 P
-X P11 11 -250 -250 150 R 50 50 1 1 P
-X P12 12 250 -250 150 L 50 50 1 1 P
+C -70 0 30 0 1 0 N
+C 70 0 30 0 1 0 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_02X20
+# Device_C
 #
-DEF CONN_02X20 P 0 1 Y N 1 F N
-F0 "P" 0 1050 50 H V C CNN
-F1 "CONN_02X20" 0 0 50 V V C CNN
-F2 "" 0 -950 50 H V C CNN
-F3 "" 0 -950 50 H V C CNN
+DEF Device_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- Pin_Header_Straight_2X20
- Pin_Header_Angled_2X20
- Socket_Strip_Straight_2X20
- Socket_Strip_Angled_2X20
+ C_*
 $ENDFPLIST
 DRAW
-S -100 -945 -50 -955 0 1 0 N
-S -100 -845 -50 -855 0 1 0 N
-S -100 -745 -50 -755 0 1 0 N
-S -100 -645 -50 -655 0 1 0 N
-S -100 -545 -50 -555 0 1 0 N
-S -100 -445 -50 -455 0 1 0 N
-S -100 -345 -50 -355 0 1 0 N
-S -100 -245 -50 -255 0 1 0 N
-S -100 -145 -50 -155 0 1 0 N
-S -100 -45 -50 -55 0 1 0 N
-S -100 55 -50 45 0 1 0 N
-S -100 155 -50 145 0 1 0 N
-S -100 255 -50 245 0 1 0 N
-S -100 355 -50 345 0 1 0 N
-S -100 455 -50 445 0 1 0 N
-S -100 555 -50 545 0 1 0 N
-S -100 655 -50 645 0 1 0 N
-S -100 755 -50 745 0 1 0 N
-S -100 855 -50 845 0 1 0 N
-S -100 955 -50 945 0 1 0 N
-S -100 1000 100 -1000 0 1 0 N
-S 50 -945 100 -955 0 1 0 N
-S 50 -845 100 -855 0 1 0 N
-S 50 -745 100 -755 0 1 0 N
-S 50 -645 100 -655 0 1 0 N
-S 50 -545 100 -555 0 1 0 N
-S 50 -445 100 -455 0 1 0 N
-S 50 -345 100 -355 0 1 0 N
-S 50 -245 100 -255 0 1 0 N
-S 50 -145 100 -155 0 1 0 N
-S 50 -45 100 -55 0 1 0 N
-S 50 55 100 45 0 1 0 N
-S 50 155 100 145 0 1 0 N
-S 50 255 100 245 0 1 0 N
-S 50 355 100 345 0 1 0 N
-S 50 455 100 445 0 1 0 N
-S 50 555 100 545 0 1 0 N
-S 50 655 100 645 0 1 0 N
-S 50 755 100 745 0 1 0 N
-S 50 855 100 845 0 1 0 N
-S 50 955 100 945 0 1 0 N
-X P1 1 -250 950 150 R 50 50 1 1 P
-X P2 2 250 950 150 L 50 50 1 1 P
-X P3 3 -250 850 150 R 50 50 1 1 P
-X P4 4 250 850 150 L 50 50 1 1 P
-X P5 5 -250 750 150 R 50 50 1 1 P
-X P6 6 250 750 150 L 50 50 1 1 P
-X P7 7 -250 650 150 R 50 50 1 1 P
-X P8 8 250 650 150 L 50 50 1 1 P
-X P9 9 -250 550 150 R 50 50 1 1 P
-X P10 10 250 550 150 L 50 50 1 1 P
-X P20 20 250 50 150 L 50 50 1 1 P
-X P30 30 250 -450 150 L 50 50 1 1 P
-X P40 40 250 -950 150 L 50 50 1 1 P
-X P11 11 -250 450 150 R 50 50 1 1 P
-X P21 21 -250 -50 150 R 50 50 1 1 P
-X P31 31 -250 -550 150 R 50 50 1 1 P
-X P12 12 250 450 150 L 50 50 1 1 P
-X P22 22 250 -50 150 L 50 50 1 1 P
-X P32 32 250 -550 150 L 50 50 1 1 P
-X P13 13 -250 350 150 R 50 50 1 1 P
-X P23 23 -250 -150 150 R 50 50 1 1 P
-X P33 33 -250 -650 150 R 50 50 1 1 P
-X P14 14 250 350 150 L 50 50 1 1 P
-X P24 24 250 -150 150 L 50 50 1 1 P
-X P34 34 250 -650 150 L 50 50 1 1 P
-X P15 15 -250 250 150 R 50 50 1 1 P
-X P25 25 -250 -250 150 R 50 50 1 1 P
-X P35 35 -250 -750 150 R 50 50 1 1 P
-X P16 16 250 250 150 L 50 50 1 1 P
-X P26 26 250 -250 150 L 50 50 1 1 P
-X P36 36 250 -750 150 L 50 50 1 1 P
-X P17 17 -250 150 150 R 50 50 1 1 P
-X P27 27 -250 -350 150 R 50 50 1 1 P
-X P37 37 -250 -850 150 R 50 50 1 1 P
-X P18 18 250 150 150 L 50 50 1 1 P
-X P28 28 250 -350 150 L 50 50 1 1 P
-X P38 38 250 -850 150 L 50 50 1 1 P
-X P19 19 -250 50 150 R 50 50 1 1 P
-X P29 29 -250 -450 150 R 50 50 1 1 P
-X P39 39 -250 -950 150 R 50 50 1 1 P
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Crystal
+# Device_Crystal
 #
-DEF Crystal Y 0 40 N N 1 F N
+DEF Device_Crystal Y 0 40 N N 1 F N
 F0 "Y" 0 150 50 H V C CNN
-F1 "Crystal" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F1 "Device_Crystal" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- Crystal_*
+ Crystal*
 $ENDFPLIST
 DRAW
-S -50 100 50 -100 0 1 12 N
-P 2 0 1 12 -100 -50 -100 50 N
-P 2 0 1 12 100 -50 100 50 N
-X 1 1 -150 0 50 R 40 40 1 1 P
-X 2 2 150 0 50 L 40 40 1 1 P
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 20 75 -50 75 50 N
+P 2 0 1 0 100 0 75 0 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# GND
+# Device_R
 #
-DEF GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF Device_R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "Device_R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
 DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GND 1 0 0 0 D 50 50 1 1 W N
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# gsg-symbols_BALUN
+#
+DEF gsg-symbols_BALUN T 0 40 Y N 1 F N
+F0 "T" 0 250 70 H V C CNN
+F1 "gsg-symbols_BALUN" 0 -300 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
+A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
+A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
+A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
+A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
+P 2 0 1 0 -25 200 -25 -200 N
+P 2 0 1 0 25 -200 25 200 N
+X S1 1 400 -200 300 L 60 60 1 1 P
+X S2 2 400 200 300 L 60 60 1 1 P
+X PR1 3 -400 200 300 R 60 60 1 1 P
+X PR2 4 -400 -200 300 R 60 60 1 1 P
+X PM 5 -400 0 300 R 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
-# PCA9674
+# gsg-symbols_PCA9674
 #
-DEF PCA9674 U 0 40 Y Y 1 F N
+DEF gsg-symbols_PCA9674 U 0 40 Y Y 1 F N
 F0 "U" -50 0 40 V V C CNN
-F1 "PCA9674" 50 0 40 V V C CNN
+F1 "gsg-symbols_PCA9674" 50 0 40 V V C CNN
 F2 "" 0 0 40 H V C CNN
 F3 "" 0 0 40 H V C CNN
 DRAW
 S -300 400 300 -400 0 1 0 N
 X AD0 1 -450 350 150 R 50 50 1 1 I
+X P5 10 450 -250 150 L 50 50 1 1 B
+X P6 11 450 -150 150 L 50 50 1 1 B
+X P7 12 450 -50 150 L 50 50 1 1 B
+X INT 13 450 50 150 L 50 50 1 1 O
+X SCL 14 450 150 150 L 50 50 1 1 B
+X SDA 15 450 250 150 L 50 50 1 1 B
+X VDD 16 450 350 150 L 50 50 1 1 W
 X AD1 2 -450 250 150 R 50 50 1 1 I
 X AD2 3 -450 150 150 R 50 50 1 1 I
 X P0 4 -450 50 150 R 50 50 1 1 B
@@ -345,83 +366,20 @@ X P2 6 -450 -150 150 R 50 50 1 1 B
 X P3 7 -450 -250 150 R 50 50 1 1 B
 X VSS 8 -450 -350 150 R 50 50 1 1 W
 X P4 9 450 -350 150 L 50 50 1 1 B
-X P5 10 450 -250 150 L 50 50 1 1 B
-X P6 11 450 -150 150 L 50 50 1 1 B
-X P7 12 450 -50 150 L 50 50 1 1 B
-X INT 13 450 50 150 L 50 50 1 1 O
-X SCL 14 450 150 150 L 50 50 1 1 B
-X SDA 15 450 250 150 L 50 50 1 1 B
-X VDD 16 450 350 150 L 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R_*
- Resistor_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TEST
-#
-DEF TEST W 0 30 N N 1 F N
-F0 "W" 0 60 50 H V C CNN
-F1 "TEST" 0 -70 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C -70 0 30 0 1 0 N
-C 70 0 30 0 1 0 N
-X 1 1 -200 0 100 R 50 50 0 1 P
-X 2 2 200 0 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# VCC
-#
-DEF VCC #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VCC" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VCC 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# nRF24L01+
+# gsg-symbols_nRF24L01+
 #
-DEF nRF24L01+ U 0 40 Y Y 1 F N
+DEF gsg-symbols_nRF24L01+ U 0 40 Y Y 1 F N
 F0 "U" 0 50 60 H V C CNN
-F1 "nRF24L01+" 0 -50 60 H V C CNN
+F1 "gsg-symbols_nRF24L01+" 0 -50 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 S -500 500 500 -500 0 1 0 N
 X CE 1 -650 200 150 R 50 50 1 1 I
-X CSN 2 -650 100 150 R 50 50 1 1 I
-X SCK 3 -650 0 150 R 50 50 1 1 I
-X MOSI 4 -650 -100 150 R 50 50 1 1 I
-X MISO 5 -650 -200 150 R 50 50 1 1 O
-X IRQ 6 -200 -650 150 U 50 50 1 1 O
-X VDD 7 -100 -650 150 U 50 50 1 1 W
-X VSS 8 0 -650 150 U 50 50 1 1 W
-X XC2 9 100 -650 150 U 50 50 1 1 O
 X XC1 10 200 -650 150 U 50 50 1 1 I
-X VSS 20 -200 650 150 D 50 50 1 1 W
 X VDD_PA 11 650 -200 150 L 50 50 1 1 w
 X ANT1 12 650 -100 150 L 50 50 1 1 B
 X ANT2 13 650 0 150 L 50 50 1 1 B
@@ -431,6 +389,42 @@ X IREF 16 200 650 150 D 50 50 1 1 I
 X VSS 17 100 650 150 D 50 50 1 1 W
 X VDD 18 0 650 150 D 50 50 1 1 W
 X DVDD 19 -100 650 150 D 50 50 1 1 w
+X CSN 2 -650 100 150 R 50 50 1 1 I
+X VSS 20 -200 650 150 D 50 50 1 1 W
+X SCK 3 -650 0 150 R 50 50 1 1 I
+X MOSI 4 -650 -100 150 R 50 50 1 1 I
+X MISO 5 -650 -200 150 R 50 50 1 1 O
+X IRQ 6 -200 -650 150 U 50 50 1 1 O
+X VDD 7 -100 -650 150 U 50 50 1 1 W
+X VSS 8 0 -650 150 U 50 50 1 1 W
+X XC2 9 100 -650 150 U 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_VCC
+#
+DEF power_VCC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_VCC" 0 150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VCC 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
diff --git a/crocus.sch b/crocus.sch
index 2022506..40561d4 100644
--- a/crocus.sch
+++ b/crocus.sch
@@ -1,35 +1,9 @@
-EESchema Schematic File Version 2
+EESchema Schematic File Version 4
 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:gsg-symbols
 LIBS:crocus-cache
-EELAYER 25 0
+EELAYER 30 0
 EELAYER END
 $Descr USLetter 11000 8500
 encoding utf-8
@@ -44,22 +18,22 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L CONN_02X20 J2
+L Connector_Generic:Conn_02x20_Odd_Even J2
 U 1 1 55EAB4B7
-P 9400 3050
-F 0 "J2" H 9400 4100 50  0000 C CNN
-F 1 "NEIGHBOR2" V 9400 3050 50  0000 C CNN
-F 2 "gsg-modules:HEADER-2x20" H 9400 2100 60  0001 C CNN
-F 3 "" H 9400 2100 60  0000 C CNN
-F 4 "Samtec" H 9400 3050 60  0001 C CNN "Manufacturer"
-F 5 "SSQ-120-23-G-D" H 9400 3050 60  0001 C CNN "Part Number"
-F 6 "CONN RCPT .100\" 40POS DUAL-ROW STACKING GOLD" H 9400 3050 60  0001 C CNN "Description"
-F 7 "Alternate: https://www.adafruit.com/products/2223" H 9400 3050 60  0001 C CNN "Note"
-	1    9400 3050
+P 9350 3000
+F 0 "J2" H 9400 4050 50  0000 C CNN
+F 1 "NEIGHBOR2" V 9400 2950 50  0000 C CNN
+F 2 "gsg-modules:HEADER-2x20" H 9350 2050 60  0001 C CNN
+F 3 "" H 9350 2050 60  0000 C CNN
+F 4 "Samtec" H 9350 3000 60  0001 C CNN "Manufacturer"
+F 5 "SSQ-120-23-G-D" H 9350 3000 60  0001 C CNN "Part Number"
+F 6 "CONN RCPT .100\" 40POS DUAL-ROW STACKING GOLD" H 9350 3000 60  0001 C CNN "Description"
+F 7 "Alternate: https://www.adafruit.com/products/2223" H 9350 3000 60  0001 C CNN "Note"
+	1    9350 3000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR01
+L power:GND #PWR01
 U 1 1 55EAECD0
 P 8950 4700
 F 0 "#PWR01" H 8950 4450 50  0001 C CNN
@@ -70,18 +44,18 @@ F 3 "" H 8950 4700 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L CONN_02X20 J1
+L Connector_Generic:Conn_02x20_Odd_Even J1
 U 1 1 55FB1D52
-P 9400 5650
-F 0 "J1" H 9400 6700 50  0000 C CNN
-F 1 "NEIGHBOR1" V 9400 5650 50  0000 C CNN
-F 2 "gsg-modules:HEADER-2x20" H 9400 4700 60  0001 C CNN
-F 3 "" H 9400 4700 60  0000 C CNN
-F 4 "Samtec" H 9400 5650 60  0001 C CNN "Manufacturer"
-F 5 "SSQ-120-23-G-D" H 9400 5650 60  0001 C CNN "Part Number"
-F 6 "CONN RCPT .100\" 40POS DUAL-ROW STACKING GOLD" H 9400 5650 60  0001 C CNN "Description"
-F 7 "Alternate: https://www.adafruit.com/products/2223" H 9400 5650 60  0001 C CNN "Note"
-	1    9400 5650
+P 9350 5600
+F 0 "J1" H 9400 6650 50  0000 C CNN
+F 1 "NEIGHBOR1" V 9400 5600 50  0000 C CNN
+F 2 "gsg-modules:HEADER-2x20" H 9350 4650 60  0001 C CNN
+F 3 "" H 9350 4650 60  0000 C CNN
+F 4 "Samtec" H 9350 5600 60  0001 C CNN "Manufacturer"
+F 5 "SSQ-120-23-G-D" H 9350 5600 60  0001 C CNN "Part Number"
+F 6 "CONN RCPT .100\" 40POS DUAL-ROW STACKING GOLD" H 9350 5600 60  0001 C CNN "Description"
+F 7 "Alternate: https://www.adafruit.com/products/2223" H 9350 5600 60  0001 C CNN "Note"
+	1    9350 5600
 	1    0    0    -1  
 $EndComp
 Text Label 9850 6600 2    40   ~ 0
@@ -107,22 +81,22 @@ I2C0_SDA
 Text Label 9850 2200 2    40   ~ 0
 INT
 $Comp
-L CONN_01X20 J7
+L Connector_Generic:Conn_01x20 J7
 U 1 1 560E713A
-P 5000 7500
-F 0 "J7" H 5000 8550 50  0000 C CNN
-F 1 "BONUS_ROW" V 5100 7500 50  0000 C CNN
-F 2 "gsg-modules:HEADER-1x20" H 5000 7500 60  0001 C CNN
-F 3 "" H 5000 7500 60  0000 C CNN
-F 4 "Samtec" H 5000 7500 60  0001 C CNN "Manufacturer"
-F 5 "SSQ-120-23-G-S" H 5000 7500 60  0001 C CNN "Part Number"
-F 6 "CONN RCPT .100\" 20POS SINGLE-ROW STACKING GOLD" H 5000 7500 60  0001 C CNN "Description"
-F 7 "DNP" V 5200 7500 60  0000 C CNN "Note"
-	1    5000 7500
+P 4950 7500
+F 0 "J7" H 4950 8550 50  0000 C CNN
+F 1 "BONUS_ROW" V 5050 7500 50  0000 C CNN
+F 2 "gsg-modules:HEADER-1x20" H 4950 7500 60  0001 C CNN
+F 3 "" H 4950 7500 60  0000 C CNN
+F 4 "Samtec" H 4950 7500 60  0001 C CNN "Manufacturer"
+F 5 "SSQ-120-23-G-S" H 4950 7500 60  0001 C CNN "Part Number"
+F 6 "CONN RCPT .100\" 20POS SINGLE-ROW STACKING GOLD" H 4950 7500 60  0001 C CNN "Description"
+F 7 "DNP" V 5150 7500 60  0000 C CNN "Note"
+	1    4950 7500
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONN_01X01 MH3
+L Connector_Generic:Conn_01x01 MH3
 U 1 1 5600EED5
 P 9500 900
 F 0 "MH3" H 9450 1000 50  0000 C CNN
@@ -134,7 +108,7 @@ F 4 "DNP" H 9500 900 60  0001 C CNN "Note"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR02
+L power:GND #PWR02
 U 1 1 5600F9D3
 P 9500 1200
 F 0 "#PWR02" H 9500 950 50  0001 C CNN
@@ -145,7 +119,7 @@ F 3 "" H 9500 1200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X01 MH4
+L Connector_Generic:Conn_01x01 MH4
 U 1 1 560100F3
 P 10000 1050
 F 0 "MH4" H 9950 1150 50  0000 C CNN
@@ -157,7 +131,7 @@ F 4 "DNP" H 10000 1050 60  0001 C CNN "Note"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR03
+L power:GND #PWR03
 U 1 1 560100F9
 P 10000 1350
 F 0 "#PWR03" H 10000 1100 50  0001 C CNN
@@ -168,7 +142,7 @@ F 3 "" H 10000 1350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X01 MH1
+L Connector_Generic:Conn_01x01 MH1
 U 1 1 56010ADB
 P 8500 900
 F 0 "MH1" H 8450 1000 50  0000 C CNN
@@ -180,7 +154,7 @@ F 4 "DNP" H 8500 900 60  0001 C CNN "Note"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR04
+L power:GND #PWR04
 U 1 1 56010AE1
 P 8500 1200
 F 0 "#PWR04" H 8500 950 50  0001 C CNN
@@ -191,7 +165,7 @@ F 3 "" H 8500 1200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X01 MH2
+L Connector_Generic:Conn_01x01 MH2
 U 1 1 56010AE9
 P 9000 1050
 F 0 "MH2" H 8950 1150 50  0000 C CNN
@@ -203,7 +177,7 @@ F 4 "DNP" H 9000 1050 60  0001 C CNN "Note"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR05
+L power:GND #PWR05
 U 1 1 56010AEF
 P 9000 1350
 F 0 "#PWR05" H 9000 1100 50  0001 C CNN
@@ -214,7 +188,7 @@ F 3 "" H 9000 1350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L nRF24L01+ U1
+L gsg-symbols:nRF24L01+ U1
 U 1 1 5604EB74
 P 5850 3650
 F 0 "U1" H 5850 3700 60  0000 C CNN
@@ -228,7 +202,7 @@ F 6 "IC RF TRANSCEIVER 2.4GHZ 20QFN" H 5850 3650 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L BNC P1
+L Connector:Conn_Coaxial P1
 U 1 1 5604F06F
 P 8400 4050
 F 0 "P1" H 8410 4170 50  0000 C CNN
@@ -241,7 +215,7 @@ F 5 "CONREVSMA003.031" H 8400 4050 60  0001 C CNN "Part Number"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L power:GND #PWR06
 U 1 1 5604F191
 P 8400 4350
 F 0 "#PWR06" H 8400 4100 50  0001 C CNN
@@ -252,7 +226,7 @@ F 3 "" H 8400 4350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR07
+L power:GND #PWR07
 U 1 1 5604F268
 P 5850 4450
 F 0 "#PWR07" H 5850 4200 50  0001 C CNN
@@ -263,7 +237,7 @@ F 3 "" H 5850 4450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR08
+L power:GND #PWR08
 U 1 1 5604F2B2
 P 5650 2900
 F 0 "#PWR08" H 5650 2650 50  0001 C CNN
@@ -274,7 +248,7 @@ F 3 "" H 5650 2900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR09
+L power:GND #PWR09
 U 1 1 5604F2E1
 P 5950 2900
 F 0 "#PWR09" H 5950 2650 50  0001 C CNN
@@ -285,7 +259,7 @@ F 3 "" H 5950 2900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR010
+L power:GND #PWR010
 U 1 1 5604F307
 P 6600 3550
 F 0 "#PWR010" H 6600 3300 50  0001 C CNN
@@ -296,7 +270,7 @@ F 3 "" H 6600 3550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR011
+L power:VCC #PWR011
 U 1 1 5604F59C
 P 5850 2750
 F 0 "#PWR011" H 5850 2600 50  0001 C CNN
@@ -307,7 +281,7 @@ F 3 "" H 5850 2750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR012
+L power:VCC #PWR012
 U 1 1 5604F5F8
 P 6750 3450
 F 0 "#PWR012" H 6750 3300 50  0001 C CNN
@@ -318,7 +292,7 @@ F 3 "" H 6750 3450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR013
+L power:VCC #PWR013
 U 1 1 5604F65B
 P 5750 4600
 F 0 "#PWR013" H 5750 4450 50  0001 C CNN
@@ -335,7 +309,7 @@ MOSI
 Text Label 5000 3850 0    40   ~ 0
 MISO
 $Comp
-L Crystal Y1
+L Device:Crystal Y1
 U 1 1 5605026E
 P 6200 4700
 F 0 "Y1" H 6200 4850 50  0000 C CNN
@@ -349,7 +323,7 @@ F 6 "CRYSTAL 16.0000MHZ 12PF SMD" H 6200 4700 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C4
+L Device:C C4
 U 1 1 560502F7
 P 5950 5050
 F 0 "C4" H 5975 5150 50  0000 L CNN
@@ -363,7 +337,7 @@ F 6 "CAP CER 18PF 50V 5% NP0 0603" H 5950 5050 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR014
+L power:GND #PWR014
 U 1 1 5605045B
 P 5950 5300
 F 0 "#PWR014" H 5950 5050 50  0001 C CNN
@@ -374,7 +348,7 @@ F 3 "" H 5950 5300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L power:GND #PWR015
 U 1 1 5605049D
 P 6450 5300
 F 0 "#PWR015" H 6450 5050 50  0001 C CNN
@@ -385,7 +359,7 @@ F 3 "" H 6450 5300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C5
+L Device:C C5
 U 1 1 56050FB1
 P 6450 5050
 F 0 "C5" H 6475 5150 50  0000 L CNN
@@ -399,7 +373,7 @@ F 6 "CAP CER 18PF 50V 5% NP0 0603" H 6450 5050 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L Device:R R1
 U 1 1 5605108E
 P 6050 2300
 F 0 "R1" V 6130 2300 50  0000 C CNN
@@ -413,7 +387,7 @@ F 6 "RES SMD 22K OHM 1% 1/10W 0603" H 6050 2300 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR016
+L power:GND #PWR016
 U 1 1 56051138
 P 6050 2050
 F 0 "#PWR016" H 6050 1800 50  0001 C CNN
@@ -444,7 +418,7 @@ NoConn ~ 5750 7700
 NoConn ~ 5850 7700
 NoConn ~ 5950 7700
 $Comp
-L BALUN T1
+L gsg-symbols:BALUN T1
 U 1 1 56052B6C
 P 7650 3850
 F 0 "T1" H 7650 4100 70  0000 C CNN
@@ -458,7 +432,7 @@ F 6 "NRF24L01 NRF24LE01 NRF8001 SMD BALUN" H 7650 3850 60  0001 C CNN "Descripti
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L power:GND #PWR017
 U 1 1 56052DB2
 P 8150 3650
 F 0 "#PWR017" H 8150 3400 50  0001 C CNN
@@ -469,7 +443,7 @@ F 3 "" H 8150 3650 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C3
+L Device:C C3
 U 1 1 56053546
 P 6850 4100
 F 0 "C3" H 6875 4200 50  0000 L CNN
@@ -483,7 +457,7 @@ F 6 "CAP CER 2200PF 50V X7R 0603" H 6850 4100 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L power:GND #PWR018
 U 1 1 56053B17
 P 6850 4350
 F 0 "#PWR018" H 6850 4100 50  0001 C CNN
@@ -494,7 +468,7 @@ F 3 "" H 6850 4350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C2
+L Device:C C2
 U 1 1 56054B74
 P 5150 2700
 F 0 "C2" H 5175 2800 50  0000 L CNN
@@ -508,7 +482,7 @@ F 6 "CAP CER 0.033UF 50V X7R 0603" H 5150 2700 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L power:GND #PWR019
 U 1 1 56054D2F
 P 5150 2950
 F 0 "#PWR019" H 5150 2700 50  0001 C CNN
@@ -519,7 +493,7 @@ F 3 "" H 5150 2950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L Device:C C6
 U 1 1 560553E5
 P 7450 5950
 F 0 "C6" H 7475 6050 50  0000 L CNN
@@ -533,7 +507,7 @@ F 6 "CAP CER 10000PF 50V X7R 0603" H 7450 5950 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR020
+L power:VCC #PWR020
 U 1 1 5605549D
 P 7650 5600
 F 0 "#PWR020" H 7650 5450 50  0001 C CNN
@@ -544,7 +518,7 @@ F 3 "" H 7650 5600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C7
+L Device:C C7
 U 1 1 56055555
 P 7850 5950
 F 0 "C7" H 7875 6050 50  0000 L CNN
@@ -558,7 +532,7 @@ F 6 "CAP CER 1000PF 50V X7R 0603" H 7850 5950 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L power:GND #PWR021
 U 1 1 560556B9
 P 7650 6300
 F 0 "#PWR021" H 7650 6050 50  0001 C CNN
@@ -569,7 +543,7 @@ F 3 "" H 7650 6300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PCA9674 U2
+L gsg-symbols:PCA9674 U2
 U 1 1 560590D7
 P 3050 3400
 F 0 "U2" V 3000 3400 40  0000 C CNN
@@ -583,7 +557,7 @@ F 6 "IC I/O EXPANDER I2C 8B 16TSSOP" H 3050 3400 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L power:GND #PWR022
 U 1 1 5605B1C2
 P 2500 3850
 F 0 "#PWR022" H 2500 3600 50  0001 C CNN
@@ -594,7 +568,7 @@ F 3 "" H 2500 3850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR023
+L power:VCC #PWR023
 U 1 1 5605B330
 P 3800 2200
 F 0 "#PWR023" H 3800 2050 50  0001 C CNN
@@ -609,7 +583,7 @@ I2C0_SDA
 Text Label 3850 3250 2    40   ~ 0
 I2C0_SCL
 $Comp
-L R R2
+L Device:R R2
 U 1 1 5605BA20
 P 4100 3100
 F 0 "R2" V 4180 3100 50  0000 C CNN
@@ -625,7 +599,7 @@ $EndComp
 Text Label 4300 3350 2    40   ~ 0
 INT
 $Comp
-L VCC #PWR024
+L power:VCC #PWR024
 U 1 1 5605BD4D
 P 4100 2850
 F 0 "#PWR024" H 4100 2700 50  0001 C CNN
@@ -636,19 +610,19 @@ F 3 "" H 4100 2850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X06 P2
+L Connector_Generic:Conn_02x06_Odd_Even P2
 U 1 1 5605C25E
-P 2450 7100
-F 0 "P2" H 2450 7450 50  0000 C CNN
-F 1 "EXPANSION" H 2450 6750 50  0000 C CNN
-F 2 "gsg-modules:HEADER-2x6" H 2450 5900 60  0001 C CNN
-F 3 "" H 2450 5900 60  0000 C CNN
-F 4 "DNP" H 2450 7550 60  0000 C CNN "Note"
-	1    2450 7100
+P 2400 7050
+F 0 "P2" H 2450 7400 50  0000 C CNN
+F 1 "EXPANSION" H 2450 6600 50  0000 C CNN
+F 2 "gsg-modules:HEADER-2x6" H 2400 5850 60  0001 C CNN
+F 3 "" H 2400 5850 60  0000 C CNN
+F 4 "DNP" H 2450 7500 60  0000 C CNN "Note"
+	1    2400 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L power:GND #PWR025
 U 1 1 5605C3C4
 P 2100 7450
 F 0 "#PWR025" H 2100 7200 50  0001 C CNN
@@ -659,7 +633,7 @@ F 3 "" H 2100 7450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR026
+L power:VCC #PWR026
 U 1 1 5605C8C7
 P 2800 6750
 F 0 "#PWR026" H 2800 6600 50  0001 C CNN
@@ -712,7 +686,7 @@ CSN
 Text Label 4600 3450 0    40   ~ 0
 CE
 $Comp
-L GND #PWR027
+L power:GND #PWR027
 U 1 1 5605EBAA
 P 3800 2800
 F 0 "#PWR027" H 3800 2550 50  0001 C CNN
@@ -723,7 +697,7 @@ F 3 "" H 3800 2800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C1
+L Device:C C1
 U 1 1 5605F0B6
 P 3800 2550
 F 0 "C1" H 3825 2650 50  0000 L CNN
@@ -736,28 +710,28 @@ F 6 "CAP CER 0.033UF 50V X7R 0603" H 3800 2550 60  0001 C CNN "Description"
 	1    3800 2550
 	1    0    0    -1  
 $EndComp
-Text Label 8100 4050 0    40   ~ 0
+Text Label 8050 4050 0    40   ~ 0
 RF
 $Comp
-L GND #PWR028
+L power:GND #PWR028
 U 1 1 56062798
-P 3100 2600
-F 0 "#PWR028" H 3100 2350 50  0001 C CNN
-F 1 "GND" H 3100 2450 50  0000 C CNN
-F 2 "" H 3100 2600 60  0000 C CNN
-F 3 "" H 3100 2600 60  0000 C CNN
-	1    3100 2600
+P 3050 2600
+F 0 "#PWR028" H 3050 2350 50  0001 C CNN
+F 1 "GND" H 3050 2450 50  0000 C CNN
+F 2 "" H 3050 2600 60  0000 C CNN
+F 3 "" H 3050 2600 60  0000 C CNN
+	1    3050 2600
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR029
+L power:VCC #PWR029
 U 1 1 56062D36
-P 3100 1800
-F 0 "#PWR029" H 3100 1650 50  0001 C CNN
-F 1 "VCC" H 3100 1950 50  0000 C CNN
-F 2 "" H 3100 1800 60  0000 C CNN
-F 3 "" H 3100 1800 60  0000 C CNN
-	1    3100 1800
+P 3050 1800
+F 0 "#PWR029" H 3050 1650 50  0001 C CNN
+F 1 "VCC" H 3050 1950 50  0000 C CNN
+F 2 "" H 3050 1800 60  0000 C CNN
+F 3 "" H 3050 1800 60  0000 C CNN
+	1    3050 1800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -771,11 +745,11 @@ Wire Wire Line
 Wire Wire Line
 	6450 4450 6050 4450
 Wire Wire Line
-	6450 4450 6450 4900
+	6450 4450 6450 4700
 Wire Wire Line
 	6350 4700 6450 4700
 Wire Wire Line
-	5950 4300 5950 4900
+	5950 4300 5950 4700
 Wire Wire Line
 	5950 4700 6050 4700
 Wire Wire Line
@@ -793,25 +767,11 @@ Wire Wire Line
 Wire Wire Line
 	6750 3450 6500 3450
 Wire Wire Line
-	6500 3850 7250 3850
+	6500 3850 6850 3850
 Wire Wire Line
 	5750 4300 5750 4600
 Wire Wire Line
 	5850 4300 5850 4450
-Wire Wire Line
-	5650 3000 5650 2900
-Wire Wire Line
-	5950 3000 5950 2900
-Wire Wire Line
-	6600 3550 6500 3550
-Wire Wire Line
-	9000 1250 9000 1350
-Wire Wire Line
-	8500 1100 8500 1200
-Wire Wire Line
-	10000 1250 10000 1350
-Wire Wire Line
-	9500 1100 9500 1200
 Wire Wire Line
 	9650 2200 9850 2200
 Wire Wire Line
@@ -848,8 +808,6 @@ Wire Wire Line
 	8950 4700 9150 4700
 Wire Wire Line
 	8050 3650 8150 3650
-Wire Wire Line
-	8050 4050 8250 4050
 Wire Wire Line
 	6500 3650 7250 3650
 Wire Wire Line
@@ -876,7 +834,7 @@ Wire Wire Line
 Wire Wire Line
 	7450 6100 7450 6200
 Wire Wire Line
-	7450 6200 7850 6200
+	7450 6200 7650 6200
 Wire Wire Line
 	7650 6200 7650 6300
 Wire Wire Line
@@ -885,7 +843,7 @@ Connection ~ 7650 6200
 Wire Wire Line
 	7850 5700 7850 5800
 Wire Wire Line
-	7450 5700 7850 5700
+	7450 5700 7650 5700
 Wire Wire Line
 	7650 5700 7650 5600
 Wire Wire Line
@@ -914,7 +872,7 @@ Wire Wire Line
 Wire Wire Line
 	3850 3250 3500 3250
 Wire Wire Line
-	3500 3350 4300 3350
+	3500 3350 4100 3350
 Wire Wire Line
 	4100 3250 4100 3350
 Connection ~ 4100 3350
@@ -923,7 +881,7 @@ Wire Wire Line
 Wire Wire Line
 	2200 6850 2100 6850
 Wire Wire Line
-	2100 6850 2100 7450
+	2100 6850 2100 6950
 Wire Wire Line
 	2200 6950 2100 6950
 Connection ~ 2100 6950
@@ -968,167 +926,78 @@ Wire Wire Line
 Wire Wire Line
 	3600 2300 3800 2300
 Wire Wire Line
-	3800 2200 3800 2400
+	3800 2200 3800 2300
 Connection ~ 3800 2300
 Wire Wire Line
 	3800 2700 3800 2800
 Wire Wire Line
-	2500 1900 2500 3050
-Wire Wire Line
-	2500 1900 2600 1900
+	2450 1900 2450 2100
 Wire Wire Line
-	2500 2100 2600 2100
-Connection ~ 2500 2100
+	2450 1900 2550 1900
 Wire Wire Line
-	2500 2300 2600 2300
-Connection ~ 2500 2300
+	2450 2100 2550 2100
+Connection ~ 2450 2100
 Wire Wire Line
-	2500 2500 2600 2500
-Connection ~ 2500 2500
+	2450 2300 2550 2300
+Connection ~ 2450 2300
 Wire Wire Line
-	3000 2500 3100 2500
+	2450 2500 2550 2500
+Connection ~ 2450 2500
 Wire Wire Line
-	3100 2500 3100 2600
+	2950 2500 3050 2500
 Wire Wire Line
-	2000 3050 2600 3050
+	3050 2500 3050 2600
 Wire Wire Line
-	3000 1900 3100 1900
+	2000 3050 2450 3050
 Wire Wire Line
-	3100 1900 3100 1800
+	2950 1900 3050 1900
 Wire Wire Line
-	3200 2100 3000 2100
+	1500 1900 1500 2100
 Wire Wire Line
-	3200 2300 3000 2300
+	1500 2500 1600 2500
 Wire Wire Line
-	1700 1900 1700 3350
+	1500 1900 1600 1900
 Wire Wire Line
-	1700 2500 1800 2500
+	1500 2100 1600 2100
+Connection ~ 1500 2100
 Wire Wire Line
-	1700 1900 1800 1900
-Wire Wire Line
-	1700 2100 1800 2100
-Connection ~ 1700 2100
-Wire Wire Line
-	1700 2300 1800 2300
-Connection ~ 1700 2300
-Connection ~ 1700 2500
+	1500 2300 1600 2300
+Connection ~ 1500 2300
+Connection ~ 1500 2500
 $Comp
-L GND #PWR030
+L power:GND #PWR030
 U 1 1 5606333D
-P 2300 2600
-F 0 "#PWR030" H 2300 2350 50  0001 C CNN
-F 1 "GND" H 2300 2450 50  0000 C CNN
-F 2 "" H 2300 2600 60  0000 C CNN
-F 3 "" H 2300 2600 60  0000 C CNN
-	1    2300 2600
+P 2100 2600
+F 0 "#PWR030" H 2100 2350 50  0001 C CNN
+F 1 "GND" H 2100 2450 50  0000 C CNN
+F 2 "" H 2100 2600 60  0000 C CNN
+F 3 "" H 2100 2600 60  0000 C CNN
+	1    2100 2600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2200 2500 2300 2500
+	2000 2500 2100 2500
 Wire Wire Line
-	2300 2500 2300 2600
+	2100 2500 2100 2600
 $Comp
-L VCC #PWR031
+L power:VCC #PWR031
 U 1 1 56063346
-P 2300 1800
-F 0 "#PWR031" H 2300 1650 50  0001 C CNN
-F 1 "VCC" H 2300 1950 50  0000 C CNN
-F 2 "" H 2300 1800 60  0000 C CNN
-F 3 "" H 2300 1800 60  0000 C CNN
-	1    2300 1800
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2200 1900 2300 1900
-Wire Wire Line
-	2300 1900 2300 1800
-Wire Wire Line
-	2400 2100 2200 2100
-Wire Wire Line
-	2400 2300 2200 2300
-Wire Wire Line
-	1700 3150 2600 3150
-Wire Wire Line
-	900  1900 900  3350
-Wire Wire Line
-	900  2500 1000 2500
-Wire Wire Line
-	900  1900 1000 1900
-Wire Wire Line
-	900  2100 1000 2100
-Connection ~ 900  2100
-Wire Wire Line
-	900  2300 1000 2300
-Connection ~ 900  2300
-Connection ~ 900  2500
-$Comp
-L GND #PWR032
-U 1 1 56063AEC
-P 1500 2600
-F 0 "#PWR032" H 1500 2350 50  0001 C CNN
-F 1 "GND" H 1500 2450 50  0000 C CNN
-F 2 "" H 1500 2600 60  0000 C CNN
-F 3 "" H 1500 2600 60  0000 C CNN
-	1    1500 2600
+P 2100 1800
+F 0 "#PWR031" H 2100 1650 50  0001 C CNN
+F 1 "VCC" H 2100 1950 50  0000 C CNN
+F 2 "" H 2100 1800 60  0000 C CNN
+F 3 "" H 2100 1800 60  0000 C CNN
+	1    2100 1800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1400 2500 1500 2500
+	2000 1900 2100 1900
 Wire Wire Line
-	1500 2500 1500 2600
-$Comp
-L VCC #PWR033
-U 1 1 56063AF4
-P 1500 1800
-F 0 "#PWR033" H 1500 1650 50  0001 C CNN
-F 1 "VCC" H 1500 1950 50  0000 C CNN
-F 2 "" H 1500 1800 60  0000 C CNN
-F 3 "" H 1500 1800 60  0000 C CNN
-	1    1500 1800
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1400 1900 1500 1900
-Wire Wire Line
-	1500 1900 1500 1800
-Wire Wire Line
-	1600 2100 1400 2100
-Wire Wire Line
-	1600 2300 1400 2300
-Wire Wire Line
-	900  3250 2600 3250
+	2100 1900 2100 1800
 Text Notes 1250 1500 0    40   ~ 0
 I2C address can be set with solder jumpers.\nSee PCA9674 datasheet for address table.
 $Comp
-L R R4
-U 1 1 5606618C
-P 1700 3500
-F 0 "R4" V 1780 3500 50  0000 C CNN
-F 1 "10k" V 1700 3500 50  0000 C CNN
-F 2 "gsg-modules:0603" V 1630 3500 30  0001 C CNN
-F 3 "" H 1700 3500 30  0000 C CNN
-F 4 "Panasonic" H 1700 3500 60  0001 C CNN "Manufacturer"
-F 5 "ERJ-3GEYJ103V" H 1700 3500 60  0001 C CNN "Part Number"
-F 6 "RES 10K OHM 1/10W 5% 0603 SMD" H 1700 3500 60  0001 C CNN "Description"
-	1    1700 3500
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R3
-U 1 1 560662F3
-P 900 3500
-F 0 "R3" V 980 3500 50  0000 C CNN
-F 1 "10k" V 900 3500 50  0000 C CNN
-F 2 "gsg-modules:0603" V 830 3500 30  0001 C CNN
-F 3 "" H 900 3500 30  0000 C CNN
-F 4 "Panasonic" H 900 3500 60  0001 C CNN "Manufacturer"
-F 5 "ERJ-3GEYJ103V" H 900 3500 60  0001 C CNN "Part Number"
-F 6 "RES 10K OHM 1/10W 5% 0603 SMD" H 900 3500 60  0001 C CNN "Description"
-	1    900  3500
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R5
+L Device:R R5
 U 1 1 5606638D
 P 2000 3500
 F 0 "R5" V 2080 3500 50  0000 C CNN
@@ -1141,52 +1010,10 @@ F 6 "RES 10K OHM 1/10W 5% 0603 SMD" H 2000 3500 60  0001 C CNN "Description"
 	1    2000 3500
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1700 3750 1700 3650
-$Comp
-L GND #PWR034
-U 1 1 56066602
-P 2000 3750
-F 0 "#PWR034" H 2000 3500 50  0001 C CNN
-F 1 "GND" H 2000 3600 50  0000 C CNN
-F 2 "" H 2000 3750 60  0000 C CNN
-F 3 "" H 2000 3750 60  0000 C CNN
-	1    2000 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR035
-U 1 1 560666F5
-P 900 3750
-F 0 "#PWR035" H 900 3500 50  0001 C CNN
-F 1 "GND" H 900 3600 50  0000 C CNN
-F 2 "" H 900 3750 60  0000 C CNN
-F 3 "" H 900 3750 60  0000 C CNN
-	1    900  3750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	900  3750 900  3650
-Connection ~ 900  3250
-Wire Wire Line
-	2000 3750 2000 3650
-Connection ~ 1700 3150
 Wire Wire Line
 	2000 3350 2000 3050
-Connection ~ 2500 3050
 Text Notes 800  4250 0    40   ~ 0
-Default I2C address set by resistors:\n0x20 (7-bit format)
-$Comp
-L GND #PWR036
-U 1 1 56067F1F
-P 1700 3750
-F 0 "#PWR036" H 1700 3500 50  0001 C CNN
-F 1 "GND" H 1700 3600 50  0000 C CNN
-F 2 "" H 1700 3750 60  0000 C CNN
-F 3 "" H 1700 3750 60  0000 C CNN
-	1    1700 3750
-	1    0    0    -1  
-$EndComp
+Default I2C address set by resistors:\n0x27 (7-bit format)
 Text Notes 9900 2200 0    40   ~ 0
 NMI/P4_0
 Text Label 9950 6400 2    40   ~ 0
@@ -1222,7 +1049,7 @@ CSN_ALT2
 Text Notes 8800 6100 2    40   ~ 0
 P5_7
 $Comp
-L VCC #PWR037
+L power:VCC #PWR037
 U 1 1 55EAF03E
 P 9850 4700
 F 0 "#PWR037" H 9850 4550 50  0001 C CNN
@@ -1300,7 +1127,7 @@ INT_ALT1
 Text Label 1800 5450 2    40   ~ 0
 INT_ALT2
 Wire Wire Line
-	850  5250 1100 5250
+	850  5250 1000 5250
 Wire Wire Line
 	1000 5250 1000 5450
 Wire Wire Line
@@ -1325,9 +1152,9 @@ INT_ALT2
 Wire Wire Line
 	1500 6300 1800 6300
 Wire Wire Line
-	850  5900 1100 5900
+	850  5900 1000 5900
 Wire Wire Line
-	1000 5900 1000 6300
+	1000 5900 1000 6100
 Wire Wire Line
 	1000 6300 1100 6300
 Connection ~ 1000 5900
@@ -1341,7 +1168,7 @@ CE_ALT1
 Text Label 3100 5450 2    40   ~ 0
 CE_ALT2
 Wire Wire Line
-	2150 5250 2400 5250
+	2150 5250 2300 5250
 Wire Wire Line
 	2300 5250 2300 5450
 Wire Wire Line
@@ -1358,7 +1185,7 @@ CSN_ALT1
 Text Label 3100 6100 2    40   ~ 0
 CSN_ALT2
 Wire Wire Line
-	2150 5900 2400 5900
+	2150 5900 2300 5900
 Wire Wire Line
 	2300 5900 2300 6100
 Wire Wire Line
@@ -1371,7 +1198,7 @@ Wire Wire Line
 Text Label 4500 5250 2    40   ~ 0
 SCK_ALT1
 $Comp
-L TEST W15
+L Connector:TestPoint_2Pole W15
 U 1 1 56077278
 P 3950 5250
 F 0 "W15" H 3950 5310 40  0000 C CNN
@@ -1407,7 +1234,7 @@ Wire Wire Line
 Text Notes 1800 5050 0    40   ~ 0
 Alternative pin configuratons are provided for dealing with\npin contention with other neighbors or to implement faster\nnRF24L01+ response time.
 $Comp
-L TEST W18
+L Connector:TestPoint_2Pole W18
 U 1 1 5607CC22
 P 3950 5600
 F 0 "W18" H 3950 5660 40  0000 C CNN
@@ -1419,7 +1246,7 @@ F 4 "DNP" H 3950 5600 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W21
+L Connector:TestPoint_2Pole W21
 U 1 1 5607CD11
 P 3950 5900
 F 0 "W21" H 3950 5960 40  0000 C CNN
@@ -1431,7 +1258,7 @@ F 4 "DNP" H 3950 5900 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W23
+L Connector:TestPoint_2Pole W23
 U 1 1 5607CDA3
 P 2600 6100
 F 0 "W23" H 2600 6160 40  0000 C CNN
@@ -1443,7 +1270,7 @@ F 4 "DNP" H 2600 6100 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W20
+L Connector:TestPoint_2Pole W20
 U 1 1 5607CE5E
 P 2600 5900
 F 0 "W20" H 2600 5960 40  0000 C CNN
@@ -1455,7 +1282,7 @@ F 4 "DNP" H 2600 5900 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W17
+L Connector:TestPoint_2Pole W17
 U 1 1 5607CEF2
 P 2600 5450
 F 0 "W17" H 2600 5510 40  0000 C CNN
@@ -1467,7 +1294,7 @@ F 4 "DNP" H 2600 5450 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W14
+L Connector:TestPoint_2Pole W14
 U 1 1 5607CF91
 P 2600 5250
 F 0 "W14" H 2600 5310 40  0000 C CNN
@@ -1479,7 +1306,7 @@ F 4 "DNP" H 2600 5250 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W13
+L Connector:TestPoint_2Pole W13
 U 1 1 5607D02B
 P 1300 5250
 F 0 "W13" H 1300 5310 40  0000 C CNN
@@ -1491,7 +1318,7 @@ F 4 "DNP" H 1300 5250 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W16
+L Connector:TestPoint_2Pole W16
 U 1 1 5607D0EA
 P 1300 5450
 F 0 "W16" H 1300 5510 40  0000 C CNN
@@ -1503,7 +1330,7 @@ F 4 "DNP" H 1300 5450 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W19
+L Connector:TestPoint_2Pole W19
 U 1 1 5607D18A
 P 1300 5900
 F 0 "W19" H 1300 5960 40  0000 C CNN
@@ -1515,7 +1342,7 @@ F 4 "DNP" H 1300 5900 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W22
+L Connector:TestPoint_2Pole W22
 U 1 1 5607D237
 P 1300 6100
 F 0 "W22" H 1300 6160 40  0000 C CNN
@@ -1527,7 +1354,7 @@ F 4 "DNP" H 1300 6100 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W24
+L Connector:TestPoint_2Pole W24
 U 1 1 5607D2DF
 P 1300 6300
 F 0 "W24" H 1300 6360 40  0000 C CNN
@@ -1539,147 +1366,99 @@ F 4 "DNP" H 1300 6300 60  0001 C CNN "Note"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W1
-U 1 1 5607D388
-P 1200 1900
-F 0 "W1" H 1200 1960 40  0000 C CNN
-F 1 "TEST" H 1200 1830 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 1200 1900 60  0001 C CNN
-F 3 "" H 1200 1900 60  0000 C CNN
-F 4 "DNP" H 1200 1900 60  0001 C CNN "Note"
-	1    1200 1900
-	-1   0    0    1   
-$EndComp
-$Comp
-L TEST W4
-U 1 1 5607DA72
-P 1200 2100
-F 0 "W4" H 1200 2160 40  0000 C CNN
-F 1 "TEST" H 1200 2030 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 1200 2100 60  0001 C CNN
-F 3 "" H 1200 2100 60  0000 C CNN
-F 4 "DNP" H 1200 2100 60  0001 C CNN "Note"
-	1    1200 2100
-	-1   0    0    1   
-$EndComp
-$Comp
-L TEST W7
-U 1 1 5607DB19
-P 1200 2300
-F 0 "W7" H 1200 2360 40  0000 C CNN
-F 1 "TEST" H 1200 2230 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 1200 2300 60  0001 C CNN
-F 3 "" H 1200 2300 60  0000 C CNN
-F 4 "DNP" H 1200 2300 60  0001 C CNN "Note"
-	1    1200 2300
-	-1   0    0    1   
-$EndComp
-$Comp
-L TEST W10
-U 1 1 5607DBBF
-P 1200 2500
-F 0 "W10" H 1200 2560 40  0000 C CNN
-F 1 "TEST" H 1200 2430 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 1200 2500 60  0001 C CNN
-F 3 "" H 1200 2500 60  0000 C CNN
-F 4 "DNP" H 1200 2500 60  0001 C CNN "Note"
-	1    1200 2500
-	-1   0    0    1   
-$EndComp
-$Comp
-L TEST W2
+L Connector:TestPoint_2Pole W2
 U 1 1 5607DF0E
-P 2000 1900
-F 0 "W2" H 2000 1960 40  0000 C CNN
-F 1 "TEST" H 2000 1830 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2000 1900 60  0001 C CNN
-F 3 "" H 2000 1900 60  0000 C CNN
-F 4 "DNP" H 2000 1900 60  0001 C CNN "Note"
-	1    2000 1900
+P 1800 1900
+F 0 "W2" H 1800 1960 40  0000 C CNN
+F 1 "TEST" H 1800 1830 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 1800 1900 60  0001 C CNN
+F 3 "" H 1800 1900 60  0000 C CNN
+F 4 "DNP" H 1800 1900 60  0001 C CNN "Note"
+	1    1800 1900
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W5
+L Connector:TestPoint_2Pole W5
 U 1 1 5607DF15
-P 2000 2100
-F 0 "W5" H 2000 2160 40  0000 C CNN
-F 1 "TEST" H 2000 2030 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2000 2100 60  0001 C CNN
-F 3 "" H 2000 2100 60  0000 C CNN
-F 4 "DNP" H 2000 2100 60  0001 C CNN "Note"
-	1    2000 2100
+P 1800 2100
+F 0 "W5" H 1800 2160 40  0000 C CNN
+F 1 "TEST" H 1800 2030 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 1800 2100 60  0001 C CNN
+F 3 "" H 1800 2100 60  0000 C CNN
+F 4 "DNP" H 1800 2100 60  0001 C CNN "Note"
+	1    1800 2100
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W8
+L Connector:TestPoint_2Pole W8
 U 1 1 5607DF1C
-P 2000 2300
-F 0 "W8" H 2000 2360 40  0000 C CNN
-F 1 "TEST" H 2000 2230 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2000 2300 60  0001 C CNN
-F 3 "" H 2000 2300 60  0000 C CNN
-F 4 "DNP" H 2000 2300 60  0001 C CNN "Note"
-	1    2000 2300
+P 1800 2300
+F 0 "W8" H 1800 2360 40  0000 C CNN
+F 1 "TEST" H 1800 2230 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 1800 2300 60  0001 C CNN
+F 3 "" H 1800 2300 60  0000 C CNN
+F 4 "DNP" H 1800 2300 60  0001 C CNN "Note"
+	1    1800 2300
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W11
+L Connector:TestPoint_2Pole W11
 U 1 1 5607DF23
-P 2000 2500
-F 0 "W11" H 2000 2560 40  0000 C CNN
-F 1 "TEST" H 2000 2430 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2000 2500 60  0001 C CNN
-F 3 "" H 2000 2500 60  0000 C CNN
-F 4 "DNP" H 2000 2500 60  0001 C CNN "Note"
-	1    2000 2500
+P 1800 2500
+F 0 "W11" H 1800 2560 40  0000 C CNN
+F 1 "TEST" H 1800 2430 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 1800 2500 60  0001 C CNN
+F 3 "" H 1800 2500 60  0000 C CNN
+F 4 "DNP" H 1800 2500 60  0001 C CNN "Note"
+	1    1800 2500
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W3
+L Connector:TestPoint_2Pole W3
 U 1 1 5607E045
-P 2800 1900
-F 0 "W3" H 2800 1960 40  0000 C CNN
-F 1 "TEST" H 2800 1830 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2800 1900 60  0001 C CNN
-F 3 "" H 2800 1900 60  0000 C CNN
-F 4 "DNP" H 2800 1900 60  0001 C CNN "Note"
-	1    2800 1900
+P 2750 1900
+F 0 "W3" H 2750 1960 40  0000 C CNN
+F 1 "TEST" H 2750 1830 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 2750 1900 60  0001 C CNN
+F 3 "" H 2750 1900 60  0000 C CNN
+F 4 "DNP" H 2750 1900 60  0001 C CNN "Note"
+	1    2750 1900
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W6
+L Connector:TestPoint_2Pole W6
 U 1 1 5607E04C
-P 2800 2100
-F 0 "W6" H 2800 2160 40  0000 C CNN
-F 1 "TEST" H 2800 2030 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2800 2100 60  0001 C CNN
-F 3 "" H 2800 2100 60  0000 C CNN
-F 4 "DNP" H 2800 2100 60  0001 C CNN "Note"
-	1    2800 2100
+P 2750 2100
+F 0 "W6" H 2750 2160 40  0000 C CNN
+F 1 "TEST" H 2750 2030 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 2750 2100 60  0001 C CNN
+F 3 "" H 2750 2100 60  0000 C CNN
+F 4 "DNP" H 2750 2100 60  0001 C CNN "Note"
+	1    2750 2100
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W9
+L Connector:TestPoint_2Pole W9
 U 1 1 5607E053
-P 2800 2300
-F 0 "W9" H 2800 2360 40  0000 C CNN
-F 1 "TEST" H 2800 2230 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2800 2300 60  0001 C CNN
-F 3 "" H 2800 2300 60  0000 C CNN
-F 4 "DNP" H 2800 2300 60  0001 C CNN "Note"
-	1    2800 2300
+P 2750 2300
+F 0 "W9" H 2750 2360 40  0000 C CNN
+F 1 "TEST" H 2750 2230 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 2750 2300 60  0001 C CNN
+F 3 "" H 2750 2300 60  0000 C CNN
+F 4 "DNP" H 2750 2300 60  0001 C CNN "Note"
+	1    2750 2300
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST W12
+L Connector:TestPoint_2Pole W12
 U 1 1 5607E05A
-P 2800 2500
-F 0 "W12" H 2800 2560 40  0000 C CNN
-F 1 "TEST" H 2800 2430 40  0000 C CNN
-F 2 "gsg-modules:0603-JUMPER" H 2800 2500 60  0001 C CNN
-F 3 "" H 2800 2500 60  0000 C CNN
-F 4 "DNP" H 2800 2500 60  0001 C CNN "Note"
-	1    2800 2500
+P 2750 2500
+F 0 "W12" H 2750 2560 40  0000 C CNN
+F 1 "TEST" H 2750 2430 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 2750 2500 60  0001 C CNN
+F 3 "" H 2750 2500 60  0000 C CNN
+F 4 "DNP" H 2750 2500 60  0001 C CNN "Note"
+	1    2750 2500
 	-1   0    0    1   
 $EndComp
 Text Label 2200 3050 0    40   ~ 0
@@ -1690,16 +1469,269 @@ Text Label 2200 3250 0    40   ~ 0
 AD2
 NoConn ~ 9650 2100
 NoConn ~ 9150 2100
-Text Label 3200 2100 2    40   ~ 0
+Text Label 3250 2100 2    40   ~ 0
 I2C0_SDA
-Text Label 2400 2100 2    40   ~ 0
+Text Label 2300 2100 2    40   ~ 0
 I2C0_SDA
-Text Label 1600 2100 2    40   ~ 0
-I2C0_SDA
-Text Label 3200 2300 2    40   ~ 0
+Text Label 3250 2300 2    40   ~ 0
 I2C0_SCL
-Text Label 2400 2300 2    40   ~ 0
+Text Label 2300 2300 2    40   ~ 0
 I2C0_SCL
-Text Label 1600 2300 2    40   ~ 0
+Wire Wire Line
+	5950 4700 5950 4900
+Wire Wire Line
+	6450 4700 6450 4900
+Wire Wire Line
+	6850 3850 7250 3850
+Wire Wire Line
+	7650 6200 7850 6200
+Wire Wire Line
+	7650 5700 7850 5700
+Wire Wire Line
+	4100 3350 4300 3350
+Wire Wire Line
+	2100 6950 2100 7050
+Wire Wire Line
+	2100 7050 2100 7150
+Wire Wire Line
+	2100 7150 2100 7250
+Wire Wire Line
+	2100 7250 2100 7350
+Wire Wire Line
+	2100 7350 2100 7450
+Wire Wire Line
+	3800 2300 3800 2400
+Wire Wire Line
+	2450 2100 2450 2300
+Wire Wire Line
+	2450 2300 2450 2500
+Wire Wire Line
+	2450 2500 2450 3050
+Wire Wire Line
+	1500 2100 1500 2300
+Wire Wire Line
+	1500 2300 1500 2500
+Wire Wire Line
+	1000 5250 1100 5250
+Wire Wire Line
+	1000 5900 1100 5900
+Wire Wire Line
+	1000 6100 1000 6300
+Wire Wire Line
+	2300 5250 2400 5250
+Wire Wire Line
+	2300 5900 2400 5900
+Wire Wire Line
+	8050 4050 8200 4050
+Wire Wire Line
+	10000 1250 10000 1350
+Wire Wire Line
+	8500 1100 8500 1200
+Wire Wire Line
+	9000 1250 9000 1350
+Wire Wire Line
+	9500 1100 9500 1200
+Wire Wire Line
+	5950 3000 5950 2900
+Wire Wire Line
+	5650 3000 5650 2900
+Wire Wire Line
+	6500 3550 6600 3550
+Wire Wire Line
+	3050 1900 3050 1800
+Wire Wire Line
+	2950 2100 3250 2100
+Wire Wire Line
+	2950 2300 3250 2300
+Wire Wire Line
+	600  3250 600  3350
+Wire Wire Line
+	600  2500 600  3250
+Wire Wire Line
+	600  2300 600  2500
+Wire Wire Line
+	600  2100 600  2300
+Text Label 1400 2300 2    40   ~ 0
 I2C0_SCL
+Text Label 1400 2100 2    40   ~ 0
+I2C0_SDA
+$Comp
+L Connector:TestPoint_2Pole W10
+U 1 1 5607DBBF
+P 900 2500
+F 0 "W10" H 900 2560 40  0000 C CNN
+F 1 "TEST" H 900 2430 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 900 2500 60  0001 C CNN
+F 3 "" H 900 2500 60  0000 C CNN
+F 4 "DNP" H 900 2500 60  0001 C CNN "Note"
+	1    900  2500
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint_2Pole W7
+U 1 1 5607DB19
+P 900 2300
+F 0 "W7" H 900 2360 40  0000 C CNN
+F 1 "TEST" H 900 2230 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 900 2300 60  0001 C CNN
+F 3 "" H 900 2300 60  0000 C CNN
+F 4 "DNP" H 900 2300 60  0001 C CNN "Note"
+	1    900  2300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint_2Pole W4
+U 1 1 5607DA72
+P 900 2100
+F 0 "W4" H 900 2160 40  0000 C CNN
+F 1 "TEST" H 900 2030 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 900 2100 60  0001 C CNN
+F 3 "" H 900 2100 60  0000 C CNN
+F 4 "DNP" H 900 2100 60  0001 C CNN "Note"
+	1    900  2100
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:TestPoint_2Pole W1
+U 1 1 5607D388
+P 900 1900
+F 0 "W1" H 900 1960 40  0000 C CNN
+F 1 "TEST" H 900 1830 40  0000 C CNN
+F 2 "gsg-modules:0603-JUMPER" H 900 1900 60  0001 C CNN
+F 3 "" H 900 1900 60  0000 C CNN
+F 4 "DNP" H 900 1900 60  0001 C CNN "Note"
+	1    900  1900
+	-1   0    0    1   
+$EndComp
+Connection ~ 600  3250
+$Comp
+L Device:R R3
+U 1 1 560662F3
+P 600 3500
+F 0 "R3" V 680 3500 50  0000 C CNN
+F 1 "10k" V 600 3500 50  0000 C CNN
+F 2 "gsg-modules:0603" V 530 3500 30  0001 C CNN
+F 3 "" H 600 3500 30  0000 C CNN
+F 4 "Panasonic" H 600 3500 60  0001 C CNN "Manufacturer"
+F 5 "ERJ-3GEYJ103V" H 600 3500 60  0001 C CNN "Part Number"
+F 6 "RES 10K OHM 1/10W 5% 0603 SMD" H 600 3500 60  0001 C CNN "Description"
+	1    600  3500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1200 1900 1200 1800
+Wire Wire Line
+	1100 1900 1200 1900
+$Comp
+L power:VCC #PWR033
+U 1 1 56063AF4
+P 1200 1800
+F 0 "#PWR033" H 1200 1650 50  0001 C CNN
+F 1 "VCC" H 1200 1950 50  0000 C CNN
+F 2 "" H 1200 1800 60  0000 C CNN
+F 3 "" H 1200 1800 60  0000 C CNN
+	1    1200 1800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1200 2500 1200 2600
+Wire Wire Line
+	1100 2500 1200 2500
+$Comp
+L power:GND #PWR032
+U 1 1 56063AEC
+P 1200 2600
+F 0 "#PWR032" H 1200 2350 50  0001 C CNN
+F 1 "GND" H 1200 2450 50  0000 C CNN
+F 2 "" H 1200 2600 60  0000 C CNN
+F 3 "" H 1200 2600 60  0000 C CNN
+	1    1200 2600
+	1    0    0    -1  
+$EndComp
+Connection ~ 600  2500
+Connection ~ 600  2300
+Wire Wire Line
+	600  2300 700  2300
+Connection ~ 600  2100
+Wire Wire Line
+	600  2100 700  2100
+Wire Wire Line
+	600  1900 700  1900
+Wire Wire Line
+	600  2500 700  2500
+Wire Wire Line
+	600  1900 600  2100
+Wire Wire Line
+	600  3250 2600 3250
+$Comp
+L Device:R R4
+U 1 1 5606618C
+P 1500 3500
+F 0 "R4" V 1580 3500 50  0000 C CNN
+F 1 "10k" V 1500 3500 50  0000 C CNN
+F 2 "gsg-modules:0603" V 1430 3500 30  0001 C CNN
+F 3 "" H 1500 3500 30  0000 C CNN
+F 4 "Panasonic" H 1500 3500 60  0001 C CNN "Manufacturer"
+F 5 "ERJ-3GEYJ103V" H 1500 3500 60  0001 C CNN "Part Number"
+F 6 "RES 10K OHM 1/10W 5% 0603 SMD" H 1500 3500 60  0001 C CNN "Description"
+	1    1500 3500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1500 2500 1500 3150
+Wire Wire Line
+	1500 3150 2600 3150
+Connection ~ 1500 3150
+Wire Wire Line
+	1500 3150 1500 3350
+Wire Wire Line
+	2000 2100 2300 2100
+Wire Wire Line
+	2000 2300 2300 2300
+Wire Wire Line
+	1100 2100 1400 2100
+Wire Wire Line
+	1100 2300 1400 2300
+Connection ~ 2450 3050
+Wire Wire Line
+	2450 3050 2600 3050
+$Comp
+L power:VCC #PWR?
+U 1 1 5DC9DB1D
+P 600 3800
+F 0 "#PWR?" H 600 3650 50  0001 C CNN
+F 1 "VCC" H 618 3973 50  0000 C CNN
+F 2 "" H 600 3800 50  0001 C CNN
+F 3 "" H 600 3800 50  0001 C CNN
+	1    600  3800
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:VCC #PWR?
+U 1 1 5DC9F634
+P 1500 3800
+F 0 "#PWR?" H 1500 3650 50  0001 C CNN
+F 1 "VCC" H 1518 3973 50  0000 C CNN
+F 2 "" H 1500 3800 50  0001 C CNN
+F 3 "" H 1500 3800 50  0001 C CNN
+	1    1500 3800
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:VCC #PWR?
+U 1 1 5DCAC013
+P 2000 3800
+F 0 "#PWR?" H 2000 3650 50  0001 C CNN
+F 1 "VCC" H 2018 3973 50  0000 C CNN
+F 2 "" H 2000 3800 50  0001 C CNN
+F 3 "" H 2000 3800 50  0001 C CNN
+	1    2000 3800
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	600  3650 600  3800
+Wire Wire Line
+	1500 3650 1500 3800
+Wire Wire Line
+	2000 3650 2000 3800
 $EndSCHEMATC
diff --git a/sym-lib-table b/sym-lib-table
new file mode 100644
index 0000000..d43897d
--- /dev/null
+++ b/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name gsg-symbols)(type Legacy)(uri ${KIPRJMOD}/gsg-kicad-lib/gsg-symbols.lib)(options "")(descr ""))
+)