diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 7cda4625..b4769040 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -606,12 +606,24 @@ K RAM ADC UART PWM
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
 $ENDCMP
 #
+$CMP PIC18LF1220-SO
+D 18-Pin Flash Microcontroller 4K Flash 256byte RAM
+K RAM ADC UART PWM 
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
+$ENDCMP
+#
 $CMP PIC18F1320-SO
 D 18-Pin Flash Microcontroller 8K Flash 256byte RAM
 K RAM ADC UART PWM 
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
 $ENDCMP
 #
+$CMP PIC18LF1320-SO
+D 18-Pin Flash Microcontroller 8K Flash 256byte RAM
+K RAM ADC UART PWM 
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
+$ENDCMP
+#
 $CMP PIC18F23K20_I/SS
 D 8K Flash, 512Byte RAM, 256Byte EEPROM, PIC18 Microcontroller ADC PWM SPI I2C USART in SSOP28 package
 K microcontroller PIC18F flash XLP
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 371be083..bbb4867f 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -6,12 +6,12 @@ EESchema-LIBRARY Version 2.3
 DEF PIC18F13K50-E/P U 0 50 Y Y 1 F N
 F0 "U" -1300 700 50 H V C CNN
 F1 "PIC18F13K50-E/P" 950 -700 50 H V C CNN
-F2 "DIP20" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP20_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 100 50 H I C CNN
 ALIAS PIC18F14K50-E/P PIC18LF14K50-E/P PIC18LF13K50-E/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W7.62mm*
+ PDIP*W7.62mm*
 $ENDFPLIST
 DRAW
 S -1350 650 1350 -650 0 1 10 f
@@ -43,11 +43,11 @@ ENDDEF
 DEF PIC18F13K50-E/SO U 0 50 Y Y 1 F N
 F0 "U" -1300 700 50 H V C CNN
 F1 "PIC18F13K50-E/SO" 900 -700 50 H V C CNN
-F2 "SO20" 0 0 50 H I C CIN
+F2 "Housings_SOIC:SOIC-20W_7.5x12.8mm_Pitch1.27mm" 0 0 50 H I C CIN
 F3 "" 0 100 50 H I C CNN
 ALIAS PIC18LF13K50-E/SO PIC18LF14K50-E/SO PIC18F14K50-E/SO
 $FPLIST
- SO*
+ SOIC*W*7.5x12.8mm*Pitch1.27mm*
 $ENDFPLIST
 DRAW
 S -1350 650 1350 -650 0 1 10 f
@@ -79,11 +79,11 @@ ENDDEF
 DEF PIC18F13K50-E/SS U 0 50 Y Y 1 F N
 F0 "U" -1300 700 50 H V C CNN
 F1 "PIC18F13K50-E/SS" 900 -700 50 H V C CNN
-F2 "SSOP20" 0 0 50 H I C CIN
+F2 "Housings_SSOP:SSOP-20_5.3x7.2mm" 0 0 50 H I C CIN
 F3 "" 0 100 50 H I C CNN
 ALIAS PIC18LF13K50-E/SS PIC18LF14K50-E/SS PIC18F14K50-E/SS
 $FPLIST
- SSOP*
+ SSOP*5.3x7.2mm*
 $ENDFPLIST
 DRAW
 S -1350 650 1350 -650 0 1 10 f
@@ -115,11 +115,11 @@ ENDDEF
 DEF PIC18F2331-I/ML U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
 F1 "PIC18F2331-I/ML" 650 -1100 50 H V C CNN
-F2 "SOIC28" 0 0 50 H I C CIN
+F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 0 0 50 H I C CIN
 F3 "" 0 -400 50 H I C CNN
 ALIAS PIC18LF2331-I/ML PIC18LF2431-I/ML PIC18F2431-I/ML
 $FPLIST
- QFN*
+ QFN*1EP*6x6mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
 S -1050 1050 1050 -1050 0 1 10 f
@@ -159,11 +159,11 @@ ENDDEF
 DEF PIC18F2331-I/SO U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
 F1 "PIC18F2331-I/SO" 650 -1100 50 H V C CNN
-F2 "SOIC28" 0 0 50 H I C CIN
+F2 "Housings_SOIC:SOIC-28W_7.5x17.9mm_Pitch1.27mm" 0 0 50 H I C CIN
 F3 "" 0 -400 50 H I C CNN
 ALIAS PIC18LF2331-I/SO PIC18LF2431-I/SO PIC18F2431-I/SO
 $FPLIST
- SO*
+ SO*W*7.5x17.9mm*Pitch1.27mm*
 $ENDFPLIST
 DRAW
 S -1050 1050 1050 -1050 0 1 10 f
@@ -203,12 +203,12 @@ ENDDEF
 DEF PIC18F2331-I/SP U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
 F1 "PIC18F2331-I/SP" 650 -1100 50 H V C CNN
-F2 "SPDIP28" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 -400 50 H I C CNN
 ALIAS PIC18LF2331-I/SP PIC18LF2431-I/SP PIC18F2431-I/SP
 $FPLIST
- DIP*
- PDIP*
+ DIP*W7.62mm*
+ PDIP*W7.62mm*
 $ENDFPLIST
 DRAW
 S -1050 1050 1050 -1050 0 1 10 f
@@ -248,10 +248,11 @@ ENDDEF
 DEF PIC18F2450-I/ML U 0 50 Y Y 1 F N
 F0 "U" -800 1100 50 H V C CNN
 F1 "PIC18F2450-I/ML" 450 -1100 50 H V C CNN
-F2 "QFN28" 0 0 50 H I C CIN
+F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 0 0 50 H I C CIN
 F3 "" 0 -450 50 H I C CNN
+ALIAS PIC18LF2450-I/ML
 $FPLIST
- QFN*
+ QFN*1EP*6x6mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
 S -850 1050 850 -1050 0 1 10 f
@@ -262,7 +263,7 @@ X RA5/AN4/HLVDIN 4 -1000 400 150 R 50 50 1 1 B
 X VSS 5 -100 -1200 150 U 50 50 1 1 W
 X OSC1/CLKI 6 -1000 100 150 R 50 50 1 1 I
 X RA6/OSC2/CLKO 7 -1000 300 150 R 50 50 1 1 O
-X T1OSO/T13CKI/RC0 8 1000 900 150 L 50 50 1 1 B
+X T1OSO/T1CKI/RC0 8 1000 900 150 L 50 50 1 1 B
 X ~UOE~/T1OSI/RC1 9 1000 800 150 L 50 50 1 1 B
 X CCP1/RC2 10 1000 700 150 L 50 50 1 1 B
 X RB2/AN8/INT2/VMO 20 -1000 -300 150 R 50 50 1 1 B
@@ -291,10 +292,11 @@ ENDDEF
 DEF PIC18F2450-I/SO U 0 50 Y Y 1 F N
 F0 "U" -800 1100 50 H V C CNN
 F1 "PIC18F2450-I/SO" 450 -1100 50 H V C CNN
-F2 "SO28" 0 0 50 H I C CIN
+F2 "Housings_SOIC:SOIC-20W_7.5x12.8mm_Pitch1.27mm" 0 0 50 H I C CIN
 F3 "" 0 -300 50 H I C CNN
+ALIAS PIC18LF2450-I/SO
 $FPLIST
- SO*
+ SOIC*W*7.5x12.8mm*Pitch1.27mm*
 $ENDFPLIST
 DRAW
 S -850 1050 850 -1050 0 1 10 f
@@ -309,7 +311,7 @@ X VSS 8 -100 -1200 150 U 50 50 1 1 W
 X OSC1/CLKI 9 -1000 100 150 R 50 50 1 1 I
 X RA6/OSC2/CLKO 10 -1000 300 150 R 50 50 1 1 O
 X VDD 20 0 1200 150 D 50 50 1 1 W
-X T1OSO/T13CKI/RC0 11 1000 900 150 L 50 50 1 1 B
+X T1OSO/T1CKI/RC0 11 1000 900 150 L 50 50 1 1 B
 X RB0/AN12/INT0 21 -1000 -100 150 R 50 50 1 1 B
 X ~UOE~/T1OSI/RC1 12 1000 800 150 L 50 50 1 1 B
 X RB1/AN10/INT1 22 -1000 -200 150 R 50 50 1 1 B
@@ -334,12 +336,13 @@ ENDDEF
 DEF PIC18F2450-I/SP U 0 50 Y Y 1 F N
 F0 "U" -800 1100 50 H V C CNN
 F1 "PIC18F2450-I/SP" 450 -1100 50 H V C CNN
-F2 "SPDIP28" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 -450 50 H I C CNN
+ALIAS PIC18LF2450-I/SP
 $FPLIST
- SPDIP*
- DIP*
- PDIP*
+ SPDIP*W7.62mm*
+ DIP*W7.62mm*
+ PDIP*W7.62mm*
 $ENDFPLIST
 DRAW
 S -850 1050 850 -1050 0 1 10 f
@@ -354,7 +357,7 @@ X VSS 8 -100 -1200 150 U 50 50 1 1 W
 X OSC1/CLKI 9 -1000 100 150 R 50 50 1 1 I
 X RA6/OSC2/CLKO 10 -1000 300 150 R 50 50 1 1 O
 X VDD 20 0 1200 150 D 50 50 1 1 W
-X T1OSO/T13CKI/RC0 11 1000 900 150 L 50 50 1 1 B
+X T1OSO/T1CKI/RC0 11 1000 900 150 L 50 50 1 1 B
 X RB0/AN12/INT0 21 -1000 -100 150 R 50 50 1 1 B
 X ~UOE~/T1OSI/RC1 12 1000 800 150 L 50 50 1 1 B
 X RB1/AN10/INT1 22 -1000 -200 150 R 50 50 1 1 B
@@ -379,11 +382,11 @@ ENDDEF
 DEF PIC18F2455-I/SO U 0 50 Y Y 1 F N
 F0 "U" -1000 1000 50 H V C CNN
 F1 "PIC18F2455-I/SO" 650 -1000 50 H V C CNN
-F2 "SPDIP28" 0 0 50 H I C CIN
+F2 "Housings_SOIC:SOIC-28W_7.5x17.9mm_Pitch1.27mm" 0 0 50 H I C CIN
 F3 "" 0 -450 50 H I C CNN
-ALIAS PIC18LF2450-I/ML PIC18LF2450-I/SO PIC18LF2450-I/SP PIC18LF2455-I/SO PIC18LF2550-I/SO PIC18F2550-I/SO
+ALIAS PIC18LF2455-I/SO PIC18LF2550-I/SO PIC18F2550-I/SO
 $FPLIST
- SO*
+ SO*W*7.5x17.9mm_Pitch1.27mm*
 $ENDFPLIST
 DRAW
 S -1050 950 1050 -950 0 1 10 f
@@ -423,13 +426,13 @@ ENDDEF
 DEF PIC18F2455-I/SP U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
 F1 "PIC18F2455-I/SP" 650 -1100 50 H V C CNN
-F2 "SPDIP28" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 -450 50 H I C CNN
 ALIAS PIC18LF2455-I/SP PIC18LF2550-I/SP PIC18F2550-I/SP
 $FPLIST
- SPDIP*
- DIP*
- PDIP*
+ SPDIP*28_W7.62mm*
+ DIP*28_W7.62mm*
+ PDIP*28_W7.62mm*
 $ENDFPLIST
 DRAW
 S -1050 1050 1050 -1050 0 1 10 f
@@ -469,11 +472,11 @@ ENDDEF
 DEF PIC18F4331-I/ML U 0 50 Y Y 1 F N
 F0 "U" -1200 1200 50 H V C CNN
 F1 "PIC18F4331-I/ML" 850 -1200 50 H V C CNN
-F2 "QFN44" 0 0 50 H I C CIN
+F2 "Housings_DFN_QFN:QFN-44-1EP_8x8mm_Pitch0.65mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
 ALIAS PIC18LF4331-I/ML PIC18LF4431-I/ML PIC18F4431-I/ML
 $FPLIST
- QFN*
+ QFN*1EP*8x8mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
 S -1250 1150 1250 -1150 0 1 10 f
@@ -489,7 +492,8 @@ X RB0/PWM0 9 -1400 -100 150 R 50 50 1 1 B
 X RB1/PWM1 10 -1400 -200 150 R 50 50 1 1 B
 X RA1/AN1 20 -1400 700 150 R 50 50 1 1 B
 X AVSS 30 -200 -1300 150 U 50 50 1 1 W
-X SDA/SDI/RD2 50 1400 -100 150 L 50 50 1 1 B
+X NC 13 -400 -1300 150 U 50 50 1 1 N N
+X SDA/SDI/RD2 40 1400 -100 150 L 50 50 1 1 B
 X RB2/PWM2 11 -1400 -300 150 R 50 50 1 1 B
 X RA2/AN2/Vref-/CAP1/INDX 21 -1400 600 150 R 50 50 1 1 B
 X VSS 31 100 -1300 150 U 50 50 1 1 W
@@ -528,12 +532,12 @@ ENDDEF
 DEF PIC18F4331-I/P U 0 50 Y Y 1 F N
 F0 "U" -1100 1200 50 H V C CNN
 F1 "PIC18F4331-I/P" 750 -1200 50 H V C CNN
-F2 "DIP40" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
 ALIAS PIC18LF4331-I/P PIC18LF4431-I/P PIC18F4431-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W15.24*
+ PDIP*W15.24*
 $ENDFPLIST
 DRAW
 S -1150 1150 1150 -1150 0 1 10 f
@@ -549,7 +553,7 @@ X AN7/RE1 9 1300 -900 150 L 50 50 1 1 B
 X AN8/RE2 10 1300 -1000 150 L 50 50 1 1 B
 X SDO/RD1 20 1300 0 150 L 50 50 1 1 B
 X PWM7/RD7 30 1300 -600 150 L 50 50 1 1 B
-X RB7/KBI3/PGD 50 -1300 -800 150 R 50 50 1 1 B
+X RB7/KBI3/PGD 40 -1300 -800 150 R 50 50 1 1 B
 X AVDD 11 -100 1300 150 D 50 50 1 1 W
 X SDA/SDI/RD2 21 1300 -100 150 L 50 50 1 1 B
 X VSS 31 100 -1300 150 U 50 50 1 1 W
@@ -585,11 +589,11 @@ ENDDEF
 DEF PIC18F4331-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1000 1200 50 H V C CNN
 F1 "PIC18F4331-I/PT" 650 -1200 50 H V C CNN
-F2 "TQFP44" 0 0 50 H I C CIN
+F2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
 ALIAS PIC18LF4331-I/PT PIC18LF4431-I/PT PIC18F4431-I/PT
 $FPLIST
- TQFP*
+ TQFP*10x10mm*Pitch0.8mm*
 $ENDFPLIST
 DRAW
 S -1050 1150 1050 -1150 0 1 10 f
@@ -632,6 +636,10 @@ X AVDD 28 -100 1300 150 D 50 50 1 1 W
 X T5CKI/T0CKI/RD0 38 1200 100 150 L 50 50 1 1 B
 X RA0/AN0 19 -1200 800 150 R 50 50 1 1 B
 X AVSS 29 -100 -1300 150 U 50 50 1 1 W
+X NC 12 -600 -1300 150 U 50 50 1 1 N N
+X NC 13 -500 -1300 150 U 50 50 1 1 N N
+X NC 33 -400 -1300 150 U 50 50 1 1 N N
+X NC 34 -300 -1300 150 U 50 50 1 1 N N
 X SDO/RD1 39 1200 0 150 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
@@ -641,12 +649,12 @@ ENDDEF
 DEF PIC18F442-I/P U 0 50 Y Y 1 F N
 F0 "U" -800 1200 50 H V C CNN
 F1 "PIC18F442-I/P" 500 -1200 50 H V C CNN
-F2 "DIP40" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 -350 50 H I C CNN
 ALIAS PIC18LF442-I/P PIC18LF452-I/P PIC18F452-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W15.24mm*
+ PDIP*W15.24mm*
 $ENDFPLIST
 DRAW
 S -850 -1150 850 1150 0 1 10 f
@@ -656,13 +664,13 @@ X RA1/AN1 3 -1000 700 150 R 50 50 1 1 B
 X RA2/AN2/Vref- 4 -1000 600 150 R 50 50 1 1 B
 X RA3/AN3/Vref+ 5 -1000 500 150 R 50 50 1 1 B
 X RA4/TOCKI 6 -1000 400 150 R 50 50 1 1 B
-X RA5/ANA4/~SS~/LVDIN 7 -1000 300 150 R 50 50 1 1 B
+X RA5/AN4/~SS~/LVDIN 7 -1000 300 150 R 50 50 1 1 B
 X ~RD~/AN5/RE0 8 1000 -800 150 L 50 50 1 1 B
 X ~WR~/AN6/RE1 9 1000 -900 150 L 50 50 1 1 B
 X ~CS~/AN7/RE2 10 1000 -1000 150 L 50 50 1 1 B
 X PSP1/RD1 20 1000 0 150 L 50 50 1 1 B
 X PSP7/RD7 30 1000 -600 150 L 50 50 1 1 B
-X RB7/PGD 50 -1000 -900 150 R 50 50 1 1 B
+X RB7/PGD 40 -1000 -900 150 R 50 50 1 1 B
 X VDD 11 -100 1300 150 D 50 50 1 1 W
 X PSP2/RD2 21 1000 -100 150 L 50 50 1 1 B
 X VSS 31 0 -1300 150 U 50 50 1 1 W
@@ -698,11 +706,11 @@ ENDDEF
 DEF PIC18F442-I/PT IC 0 40 Y Y 1 F N
 F0 "U" -850 1200 50 H V L CNN
 F1 "PIC18F442-I/PT" 200 -1200 50 H V L CNN
-F2 "TQFP-44" 0 0 50 H I C CIN
+F2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 ALIAS PIC18LF442-I/PT PIC18LF452-I/PT PIC18F452-I/PT
 $FPLIST
- TQFP*
+ TQFP*10x10mm*Pitch0.8mm*
 $ENDFPLIST
 DRAW
 S 850 -1150 -850 1150 0 1 10 f
@@ -712,6 +720,10 @@ X PSP5/RD5 3 1000 -400 150 L 50 50 1 1 B
 X PSP6/RD6 4 1000 -500 150 L 50 50 1 1 B
 X PSP7/RD7 5 1000 -600 150 L 50 50 1 1 B
 X VSS 6 -100 -1300 150 U 50 50 1 1 W
+X NC 12 -600 -1300 150 U 50 50 1 1 N N
+X NC 13 -500 -1300 150 U 50 50 1 1 N N
+X NC 33 -400 -1300 150 U 50 50 1 1 N N
+X NC 34 -300 -1300 150 U 50 50 1 1 N N
 X VDD 7 -100 1300 150 D 50 50 1 1 W
 X RB0/INT0 8 -1000 -200 150 R 50 50 1 1 B
 X RB1/INT1 9 -1000 -300 150 R 50 50 1 1 B
@@ -754,10 +766,11 @@ ENDDEF
 DEF PIC18F4450-I/ML U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
 F1 "PIC18F4450-I/ML" 550 -1300 50 H V C CNN
-F2 "QFN44" 0 0 50 H I C CIN
+F2 "Housings_DFN_QFN:QFN-44-1EP_8x8mm_Pitch0.65mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
+ALIAS PIC18LF4450-I/ML
 $FPLIST
- QFN*
+ QFN*1EP*8x8mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
 S -950 1250 950 -1250 0 1 10 f
@@ -773,6 +786,7 @@ X RB0/AN12/INT0 9 -1100 100 150 R 50 50 1 1 B
 X RB1/AN10/INT1 10 -1100 0 150 R 50 50 1 1 B
 X RA1/AN1 20 -1100 1000 150 R 50 50 1 1 B
 X AVSS 30 -300 -1400 150 U 50 50 1 1 W
+X NC 13 -500 -1400 150 U 50 50 1 1 N N
 X RD2 40 1100 -100 150 L 50 50 1 1 B
 X RB2/AN8/INT2/VMO 11 -1100 -100 150 R 50 50 1 1 B
 X RA2/AN2/Vref- 21 -1100 900 150 R 50 50 1 1 B
@@ -787,18 +801,18 @@ X RA6/OSC2/CLKO 33 -1100 500 150 R 50 50 1 1 O
 X VP/D+/RC5 43 1100 700 150 L 50 50 1 1 B
 X RB4/AN11/KBI0 14 -1100 -300 150 R 50 50 1 1 B
 X RA5/AN4/HLVDIN 24 -1100 600 150 R 50 50 1 1 B
-X T1OSO/T13CKI/RC0 34 1100 1100 150 L 50 50 1 1 B
+X T1OSO/T1CKI/RC0 34 1100 1100 150 L 50 50 1 1 B
 X TX/CK/RC6 44 1100 600 150 L 50 50 1 1 B
 X RB5/KBI1/PGM 15 -1100 -400 150 R 50 50 1 1 B
-X AN5/RE0 25 1100 -750 150 L 50 50 1 1 B
+X AN5/RE0 25 1100 -800 150 L 50 50 1 1 B
 X ~UOE~/T1OSI/RC1 35 1100 1000 150 L 50 50 1 1 B
 X RB6/KBI2/PGC 16 -1100 -500 150 R 50 50 1 1 B
-X AN6/RE1 26 1100 -850 150 L 50 50 1 1 B
+X AN6/RE1 26 1100 -900 150 L 50 50 1 1 B
 X CCP1/RC2 36 1100 900 150 L 50 50 1 1 B
 X RB7/KBI3/PGD 17 -1100 -600 150 R 50 50 1 1 B
-X AN7/RE2 27 1100 -950 150 L 50 50 1 1 B
+X AN7/RE2 27 1100 -1000 150 L 50 50 1 1 B
 X VUSB 37 1100 300 150 L 50 50 1 1 B
-X Vpp/~MCLR~/RE3 18 1100 -1050 150 L 50 50 1 1 I
+X Vpp/~MCLR~/RE3 18 1100 -1100 150 L 50 50 1 1 I
 X AVDD 28 -200 1400 150 D 50 50 1 1 W
 X RD0 38 1100 100 150 L 50 50 1 1 B
 X RA0/AN0 19 -1100 1100 150 R 50 50 1 1 B
@@ -812,11 +826,12 @@ ENDDEF
 DEF PIC18F4450-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
 F1 "PIC18F4450-I/P" 550 -1300 50 H V C CNN
-F2 "DIP40" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
+ALIAS PIC18LF4450-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W15.24mm*
+ PDIP*W15.24mm*
 $ENDFPLIST
 DRAW
 S -950 1250 950 -1250 0 1 10 f
@@ -845,7 +860,7 @@ X RB0/AN12/INT0 33 -1100 100 150 R 50 50 1 1 B
 X RA6/OSC2/CLKO 14 -1100 500 150 R 50 50 1 1 O
 X VP/D+/RC5 24 1100 700 150 L 50 50 1 1 B
 X RB1/AN10/INT1 34 -1100 0 150 R 50 50 1 1 B
-X T1OSO/T13CKI/RC0 15 1100 1100 150 L 50 50 1 1 B
+X T1OSO/T1CKI/RC0 15 1100 1100 150 L 50 50 1 1 B
 X TX/CK/RC6 25 1100 600 150 L 50 50 1 1 B
 X RB2/AN8/INT2/VMO 35 -1100 -100 150 R 50 50 1 1 B
 X ~UOE~/T1OSI/RC1 16 1100 1000 150 L 50 50 1 1 B
@@ -868,10 +883,11 @@ ENDDEF
 DEF PIC18F4450-I/PT U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
 F1 "PIC18F4450-I/PT" 550 -1300 50 H V C CNN
-F2 "TQFP44" 0 0 50 H I C CIN
+F2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
+ALIAS PIC18LF4450-I/PT
 $FPLIST
- TQFP*
+ TQFP*10x10mm*Pitch0.8mm*
 $ENDFPLIST
 DRAW
 S -950 1250 950 -1250 0 1 10 f
@@ -892,17 +908,17 @@ X RB3/AN9/VPO 11 -1100 -200 150 R 50 50 1 1 B
 X RA2/AN2/Vref- 21 -1100 900 150 R 50 50 1 1 B
 X RA6/OSC2/CLKO 31 -1100 500 150 R 50 50 1 1 O
 X RD3 41 1100 -200 150 L 50 50 1 1 B
-X (ICCK/ICPGC) 12 -1100 -850 150 R 50 50 1 1 B
+X (ICCK/ICPGC) 12 -1100 -900 150 R 50 50 1 1 B
 X RA3/AN3/Vref+ 22 -1100 800 150 R 50 50 1 1 B
-X T1OSO/T13CKI/RC0 32 1100 1100 150 L 50 50 1 1 B
+X T1OSO/T1CKI/RC0 32 1100 1100 150 L 50 50 1 1 B
 X VM/D-/RC4 42 1100 800 150 L 50 50 1 1 B
-X (ICDT/ICPGD) 13 -1100 -950 150 R 50 50 1 1 B
+X (ICDT/ICPGD) 13 -1100 -1000 150 R 50 50 1 1 B
 X RA4/T0CKI/RCV 23 -1100 700 150 R 50 50 1 1 B
-X (~ICRST~/ICVpp) 33 -1100 -750 150 R 50 50 1 1 I
+X (~ICRST~/ICVpp) 33 -1100 -800 150 R 50 50 1 1 I
 X VP/D+/RC5 43 1100 700 150 L 50 50 1 1 B
 X RB4/AN11/KBI0 14 -1100 -300 150 R 50 50 1 1 B
 X RA5/AN4/HLVDIN 24 -1100 600 150 R 50 50 1 1 B
-X (ICPORTS) 34 -1100 -1050 150 R 50 50 1 1 B
+X (ICPORTS) 34 -1100 -1100 150 R 50 50 1 1 B
 X TX/CK/RC6 44 1100 600 150 L 50 50 1 1 B
 X RB5/KBI1/PGM 15 -1100 -400 150 R 50 50 1 1 B
 X AN5/RE0 25 1100 -800 150 L 50 50 1 1 B
@@ -927,11 +943,11 @@ ENDDEF
 DEF PIC18F4455-I/ML U 0 50 Y Y 1 F N
 F0 "U" -1000 1300 50 H V C CNN
 F1 "PIC18F4455-I/ML" 650 -1300 50 H V C CNN
-F2 "QFN44" 0 200 50 H I C CIN
+F2 "Housings_DFN_QFN:QFN-44-1EP_8x8mm_Pitch0.65mm" 0 200 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
-ALIAS PIC18LF4450-I/ML PIC18LF4450-I/P PIC18LF4450-I/PT PIC18LF4455-I/ML PIC18LF4550-I/ML PIC18F4550-I/ML
+ALIAS PIC18LF4455-I/ML PIC18LF4550-I/ML PIC18F4550-I/ML
 $FPLIST
- QFN*
+ QFN*1EP*8x8mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
 S -1050 1250 1050 -1250 0 1 10 f
@@ -940,10 +956,11 @@ X SPP4/RD4 2 1200 -300 150 L 50 50 1 1 B
 X P1B/SPP5/RD5 3 1200 -400 150 L 50 50 1 1 B
 X P1C/SPP6/RD6 4 1200 -500 150 L 50 50 1 1 B
 X P1D/SPP7/RD7 5 1200 -600 150 L 50 50 1 1 B
+X NC 13 -300 -1400 150 U 50 50 1 1 N N
 X VSS 6 -100 -1400 150 U 50 50 1 1 W
 X VDD 7 -300 1400 150 D 50 50 1 1 W
 X VDD 8 -200 1400 150 D 50 50 1 1 W
-X RB0/AN12/INT0/SDI/SDA 9 -1200 100 150 R 50 50 1 1 B
+X RB0/AN12/INT0/FLT0/SDI/SDA 9 -1200 100 150 R 50 50 1 1 B
 X RB1/AN10/INT1/SCK/SCL 10 -1200 0 150 R 50 50 1 1 B
 X RA1/AN1 20 -1200 1000 150 R 50 50 1 1 B
 X VSS 30 0 -1400 150 U 50 50 1 1 W
@@ -964,15 +981,15 @@ X RA5/AN4/~SS~/HLVDIN/C2OUT 24 -1200 600 150 R 50 50 1 1 B
 X T1OSO/T13CKI/RC0 34 1200 1100 150 L 50 50 1 1 B
 X TX/CK/RC6 44 1200 600 150 L 50 50 1 1 B
 X RB5/KBI1/PGM 15 -1200 -400 150 R 50 50 1 1 B
-X CK1SPP/AN5/RE0 25 1200 -750 150 L 50 50 1 1 B
+X CK1SPP/AN5/RE0 25 1200 -800 150 L 50 50 1 1 B
 X ~UOE~/CCP2/T1OSI/RC1 35 1200 1000 150 L 50 50 1 1 B
 X RB6/KBI2/PGC 16 -1200 -500 150 R 50 50 1 1 B
-X CK2SPP/AN6/RE1 26 1200 -850 150 L 50 50 1 1 B
+X CK2SPP/AN6/RE1 26 1200 -900 150 L 50 50 1 1 B
 X P1A/CCP1/RC2 36 1200 900 150 L 50 50 1 1 B
 X RB7/KBI3/PGD 17 -1200 -600 150 R 50 50 1 1 B
-X OESPP/AN7/RE2 27 1200 -950 150 L 50 50 1 1 B
+X OESPP/AN7/RE2 27 1200 -1000 150 L 50 50 1 1 B
 X VUSB 37 1200 300 150 L 50 50 1 1 B
-X Vpp/~MCLR~/RE3 18 1200 -1050 150 L 50 50 1 1 I
+X Vpp/~MCLR~/RE3 18 1200 -1100 150 L 50 50 1 1 I
 X VDD 28 -100 1400 150 D 50 50 1 1 W
 X SPP0/RD0 38 1200 100 150 L 50 50 1 1 B
 X RA0/AN0 19 -1200 1100 150 R 50 50 1 1 B
@@ -986,12 +1003,12 @@ ENDDEF
 DEF PIC18F4455-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
 F1 "PIC18F4455-I/P" 550 -1300 50 H V C CNN
-F2 "DIP40" 0 200 50 H I C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 200 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
 ALIAS PIC18LF4455-I/P PIC18LF4550-I/P PIC18F4550-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W15.24mm*
+ PDIP*W15.24mm*
 $ENDFPLIST
 DRAW
 S -950 1250 950 -1250 0 1 10 f
@@ -1016,7 +1033,7 @@ X SPP3/RD3 22 1100 -200 150 L 50 50 1 1 B
 X VDD 32 0 1400 150 D 50 50 1 1 W
 X OSC1/CLKI 13 -1100 300 150 R 50 50 1 1 I
 X VM/D-/RC4 23 1100 800 150 L 50 50 1 1 B
-X RB0/AN12/INT0/SDI/SDA 33 -1100 100 150 R 50 50 1 1 B
+X RB0/AN12/INT0/FLT0/SDI/SDA 33 -1100 100 150 R 50 50 1 1 B
 X RA6/OSC2/CLKO 14 -1100 500 150 R 50 50 1 1 O
 X VP/D+/RC5 24 1100 700 150 L 50 50 1 1 B
 X RB1/AN10/INT1/SCK/SCL 34 -1100 0 150 R 50 50 1 1 B
@@ -1043,11 +1060,11 @@ ENDDEF
 DEF PIC18F4455-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1000 1300 50 H V C CNN
 F1 "PIC18F4455-I/PT" 650 -1300 50 H V C CNN
-F2 "TQFP44" 0 200 50 H I C CIN
+F2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" 0 200 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
 ALIAS PIC18LF4455-I/PT PIC18LF4550-I/PT PIC18F4550-I/PT
 $FPLIST
- TQFP*
+ TQFP*10x10mm*Pitch0.8mm*
 $ENDFPLIST
 DRAW
 S -1050 1250 1050 -1250 0 1 10 f
@@ -1058,7 +1075,7 @@ X P1C/SPP6/RD6 4 1200 -500 150 L 50 50 1 1 B
 X P1D/SPP7/RD7 5 1200 -600 150 L 50 50 1 1 B
 X VSS 6 -100 -1400 150 U 50 50 1 1 W
 X VDD 7 -100 1400 150 D 50 50 1 1 W
-X RB0/AN12/INT0/SDI/SDA 8 -1200 100 150 R 50 50 1 1 B
+X RB0/AN12/INT0/FLT0/SDI/SDA 8 -1200 100 150 R 50 50 1 1 B
 X RB1/AN10/INT1/SCK/SCL 9 -1200 0 150 R 50 50 1 1 B
 X RB2/AN8/INT2/VMO 10 -1200 -100 150 R 50 50 1 1 B
 X RA1/AN1 20 -1200 1000 150 R 50 50 1 1 B
@@ -1281,12 +1298,12 @@ ENDDEF
 DEF PIC18F448-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1200 50 H V C CNN
 F1 "PIC18F448-I/P" 600 -1200 50 H V C CNN
-F2 "DIP40" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 -350 50 H I C CNN
 ALIAS PIC18LF448-I/P PIC18LF458-I/P PIC18F458-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W15.24mm*
+ PDIP*W15.24mm*
 $ENDFPLIST
 DRAW
 S -950 -1150 950 1150 0 1 10 f
@@ -1296,7 +1313,7 @@ X RA1/AN1 3 -1100 700 150 R 50 50 1 1 B
 X RA2/AN2/Vref- 4 -1100 600 150 R 50 50 1 1 B
 X RA3/AN3/Vref+ 5 -1100 500 150 R 50 50 1 1 B
 X RA4/TOCKI 6 -1100 400 150 R 50 50 1 1 B
-X RA5/ANA4/~SS~/LVDIN 7 -1100 300 150 R 50 50 1 1 B
+X RA5/AN4/~SS~/LVDIN 7 -1100 300 150 R 50 50 1 1 B
 X ~RD~/AN5/RE0 8 1100 -800 150 L 50 50 1 1 B
 X C1OUT/~WR~/AN6/RE1 9 1100 -900 150 L 50 50 1 1 B
 X C2OUT/~CS~/AN7/RE2 10 1100 -1000 150 L 50 50 1 1 B
@@ -1338,12 +1355,12 @@ ENDDEF
 DEF PIC18F44J10-I/P U 0 50 Y Y 1 F N
 F0 "U" -1000 1200 50 H V C CNN
 F1 "PIC18F44J10-I/P" 650 -1200 50 H V C CNN
-F2 "DIP40" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" -1150 1200 50 H I C CNN
 ALIAS PIC18LF44J10-I/P PIC18LF45J10-I/P PIC18F45J10-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W15.24mm*
+ PDIP*W15.24mm*
 $ENDFPLIST
 DRAW
 S -1050 -1150 1050 1150 0 0 10 f
@@ -1359,7 +1376,7 @@ X ~WR~/AN6/RE1 9 1200 -900 150 L 50 50 1 1 T
 X ~CS~/AN7/RE2 10 1200 -1000 150 L 50 50 1 1 T
 X PSP1/SDI2/SDA2/RD1 20 1200 0 150 L 50 50 1 1 T
 X PSP7/P1D/RD7 30 1200 -600 150 L 50 50 1 1 T
-X RB7/KBI3/PGD 50 -1200 -500 150 R 50 50 1 1 T
+X RB7/KBI3/PGD 40 -1200 -500 150 R 50 50 1 1 T
 X VDD 11 100 1300 150 D 50 50 1 1 W
 X PSP2/SDO2/RD2 21 1200 -100 150 L 50 50 1 1 T
 X VSS 31 0 -1300 150 U 50 50 1 1 W
@@ -1395,12 +1412,12 @@ ENDDEF
 DEF PIC18F4580-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1200 50 H V C CNN
 F1 "PIC18F4580-I/P" 600 -1200 50 H V C CNN
-F2 "DIP40" 0 0 50 H I C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 -350 50 H I C CNN
 ALIAS PIC18LF4580-I/P PIC18LF4480-I/P PIC18F4480-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*W15.24mm*
+ PDIP*W15.24mm*
 $ENDFPLIST
 DRAW
 S -950 -1150 950 1150 0 1 10 f
@@ -1452,11 +1469,11 @@ ENDDEF
 DEF PIC18F45K80-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1200 1300 50 H V C CNN
 F1 "PIC18F45K80-I/PT" 800 -1300 50 H V C CNN
-F2 "TQFP44" 0 0 50 H I C CIN
+F2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" 0 0 50 H I C CIN
 F3 "" 0 -300 50 H I C CNN
 ALIAS PIC18LF45K80-I/PT PIC18LF46K80-I/PT PIC18F46K80-I/PT
 $FPLIST
- TQFP*
+ TQFP*10x10mm*Pitch0.8mm*
 $ENDFPLIST
 DRAW
 S -1250 1250 1250 -1250 0 1 10 f
@@ -1472,7 +1489,7 @@ X AN8/CTDIN/INT1/RB1 9 1400 -300 150 L 50 50 1 1 B
 X CANTX/CTED1/INT2/RB2 10 1400 -400 150 L 50 50 1 1 B
 X AN1/C1INC/RA1 20 1400 300 150 L 50 50 1 1 B
 X OSC1/CLKIN/RA7 30 1400 900 150 L 50 50 1 1 I
-X RD2/C2INA/PSP2 50 -1400 500 150 R 50 50 1 1 B
+X RD2/C2INA/PSP2 40 -1400 500 150 R 50 50 1 1 B
 X CANRX/CTED2/INT3/RB3 11 1400 -500 150 L 50 50 1 1 B
 X VREF-/AN2/C2INC/RA2 21 1400 200 150 L 50 50 1 1 B
 X OSC2/CLKOUT/RA6 31 1400 800 150 L 50 50 1 1 O
@@ -1512,29 +1529,32 @@ ENDDEF
 DEF PIC18F1220-SO U 0 40 Y Y 1 F N
 F0 "U" -550 550 50 H V C CNN
 F1 "PIC18F1220-SO" 100 550 50 H V L CNN
-F2 "SOIC-18" 50 -150 50 H I C CIN
-F3 "" -250 550 50 H I C CNN
-ALIAS PIC18F1320-SO
+F2 "Housings_SOIC:SOIC-18W_7.5x11.6mm_Pitch1.27mm" 0 0 50 H I C CIN
+F3 "" -150 550 50 H I C CNN
+ALIAS PIC18LF1220-SO PIC18LF1320-SO PIC18F1320-SO
+$FPLIST
+ SOIC*W*7.5x11.6mm*Pitch1.27mm*
+$ENDFPLIST
 DRAW
-S -600 500 700 -400 0 1 10 f
-X RA0/AN0 1 -700 300 100 R 50 50 1 1 I
-X RA1/AN1 2 -700 200 100 R 50 50 1 1 I
-X RA4/TOCKI 3 -700 -100 100 R 50 50 1 1 I
-X ~MCLR~/Vpp 4 -700 400 100 R 50 50 1 1 I
-X Vss 5 -100 -500 100 U 50 50 1 1 W
-X RA2/AN2 6 -700 100 100 R 50 50 1 1 I
-X RA3/AN3 7 -700 0 100 R 50 50 1 1 I
-X RB0/INT0 8 800 400 100 L 50 50 1 1 I
-X RB1/AN5/TX/INT1 9 800 300 100 L 50 50 1 1 I
-X RB4/AN6/RX 10 800 0 100 L 50 50 1 1 I
-X RB5/PGM 11 800 -100 100 L 50 50 1 1 I
-X RB6/PGC 12 800 -200 100 L 50 50 1 1 I
-X RB7/PGD 13 800 -300 100 L 50 50 1 1 I
-X Vdd 14 -100 600 100 D 50 50 1 1 W
-X OSC2 15 -700 -300 100 R 50 50 1 1 I
-X OSC1 16 -700 -200 100 R 50 50 1 1 I
-X RB2/INT2 17 800 200 100 L 50 50 1 1 I
-X RB3/CCP1 18 800 100 100 L 50 50 1 1 I
+S -1200 600 1200 -500 0 1 10 f
+X RA0/AN0 1 -1300 300 100 R 50 50 1 1 I
+X RA1/AN1/LVDIN 2 -1300 200 100 R 50 50 1 1 I
+X RA4/TOCKI 3 -1300 -100 100 R 50 50 1 1 I
+X ~MCLR~/Vpp/RA5 4 -1300 400 100 R 50 50 1 1 I
+X Vss 5 0 -600 100 U 50 50 1 1 W
+X RA2/AN2/Vref- 6 -1300 100 100 R 50 50 1 1 I
+X RA3/AN3/Vref+ 7 -1300 0 100 R 50 50 1 1 I
+X INT0/AN4/RB0 8 1300 400 100 L 50 50 1 1 I
+X INT1/CK/TX/AN5/RB1 9 1300 300 100 L 50 50 1 1 I
+X KBI0/DT/RX/AN6/RB4 10 1300 0 100 L 50 50 1 1 I
+X KBI1/PGM/RB5 11 1300 -100 100 L 50 50 1 1 I
+X KBI2/P1C/T13CKI/T1OSO/PGC/RB6 12 1300 -200 100 L 50 50 1 1 I
+X KBI3/P1D/T1OSI/PGD/RB7 13 1300 -300 100 L 50 50 1 1 I
+X Vdd 14 0 700 100 D 50 50 1 1 W
+X OSC2/CLKO/RA6 15 -1300 -300 100 R 50 50 1 1 I
+X OSC1/CLKI/RA7 16 -1300 -200 100 R 50 50 1 1 I
+X INT2/P1B/RB2 17 1300 200 100 L 50 50 1 1 I
+X P1A/CCP1/RB3 18 1300 100 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -1543,9 +1563,12 @@ ENDDEF
 DEF PIC18F23K20_I/SS U 0 40 Y Y 1 F N
 F0 "U" -700 950 50 H V L CNN
 F1 "PIC18F23K20_I/SS" 700 950 50 H V R CNN
-F2 "SSOP28" -500 -500 50 H I C CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" -500 -500 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 ALIAS PIC18F24K20_I/SS PIC18F25K20_I/SS PIC18F26K20_I/SS
+$FPLIST
+  SSOP*5.3x10.2mm*Pitch0.65mm*
+$ENDFPLIST
 DRAW
 S -700 900 700 -900 0 1 10 f
 X ~MCLR~/RE3 1 -800 100 100 R 50 50 1 1 B
@@ -1584,20 +1607,23 @@ ENDDEF
 DEF PIC18F25K80_I/ML U 0 40 Y Y 1 F N
 F0 "U" -700 950 50 H V L CNN
 F1 "PIC18F25K80_I/ML" 700 950 50 H V R CNN
-F2 "QFN28" 0 -250 50 H I C CNN
+F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 0 -250 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 ALIAS PIC18F26K80_I/ML PIC18LF25K80_I/ML PIC18LF26K80_I/ML
+$FPLIST
+  QFN*1EP*6x6mm*Pitch0.65mm*
+$ENDFPLIST
 DRAW
 S -700 900 700 -900 0 1 10 f
-X RA2/Vref-AN2 1 -800 600 100 R 50 50 1 1 B
-X RA3/Vref+AN3 2 -800 500 100 R 50 50 1 1 B
+X RA2/Vref-/AN2 1 -800 600 100 R 50 50 1 1 B
+X RA3/Vref+/AN3 2 -800 500 100 R 50 50 1 1 B
 X Vcap 3 -800 -400 100 R 50 50 1 1 W
 X RA5/AN4 4 -800 400 100 R 50 50 1 1 B
 X Vss 5 -800 -700 100 R 50 50 1 1 W
 X OSC1/CLKIN 6 -800 -100 100 R 50 50 1 1 I
 X OSC2/CLKOUT 7 -800 0 100 R 50 50 1 1 I
 X SOSCO/RC0 8 800 -100 100 L 50 50 1 1 B
-X SOSC1/RC1 9 800 -200 100 L 50 50 1 1 B
+X SOSCI/RC1 9 800 -200 100 L 50 50 1 1 B
 X CCP2/RC2 10 800 -300 100 L 50 50 1 1 B
 X CANTX/INT2/RB2 20 800 600 100 L 50 50 1 1 B
 X SCL/SCK/RC3 11 800 -400 100 L 50 50 1 1 B
@@ -1626,16 +1652,19 @@ ENDDEF
 DEF PIC18F25K80_I/SS U 0 40 Y Y 1 F N
 F0 "U" -700 950 50 H V L CNN
 F1 "PIC18F25K80_I/SS" 700 950 50 H V R CNN
-F2 "SSOP28" 0 -250 50 H I C CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" 0 -250 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 ALIAS PIC18F26K80_I/SS PIC18LF25K80_I/SS PIC18LF26K80_I/SS
+$FPLIST
+  SSOP*5.3x10.2mm*Pitch0.65mm*
+$ENDFPLIST
 DRAW
 S -700 900 700 -900 0 1 10 f
 X ~MCLR~/RE3 1 -800 200 100 R 50 50 1 1 B
 X RA0/AN0 2 -800 800 100 R 50 50 1 1 B
 X RA1/AN1 3 -800 700 100 R 50 50 1 1 B
-X RA2/Vref-AN2 4 -800 600 100 R 50 50 1 1 B
-X RA3/Vref+AN3 5 -800 500 100 R 50 50 1 1 B
+X RA2/Vref-/AN2 4 -800 600 100 R 50 50 1 1 B
+X RA3/Vref+/AN3 5 -800 500 100 R 50 50 1 1 B
 X Vcap 6 -800 -400 100 R 50 50 1 1 W
 X RA5/AN4 7 -800 400 100 R 50 50 1 1 B
 X Vss 8 -800 -600 100 R 50 50 1 1 W
@@ -1643,7 +1672,7 @@ X OSC1/CLKIN 9 -800 -100 100 R 50 50 1 1 I
 X OSC2/CLKOUT 10 -800 0 100 R 50 50 1 1 I
 X SOSCO/RC0 11 800 -100 100 L 50 50 1 1 B
 X AN10/INT0/RB0 21 800 800 100 L 50 50 1 1 B
-X SOSC1/RC1 12 800 -200 100 L 50 50 1 1 B
+X SOSCI/RC1 12 800 -200 100 L 50 50 1 1 B
 X AN8/INT1/RB1 22 800 700 100 L 50 50 1 1 B
 X CCP2/RC2 13 800 -300 100 L 50 50 1 1 B
 X CANTX/INT2/RB2 23 800 600 100 L 50 50 1 1 B
@@ -1654,7 +1683,7 @@ X AN9/ECCP1/RB4 25 800 400 100 L 50 50 1 1 B
 X SDO/RC5 16 800 -600 100 L 50 50 1 1 B
 X CCP5/RB5 26 800 300 100 L 50 50 1 1 B
 X CANTX/TX1/CCP3/RC6 17 800 -700 100 L 50 50 1 1 B
-X Vdd 17 -800 -300 100 R 50 50 1 1 W
+X Vdd 20 -800 -300 100 R 50 50 1 1 W
 X PGC/TX2/RB6 27 800 200 100 L 50 50 1 1 B
 X CANRX/RX1/CCP4/RC7 18 800 -800 100 L 50 50 1 1 B
 X PGD/RX2/RB7 28 800 100 100 L 50 50 1 1 B
@@ -1667,9 +1696,12 @@ ENDDEF
 DEF PIC18F45K80-I/ML U 0 40 Y Y 1 F N
 F0 "U" -900 1150 50 H V L CNN
 F1 "PIC18F45K80-I/ML" -900 -1150 50 H V L CNN
-F2 "QFN44" 0 -800 50 H I C CNN
+F2 "Housings_DFN_QFN:QFN-44-1EP_8x8mm_Pitch0.65mm" 0 -800 50 H I C CNN
 F3 "" -650 -100 50 H I C CNN
 ALIAS PIC18F46K80-I/ML PIC18LF45K80-I/ML PIC18LF46K80-I/ML
+$FPLIST
+ QFN*1EP*8x8mm*Pitch0.65mm*
+$ENDFPLIST
 DRAW
 S -900 1100 900 -1100 0 1 10 f
 X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 B
@@ -1677,6 +1709,10 @@ X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 B
 X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 B
 X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 B
 X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 B
+X NC 12 -400 -1200 100 U 50 50 1 1 N N
+X NC 13 -300 -1200 100 U 50 50 1 1 N N
+X NC 33 -200 -1200 100 U 50 50 1 1 N N
+X NC 34 -100 -1200 100 U 50 50 1 1 N N
 X Vss 6 0 -1200 100 U 50 50 1 1 W
 X Vdd 7 100 1200 100 D 50 50 1 1 W
 X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 B
@@ -1721,11 +1757,11 @@ ENDDEF
 DEF PIC18F66J60-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1000 1900 50 H V C CNN
 F1 "PIC18F66J60-I/PT" 700 -1900 50 H V C CNN
-F2 "TQFP64" 0 0 50 H I C CIN
+F2 "Housings_QFP:TQFP-64_10x10mm_Pitch0.5mm" 0 0 50 H I C CIN
 F3 "" 0 250 50 H I C CNN
 ALIAS PIC18F66J65-I/PT PIC18F67J60-I/PT
 $FPLIST
- TQFP*
+ TQFP*10x10mm*Pitch0.5mm*
 $ENDFPLIST
 DRAW
 S -1050 1850 1050 -1850 0 1 10 f
@@ -1736,49 +1772,49 @@ X INT1/RB1 4 1200 -200 150 L 50 50 1 1 B
 X INT2/RB2 5 1200 -300 150 L 50 50 1 1 B
 X INT3/RB3 6 1200 -400 150 L 50 50 1 1 B
 X ~MCLR~ 7 -1200 1700 150 R 50 50 1 1 I
-X RG4/CCP5/P1D 8 -1200 -1150 150 R 50 50 1 1 B
+X RG4/CCP5/P1D 8 -1200 -1200 150 R 50 50 1 1 B
 X VSS 9 -200 -2000 150 U 50 50 1 1 W
 X VDDCORE/VCAP 10 -1200 900 150 R 50 50 1 1 P
 X AVSS 20 -400 -2000 150 U 50 50 1 1 W
 X T13CKI/T1OSO/RC0 30 1200 -1000 150 L 50 50 1 1 B
-X OSC2/CLK2 50 -1200 1300 150 R 50 50 1 1 O
-X TPUOT- 50 1200 1100 150 L 50 50 1 1 P
+X OSC2/CLK2 40 -1200 1300 150 R 50 50 1 1 O
+X TPOUT- 50 1200 1100 150 L 50 50 1 1 P
 X RD0/P1B 60 -1200 700 150 R 50 50 1 1 B
-X RF7/~SS1~ 11 -1200 -950 150 R 50 50 1 1 B
+X RF7/~SS1~ 11 -1200 -1000 150 R 50 50 1 1 B
 X Vref+/AN3/RA3 21 1200 300 150 L 50 50 1 1 B
 X TX1/CK1/RC6 31 1200 -1600 150 L 50 50 1 1 B
 X VSS 41 0 -2000 150 U 50 50 1 1 W
 X TPOUT+ 51 1200 1200 150 L 50 50 1 1 P
 X RE5/P1C 61 -1200 -200 150 R 50 50 1 1 B
-X RF6/AN11 12 -1200 -850 150 R 50 50 1 1 B
+X RF6/AN11 12 -1200 -900 150 R 50 50 1 1 B
 X Vref-/AN2/RA2 22 1200 400 150 L 50 50 1 1 B
 X RX1/DT1/RC7 32 1200 -1700 150 L 50 50 1 1 B
 X PGC/KBI2/RB6 42 1200 -700 150 L 50 50 1 1 B
 X VSSTX 52 1200 1000 150 L 50 50 1 1 W
 X RE4/P3B 62 -1200 -100 150 R 50 50 1 1 B
-X RF5/AN10/CVref 13 -1200 -750 150 R 50 50 1 1 B
+X RF5/AN10/CVref 13 -1200 -800 150 R 50 50 1 1 B
 X LEDB/AN1/RA1 23 1200 500 150 L 50 50 1 1 B
 X ECCP1/P1A/RC2 33 1200 -1200 150 L 50 50 1 1 B
 X KBI1/RB5 43 1200 -600 150 L 50 50 1 1 B
 X RBIAS 53 1200 800 150 L 50 50 1 1 P
 X RE3/P3C 63 -1200 0 150 R 50 50 1 1 B
-X RF4/AN9 14 -1200 -650 150 R 50 50 1 1 B
+X RF4/AN9 14 -1200 -700 150 R 50 50 1 1 B
 X LEDA/AN0/RA0 24 1200 600 150 L 50 50 1 1 B
 X SCK1/SCL1/RC3 34 1200 -1300 150 L 50 50 1 1 B
 X KBI0/RB4 44 1200 -500 150 L 50 50 1 1 B
 X VDDPLL 54 300 2000 150 D 50 50 1 1 W
 X RE2/P2B 64 -1200 100 150 R 50 50 1 1 B
-X RF3/AN8 15 -1200 -550 150 R 50 50 1 1 B
+X RF3/AN8 15 -1200 -600 150 R 50 50 1 1 B
 X VSS 25 -100 -2000 150 U 50 50 1 1 W
 X SDI1/SDA1/RC4 35 1200 -1400 150 L 50 50 1 1 B
 X VSSRX 45 1200 1500 150 L 50 50 1 1 W
 X VSSPLL 55 300 -2000 150 U 50 50 1 1 W
-X RF2/AN7/C1OUT 16 -1200 -450 150 R 50 50 1 1 B
+X RF2/AN7/C1OUT 16 -1200 -500 150 R 50 50 1 1 B
 X VDD 26 -100 2000 150 D 50 50 1 1 W
 X SDO1/RC5 36 1200 -1500 150 L 50 50 1 1 B
 X TPIN- 46 1200 1600 150 L 50 50 1 1 P
 X VSS 56 100 -2000 150 U 50 50 1 1 W
-X RF1/AN6/C2OUT 17 -1200 -350 150 R 50 50 1 1 B
+X RF1/AN6/C2OUT 17 -1200 -400 150 R 50 50 1 1 B
 X AN4/RA5 27 1200 100 150 L 50 50 1 1 B
 X PGD/KBI3/RB7 37 1200 -800 150 L 50 50 1 1 B
 X TPIN+ 47 1200 1700 150 L 50 50 1 1 P
@@ -1801,11 +1837,12 @@ ENDDEF
 DEF PIC18F96J60-I/PT U 0 20 Y Y 1 F N
 F0 "U" -1350 2800 50 H V C CNN
 F1 "PIC18F96J60-I/PT" 1100 -2800 50 H V C CNN
-F2 "TQFP100" 0 0 50 H I C CIN
+F2 "Housings_QFP:TQFP-100_12x12mm_Pitch0.4mm" 0 0 50 H I C CIN
 F3 "" -650 -500 50 H I C CNN
 ALIAS PIC18F96J65-I/PT PIC18F97J60-I/PT PIC18F96J60-I/PF PIC18F96J65-I/PF PIC18F97J60-I/PF
 $FPLIST
- TQFP*
+ TQFP*12x12mm*Pitch0.4mm*
+ TQFP*14x14mm*Pitch0.5mm*
 $ENDFPLIST
 DRAW
 S -1450 2750 1450 -2750 0 1 10 f
@@ -1821,13 +1858,14 @@ X RG6 10 -1600 0 150 R 50 50 1 1 B
 X RF5/AN10/CVref 20 -1600 1000 150 R 50 50 1 1 B
 X AVDD 30 -500 2900 150 D 50 50 1 1 W
 X RJ1/~OE~ 50 -1600 -1300 150 R 50 50 1 1 B
-X VSS 50 -100 -2900 150 U 50 50 1 1 W
+X VSS 40 -100 -2900 150 U 50 50 1 1 W
 X VSS 60 0 -2900 150 U 50 50 1 1 W
 X RG1/TX2/CK2 70 -1600 500 150 R 50 50 1 1 B
 X RBIAS 80 1600 1600 150 L 50 50 1 1 P
 X AD2/PSP2/RD2 90 1600 -1200 150 L 50 50 1 1 B
 X RG5 11 -1600 100 150 R 50 50 1 1 B
 X RF4/AN9 21 -1600 1100 150 R 50 50 1 1 B
+X NC 9 -800 -2900 150 U 50 50 1 1 N N
 X AVSS 31 -600 -2900 150 U 50 50 1 1 W
 X AN4/RA5 41 1600 900 150 L 50 50 1 1 B
 X RG3/CCP4/P3D 51 -1600 300 150 R 50 50 1 1 B
@@ -1860,7 +1898,7 @@ X T13CKI/T1OSO/RC0 44 1600 -100 150 L 50 50 1 1 B
 X SCK1/SCL1/RC3 54 1600 -400 150 L 50 50 1 1 B
 X OSC2/CLK0 64 -1600 2100 150 R 50 50 1 1 O
 X TPIN+ 74 1600 2500 150 L 50 50 1 1 P
-X AD6/PSP6/SCK2/SCL2/RD6 84 1600 -1500 150 L 50 50 1 1 B
+X AD6/PSP6/SCK2/SCL2/RD6 84 1600 -1600 150 L 50 50 1 1 B
 X AD14/P1B/RE6 94 1600 -2500 150 L 50 50 1 1 B
 X VSS 15 -300 -2900 150 U 50 50 1 1 W
 X RH6/AN14/P1C 25 -1600 -900 150 R 50 50 1 1 B
@@ -1887,7 +1925,7 @@ X RJ4/BA0 47 -1600 -1600 150 R 50 50 1 1 B
 X PGD/KBI3/RB7 57 1600 100 150 L 50 50 1 1 B
 X PGC/KBI2/RB6 67 1600 200 150 L 50 50 1 1 B
 X TPOUT- 77 1600 1900 150 L 50 50 1 1 P
-X AD5/PSP5/SDI2/SDA2/RD5 87 1600 -1600 150 L 50 50 1 1 B
+X AD5/PSP5/SDI2/SDA2/RD5 87 1600 -1500 150 L 50 50 1 1 B
 X AD11/P3C/RE3 97 1600 -2200 150 L 50 50 1 1 B
 X RF7/~SS1~ 18 -1600 800 150 R 50 50 1 1 B
 X RF1/AN6/C2OUT 28 -1600 1400 150 R 50 50 1 1 B
@@ -1896,7 +1934,7 @@ X RJ5/~CE~ 48 -1600 -1700 150 R 50 50 1 1 B
 X RJ6/~LB~ 58 -1600 -1800 150 R 50 50 1 1 B
 X KBI1/RB5 68 1600 300 150 L 50 50 1 1 B
 X TP0UT+ 78 1600 2000 150 L 50 50 1 1 P
-X SD02/AD4/PSP4/RD4 88 1600 -1300 150 L 50 50 1 1 B
+X SD02/AD4/PSP4/RD4 88 1600 -1400 150 L 50 50 1 1 B
 X ~CS~/AD10/P2B/RE2 98 1600 -2100 150 L 50 50 1 1 B
 X RF6/AN11 19 -1600 900 150 R 50 50 1 1 B
 X ENVREG 29 -1600 1900 150 R 50 50 1 1 P
@@ -1905,7 +1943,7 @@ X RJ0/ALE 49 -1600 -1200 150 R 50 50 1 1 B
 X VDD 59 0 2900 150 D 50 50 1 1 W
 X KBI0/RB4 69 1600 400 150 L 50 50 1 1 B
 X VSSTX 79 1600 1800 150 L 50 50 1 1 W
-X AD3/PSP3/RD3 89 1600 -1400 150 L 50 50 1 1 B
+X AD3/PSP3/RD3 89 1600 -1300 150 L 50 50 1 1 B
 X RH0/A16 99 -1600 -300 150 R 50 50 1 1 B
 X RH1/A17 100 -1600 -400 150 R 50 50 1 1 B
 ENDDRAW