diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 8e32a54b..5bfb6328 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1742,11 +1742,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 V C CIN
+F2 "Housings_QFP:TQFP-64_10x10mm_Pitch0.5mm" 0 0 50 H I C CIN
 F3 "" 0 250 50 H V C CNN
 ALIAS PIC18F66J65-I/PT PIC18F67J60-I/PT
 $FPLIST
- TQFP*
+ TQFP*64_10x10mm*
 $ENDFPLIST
 DRAW
 S -1050 1850 1050 -1850 0 1 10 f
@@ -1757,49 +1757,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
@@ -1822,11 +1822,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 V C CIN
+F2 "Housings_QFP:TQFP-100_12x12mm_Pitch0.4mm" 0 0 50 H I C CIN
 F3 "" -650 -500 50 H V C CNN
 ALIAS PIC18F96J65-I/PT PIC18F97J60-I/PT PIC18F96J60-I/PF PIC18F96J65-I/PF PIC18F97J60-I/PF
 $FPLIST
- TQFP*
+ TQFP*100*12x12*
+ TQFP*100*14x14*
 $ENDFPLIST
 DRAW
 S -1450 2750 1450 -2750 0 1 10 f
@@ -1842,7 +1843,7 @@ 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
@@ -1881,7 +1882,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
@@ -1908,7 +1909,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
@@ -1917,7 +1918,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
@@ -1926,7 +1927,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