diff --git a/library/74xgxx.dcm b/library/74xgxx.dcm
index 0a916a91..63bb188b 100644
--- a/library/74xgxx.dcm
+++ b/library/74xgxx.dcm
@@ -1,55 +1,55 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP 74AHC1G00
-D 74AHC1G00, Single NAND Gate, Low-Voltage CMOS
+D Single NAND Gate, Low-Voltage CMOS
 K Single Gate NAND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G02
-D 74AHC1G02, Single NOR Gate, Low-Voltage CMOS
+D Single NOR Gate, Low-Voltage CMOS
 K Single Gate NOR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G04
-D 74AHC1G04, Single NOT Gate, Low-Voltage CMOS
+D Single NOT Gate, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G08
-D 74AHC1G08, Single AND Gate, Low-Voltage CMOS
+D Single AND Gate, Low-Voltage CMOS
 K Single Gate AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G125
-D 74AHC1G125, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G126
-D 74AHC1G126, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G14
-D 74AHC1G14, Single Schmidt NOT Gate, Low-Voltage CMOS
+D Single Schmidt NOT Gate, Low-Voltage CMOS
 K Single Gate NOT Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G32
-D 74AHC1G32, Single OR Gate, Low-Voltage CMOS
+D Single OR Gate, Low-Voltage CMOS
 K Single Gate OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHC1G86
-D 74AHC1G86, Single EX-OR Gate, Low-Voltage CMOS
+D Single EX-OR Gate, Low-Voltage CMOS
 K Single Gate EX-OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -61,55 +61,55 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G00
-D 74AHCT1G00, Single NAND Gate, Low-Voltage CMOS
+D Single NAND Gate, Low-Voltage CMOS
 K Single Gate NAND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G02
-D 74AHCT1G02, Single NOR Gate, Low-Voltage CMOS
+D Single NOR Gate, Low-Voltage CMOS
 K Single Gate NOR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G04
-D 74AHCT1G04, Single NOT Gate, Low-Voltage CMOS
+D Single NOT Gate, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G08
-D 74AHCT1G08, Single AND Gate, Low-Voltage CMOS
+D Single AND Gate, Low-Voltage CMOS
 K Single Gate AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G125
-D 74AHCT1G125, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G126
-D 74AHCT1G126, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G14
-D 74AHCT1G14, Single Schmidt NOT Gate, Low-Voltage CMOS
+D Single Schmidt NOT Gate, Low-Voltage CMOS
 K Single Gate NOT Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G32
-D 74AHCT1G32, Single OR Gate, Low-Voltage CMOS
+D Single OR Gate, Low-Voltage CMOS
 K Single Gate OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AHCT1G86
-D 74AHCT1G86, Single EX-OR Gate, Low-Voltage CMOS
+D Single EX-OR Gate, Low-Voltage CMOS
 K Single Gate EX-OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -121,115 +121,115 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G00
-D 74AUC1G00, Single NAND Gate, Low-Voltage CMOS
+D Single NAND Gate, Low-Voltage CMOS
 K Single Gate NAND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G02
-D 74AUC1G02, Single NOR Gate, Low-Voltage CMOS
+D Single NOR Gate, Low-Voltage CMOS
 K Single Gate NOR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G04
-D 74AUC1G04, Single NOT Gate, Low-Voltage CMOS
+D Single NOT Gate, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G06
-D 74AUC1G06, Single NOT Gate w/ Open Drain, Low-Voltage CMOS
+D Single NOT Gate w/ Open Drain, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS Open Drain
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G07
-D 74AUC1G07, Single Buffer Gate w/ Open Drain, Low-Voltage CMOS
+D Single Buffer Gate w/ Open Drain, Low-Voltage CMOS
 K Single Gate Buff LVC CMOS Open Drain
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G08
-D 74AUC1G08, Single AND Gate, Low-Voltage CMOS
+D Single AND Gate, Low-Voltage CMOS
 K Single Gate AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G125
-D 74AUC1G125, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G126
-D 74AUC1G126, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G14
-D 74AUC1G14, Single Schmidt NOT Gate, Low-Voltage CMOS
+D Single Schmidt NOT Gate, Low-Voltage CMOS
 K Single Gate NOT Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G17
-D 74AUC1G17, Single Schmidt Buffer Gate, Low-Voltage CMOS
+D Single Schmidt Buffer Gate, Low-Voltage CMOS
 K Single Gate Buff Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G18
-D 74AUC1G18, Single Demultiplexer, Low-Voltage CMOS
+D Single Demultiplexer, Low-Voltage CMOS
 K Single Demux LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G19
-D 74AUC1G19, Single 1 of 2 Decoder, Low-Voltage CMOS
+D Single 1 of 2 Decoder, Low-Voltage CMOS
 K Single Decoder LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G240
-D 74AUC1G240, Single Buffer/Driver Gate Tri-State, Low-Voltage CMOS
+D Single Buffer/Driver Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff/Drv Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G32
-D 74AUC1G32, Single OR Gate, Low-Voltage CMOS
+D Single OR Gate, Low-Voltage CMOS
 K Single Gate OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G66
-D 74AUC1G66, Single Analog Switch
+D Single Analog Switch
 K Single Analog Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G74
-D 74AUC1G74, Single D Flip-Flop, Low-Voltage CMOS
+D Single D Flip-Flop, Low-Voltage CMOS
 K Single D Flip-Flop D CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G79
-D 74AUC1G79, Single D Flip-Flop, Low-Voltage CMOS
+D Single D Flip-Flop, Low-Voltage CMOS
 K Single D Flip-Flop D CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G80
-D 74AUC1G80, Single D Flip-Flop Iverted Output, Low-Voltage CMOS
+D Single D Flip-Flop Iverted Output, Low-Voltage CMOS
 K Single D Flip-Flop CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC1G86
-D 74AUC1G86, Single EX-OR Gate, Low-Voltage CMOS
+D Single EX-OR Gate, Low-Voltage CMOS
 K Single Gate EX-OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -241,103 +241,103 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G00
-D 74AUC2G00, Dual NAND Gate, Low-Voltage CMOS
+D Dual NAND Gate, Low-Voltage CMOS
 K Dual Gate NAND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G02
-D 74AUC2G02, Dual NOR Gate, Low-Voltage CMOS
+D Dual NOR Gate, Low-Voltage CMOS
 K Dual Gate NOR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G04
-D 74AUC2G04, Dual NOT Gate, Low-Voltage CMOS
+D Dual NOT Gate, Low-Voltage CMOS
 K Dual Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G06
-D 74AUC2G06, Dual NOT Gate w/ Open Drain, Low-Voltage CMOS
+D Dual NOT Gate w/ Open Drain, Low-Voltage CMOS
 K Dual Gate NOT Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G07
-D 74AUC2G07, Dual Buffer w/ Open Drain, Low-Voltage CMOS
+D Dual Buffer w/ Open Drain, Low-Voltage CMOS
 K Dual Gate Buffer Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G08
-D 74AUC2G08, Dual AND Gate, Low-Voltage CMOS
+D Dual AND Gate, Low-Voltage CMOS
 K Dual Gate AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G125
-D 74AUC2G125, Dual Buffer Tri-State, Low-Voltage CMOS
+D Dual Buffer Tri-State, Low-Voltage CMOS
 K Dual Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G126
-D 74AUC2G126, Dual Buffer Tri-State, Low-Voltage CMOS
+D Dual Buffer Tri-State, Low-Voltage CMOS
 K Dual Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G240
-D 74AUC2G240, Dual Inverter Buffer Tri-State, Low-Voltage CMOS
+D Dual Inverter Buffer Tri-State, Low-Voltage CMOS
 K Dual Inv Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G241
-D 74AUC2G241, Dual Buffer Tri-State, Low-Voltage CMOS
+D Dual Buffer Tri-State, Low-Voltage CMOS
 K Dual Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G32
-D 74AUC2G32, Dual OR Gate, Low-Voltage CMOS
+D Dual OR Gate, Low-Voltage CMOS
 K Dual Gate OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G34
-D 74AUC2G34, Dual Buffer, Low-Voltage CMOS
+D Dual Buffer, Low-Voltage CMOS
 K Dual Buffer LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G53
-D 74AUC2G53, 1 to 2 Analog Swich Mux/Demux, Low-Voltage CMOS
+D 1 to 2 Analog Swich Mux/Demux, Low-Voltage CMOS
 K Analog Switch 1 to 2 CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G66
-D 74AUC2G66, Dual Analog Switch
+D Dual Analog Switch
 K Dual Analog Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G79
-D 74AUC2G79, Dual D Flip-Flop, Low-Voltage CMOS
+D Dual D Flip-Flop, Low-Voltage CMOS
 K Dual D Flip-Flop D CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G80
-D 74AUC2G80, Dual D Flip-Flop w/ Negative Output, Low-Voltage CMOS
+D Dual D Flip-Flop w/ Negative Output, Low-Voltage CMOS
 K Dual D Flip-Flop Negative CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUC2G86
-D 74AUC2G86, Dual EX-OR Gate, Low-Voltage CMOS
+D Dual EX-OR Gate, Low-Voltage CMOS
 K Dual Gate EX-OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -349,85 +349,85 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G00
-D 74AUP1G00, Single NAND Gate, Low-Voltage CMOS
+D Single NAND Gate, Low-Voltage CMOS
 K Single Gate NAND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G02
-D 74AUP1G02, Single NOR Gate, Low-Voltage CMOS
+D Single NOR Gate, Low-Voltage CMOS
 K Single Gate NOR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G04
-D 74AUP1G04, Single NOT Gate, Low-Voltage CMOS
+D Single NOT Gate, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G06
-D 74AUP1G06, Single NOT Gate w/ Open Drain, Low-Voltage CMOS
+D Single NOT Gate w/ Open Drain, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS Open Drain
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G07
-D 74AUP1G07, Single Buffer Gate w/ Open Drain, Low-Voltage CMOS
+D Single Buffer Gate w/ Open Drain, Low-Voltage CMOS
 K Single Gate Buff LVC CMOS Open Drain
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G08
-D 74AUP1G08, Single AND Gate, Low-Voltage CMOS
+D Single AND Gate, Low-Voltage CMOS
 K Single Gate AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G125
-D 74AUP1G125, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G126
-D 74AUP1G126, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G14
-D 74AUP1G14, Single Schmidt NOT Gate, Low-Voltage CMOS
+D Single Schmidt NOT Gate, Low-Voltage CMOS
 K Single Gate NOT Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G17
-D 74AUP1G17, Single Schmidt Buffer Gate, Low-Voltage CMOS
+D Single Schmidt Buffer Gate, Low-Voltage CMOS
 K Single Gate Buff Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G240
-D 74AUP1G240, Single Buffer/Driver Gate Tri-State, Low-Voltage CMOS
+D Single Buffer/Driver Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff/Drv Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G32
-D 74AUP1G32, Single OR Gate, Low-Voltage CMOS
+D Single OR Gate, Low-Voltage CMOS
 K Single Gate OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G34
-D 74AUP1G34, Single Buffef Gate, Low-Voltage CMOS
+D Single Buffef Gate, Low-Voltage CMOS
 K Single Gate Buff LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G57
-D 74AUP1G57, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -439,37 +439,37 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G74
-D 74AUP1G74, Single D Flip-Flop, Low-Voltage CMOS
+D Single D Flip-Flop, Low-Voltage CMOS
 K Single D Flip-Flop D CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G79
-D 74AUP1G79, Single D Flip-Flop, Low-Voltage CMOS
+D Single D Flip-Flop, Low-Voltage CMOS
 K Single D Flip-Flop D CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G80
-D 74AUP1G80, Single D Flip-Flop Iverted Output, Low-Voltage CMOS
+D Single D Flip-Flop Iverted Output, Low-Voltage CMOS
 K Single D Flip-Flop CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G97
-D 74AUP1G97, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G98
-D 74AUP1G98, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74AUP1G99
-D 74AUP1G99, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -481,271 +481,271 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74CB3T1G125
-D 74CB3T1G125, Single FET Bus Switch
+D Single FET Bus Switch
 K Single FET Bus Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74CBT1G125
-D 74CBT1G125, Single FET Bus Switch
+D Single FET Bus Switch
 K Single FET Bus Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74CBT1G384
-D 74CBT1G384, Single FET Bus Switch
+D Single FET Bus Switch
 K Single FET Bus Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74CBTD1G125
-D 74CBTD1G125, Single FET Bus Switch
+D Single FET Bus Switch
 K Single FET Bus Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74CBTD1G384
-D 74CBTD1G384, Single FET Bus Switch
+D Single FET Bus Switch
 K Single FET Bus Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74CBTLV1G125
-D 74CBTLV1G125, Single FET Bus Switch
+D Single FET Bus Switch
 K Single FET Bus Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G00
-D 74LVC1G00, Single NAND Gate, Low-Voltage CMOS
+D Single NAND Gate, Low-Voltage CMOS
 K Single Gate NAND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G02
-D 74LVC1G02, Single NOR Gate, Low-Voltage CMOS
+D Single NOR Gate, Low-Voltage CMOS
 K Single Gate NOR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G04
-D 74LVC1G04, Single NOT Gate, Low-Voltage CMOS
+D Single NOT Gate, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G06
-D 74LVC1G06, Single NOT Gate w/ Open Drain, Low-Voltage CMOS
+D Single NOT Gate w/ Open Drain, Low-Voltage CMOS
 K Single Gate NOT LVC CMOS Open Drain
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G07
-D 74LVC1G07, Single Buffer Gate w/ Open Drain, Low-Voltage CMOS
+D Single Buffer Gate w/ Open Drain, Low-Voltage CMOS
 K Single Gate Buff LVC CMOS Open Drain
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G08
-D 74LVC1G08, Single AND Gate, Low-Voltage CMOS
+D Single AND Gate, Low-Voltage CMOS
 K Single Gate AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G0832
-D 74LVC1G0832, Single AND-OR Gate, Low-Voltage CMOS
+D Single AND-OR Gate, Low-Voltage CMOS
 K Single Gate AND-OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G10
-D 74LVC1G10, Single NAND 3in Gate, Low-Voltage CMOS
+D Single NAND 3in Gate, Low-Voltage CMOS
 K Single Gate NAND 3in LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G11
-D 74LVC1G11, Single AND 3in Gate, Low-Voltage CMOS
+D Single AND 3in Gate, Low-Voltage CMOS
 K Single Gate AND 3in LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G123
-D 74LVC1G123, Single Retrigerrable Monostabile Multivibrator, Low-Voltage CMOS
+D Single Retrigerrable Monostabile Multivibrator, Low-Voltage CMOS
 K Single Mono Multivibrator CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G125
-D 74LVC1G125, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G126
-D 74LVC1G126, Single Buffer Gate Tri-State, Low-Voltage CMOS
+D Single Buffer Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G139
-D 74LVC1G139, 2 to 4 Decoder, Low-Voltage CMOS
+D 2 to 4 Decoder, Low-Voltage CMOS
 K Single Decoder LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G14
-D 74LVC1G14, Single Schmidt NOT Gate, Low-Voltage CMOS
+D Single Schmidt NOT Gate, Low-Voltage CMOS
 K Single Gate NOT Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G17
-D 74LVC1G17, Single Schmidt Buffer Gate, Low-Voltage CMOS
+D Single Schmidt Buffer Gate, Low-Voltage CMOS
 K Single Gate Buff Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G175
-D 74LVC1G175, Single D Flip-Flop w/ Asnynchronus Clear, Low-Voltage CMOS
+D Single D Flip-Flop w/ Asnynchronus Clear, Low-Voltage CMOS
 K Single D Flip-Flop Clear CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G18
-D 74LVC1G18, Single Demultiplexer, Low-Voltage CMOS
+D Single Demultiplexer, Low-Voltage CMOS
 K Single Demux LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G19
-D 74LVC1G19, 1 of 2 Decoder, Low-Voltage CMOS
+D 1 of 2 Decoder, Low-Voltage CMOS
 K Single Decoder LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G240
-D 74LVC1G240, Single Buffer/Driver Gate Tri-State, Low-Voltage CMOS
+D Single Buffer/Driver Gate Tri-State, Low-Voltage CMOS
 K Single Gate Buff/Drv Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G27
-D 74LVC1G27, Single NOR 3in Gate, Low-Voltage CMOS
+D Single NOR 3in Gate, Low-Voltage CMOS
 K Single Gate NOR 3in LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G29
-D 74LVC1G29, 2 of 3 Decoder, Low-Voltage CMOS
+D 2 of 3 Decoder, Low-Voltage CMOS
 K Single Decoder LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G3157
-D 74LVC1G3157, SPDT Analog Swich, Low-Voltage CMOS
+D SPDT Analog Swich, Low-Voltage CMOS
 K SPDT Analog Switch CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G32
-D 74LVC1G32, Single OR Gate, Low-Voltage CMOS
+D Single OR Gate, Low-Voltage CMOS
 K Single Gate OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G3208
-D 74LVC1G3208, Single OR-AND Gate, Low-Voltage CMOS
+D Single OR-AND Gate, Low-Voltage CMOS
 K Single Gate OR-AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G332
-D 74LVC1G332, Single OR 3in Gate, Low-Voltage CMOS
+D Single OR 3in Gate, Low-Voltage CMOS
 K Single Gate OR 3in LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G34
-D 74LVC1G34, Single Buffef Gate, Low-Voltage CMOS
+D Single Buffef Gate, Low-Voltage CMOS
 K Single Gate Buff LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G373
-D 74LVC1G373, Single D Latch, Low-Voltage CMOS
+D Single D Latch, Low-Voltage CMOS
 K Single D Latch CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G374
-D 74LVC1G374, Single D Flip-Flop Tri-State Output, Low-Voltage CMOS
+D Single D Flip-Flop Tri-State Output, Low-Voltage CMOS
 K Single D Flip-Flop Tri-State CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G38
-D 74LVC1G38, Single NAND Gate Open Drain, Low-Voltage CMOS
+D Single NAND Gate Open Drain, Low-Voltage CMOS
 K Single Gate NAND Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G386
-D 74LVC1G386, Single EX-OR 3in Gate, Low-Voltage CMOS
+D Single EX-OR 3in Gate, Low-Voltage CMOS
 K Single Gate EX-OR 3in LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G57
-D 74LVC1G57, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G58
-D 74LVC1G58, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G66
-D 74LVC1G66, Single Analog Switch
+D Single Analog Switch
 K Single Analog Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G79
-D 74LVC1G79, Single D Flip-Flop, Low-Voltage CMOS
+D Single D Flip-Flop, Low-Voltage CMOS
 K Single D Flip-Flop D CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G80
-D 74LVC1G80, Single D Flip-Flop Iverted Output, Low-Voltage CMOS
+D Single D Flip-Flop Iverted Output, Low-Voltage CMOS
 K Single D Flip-Flop CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G86
-D 74LVC1G86, Single EX-OR Gate, Low-Voltage CMOS
+D Single EX-OR Gate, Low-Voltage CMOS
 K Single Gate EX-OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G97
-D 74LVC1G97, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G98
-D 74LVC1G98, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC1G99
-D 74LVC1G99, Configurable Multi-Function Single Gate, Low-Voltage CMOS
+D Configurable Multi-Function Single Gate, Low-Voltage CMOS
 K Configurable Single Gate LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -757,109 +757,109 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G00
-D 74LVC2G00, Dual NAND Gate, Low-Voltage CMOS
+D Dual NAND Gate, Low-Voltage CMOS
 K Dual Gate NAND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G02
-D 74LVC2G02, Dual NOR Gate, Low-Voltage CMOS
+D Dual NOR Gate, Low-Voltage CMOS
 K Dual Gate NOR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G04
-D 74LVC2G04, Dual NOT Gate, Low-Voltage CMOS
+D Dual NOT Gate, Low-Voltage CMOS
 K Dual Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G06
-D 74LVC2G06, Dual NOT Gate w/ Open Drain, Low-Voltage CMOS
+D Dual NOT Gate w/ Open Drain, Low-Voltage CMOS
 K Dual Gate NOT Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G07
-D 74LVC2G07, Dual Buffer w/ Open Drain, Low-Voltage CMOS
+D Dual Buffer w/ Open Drain, Low-Voltage CMOS
 K Dual Gate Buffer Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G08
-D 74LVC2G08, Dual AND Gate, Low-Voltage CMOS
+D Dual AND Gate, Low-Voltage CMOS
 K Dual Gate AND LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G125
-D 74LVC2G125, Dual Buffer Tri-State, Low-Voltage CMOS
+D Dual Buffer Tri-State, Low-Voltage CMOS
 K Dual Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G126
-D 74LVC2G126, Dual Buffer Tri-State, Low-Voltage CMOS
+D Dual Buffer Tri-State, Low-Voltage CMOS
 K Dual Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G14
-D 74LVC2G14, Dual NOT Gate Schmidt Triggered, Low-Voltage CMOS
+D Dual NOT Gate Schmidt Triggered, Low-Voltage CMOS
 K Dual Gate NOT Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G157
-D 74LVC2G157, Single 2 to 1 Multiplexer, Low-Voltage CMOS
+D Single 2 to 1 Multiplexer, Low-Voltage CMOS
 K Single Mux CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G17
-D 74LVC2G17, Dual Buffer Schmidt Triggered, Low-Voltage CMOS
+D Dual Buffer Schmidt Triggered, Low-Voltage CMOS
 K Dual Buffer Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G240
-D 74LVC2G240, Dual Inverter Buffer Tri-State, Low-Voltage CMOS
+D Dual Inverter Buffer Tri-State, Low-Voltage CMOS
 K Dual Inv Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G241
-D 74LVC2G241, Dual Buffer Tri-State, Low-Voltage CMOS
+D Dual Buffer Tri-State, Low-Voltage CMOS
 K Dual Buff Tri-State LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G32
-D 74LVC2G32, Dual OR Gate, Low-Voltage CMOS
+D Dual OR Gate, Low-Voltage CMOS
 K Dual Gate OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G34
-D 74LVC2G34, Dual Buffer, Low-Voltage CMOS
+D Dual Buffer, Low-Voltage CMOS
 K Dual Buffer LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G38
-D 74LVC2G38, Dual NAND Gate w/ Open Drain, Low-Voltage CMOS
+D Dual NAND Gate w/ Open Drain, Low-Voltage CMOS
 K Dual Gate NAND Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G53
-D 74LVC2G53, 1 to 2 Analog Swich Mux/Demux, Low-Voltage CMOS
+D 1 to 2 Analog Swich Mux/Demux, Low-Voltage CMOS
 K Analog Switch 1 to 2 CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G66
-D 74LVC2G66, Dual Analog Switch
+D Dual Analog Switch
 K Dual Analog Switch
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -871,19 +871,19 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G79
-D 74LVC2G79, Dual D Flip-Flop, Low-Voltage CMOS
+D Dual D Flip-Flop, Low-Voltage CMOS
 K Dual D Flip-Flop D CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G80
-D 74LVC2G80, Dual D Flip-Flop w/ Negative Output, Low-Voltage CMOS
+D Dual D Flip-Flop w/ Negative Output, Low-Voltage CMOS
 K Dual D Flip-Flop Negative CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC2G86
-D 74LVC2G86, Dual EX-OR Gate, Low-Voltage CMOS
+D Dual EX-OR Gate, Low-Voltage CMOS
 K Dual Gate EX-OR LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
@@ -895,37 +895,37 @@ F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC3G04
-D 74LVC3G04, Triple NOT Gate, Low-Voltage CMOS
+D Triple NOT Gate, Low-Voltage CMOS
 K Triple Gate NOT LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC3G06
-D 74LVC3G06, Triple NOT Gate w/ Open Drain, Low-Voltage CMOS
+D Triple NOT Gate w/ Open Drain, Low-Voltage CMOS
 K Triple Gate NOT Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC3G07
-D 74LVC3G07, Triple Buffer w/ Open Drain, Low-Voltage CMOS
+D Triple Buffer w/ Open Drain, Low-Voltage CMOS
 K Triple Buff Open Drain LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC3G14
-D 74LVC3G14, Triple NOT Gate Schmidt, Low-Voltage CMOS
+D Triple NOT Gate Schmidt, Low-Voltage CMOS
 K Triple NOT Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC3G17
-D 74LVC3G17, Triple Buffer Schmidt, Low-Voltage CMOS
+D Triple Buffer Schmidt, Low-Voltage CMOS
 K Triple Buf Schmidt LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
 #
 $CMP 74LVC3G34
-D 74LVC3G34, Triple Buffer, Low-Voltage CMOS
+D Triple Buffer, Low-Voltage CMOS
 K Triple Buf LVC CMOS
 F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
 $ENDCMP
diff --git a/library/Lattice.dcm b/library/Lattice.dcm
index 6fdb93dd..b76e6a46 100644
--- a/library/Lattice.dcm
+++ b/library/Lattice.dcm
@@ -1,23 +1,23 @@
-EESchema-DOCLIB  Version 2.0
-#
-$CMP GAL16V8
-D GAL16V8, Programmable Logic Array, DIP-20/SOIC-20/PLCC-20
-K GAL PLD 16V8
-$ENDCMP
-#
-$CMP PAL16L8
-D PAL16L8, Programmable Logic Array, DIP-20
-K PAL PLD 16L8
-$ENDCMP
-#
-$CMP PAL20L8
-D PAL20L8, Programmable Logic Array, DIP-24
-K PAL PLD 20L8
-$ENDCMP
-#
-$CMP PAL20RS10
-D PAL20RS10, Programmable Logic Array, DIP-24 (Narrow)
-K PAL PLD 20RS10
-$ENDCMP
-#
-#End Doc Library
+EESchema-DOCLIB  Version 2.0
+#
+$CMP GAL16V8
+D Programmable Logic Array, DIP-20/SOIC-20/PLCC-20
+K GAL PLD 16V8
+$ENDCMP
+#
+$CMP PAL16L8
+D Programmable Logic Array, DIP-20
+K PAL PLD 16L8
+$ENDCMP
+#
+$CMP PAL20L8
+D Programmable Logic Array, DIP-24
+K PAL PLD 20L8
+$ENDCMP
+#
+$CMP PAL20RS10
+D Programmable Logic Array, DIP-24 (Narrow)
+K PAL PLD 20RS10
+$ENDCMP
+#
+#End Doc Library
diff --git a/library/Xicor.dcm b/library/Xicor.dcm
index 38eeb10c..6c8a95da 100644
--- a/library/Xicor.dcm
+++ b/library/Xicor.dcm
@@ -1,17 +1,17 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP X9118
-D X9118, 100k Digital Potentiometer, 1024 steps, TSSOP-14
+D 100k Digital Potentiometer, 1024 steps, TSSOP-14
 F http://www.intersil.com/content/dam/Intersil/documents/x911/x9118.pdf
 $ENDCMP
 #
 $CMP X9250
-D X9250, Quad 100k Digital Potentiometer, 256 steps, TSSOP-24/SOIC-24
+D Quad 100k Digital Potentiometer, 256 steps, TSSOP-24/SOIC-24
 F https://www.intersil.com/content/dam/Intersil/documents/x925/x9250.pdf
 $ENDCMP
 #
 $CMP X9258
-D X9258, Quad 50k Digital Potentiometer, 256 steps, TSSOP-24/SOIC-24
+D Quad 50k Digital Potentiometer, 256 steps, TSSOP-24/SOIC-24
 F http://www.intersil.com/content/dam/intersil/documents/x925/x9258.pdf
 $ENDCMP
 #
diff --git a/library/Zilog.dcm b/library/Zilog.dcm
index efce7925..4ac77cc0 100644
--- a/library/Zilog.dcm
+++ b/library/Zilog.dcm
@@ -1,14 +1,14 @@
-EESchema-DOCLIB  Version 2.0
-#
-$CMP Z80CPU
-D Z80 CPU, 8-bit General Purpose Microprocessor, DIP-40
-K Z80 CPU uP
-F www.zilog.com/manage_directlink.php?filepath=docs/z80/um0080
-$ENDCMP
-#
-$CMP Z8530
-D Z8530, SCC Serial Communication Controller, DIP-40
-K SCC Serial Communication
-$ENDCMP
-#
-#End Doc Library
+EESchema-DOCLIB  Version 2.0
+#
+$CMP Z80CPU
+D 8-bit General Purpose Microprocessor, DIP-40
+K Z80 CPU uP
+F www.zilog.com/manage_directlink.php?filepath=docs/z80/um0080
+$ENDCMP
+#
+$CMP Z8530
+D SCC Serial Communication Controller, DIP-40
+K SCC Serial Communication
+$ENDCMP
+#
+#End Doc Library
diff --git a/library/ac-dc.dcm b/library/ac-dc.dcm
index 3e6388a8..65a197f2 100644
--- a/library/ac-dc.dcm
+++ b/library/ac-dc.dcm
@@ -1,67 +1,67 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP FSDH321
-D FSDH321, 17W SMPS Controller, 100kHz, AC-DC, PDIP-8
+D 17W SMPS Controller, 100kHz, AC-DC, PDIP-8
 K SMPS Controller with MOSFET 17W AC-DC
 F www.fairchildsemi.com/ds/FS/FSDH321.pdf
 $ENDCMP
 #
 $CMP FSDH321L
-D FSDH321L, 17W SMPS Controller, 100kHz, AC-DC, SMD-8
+D 17W SMPS Controller, 100kHz, AC-DC, SMD-8
 K SMPS Controller with MOSFET 17W AC-DC
 F www.fairchildsemi.com/ds/FS/FSDH321.pdf
 $ENDCMP
 #
 $CMP FSDL321
-D FSDL321, 17W SMPS Controller, 50kHz, AC-DC, PDIP-8
+D 17W SMPS Controller, 50kHz, AC-DC, PDIP-8
 K SMPS Controller with MOSFET 17W AC-DC
 F www.fairchildsemi.com/ds/FS/FSDH321.pdf
 $ENDCMP
 #
 $CMP FSDL321L
-D FSDL321L, 17W SMPS Controller, 50kHz, AC-DC, SMD-8
+D 17W SMPS Controller, 50kHz, AC-DC, SMD-8
 K SMPS Controller with MOSFET 17W AC-DC
 F www.fairchildsemi.com/ds/FS/FSDH321.pdf
 $ENDCMP
 #
 $CMP FSL136MRT
-D FSL136MRT, 67kHz SMPS Controller w/ Soft Start, max. 50W AC-DC, TO-220F-6L
+D 67kHz SMPS Controller w/ Soft Start, max. 50W AC-DC, TO-220F-6L
 K SMPS Controller 50W AC-DC
 F http://www.fairchildsemi.com/ds/FS/FSL136MRT.pdf
 $ENDCMP
 #
 $CMP FSQ0565RQLDTU
-D FSQ0565RQLDTU, 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L (Formed)
+D 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L (Formed)
 K Quasi Resonant SMPS Controller 80W AC-DC
 F www.fairchildsemi.com/ds/FS/FSQ0565RQ.pdf‎
 $ENDCMP
 #
 $CMP FSQ0565RQWDTU
-D FSQ0565RQWDTU, 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L
+D 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L
 K Quasi Resonant SMPS Controller 80W AC-DC
 F www.fairchildsemi.com/ds/FS/FSQ0565RQ.pdf‎
 $ENDCMP
 #
 $CMP FSQ0565RSLDTU
-D FSQ0565RSLDTU, 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L (Formed)
+D 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L (Formed)
 K Quasi Resonant SMPS Controller 80W AC-DC
 F www.fairchildsemi.com/ds/FS/FSQ0565RQ.pdf‎
 $ENDCMP
 #
 $CMP FSQ0565RSWDTU
-D FSQ0565RSWDTU, 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L
+D 67kHz Quasi Resonant SMPS Controller w/ Soft Start, max. 80W AC-DC, TO-220F-6L
 K Quasi Resonant SMPS Controller 80W AC-DC
 F www.fairchildsemi.com/ds/FS/FSQ0565RQ.pdf‎
 $ENDCMP
 #
 $CMP KA5H02659RN
-D KA5H02659RN, 100kHz SMPS Controller, AC-DC, PDIP-8
+D 100kHz SMPS Controller, AC-DC, PDIP-8
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5H0265RCTU
-D KA5H0265RCTU, 100kHz SMPS Controller w/ Soft Start, AC-DC, TO-220F-5L
+D 100kHz SMPS Controller w/ Soft Start, AC-DC, TO-220F-5L
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
@@ -73,49 +73,49 @@ F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5H0280RTU
-D KA5H0280RTU, 100kHz SMPS Controller, AC-DC, TO-220F-4L
+D 100kHz SMPS Controller, AC-DC, TO-220F-4L
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5H0280RYDTU
-D KA5H0280RYDTU, 100kHz SMPS Controller, AC-DC, TO-220F-4L(Forming)
+D 100kHz SMPS Controller, AC-DC, TO-220F-4L(Forming)
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5L0265RTU
-D KA5L0265RTU, 50kHz SMPS Controller, AC-DC, TO-220F-4L
+D 50kHz SMPS Controller, AC-DC, TO-220F-4L
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5L0265RYDTU
-D KA5L0265RYDTU, 50kHz SMPS Controller, AC-DC, TO-220F-4L(Forming)
+D 50kHz SMPS Controller, AC-DC, TO-220F-4L(Forming)
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5M02659RN
-D KA5M02659RN, 67kHz SMPS Controller, AC-DC, PDIP-8
+D 67kHz SMPS Controller, AC-DC, PDIP-8
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5M0265RTU
-D KA5M0265RTU, 67kHz SMPS Controller, AC-DC, TO-220F-4L
+D 67kHz SMPS Controller, AC-DC, TO-220F-4L
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5M0265RYDTU
-D KA5M0265RYDTU, 67kHz SMPS Controller, AC-DC, TO-220F-4L(Forming)
+D 67kHz SMPS Controller, AC-DC, TO-220F-4L(Forming)
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP KA5M0280RTU
-D KA5M0280RTU, 67kHz SMPS Controller, AC-DC, TO-220F-4L
+D 67kHz SMPS Controller, AC-DC, TO-220F-4L
 K SMPS Controller AC-DC
 F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
@@ -127,13 +127,13 @@ F http://www.fairchildsemi.com/ds/AR/AR3522X.pdf
 $ENDCMP
 #
 $CMP NCP1200P
-D NCP1200P, SMPS Controller, AC-DC, PDIP-8
+D SMPS Controller, AC-DC, PDIP-8
 K SMPS Controller AC-DC
 F http://www.onsemi.com/pub_link/Collateral/NCP1200-D.PDF
 $ENDCMP
 #
 $CMP NCP1200S
-D NCP1200S, SMPS Controller, AC-DC, SO-8
+D SMPS Controller, AC-DC, SO-8
 K SMPS Controller AC-DC
 F http://www.onsemi.com/pub_link/Collateral/NCP1200-D.PDF
 $ENDCMP
@@ -144,25 +144,25 @@ K SMPS PWM Controller
 $ENDCMP
 #
 $CMP VIPER22ADIP-E
-D VIPer22ADIP-E, 12W SMPS Controller, AC-DC, PDIP-8
+D 12W SMPS Controller, AC-DC, PDIP-8
 K SMPS Controller with MOSFET 12W AC-DC
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00087939.pdf
 $ENDCMP
 #
 $CMP VIPER22AS-E
-D VIPer22AS-E, 12W SMPS Controller, AC-DC, SO-8
+D 12W SMPS Controller, AC-DC, SO-8
 K SMPS Controller with MOSFET 12W AC-DC
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00087939.pdf
 $ENDCMP
 #
 $CMP VIPer25HN
-D VIPer25HN, 12W SMPS Controller, AC-DC, PDIP-7
+D 12W SMPS Controller, AC-DC, PDIP-7
 K SMPS Controller with MOSFET 12W AC-DC
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00231127.pdf
 $ENDCMP
 #
 $CMP VIPer25LN
-D VIPer25LN, 12W SMPS Controller, AC-DC, PDIP-7
+D 12W SMPS Controller, AC-DC, PDIP-7
 K SMPS Controller with MOSFET 12W AC-DC
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00231127.pdf
 $ENDCMP
diff --git a/library/actel.dcm b/library/actel.dcm
index 44d183d5..bc1c1335 100644
--- a/library/actel.dcm
+++ b/library/actel.dcm
@@ -1,55 +1,55 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP A3P030-VQG100
-D A3P030-VQG100, Actel ProASIC3 Flash Family FPGAs, 256 MCLB, 100pin QFP100
+D Actel ProASIC3 Flash Family FPGAs, 256 MCLB, 100pin QFP100
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P060-VQG100
-D A3P060-VQG100, Actel ProASIC3 Flash Family FPGAs, 512 MCLB, 100pin QFP100
+D Actel ProASIC3 Flash Family FPGAs, 512 MCLB, 100pin QFP100
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P1000-PQG208
-D A3P1000-PQG208, Actel ProASIC3 Flash Family FPGAs, 1000k Gates, 208pin QFP
+D Actel ProASIC3 Flash Family FPGAs, 1000k Gates, 208pin QFP
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P125-PQG208
-D A3P125-PQG208, Actel ProASIC3 Flash Family FPGAs, 1024MCB, 208pin QFP
+D Actel ProASIC3 Flash Family FPGAs, 1024MCB, 208pin QFP
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P125-VQG100
-D A3P125-VQG100, Actel ProASIC3 Flash Family FPGAs, 1024 MCLB, 100pin QFP100
+D Actel ProASIC3 Flash Family FPGAs, 1024 MCLB, 100pin QFP100
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P250-PQG208
-D A3P250-PQG208, Actel ProASIC3 Flash Family FPGAs, 2048MCB, 208pin QFP
+D Actel ProASIC3 Flash Family FPGAs, 2048MCB, 208pin QFP
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P250-VQG100
-D A3P250-VQG100, Actel ProASIC3 Flash Family FPGAs, 2048 MCLB, 100pin QFP100
+D Actel ProASIC3 Flash Family FPGAs, 2048 MCLB, 100pin QFP100
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P400-PQG208
-D A3P400-PQG208, Actel ProASIC3 Flash Family FPGAs, 400k Gates, 208pin QFP
+D Actel ProASIC3 Flash Family FPGAs, 400k Gates, 208pin QFP
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
 #
 $CMP A3P600-PQG208
-D A3P600-PQG208, Actel ProASIC3 Flash Family FPGAs, 600k Gates, 208pin QFP
+D Actel ProASIC3 Flash Family FPGAs, 600k Gates, 208pin QFP
 K ProASIC3 ACTEL FLASH
 F http://www.microsemi.com/document-portal/doc_download/130704-proasic3-flash-family-fpgas-datasheet
 $ENDCMP
@@ -75,31 +75,31 @@ K JTAG IDC10 Male Connector
 $ENDCMP
 #
 $CMP EX128-TQ100
-D eX128-TQ100, Actel eX FPGA Family, 100pin QFP
+D Actel eX FPGA Family, 100pin QFP
 K Actel FPGA eX eX128
 F http://www.microsemi.com/document-portal/doc_download/130687-ex-datasheet
 $ENDCMP
 #
 $CMP EX128-TQ64
-D eX128-TQ64, Actel eX Family FPGA, 64pin QFP
+D Actel eX Family FPGA, 64pin QFP
 K Actel FPGA eX eX128
 F http://www.microsemi.com/document-portal/doc_download/130687-ex-datasheet
 $ENDCMP
 #
 $CMP EX256-TQ100
-D eX256-TQ100, Actel eX FPGA Family, 100pin QFP
+D Actel eX FPGA Family, 100pin QFP
 K Actel FPGA eX eX256
 F http://www.microsemi.com/document-portal/doc_download/130687-ex-datasheet
 $ENDCMP
 #
 $CMP EX64-TQ100
-D eX64-TQ100, Actel eX Family FPGA, 100pin QFP
+D Actel eX Family FPGA, 100pin QFP
 K Actel FPGA eX eX64
 F http://www.microsemi.com/document-portal/doc_download/130687-ex-datasheet
 $ENDCMP
 #
 $CMP EX64-TQ64
-D eX64-TQ64, Actel eX Family FPGA, 64pin QFP
+D Actel eX Family FPGA, 64pin QFP
 K Actel FPGA eX eX64
 F http://www.microsemi.com/document-portal/doc_download/130687-ex-datasheet
 $ENDCMP
diff --git a/library/adc-dac.dcm b/library/adc-dac.dcm
index d152afb1..cefb54dc 100644
--- a/library/adc-dac.dcm
+++ b/library/adc-dac.dcm
@@ -1,336 +1,336 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP AD390JD
-D AD390JD, Quad 12bit DAC, 4LSB Gain Error, DH-28
+D Quad 12bit DAC, 4LSB Gain Error, DH-28
 K Quad DAC 12bit
 F http://www.analog.com/static/imported-files/data_sheets/AD390MIL.pdf
 $ENDCMP
 #
 $CMP AD390KD
-D AD390KD, Quad 12bit DAC, 2LSB Gain Error, DH-28
+D Quad 12bit DAC, 2LSB Gain Error, DH-28
 K Quad DAC 12bit
 F http://www.analog.com/static/imported-files/data_sheets/AD390MIL.pdf
 $ENDCMP
 #
 $CMP AD558JN
-D AD558JN, Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, DIP-16
+D Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, DIP-16
 K 8bit DAC Reference Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD558.pdf
 $ENDCMP
 #
 $CMP AD558JP
-D AD558JP, Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, PLCC-20
+D Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, PLCC-20
 K 8bit DAC Reference Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD558.pdf
 $ENDCMP
 #
 $CMP AD558KN
-D AD558KN, Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, DIP-16
+D Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, DIP-16
 K 8bit DAC Reference Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD558.pdf
 $ENDCMP
 #
 $CMP AD558KP
-D AD558KP, Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, PLCC-20
+D Single 8-bit DAC, Internal Reference, Output Amp, Single Supply, PLCC-20
 K 8bit DAC Reference Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD558.pdf
 $ENDCMP
 #
 $CMP AD7224KN
-D AD7224KN, 8bit DAC, Dual or Single Supply, DIP-18
+D 8bit DAC, Dual or Single Supply, DIP-18
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7224KP
-D AD7224KP, 8bit DAC, Dual or Single Supply, PLCC-20
+D 8bit DAC, Dual or Single Supply, PLCC-20
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7224KR-1
-D AD7224KR-1, 8bit DAC, Dual or Single Supply, SOIC-20
+D 8bit DAC, Dual or Single Supply, SOIC-20
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7224KR-18
-D AD7224KR-18, 8bit DAC, Dual or Single Supply, SOIC-18
+D 8bit DAC, Dual or Single Supply, SOIC-18
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7224LN
-D AD7224LN, 8bit DAC, Dual or Single Supply, DIP-18
+D 8bit DAC, Dual or Single Supply, DIP-18
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7224LP
-D AD7224LP, 8bit DAC, Dual or Single Supply, PLCC-20
+D 8bit DAC, Dual or Single Supply, PLCC-20
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7224LR-1
-D AD7224LR-1, 8bit DAC, Dual or Single Supply, SOIC-20
+D 8bit DAC, Dual or Single Supply, SOIC-20
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7224LR-18
-D AD7224LR-18, 8bit DAC, Dual or Single Supply, SOIC-18
+D 8bit DAC, Dual or Single Supply, SOIC-18
 K 8bit DAC Dual Single Supply
 F http://www.analog.com/static/imported-files/data_sheets/AD7224.pdf
 $ENDCMP
 #
 $CMP AD7225BRS
-D AD7225BRS, Quad 8bit DAC, Separate Reference Voltage, SSOP-24
+D Quad 8bit DAC, Separate Reference Voltage, SSOP-24
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7225CRS
-D AD7225CRS, Quad 8bit DAC, Separate Reference Voltage, SSOP-24
+D Quad 8bit DAC, Separate Reference Voltage, SSOP-24
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7225KN
-D AD7225KN, Quad 8bit DAC, Separate Reference Voltage, PDIP-24
+D Quad 8bit DAC, Separate Reference Voltage, PDIP-24
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7225KP
-D AD7225KP, Quad 8bit DAC, Separate Reference Voltage, PLCC-28
+D Quad 8bit DAC, Separate Reference Voltage, PLCC-28
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7225KR
-D AD7225KR, Quad 8bit DAC, Separate Reference Voltage, SOIC-24
+D Quad 8bit DAC, Separate Reference Voltage, SOIC-24
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7225LN
-D AD7225LN, Quad 8bit DAC, Separate Reference Voltage, PDIP-24
+D Quad 8bit DAC, Separate Reference Voltage, PDIP-24
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7225LP
-D AD7225LP, Quad 8bit DAC, Separate Reference Voltage, PLCC-28
+D Quad 8bit DAC, Separate Reference Voltage, PLCC-28
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7225LR
-D AD7225LR, Quad 8bit DAC, Separate Reference Voltage, SO-24
+D Quad 8bit DAC, Separate Reference Voltage, SO-24
 K 8bit DAC 4CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7225.pdf
 $ENDCMP
 #
 $CMP AD7226BRSZ
-D AD7226BRSZ, Quad 8bit DAC, 4 Channel, Single Reference Voltage, SSOP-20
+D Quad 8bit DAC, 4 Channel, Single Reference Voltage, SSOP-20
 K 4CH DAC 8bit
 F http://www.analog.com/static/imported-files/data_sheets/AD7226.pdf
 $ENDCMP
 #
 $CMP AD7226KN
-D AD7226KN, Quad 8bit DAC, 4 Channel, Single Reference Voltage, DIP-20
+D Quad 8bit DAC, 4 Channel, Single Reference Voltage, DIP-20
 K 4CH DAC 8bit
 F http://www.analog.com/static/imported-files/data_sheets/AD7226.pdf
 $ENDCMP
 #
 $CMP AD7226KP
-D AD7226KP, Quad 8bit DAC, 4 Channel, Single Reference Voltage, PLCC-20
+D Quad 8bit DAC, 4 Channel, Single Reference Voltage, PLCC-20
 K 4CH DAC 8bit
 F http://www.analog.com/static/imported-files/data_sheets/AD7226.pdf
 $ENDCMP
 #
 $CMP AD7226KR
-D AD7226KR, Quad 8bit DAC, 4 Channel, Single Reference Voltage, SOIC-20
+D Quad 8bit DAC, 4 Channel, Single Reference Voltage, SOIC-20
 K 4CH DAC 8bit
 F http://www.analog.com/static/imported-files/data_sheets/AD7226.pdf
 $ENDCMP
 #
 $CMP AD7228ABN
-D AD7228ABN, 8bit DAC 8 Channel, Single Reference, DIP-24
+D 8bit DAC 8 Channel, Single Reference, DIP-24
 K 8bit DAC 8CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7228.pdf
 $ENDCMP
 #
 $CMP AD7228ABP
-D AD7228ABP, 8bit DAC 8 Channel, Single Reference, PLCC-28
+D 8bit DAC 8 Channel, Single Reference, PLCC-28
 K 8bit DAC 8CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7228.pdf
 $ENDCMP
 #
 $CMP AD7228ABR
-D AD7228ABR, 8bit DAC 8 Channel, Single Reference, SOIC-24
+D 8bit DAC 8 Channel, Single Reference, SOIC-24
 K 8bit DAC 8CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7228.pdf
 $ENDCMP
 #
 $CMP AD7228ACN
-D AD7228ACN, 8bit DAC 8 Channel, Single Reference, DIP-24
+D 8bit DAC 8 Channel, Single Reference, DIP-24
 K 8bit DAC 8CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7228.pdf
 $ENDCMP
 #
 $CMP AD7228ACP
-D AD7228ACP, 8bit DAC 8 Channel, Single Reference, PLCC-28
+D 8bit DAC 8 Channel, Single Reference, PLCC-28
 K 8bit DAC 8CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7228.pdf
 $ENDCMP
 #
 $CMP AD7228ACR
-D AD7228ACR, 8bit DAC 8 Channel, Single Reference, SOIC-24
+D 8bit DAC 8 Channel, Single Reference, SOIC-24
 K 8bit DAC 8CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7228.pdf
 $ENDCMP
 #
 $CMP AD7533JN
-D AD7533JN, 10bit Multiplying DAC, 1 Channel, DIP-16
+D 10bit Multiplying DAC, 1 Channel, DIP-16
 K 10bit DAC 1CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7533.pdf
 $ENDCMP
 #
 $CMP AD7533JP
-D AD7533JP, 10bit Multiplying DAC, 1 Channel, PLCC-20
+D 10bit Multiplying DAC, 1 Channel, PLCC-20
 K 10bit DAC 1CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7533.pdf
 $ENDCMP
 #
 $CMP AD7533KN
-D AD7533KN, 10bit Multiplying DAC, 1 Channel, DIP-16
+D 10bit Multiplying DAC, 1 Channel, DIP-16
 K 10bit DAC 1CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7533.pdf
 $ENDCMP
 #
 $CMP AD7533KP
-D AD7533KP, 10bit Multiplying DAC, 1 Channel, PLCC-20
+D 10bit Multiplying DAC, 1 Channel, PLCC-20
 K 10bit DAC 1CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7533.pdf
 $ENDCMP
 #
 $CMP AD7533KR
-D AD7533KR, 10bit Multiplying DAC, 1 Channel, SOIC-16
+D 10bit Multiplying DAC, 1 Channel, SOIC-16
 K 10bit DAC 1CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7533.pdf
 $ENDCMP
 #
 $CMP AD7533LN
-D AD7533LN, 10bit Multiplying DAC, 1 Channel, DIP-16
+D 10bit Multiplying DAC, 1 Channel, DIP-16
 K 10bit DAC 1CH
 F http://www.analog.com/static/imported-files/data_sheets/AD7533.pdf
 $ENDCMP
 #
 $CMP AD775
-D AD775, DA Converter 8 bits - 20MHz, PDIP/SOIC-24
+D DA Converter 8 bits - 20MHz, PDIP/SOIC-24
 K DAC CNA
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD775.pdf
 $ENDCMP
 #
 $CMP AD7819
-D AD7819, Analog to Digital 8 bits converter, PDIP/SOIC/TSSOP-16
+D Analog to Digital 8 bits converter, PDIP/SOIC/TSSOP-16
 K CAD
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD7819.pdf
 $ENDCMP
 #
 $CMP AD9280ARS
-D AD9280ARS, Video ADC (32 Mhz), SSOP-28
+D Video ADC (32 Mhz), SSOP-28
 K ADC CAN VIDEO
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD9280.pdf
 $ENDCMP
 #
 $CMP AD9283
-D AD9283, ADC 50MHz 8 bits, SSOP-20
+D ADC 50MHz 8 bits, SSOP-20
 K ADC 
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD9283.pdf
 $ENDCMP
 #
 $CMP AD9708AR
-D AD9708AR, Video DAC (32 MHz), SOIC/TSSOP-28
+D Video DAC (32 MHz), SOIC/TSSOP-28
 K DAC CNA VIDEO
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD9708.pdf
 $ENDCMP
 #
 $CMP ADC0800
-D ADC0800, Analog to Digital 8 bits converter, DIP-18 (Hermetic)
+D Analog to Digital 8 bits converter, DIP-18 (Hermetic)
 K CAD
 F http://www.ti.com/lit/ds/snas562/snas562.pdf
 $ENDCMP
 #
 $CMP ADC08060
-D ADC08060, Fast ADC  (20 .. 60 Mhz), TSSOP-24
+D Fast ADC  (20 .. 60 Mhz), TSSOP-24
 K ADC CAN VIDEO
 F http://www.ti.com/lit/ds/symlink/adc08060.pdf
 $ENDCMP
 #
 $CMP ADC0832
-D ADC0832, 2 inputs AD Converter (serial output), 
+D 2 inputs AD Converter (serial output), 
 K ADC CAN
 F http://www.ti.com/lit/ds/symlink/adc0831-n.pdf
 $ENDCMP
 #
 $CMP ADC1173
-D ADC1173, Fast ADC  (15 Mhz), TSSOP-24
+D Fast ADC  (15 Mhz), TSSOP-24
 K ADC CAN VIDEO
 F http://www.ti.com/lit/ds/symlink/adc1173.pdf
 $ENDCMP
 #
 $CMP ADS1232IPW
-D ADS1232, Single Bridge 24bit ADC for Sensors, TSSOP-24
+D Single Bridge 24bit ADC for Sensors, TSSOP-24
 K ADC 24bit Sensors Dual Channel
 F http://www.ti.com/lit/ds/symlink/ads1232.pdf
 $ENDCMP
 #
 $CMP ADS1234IPW
-D ADS1234, Dual Bridge 24bit ADC for Sensors, TSSOP-28
+D Dual Bridge 24bit ADC for Sensors, TSSOP-28
 K ADC 24bit Sensors Quad Channel
 F http://www.ti.com/lit/ds/symlink/ads1232.pdf
 $ENDCMP
 #
 $CMP CA3300
-D CA3300, Convertisseur A->D 6 bits rapide
+D Convertisseur A->D 6 bits rapide
 K ADC CAN
 $ENDCMP
 #
 $CMP DAC08
-D DAC08, DA Converter 8 bits
+D DA Converter 8 bits
 K DAC CNA
 F http://www.analog.com/media/en/technical-documentation/data-sheets/DAC08.pdf
 $ENDCMP
 #
 $CMP LTC1257
-D LTC1257, Single Supply 12-bit DAC with Internal Reference Voltage, SOIC-8
+D Single Supply 12-bit DAC with Internal Reference Voltage, SOIC-8
 K DAC 12-bit
 F http://cds.linear.com/docs/en/datasheet/1257fc.pdf
 $ENDCMP
 #
 $CMP LTC1406CGN
-D LTC1406CGN, ADC 8bit Low Power 20Msps, SSOP-24
+D ADC 8bit Low Power 20Msps, SSOP-24
 K Low Power ADC 8bit 20Msps
 F http://cds.linear.com/docs/en/datasheet/1406f.pdf
 $ENDCMP
 #
 $CMP LTC1406IGN
-D LTC1406IGN, ADC 8bit Low Power 20Msps, SSOP-24
+D ADC 8bit Low Power 20Msps, SSOP-24
 K Low Power ADC 8bit 20Msps
 F http://cds.linear.com/docs/en/datasheet/1406f.pdf
 $ENDCMP
 #
 $CMP LTC1594CS
-D LTC1594CS, Micropower 12-bit 4 Channel ADC, Serial IO, SOIC-16
+D Micropower 12-bit 4 Channel ADC, Serial IO, SOIC-16
 K 12bit ADC 4 Channel
 F http://cds.linear.com/docs/en/datasheet/15948fb.pdf
 $ENDCMP
 #
 $CMP LTC1594IS
-D LTC1594IS, Micropower 12-bit 4 Channel ADC, Serial IO, SO-16
+D Micropower 12-bit 4 Channel ADC, Serial IO, SO-16
 K 12bit ADC 4 Channel
 F http://cds.linear.com/docs/en/datasheet/15948fb.pdf
 $ENDCMP
@@ -342,31 +342,31 @@ F http://cds.linear.com/docs/en/datasheet/15948fb.pdf
 $ENDCMP
 #
 $CMP LTC1598IG
-D LTC1598IG, Micropower 12-bit 8 Channel ADC, Serial IO, SSOP-24
+D Micropower 12-bit 8 Channel ADC, Serial IO, SSOP-24
 K 12bit ADC 4 Channel
 F http://cds.linear.com/docs/en/datasheet/15948fb.pdf
 $ENDCMP
 #
 $CMP LTC1664CGN
-D LTC1664CGN, Quad Micropower 10-bit DAC, Standard, SSOP-16
+D Quad Micropower 10-bit DAC, Standard, SSOP-16
 K Quad DAC Micropower 10bit
 F http://cds.linear.com/docs/Datasheet/1664fa.pdf
 $ENDCMP
 #
 $CMP LTC1664CN
-D LTC1664CN, Quad Micropower 10-bit DAC, Standard, DIP-16
+D Quad Micropower 10-bit DAC, Standard, DIP-16
 K Quad DAC Micropower 10bit
 F http://cds.linear.com/docs/Datasheet/1664fa.pdf
 $ENDCMP
 #
 $CMP LTC1664IGN
-D LTC1664IGN, Quad Micropower 10-bit DAC, Industrial, SSOP-16
+D Quad Micropower 10-bit DAC, Industrial, SSOP-16
 K Quad DAC Micropower 10bit
 F http://cds.linear.com/docs/Datasheet/1664fa.pdf
 $ENDCMP
 #
 $CMP LTC1664IN
-D LTC1664IN, Quad Micropower 10-bit DAC, Industrial, DIP-16
+D Quad Micropower 10-bit DAC, Industrial, DIP-16
 K Quad DAC Micropower 10bit
 F http://cds.linear.com/docs/Datasheet/1664fa.pdf
 $ENDCMP
@@ -432,7 +432,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
 #
 $CMP MCP4921-E/P
-D MCP4921, Single 12-bit Digital to Analog Converter, SPI Interface, PDIP-8
+D Single 12-bit Digital to Analog Converter, SPI Interface, PDIP-8
 K Single DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
@@ -444,7 +444,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
 #
 $CMP MCP4922-E/P
-D MCP4922, Dual 12-bit Digital to Analog Converter, SPI Interface, PDIP-14
+D Dual 12-bit Digital to Analog Converter, SPI Interface, PDIP-14
 K Dual DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
@@ -462,13 +462,13 @@ F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
 #
 $CMP TDA8702
-D TDA8702, 8bit Video DAC (32 MHz), DIP-16
+D 8bit Video DAC (32 MHz), DIP-16
 K DAC CNA VIDEO
 F philips/tda8702.pdf
 $ENDCMP
 #
 $CMP TDA8702T
-D TDA8702T, 8bit Video DAC (32 MHz), SOIC-16
+D 8bit Video DAC (32 MHz), SOIC-16
 K DAC CNA VIDEO
 F philips/tda8702.pdf
 $ENDCMP
@@ -478,24 +478,24 @@ D TDC1408
 $ENDCMP
 #
 $CMP TLV5627CD
-D TLV5627, 4-Channel DAC, 8bit, w/ Power Down, SOIC-16
+D 4-Channel DAC, 8bit, w/ Power Down, SOIC-16
 K DAC 4CH 8bit
 F http://www.ti.com/lit/ds/symlink/tlv5627.pdf
 $ENDCMP
 #
 $CMP TLV5627CPW
-D TLV5627, 4-Channel DAC, 8bit, w/ Power Down, TSSOP-16
+D 4-Channel DAC, 8bit, w/ Power Down, TSSOP-16
 K DAC 4CH 8bit
 F http://www.ti.com/lit/ds/symlink/tlv5627.pdf
 $ENDCMP
 #
 $CMP UVC3100
-D UVC3100, High Speed 30MHz Flash 8-bit ADC 10MHz 10-bit DAC, For CCD Digitizers
+D High Speed 30MHz Flash 8-bit ADC 10MHz 10-bit DAC, For CCD Digitizers
 K 8bit ADC 10bit DAC CCD
 $ENDCMP
 #
 $CMP UVC3101
-D UVC3101, High Speed 30MHz Flash 8-bit ADC 10MHz 10-bit DAC, For CCD Digitizers
+D High Speed 30MHz Flash 8-bit ADC 10MHz 10-bit DAC, For CCD Digitizers
 K 8bit ADC 10bit DAC CCD
 $ENDCMP
 #
diff --git a/library/analog_devices.dcm b/library/analog_devices.dcm
index 404c6848..64dcdf7b 100644
--- a/library/analog_devices.dcm
+++ b/library/analog_devices.dcm
@@ -1,139 +1,139 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP AD623AN
-D AD623AN, Single Supply, Rail to Rail, Instumentation Amplifier, DIP-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, DIP-8
 K ad623 instumentation amplifier dip-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623ANZ
-D AD623ANZ, Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, DIP-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, DIP-8
 K ad623 instumentation amplifier dip-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623AR
-D AD623AR, Single Supply, Rail to Rail, Instumentation Amplifier, SOIC-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, SOIC-8
 K ad623 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623ARM
-D AD623ARM, Single Supply, Rail to Rail, Instumentation Amplifier, MSOP-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, MSOP-8
 K ad623 instumentation amplifier msop-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623ARMZ
-D AD623ARMZ, Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, MSOP-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, MSOP-8
 K ad623 instumentation amplifier msop-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623ARZ
-D AD623ARZ, Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, SOIC-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, SOIC-8
 K ad623 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623BN
-D AD623BN, Single Supply, Rail to Rail, Instumentation Amplifier, DIP-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, DIP-8
 K ad623 instumentation amplifier dip-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623BNZ
-D AD623BNZ, Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, DIP-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, DIP-8
 K ad623 instumentation amplifier dip-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623BR
-D AD623BR, Single Supply, Rail to Rail, Instumentation Amplifier, SOIC-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, SOIC-8
 K ad623 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD623BRZ
-D AD623BRZ, Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, SOIC-8
+D Single Supply, Rail to Rail, Instumentation Amplifier, RoHS, SOIC-8
 K ad623 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD623.pdf
 $ENDCMP
 #
 $CMP AD8236ARMZ
-D AD8236ARMZ Micropower Instumentation Amplifier with Zero Crossover Distortion, MSOP-8
+D Micropower Instumentation Amplifier with Zero Crossover Distortion, MSOP-8
 K ad8236 instumentation amplifier msop-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8236.pdf
 $ENDCMP
 #
 $CMP AD8421ARMZ
-D AD8421ARMZ Low Power,  Instumentation Amplifier, MSOP-8
+D Low Power,  Instumentation Amplifier, MSOP-8
 K ad8421 instumentation amplifier msop-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8421.pdf
 $ENDCMP
 #
 $CMP AD8421ARZ
-D AD8421ARZ Low Power, Instumentation Amplifier, SOIC-8
+D Low Power, Instumentation Amplifier, SOIC-8
 K ad8421 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8421.pdf
 $ENDCMP
 #
 $CMP AD8421BRMZ
-D AD8421BRMZ Low Power, Instumentation Amplifier, MSOP-8
+D Low Power, Instumentation Amplifier, MSOP-8
 K ad8421 instumentation amplifier msop-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8421.pdf
 $ENDCMP
 #
 $CMP AD8421BRZ
-D AD8421BRZ Low Power, Instumentation Amplifier, SOIC-8
+D Low Power, Instumentation Amplifier, SOIC-8
 K ad8421 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8421.pdf
 $ENDCMP
 #
 $CMP AD8422ARMZ
-D AD8422ARMZ Low Power, Rail to Rail, Instumentation Amplifier, MSOP-8
+D Low Power, Rail to Rail, Instumentation Amplifier, MSOP-8
 K ad8422 instumentation amplifier msop-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8422.pdf
 $ENDCMP
 #
 $CMP AD8422ARZ
-D AD8422ARZ Low Power, Rail to Rail, Instumentation Amplifier, SOIC-8
+D Low Power, Rail to Rail, Instumentation Amplifier, SOIC-8
 K ad8422 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8422.pdf
 $ENDCMP
 #
 $CMP AD8422BRMZ
-D AD8422BRMZ Low Power, Rail to Rail, Instumentation Amplifier, MSOP-8
+D Low Power, Rail to Rail, Instumentation Amplifier, MSOP-8
 K ad8422 instumentation amplifier msop-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8422.pdf
 $ENDCMP
 #
 $CMP AD8422BRZ
-D AD8422BRZ Low Power, Rail to Rail, Instumentation Amplifier, SOIC-8
+D Low Power, Rail to Rail, Instumentation Amplifier, SOIC-8
 K ad8422 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8422.pdf
 $ENDCMP
 #
 $CMP AD8429ARZ
-D AD8429ARZ Low Noise, Instumentation Amplifier, SOIC-8
+D Low Noise, Instumentation Amplifier, SOIC-8
 K ad8429 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8429.pdf
 $ENDCMP
 #
 $CMP AD8429BRZ
-D AD8429BRZ Low Noise, Instumentation Amplifier, SOIC-8
+D Low Noise, Instumentation Amplifier, SOIC-8
 K ad8429 instumentation amplifier soic-8
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD8429.pdf
 $ENDCMP
 #
 $CMP ADuM4160
-D ADuM4160 USB port isolator
+D USB port isolator
 K USB isolator 5kV
 F http://www.analog.com/media/en/technical-documentation/data-sheets/ADuM4160.pdf
 $ENDCMP
 #
 $CMP ADuM6000
-D ADuM6000 Isolated 5 kV DC-to-DC Converter
+D Isolated 5 kV DC-to-DC Converter
 K Isolated DC-to-DC Converter 5kV
 F http://www.analog.com/media/en/technical-documentation/data-sheets/ADuM6000.PDF
 $ENDCMP
diff --git a/library/atmel.dcm b/library/atmel.dcm
index 6ef0104c..d97fcb78 100644
--- a/library/atmel.dcm
+++ b/library/atmel.dcm
@@ -1,127 +1,127 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP AT89C2051-P
-D 89C2051, PDIP20, 2k Flash, 128B SRAM
+D PDIP20, 2k Flash, 128B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc0368.pdf
 $ENDCMP
 #
 $CMP AT89C2051-S
-D 89C2051, SO20, 2k Flash, 128B SRAM
+D SO20, 2k Flash, 128B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc0368.pdf
 $ENDCMP
 #
 $CMP AT89C4051-P
-D 89C4051, DIP20, 2k Flash, 128B SRAM
+D DIP20, 2k Flash, 128B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc1001.pdf
 $ENDCMP
 #
 $CMP AT89C4051-S
-D 89C4051, SO20, 2k Flash, 128B SRAM
+D SO20, 2k Flash, 128B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc1001.pdf
 $ENDCMP
 #
 $CMP AT89S2051-P
-D 89S2051, PDIP20, 2k Flash, 256B SRAM
+D PDIP20, 2k Flash, 256B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc3390.pdf
 $ENDCMP
 #
 $CMP AT89S2051-S
-D 89S2051, SO20, 2k Flash, 256B SRAM
+D SO20, 2k Flash, 256B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc3390.pdf
 $ENDCMP
 #
 $CMP AT89S4051-P
-D 89S4051, PDIP20, 4k Flash, 256B SRAM
+D PDIP20, 4k Flash, 256B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc3390.pdf
 $ENDCMP
 #
 $CMP AT89S4051-S
-D 89S4051, SO20, 4k Flash, 256B SRAM
+D SO20, 4k Flash, 256B SRAM
 K MCS-51 8bit Flash Microcontroller
 F http://www.atmel.com/Images/doc3390.pdf
 $ENDCMP
 #
 $CMP AT90CAN128-A
-D AT90CAN128-A, 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, TQFP64
+D 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, TQFP64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
 #
 $CMP AT90CAN128-M
-D AT90CAN128-M, 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, QFN64
+D 128k Flash, 4k SRAM, 4k EEPROM, JTAG, CAN, QFN64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
 #
 $CMP AT90CAN32-A
-D AT90CAN32-A, 32k Flash, 2k SRAM, 1k EEPROM, JTAG, CAN, TQFP64
+D 32k Flash, 2k SRAM, 1k EEPROM, JTAG, CAN, TQFP64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
 #
 $CMP AT90CAN32-M
-D AT90CAN32-M, 32k Flash, 2k SRAM, 1k EEPROM, JTAG, CAN, QFN64
+D 32k Flash, 2k SRAM, 1k EEPROM, JTAG, CAN, QFN64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
 #
 $CMP AT90CAN64-A
-D AT90CAN64-A, 64k Flash, 4k SRAM, 2k EEPROM, JTAG, CAN, TQFP64
+D 64k Flash, 4k SRAM, 2k EEPROM, JTAG, CAN, TQFP64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
 #
 $CMP AT90CAN64-M
-D AT90CAN64-M, 64k Flash, 4k SRAM, 2k EEPROM, JTAG, CAN, QFN64
+D 64k Flash, 4k SRAM, 2k EEPROM, JTAG, CAN, QFN64
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7679.pdf
 $ENDCMP
 #
 $CMP AT90PWM1-M
-D AT90PWM1, QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM
+D QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller LightingAVR PWM
 F http://www.atmel.com/Images/doc4378.pdf
 $ENDCMP
 #
 $CMP AT90PWM1-S
-D AT90PWM1, SO24, 8k Flash, 512B SRAM, 512B EEPROM
+D SO24, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller LightingAVR PWM
 F http://www.atmel.com/Images/doc4378.pdf
 $ENDCMP
 #
 $CMP AT90S1200-P
-D 90S1200, PDIP20, 1k Flash, No SRAM, 64B EEPROM
+D PDIP20, 1k Flash, No SRAM, 64B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0838.pdf
 $ENDCMP
 #
 $CMP AT90S1200-S
-D 90S1200, SO20, 1k Flash, No SRAM, 64B EEPROM
+D SO20, 1k Flash, No SRAM, 64B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0838.pdf
 $ENDCMP
 #
 $CMP AT90S1200-Y
-D 90S1200, SSOP20, 1k Flash, No SRAM, 64B EEPROM
+D SSOP20, 1k Flash, No SRAM, 64B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0838.pdf
 $ENDCMP
 #
 $CMP AT90S2313-P
-D 90S2313, PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0839.pdf
 $ENDCMP
 #
 $CMP AT90S2313-S
-D 90S2313, SO20, 2k Flash, 128B SRAM, 128B EEPROM
+D SO20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0839.pdf
 $ENDCMP
@@ -145,7 +145,7 @@ F http://www.atmel.com/Images/doc1042.pdf
 $ENDCMP
 #
 $CMP AT90S2333-P
-D AT90S2333, PDIP28 Narrow, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP28 Narrow, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1042.pdf
 $ENDCMP
@@ -163,691 +163,691 @@ F http://www.atmel.com/Images/doc1004.pdf
 $ENDCMP
 #
 $CMP AT90S4414-A
-D AT90S4414, TQFP44, 4k Flash, 256B SRAM, 256B EEPROM
+D TQFP44, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0841.pdf
 $ENDCMP
 #
 $CMP AT90S4414-J
-D AT90S4414, PLCC44, 4k Flash, 256B SRAM, 256B EEPROM
+D PLCC44, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0841.pdf
 $ENDCMP
 #
 $CMP AT90S4414-P
-D AT90S4414, PDIP40, 4k Flash, 256B SRAM, 256B EEPROM
+D PDIP40, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0841.pdf
 $ENDCMP
 #
 $CMP AT90S4433-A
-D AT90S4433, TQFP32, 4k Flash, 128B SRAM, 256B EEPROM
+D TQFP32, 4k Flash, 128B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1042.pdf
 $ENDCMP
 #
 $CMP AT90S4433-P
-D AT90S4433, PDIP28 Narrow, 4k Flash, 128B SRAM, 256B EEPROM
+D PDIP28 Narrow, 4k Flash, 128B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1042.pdf
 $ENDCMP
 #
 $CMP AT90S4434-A
-D AT90S4434, TQFP44, 4k Flash, 256B SRAM, 256B EEPROM
+D TQFP44, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90S4434-J
-D AT90S4434, PLCC44, 4k Flash, 256B SRAM, 256B EEPROM
+D PLCC44, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90S4434-M
-D AT90S4434, QFN/MLF44, 4k Flash, 256B SRAM, 256B EEPROM
+D QFN/MLF44, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90S4434-P
-D AT90S4434, PDIP40, 4k Flash, 256B SRAM, 256B EEPROM
+D PDIP40, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90S8515-A
-D AT90S8515, TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
+D TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0841.pdf
 $ENDCMP
 #
 $CMP AT90S8515-J
-D AT90S8515, PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
+D PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0841.pdf
 $ENDCMP
 #
 $CMP AT90S8515-P
-D AT90S8515, PDIP40, 8k Flash, 512B SRAM, 512B EEPROM
+D PDIP40, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc0841.pdf
 $ENDCMP
 #
 $CMP AT90S8535-A
-D AT90S8535, TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
+D TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90S8535-J
-D AT90S8535, PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
+D PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90S8535-M
-D AT90S8535, QFN/MLF44, 8k Flash, 512B SRAM, 512B EEPROM
+D QFN/MLF44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90S8535-P
-D AT90S8535, PDIP40, 8k Flash, 512B SRAM, 512B EEPROM
+D PDIP40, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller ClassicAVR
 F http://www.atmel.com/Images/doc1041.pdf
 $ENDCMP
 #
 $CMP AT90USB162-A
-D AT90USB162, TQFP32, 16k Flash, 512B SRAM, 512B EEPROM, USB 2.0
+D TQFP32, 16k Flash, 512B SRAM, 512B EEPROM, USB 2.0
 K AVR 8bit Microcontroller USB
 F http://www.atmel.com/Images/doc7707.pdf
 $ENDCMP
 #
 $CMP AT90USB162-M
-D AT90USB162, QFN/MLF32, 16k Flash, 512B SRAM, 512B EEPROM, USB 2.0
+D QFN/MLF32, 16k Flash, 512B SRAM, 512B EEPROM, USB 2.0
 K AVR 8bit Microcontroller USB
 F http://www.atmel.com/Images/doc7707.pdf
 $ENDCMP
 #
 $CMP AT90USB82-M
-D AT90USB82, QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM, USB 2.0
+D QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM, USB 2.0
 K AVR 8bit Microcontroller USB
 F http://www.atmel.com/Images/doc7707.pdf
 $ENDCMP
 #
 $CMP ATMEGA128-A
-D ATMEGA128, TQFP64, 128k Flash, 4k SRAM, 4k EEPROM, JTAG
+D TQFP64, 128k Flash, 4k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2467.pdf
 $ENDCMP
 #
 $CMP ATMEGA128-M
-D ATMEGA128, QFN/MLF64, 128k Flash, 4k SRAM, 4k EEPROM, JTAG
+D QFN/MLF64, 128k Flash, 4k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2467.pdf
 $ENDCMP
 #
 $CMP ATMEGA1280-A
-D ATMEGA1280, TQFP100, 128k Flash, 8k SRAM, 4k EEPROM, JTAG
+D TQFP100, 128k Flash, 8k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1281-A
-D ATMEGA1281, TQFP64, 128k Flash, 8k SRAM, 4k EEPROM, JTAG
+D TQFP64, 128k Flash, 8k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1281-M
-D ATMEGA1281, MLF/QFN64, 128k Flash, 8k SRAM, 4k EEPROM, JTAG
+D MLF/QFN64, 128k Flash, 8k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1284-A
-D ATMEGA1284, TQFP44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
+D TQFP44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1284-M
-D ATMEGA1284, VQFN44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
+D VQFN44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1284-P
-D ATMEGA1284, PDIP40, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
+D PDIP40, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1284P-A
-D ATMEGA1284P, TQFP44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
+D TQFP44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1284P-M
-D ATMEGA1284P, VQFN44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
+D VQFN44, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA1284P-P
-D ATMEGA1284P, PDIP40, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
+D PDIP40, 128k Flash, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA128A-A
-D ATMEGA128A, TQFP64, 128k Flash, 4k SRAM, 4k EEPROM
+D TQFP64, 128k Flash, 4k SRAM, 4k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8151.pdf
 $ENDCMP
 #
 $CMP ATMEGA128A-M
-D ATMEGA128A, MLF/QFN64, 128k Flash, 4k SRAM, 4k EEPROM
+D MLF/QFN64, 128k Flash, 4k SRAM, 4k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8151.pdf
 $ENDCMP
 #
 $CMP ATMEGA16-A
-D ATMEGA16, TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2466.pdf
 $ENDCMP
 #
 $CMP ATMEGA16-M
-D ATMEGA16, QFN/MLF44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D QFN/MLF44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2466.pdf
 $ENDCMP
 #
 $CMP ATMEGA16-P
-D ATMEGA16, PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2466.pdf
 $ENDCMP
 #
 $CMP ATMEGA161-A
-D ATMEGA161, TQFP44, 16k Flash, 1K SRAM, 512B EEPROM
+D TQFP44, 16k Flash, 1K SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc1228.pdf
 $ENDCMP
 #
 $CMP ATMEGA161-P
-D ATMEGA161, PDIP40, 16k Flash, 1K SRAM, 512B EEPROM
+D PDIP40, 16k Flash, 1K SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc1228.pdf
 $ENDCMP
 #
 $CMP ATMEGA162-A
-D ATMEGA162, TQFP44, 16k Flash, 1K SRAM, 512B EEPROM, JTAG
+D TQFP44, 16k Flash, 1K SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2513-8-bit-avr-microntroller-atmega162_datasheet-summary.pdf
 $ENDCMP
 #
 $CMP ATMEGA162-M
-D ATMEGA162, QFN/MLF44, 16k Flash, 1K SRAM, 512B EEPROM, JTAG
+D QFN/MLF44, 16k Flash, 1K SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2513-8-bit-avr-microntroller-atmega162_datasheet-summary.pdf
 $ENDCMP
 #
 $CMP ATMEGA162-P
-D ATMEGA162, PDIP40, 16k Flash, 1K SRAM, 512B EEPROM, JTAG
+D PDIP40, 16k Flash, 1K SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2513-8-bit-avr-microntroller-atmega162_datasheet-summary.pdf
 $ENDCMP
 #
 $CMP ATMEGA163-A
-D ATMEGA163, TQFP44, 16k Flash, 1k SRAM, 512B EEPROM
+D TQFP44, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc1142.pdf
 $ENDCMP
 #
 $CMP ATMEGA163-P
-D ATMEGA163, PDIP40, 16k Flash, 1k SRAM, 512B EEPROM
+D PDIP40, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc1142.pdf
 $ENDCMP
 #
 $CMP ATMEGA164A-A
-D ATMEGA164A, TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164A-M
-D ATMEGA164A, VQFN44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D VQFN44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164A-P
-D ATMEGA164A, PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164P-A
-D ATMEGA164P, TQFP44, 16k Flash, 1k SRAM, 512k EEPROM, JTAG
+D TQFP44, 16k Flash, 1k SRAM, 512k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164P-M
-D ATMEGA164P, MLF/QFN44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D MLF/QFN44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164P-P
-D ATMEGA164P, PDIP40, 16k Flash, 1k SRAM, 512k EEPROM, JTAG
+D PDIP40, 16k Flash, 1k SRAM, 512k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164PA-A
-D ATMEGA164PA, TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164PA-M
-D ATMEGA164PA, VQFN44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D VQFN44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA164PA-P
-D ATMEGA164PA, PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA165-A
-D ATMEGA165, TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2573.pdf
 $ENDCMP
 #
 $CMP ATMEGA165-M
-D ATMEGA165, QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2573.pdf
 $ENDCMP
 #
 $CMP ATMEGA165A-A
-D ATMEGA165A, TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA165A-M
-D ATMEGA165A, QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA165P-A
-D ATMEGA165P, TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/doc8019.pdf
 $ENDCMP
 #
 $CMP ATMEGA165P-M
-D ATMEGA165P, QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/doc8019.pdf
 $ENDCMP
 #
 $CMP ATMEGA165PA-A
-D ATMEGA165PA, TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA165PA-M
-D ATMEGA165PA, QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168-A
-D ATMEGA168, TQFP32, 16k Flash, 512B SRAM, 1k EEPROM
+D TQFP32, 16k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA168-M
-D ATMEGA168, QFN/MLF32, 16k Flash, 512B SRAM, 1k EEPROM
+D QFN/MLF32, 16k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA168-MM
-D ATMEGA168, QFN/MLF28, 16k Flash, 512B SRAM, 1k EEPROM
+D QFN/MLF28, 16k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA168-P
-D ATMEGA168, PDIP28 Narrow, 16k Flash, 512B SRAM, 1k EEPROM
+D PDIP28 Narrow, 16k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA168A-A
-D ATMEGA168A, TQFP32, 16k Flash, 1kB SRAM, 512B EEPROM
+D TQFP32, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168A-M
-D ATMEGA168A, QFN/MLF32, 16k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF32, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168A-MM
-D ATMEGA168A, QFN/MLF28, 16k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF28, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168A-P
-D ATMEGA168A, PDIP28 Narrow, 16k Flash, 1kB SRAM, 512B EEPROM
+D PDIP28 Narrow, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168PA-A
-D ATMEGA168PA, TQFP32, 16k Flash, 1kB SRAM, 512B EEPROM
+D TQFP32, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168PA-M
-D ATMEGA168PA, QFN/MLF32, 16k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF32, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168PA-MM
-D ATMEGA168PA, QFN/MLF28, 16k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF28, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA168PA-P
-D ATMEGA168PA, PDIP28 Narrow, 16k Flash, 1kB SRAM, 512B EEPROM
+D PDIP28 Narrow, 16k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA169-A
-D ATMEGA169, TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD
 F http://www.atmel.com/Images/doc2514.pdf
 $ENDCMP
 #
 $CMP ATMEGA169-M
-D ATMEGA169, QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD
 F http://www.atmel.com/Images/doc2514.pdf
 $ENDCMP
 #
 $CMP ATMEGA169A-A
-D ATMEGA169A, TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA169A-M
-D ATMEGA169A, QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA169P-A
-D ATMEGA169P, TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/Images/doc8018.pdf
 $ENDCMP
 #
 $CMP ATMEGA169P-M
-D ATMEGA169P, QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/Images/doc8018.pdf
 $ENDCMP
 #
 $CMP ATMEGA169PA-A
-D ATMEGA169PA, TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
+D TQFP64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA169PA-M
-D ATMEGA169PA, QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
+D QFN/MLF64, 16k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA16A-A
-D ATMEGA16A, TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D TQFP44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8154.pdf
 $ENDCMP
 #
 $CMP ATMEGA16A-M
-D ATMEGA16A, QFN/MLF44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D QFN/MLF44, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8154.pdf
 $ENDCMP
 #
 $CMP ATMEGA16A-P
-D ATMEGA16A, PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
+D PDIP40, 16k Flash, 1k SRAM, 512B EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8154.pdf
 $ENDCMP
 #
 $CMP ATMEGA16M1-A
-D ATMEGA16M1, TQFP32, 16k Flash, 1k SRAM, 512B EEPROM, CAN
+D TQFP32, 16k Flash, 1k SRAM, 512B EEPROM, CAN
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8209.pdf
 $ENDCMP
 #
 $CMP ATMEGA16M1-M
-D ATMEGA16M1, QFN32, 16k Flash, 1k SRAM, 512B EEPROM, CAN
+D QFN32, 16k Flash, 1k SRAM, 512B EEPROM, CAN
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8209.pdf
 $ENDCMP
 #
 $CMP ATMEGA16U2
-D ATMEGA16U2, TQFP-32, 16k Flash, 512B SRAM, 512B EEPROM
+D TQFP-32, 16k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7799.pdf
 $ENDCMP
 #
 $CMP ATMEGA16U4-A
-D ATMEGA16U4, TQFP44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0
+D TQFP44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA16U4-M
-D ATMEGA16U4, QFN44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0
+D QFN44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA16U4RC-A
-D ATMEGA16U4RC, TQFP44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0, RC Osc
+D TQFP44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0, RC Osc
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA16U4RC-M
-D ATMEGA16U4RC, QFN44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0, RC Osc
+D QFN44, 16K Flash, 1.25K SRAM, 512B EEPROM, USB2.0, RC Osc
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA2560-A
-D ATMEGA2560, TQFP100, 256k Flash, 8k SRAM, 4k EEPROM, JTAG
+D TQFP100, 256k Flash, 8k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA2561-A
-D ATMEGA2561, TQFP64, 256k Flash, 8k SRAM, 4k EEPROM, JTAG
+D TQFP64, 256k Flash, 8k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA2561-M
-D ATMEGA2561, MLF/QFN64, 256k Flash, 8k SRAM, 4k EEPROM, JTAG
+D MLF/QFN64, 256k Flash, 8k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32-A
-D ATMEGA32, TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2503.pdf
 $ENDCMP
 #
 $CMP ATMEGA32-M
-D ATMEGA32, QFN/MLF44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D QFN/MLF44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2503.pdf
 $ENDCMP
 #
 $CMP ATMEGA32-P
-D ATMEGA32, PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2503.pdf
 $ENDCMP
 #
 $CMP ATMEGA323-A
-D ATMEGA323, TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc1457.pdf
 $ENDCMP
 #
 $CMP ATMEGA323-P
-D ATMEGA323, PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc1457.pdf
 $ENDCMP
 #
 $CMP ATMEGA324A-A
-D ATMEGA324A, TQFP44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
+D TQFP44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324A-M
-D ATMEGA324A, VQFN44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
+D VQFN44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324A-P
-D ATMEGA324A, PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324P-A
-D ATMEGA324P, TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324P-M
-D ATMEGA324P, MLF/QFN44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D MLF/QFN44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324P-P
-D ATMEGA324P, PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324PA-A
-D ATMEGA324PA, TQFP44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
+D TQFP44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324PA-M
-D ATMEGA324PA, VQFN44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
+D VQFN44, 32k Flash, 2k SRAM, 1K EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA324PA-P
-D ATMEGA324PA, PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA325-A
-D ATMEGA325, TQFP64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2570.pdf
 $ENDCMP
 #
 $CMP ATMEGA325-M
-D ATMEGA325, MLF/QFN64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D MLF/QFN64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR 
 F http://www.atmel.com/Images/doc2570.pdf
 $ENDCMP
 #
 $CMP ATMEGA3250-A
-D ATMEGA3250, TQFP100, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP100, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2570.pdf
 $ENDCMP
 #
 $CMP ATMEGA325A-A
-D ATMEGA325A, TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
+D TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA325A-M
-D ATMEGA325A, QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM
+D QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA325PA-A
-D ATMEGA325PA, TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
+D TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA325PA-M
-D ATMEGA325PA, QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM
+D QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA328-A
-D ATMEGA328, TQFP32, 32k Flash, 2kB SRAM, 1kB EEPROM
+D TQFP32, 32k Flash, 2kB SRAM, 1kB EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA328-M
-D ATMEGA328, QFN/MLF32, 32k Flash, 2kB SRAM, 1kB EEPROM
+D QFN/MLF32, 32k Flash, 2kB SRAM, 1kB EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
@@ -859,55 +859,55 @@ F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48p
 $ENDCMP
 #
 $CMP ATMEGA328-P
-D ATMEGA328, PDIP28 Narrow, 32k Flash, 2kB SRAM, 1kB EEPROM
+D PDIP28 Narrow, 32k Flash, 2kB SRAM, 1kB EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA328P-A
-D ATMEGA328P, TQFP32, 32k Flash, 2kB SRAM, 1kB EEPROM
+D TQFP32, 32k Flash, 2kB SRAM, 1kB EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA328P-M
-D ATMEGA328P, QFN/MLF32, 32k Flash, 2kB SRAM, 1kB EEPROM
+D QFN/MLF32, 32k Flash, 2kB SRAM, 1kB EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA328P-MM
-D ATMEGA328P, QFN/MLF28, 32k Flash, 2kB SRAM, 1k EEPROM
+D QFN/MLF28, 32k Flash, 2kB SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA328P-P
-D ATMEGA328P, PDIP28 Narrow, 32k Flash, 2kB SRAM, 1kB EEPROM
+D PDIP28 Narrow, 32k Flash, 2kB SRAM, 1kB EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA329-A
-D ATMEGA329, TQFP64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2552.pdf
 $ENDCMP
 #
 $CMP ATMEGA329-M
-D ATMEGA329, QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2552.pdf
 $ENDCMP
 #
 $CMP ATMEGA3290-A
-D ATMEGA3290, TQFP100, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP100, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2552.pdf
 $ENDCMP
 #
 $CMP ATMEGA329A-A
-D ATMEGA329A, TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
+D TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
@@ -919,169 +919,169 @@ F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa
 $ENDCMP
 #
 $CMP ATMEGA329PA-A
-D ATMEGA329PA, TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
+D TQFP64, 32k Flash, 2k SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA329PA-M
-D ATMEGA329PA, QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM
+D QFN/MLF64, 32k Flash, 2k SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32A-A
-D ATMEGA32A, TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D TQFP44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8155-8-bit-microcontroller-avr-atmega32a_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32A-M
-D ATMEGA32A, QFN/MLF44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D QFN/MLF44, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8155-8-bit-microcontroller-avr-atmega32a_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32A-P
-D ATMEGA32A, PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
+D PDIP40, 32k Flash, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8155-8-bit-microcontroller-avr-atmega32a_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32M1-A
-D ATMEGA32M1, TQFP32, 32k Flash, 2k SRAM, 1kB EEPROM, CAN
+D TQFP32, 32k Flash, 2k SRAM, 1kB EEPROM, CAN
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8209.pdf
 $ENDCMP
 #
 $CMP ATMEGA32M1-M
-D ATMEGA32M1, QFN32, 32k Flash, 2k SRAM, 1kB EEPROM, CAN
+D QFN32, 32k Flash, 2k SRAM, 1kB EEPROM, CAN
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8209.pdf
 $ENDCMP
 #
 $CMP ATMEGA32U2
-D ATMEGA32U2, TQFP-32, 32k Flash, 1024B SRAM, 1024B EEPROM
+D TQFP-32, 32k Flash, 1024B SRAM, 1024B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7799.pdf
 $ENDCMP
 #
 $CMP ATMEGA32U4-A
-D ATMEGA32U4, TQFP44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
+D TQFP44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32U4-M
-D ATMEGA32U4, QFN44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
+D QFN44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32U4RC-A
-D ATMEGA32U4RC, TQFP44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
+D TQFP44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA32U4RC-M
-D ATMEGA32U4RC, QFN44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
+D QFN44, 32K Flash, 2.5K SRAM, 1K EEPROM, USB2.0
 K AVR 8bit Microcontroller MegaAVR USB
 F http://www.atmel.com/images/atmel-7766-8-bit-avr-atmega16u4-32u4_%20datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48-A
-D ATMEGA48, TQFP32, 4k Flash, 256B SRAM, 512B EEPROM
+D TQFP32, 4k Flash, 256B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA48-M
-D ATMEGA48, QFN/MLF32, 4k Flash, 256B SRAM, 512B EEPROM
+D QFN/MLF32, 4k Flash, 256B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA48-MM
-D ATMEGA48, QFN/MLF28, 4k Flash, 256B SRAM, 512B EEPROM
+D QFN/MLF28, 4k Flash, 256B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA48-P
-D ATMEGA48, PDIP28 Narrow, 4k Flash, 256B SRAM, 512B EEPROM
+D PDIP28 Narrow, 4k Flash, 256B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA48A-A
-D ATMEGA48A, TQFP32, 4k Flash, 512B SRAM, 256B EEPROM
+D TQFP32, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48A-M
-D ATMEGA48A, QFN/MLF32, 4k Flash, 512B SRAM, 256B EEPROM
+D QFN/MLF32, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48A-MM
-D ATMEGA48A, QFN/MLF28, 4k Flash, 512B SRAM, 256B EEPROM
+D QFN/MLF28, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48A-P
-D ATMEGA48A, PDIP28 Narrow, 4k Flash, 512B SRAM, 256B EEPROM
+D PDIP28 Narrow, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48PA-A
-D ATMEGA48PA, TQFP32, 4k Flash, 512B SRAM, 256B EEPROM
+D TQFP32, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48PA-M
-D ATMEGA48PA, QFN/MLF32, 4k Flash, 512B SRAM, 256B EEPROM
+D QFN/MLF32, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48PA-MM
-D ATMEGA48PA, QFN/MLF28, 4k Flash, 512B SRAM, 256B EEPROM
+D QFN/MLF28, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA48PA-P
-D ATMEGA48PA, PDIP28 Narrow, 4k Flash, 512B SRAM, 256B EEPROM
+D PDIP28 Narrow, 4k Flash, 512B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA64-A
-D ATMEGA64, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2490-8-bit-avr-microcontroller-atmega64-l_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA64-M
-D ATMEGA64, QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
+D QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2490-8-bit-avr-microcontroller-atmega64-l_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA640-A
-D ATMEGA640, TQFP100, 64k Flash, 8k SRAM, 4k EEPROM, JTAG
+D TQFP100, 64k Flash, 8k SRAM, 4k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644-A
-D ATMEGA644, TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2593.pdf
 $ENDCMP
@@ -1093,811 +1093,811 @@ F http://www.atmel.com/Images/doc2593.pdf
 $ENDCMP
 #
 $CMP ATMEGA644-P
-D ATMEGA644, PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2593.pdf
 $ENDCMP
 #
 $CMP ATMEGA644A-A
-D ATMEGA644A, TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644A-M
-D ATMEGA644A, VQFN44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D VQFN44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644A-P
-D ATMEGA644A, PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644P-A
-D ATMEGA644P, TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644P-M
-D ATMEGA644P, MLF/QFN44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D MLF/QFN44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644P-P
-D ATMEGA644P, PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8011-8-bit-avr-microcontroller-atmega164p-324p-644p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644PA-A
-D ATMEGA644PA, TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644PA-M
-D ATMEGA644PA, VQFN44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D VQFN44, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA644PA-P
-D ATMEGA644PA, PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D PDIP40, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/Images/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA645-A
-D ATMEGA645, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR 
 F http://www.atmel.com/Images/doc2570.pdf
 $ENDCMP
 #
 $CMP ATMEGA645-M
-D ATMEGA645, MLF/QFN64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D MLF/QFN64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR 
 F http://www.atmel.com/Images/doc2570.pdf
 $ENDCMP
 #
 $CMP ATMEGA6450-A
-D ATMEGA6450, TQFP100, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP100, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2570.pdf
 $ENDCMP
 #
 $CMP ATMEGA645A-A
-D ATMEGA645A, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA645A-M
-D ATMEGA645A, QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
+D QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA645P-A
-D ATMEGA645P, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA645P-M
-D ATMEGA645P, QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
+D QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA649-A
-D ATMEGA649, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2552.pdf
 $ENDCMP
 #
 $CMP ATMEGA649-M
-D ATMEGA649, QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2552.pdf
 $ENDCMP
 #
 $CMP ATMEGA6490-A
-D ATMEGA6490, TQFP100, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
+D TQFP100, 64k Flash, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2552.pdf
 $ENDCMP
 #
 $CMP ATMEGA649A-A
-D ATMEGA649A, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA649A-M
-D ATMEGA649A, QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
+D QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA649P-A
-D ATMEGA649P, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA649P-M
-D ATMEGA649P, QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
+D QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://www.atmel.com/images/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA64A-A
-D ATMEGA64A, TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
+D TQFP64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8160-8-bit-avr-microcontroller-atmega64a-datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA64A-M
-D ATMEGA64A, QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
+D QFN/MLF64, 64k Flash, 4k SRAM, 2k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8160-8-bit-avr-microcontroller-atmega64a-datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA64M1-A
-D ATMEGA64M1, TQFP32, 64k Flash, 4k SRAM, 2kB EEPROM, CAN
+D TQFP32, 64k Flash, 4k SRAM, 2kB EEPROM, CAN
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8209.pdf
 $ENDCMP
 #
 $CMP ATMEGA64M1-M
-D ATMEGA64M1, QFN32, 64k Flash, 4k SRAM, 2kB EEPROM, CAN
+D QFN32, 64k Flash, 4k SRAM, 2kB EEPROM, CAN
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc8209.pdf
 $ENDCMP
 #
 $CMP ATMEGA8-AI
-D ATMEGA8, TQFP32, 8k Flash, 1k SRAM, 512B EEPROM
+D TQFP32, 8k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA8-MI
-D ATMEGA8, QFN/MLF32, 8k Flash, 1k SRAM, 512B EEPROM
+D QFN/MLF32, 8k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA8-P
-D ATMEGA8, PDIP28 Narrow, 8k Flash, 1k SRAM, 512B EEPROM
+D PDIP28 Narrow, 8k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA8515-A
-D ATMEGA8515, TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
+D TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2512.pdf
 $ENDCMP
 #
 $CMP ATMEGA8515-J
-D ATMEGA8515, PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
+D PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2512.pdf
 $ENDCMP
 #
 $CMP ATMEGA8515-M
-D ATMEGA8515, QFN/MLF44, 8k Flash, 512B SRAM, 512B EEPROM
+D QFN/MLF44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2512.pdf
 $ENDCMP
 #
 $CMP ATMEGA8515-P
-D ATMEGA8515, PDIP40, 8K Flash, 512B SRAM, 512B EEPROM
+D PDIP40, 8K Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2512.pdf
 $ENDCMP
 #
 $CMP ATMEGA8535-A
-D ATMEGA8535, TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
+D TQFP44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2502.pdf
 $ENDCMP
 #
 $CMP ATMEGA8535-J
-D ATMEGA8535, PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
+D PLCC44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2502.pdf
 $ENDCMP
 #
 $CMP ATMEGA8535-M
-D ATMEGA8535, QFN/MLF44, 8k Flash, 512B SRAM, 512B EEPROM
+D QFN/MLF44, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2502.pdf
 $ENDCMP
 #
 $CMP ATMEGA8535-P
-D ATMEGA8535, PDIP40, 8k Flash, 512B SRAM, 512B EEPROM
+D PDIP40, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2502.pdf
 $ENDCMP
 #
 $CMP ATMEGA88-A
-D ATMEGA88, TQFP32, 8k Flash, 512B SRAM, 1k EEPROM
+D TQFP32, 8k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA88-M
-D ATMEGA88, QFN/MLF32, 8k Flash, 512B SRAM, 1k EEPROM
+D QFN/MLF32, 8k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA88-MM
-D ATMEGA88, QFN/MLF28, 8k Flash, 512B SRAM, 1k EEPROM
+D QFN/MLF28, 8k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA88-P
-D ATMEGA88, PDIP28 Narrow, 8k Flash, 512B SRAM, 1k EEPROM
+D PDIP28 Narrow, 8k Flash, 512B SRAM, 1k EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc2545.pdf
 $ENDCMP
 #
 $CMP ATMEGA88A-A
-D ATMEGA88A, TQFP32, 8k Flash, 1kB SRAM, 512B EEPROM
+D TQFP32, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA88A-M
-D ATMEGA88A, QFN/MLF32, 8k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF32, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA88A-MM
-D ATMEGA88A, QFN/MLF28, 8k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF28, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA88A-P
-D ATMEGA88A, PDIP28 Narrow, 8k Flash, 1kB SRAM, 512B EEPROM
+D PDIP28 Narrow, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA88PA-A
-D ATMEGA88PA, TQFP32, 8k Flash, 1kB SRAM, 512B EEPROM
+D TQFP32, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA88PA-M
-D ATMEGA88PA, QFN/MLF32, 8k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF32, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA88PA-MM
-D ATMEGA88PA, QFN/MLF28, 8k Flash, 1kB SRAM, 512B EEPROM
+D QFN/MLF28, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA88PA-P
-D ATMEGA88PA, PDIP28 Narrow, 8k Flash, 1kB SRAM, 512B EEPROM
+D PDIP28 Narrow, 8k Flash, 1kB SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA8A-A
-D ATMEGA8A, TQFP32, 8k Flash, 1k SRAM, 512B EEPROM
+D TQFP32, 8k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8159-8-bit-avr-microcontroller-atmega8a_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA8A-M
-D ATMEGA8A, QFN/MLF32, 8k Flash, 1k SRAM, 512B EEPROM
+D QFN/MLF32, 8k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8159-8-bit-avr-microcontroller-atmega8a_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA8A-P
-D ATMEGA8A, PDIP28 Narrow, 8k Flash, 1k SRAM, 512B EEPROM
+D PDIP28 Narrow, 8k Flash, 1k SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/images/atmel-8159-8-bit-avr-microcontroller-atmega8a_datasheet.pdf
 $ENDCMP
 #
 $CMP ATMEGA8U2
-D ATMEGA8U2, TQFP-32, 8k Flash, 512B SRAM, 512B EEPROM
+D TQFP-32, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller MegaAVR
 F http://www.atmel.com/Images/doc7799.pdf
 $ENDCMP
 #
 $CMP ATTINY10-P
-D ATTINY10, DIP8, 1k OTP Flash, No SRAM, 64B EEPROM (For reference only)
+D DIP8, 1k OTP Flash, No SRAM, 64B EEPROM (For reference only)
 K AVR 8-bit Microcontroller tinyAVR Discontinued
 F http://www.atmel.com/Images/doc1006.pdf
 $ENDCMP
 #
 $CMP ATTINY10-S
-D ATTINY10, SO8, 1k OTP FLash, No SRAM, 64B EEPROM (For reference only)
+D SO8, 1k OTP FLash, No SRAM, 64B EEPROM (For reference only)
 K AVR 8-bit Microcontroller tinyAVR Discontinued
 F http://www.atmel.com/Images/doc1006.pdf
 $ENDCMP
 #
 $CMP ATTINY10-TS
-D ATTINY10, SOT-23-6, 1k Flash, 32B SRAM, No EEPROM, ADC
+D SOT-23-6, 1k Flash, 32B SRAM, No EEPROM, ADC
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8127-avr-8-bit-microcontroller-attiny4-attiny5-attiny9-attiny10_datasheet-summary.pdf
 $ENDCMP
 #
 $CMP ATTINY11-P
-D ATTINY11, PDIP8, 1k Flash, No SRAM, No EEPROM
+D PDIP8, 1k Flash, No SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1006.pdf
 $ENDCMP
 #
 $CMP ATTINY11-S
-D ATTINY11, SO8 Wide, 1k Flash, No SRAM, No EEPROM
+D SO8 Wide, 1k Flash, No SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1006.pdf
 $ENDCMP
 #
 $CMP ATTINY12-P
-D ATTINY12, PDIP8, 1k Flash, No SRAM, 64B EEPROM
+D PDIP8, 1k Flash, No SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1006.pdf
 $ENDCMP
 #
 $CMP ATTINY12-S
-D ATTINY12, SO8 Wide, 1k Flash, No SRAM, 64B EEPROM
+D SO8 Wide, 1k Flash, No SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1006.pdf
 $ENDCMP
 #
 $CMP ATTINY13-M
-D ATTINY13, QFN/MLF20, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D QFN/MLF20, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2535.pdf
 $ENDCMP
 #
 $CMP ATTINY13-MM
-D ATTINY13, QFN/MLF10, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D QFN/MLF10, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2535.pdf
 $ENDCMP
 #
 $CMP ATTINY13-P
-D ATTINY13, PDIP8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D PDIP8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2535.pdf
 $ENDCMP
 #
 $CMP ATTINY13-S
-D ATTINY13, SO8 Wide, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D SO8 Wide, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2535.pdf
 $ENDCMP
 #
 $CMP ATTINY13-SS
-D ATTINY13, SO8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D SO8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2535.pdf
 $ENDCMP
 #
 $CMP ATTINY13A-M
-D ATTINY13A, QFN/MLF20, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D QFN/MLF20, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8126.pdf
 $ENDCMP
 #
 $CMP ATTINY13A-MM
-D ATTINY13A, QFN/MLF10, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D QFN/MLF10, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8126.pdf
 $ENDCMP
 #
 $CMP ATTINY13A-P
-D ATTINY13A, PDIP8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D PDIP8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8126.pdf
 $ENDCMP
 #
 $CMP ATTINY13A-S
-D ATTINY13A, SO8 Wide, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D SO8 Wide, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8126.pdf
 $ENDCMP
 #
 $CMP ATTINY13A-SS
-D ATTINY13A, SO8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
+D SO8, 1k Flash, 64B SRAM, 64B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8126.pdf
 $ENDCMP
 #
 $CMP ATTINY15-P
-D ATTINY15, PDIP8, 1k Flash, No SRAM, 64B EEPROM
+D PDIP8, 1k Flash, No SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1187.pdf
 $ENDCMP
 #
 $CMP ATTINY15-S
-D ATTINY15, SO8 Wide, 1k Flash, No SRAM, 64B EEPROM
+D SO8 Wide, 1k Flash, No SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1187.pdf
 $ENDCMP
 #
 $CMP ATTINY1634-M
-D ATTINY1634, QFN/MLF20, 16k Flash, 1k SRAM, 256B EEPROM
+D QFN/MLF20, 16k Flash, 1k SRAM, 256B EEPROM
 K AVR 8bit Microcontroller TinyAVR
 F http://www.atmel.com/Images/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY1634-MN
-D ATTINY1634-MN, QFN/MLF20, 16k Flash, 1k SRAM, 256B EEPROM, ADC, ACI, dW
+D QFN/MLF20, 16k Flash, 1k SRAM, 256B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY1634-MU
-D ATTINY1634-MU, QFN/MLF20, 16k Flash, 1k SRAM, 256B EEPROM, ADC, ACI, dW
+D QFN/MLF20, 16k Flash, 1k SRAM, 256B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY1634-S
-D ATTINY1634, SO20, 16k Flash, 1k SRAM, 256B EEPROM
+D SO20, 16k Flash, 1k SRAM, 256B EEPROM
 K AVR 8bit Microcontroller TinyAVR
 F http://www.atmel.com/Images/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY1634-SU
-D ATTINY1634-SU, SOIC20, 16k Flash, 1k SRAM, 256B EEPROM, ADC, ACI, dW
+D SOIC20, 16k Flash, 1k SRAM, 256B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY1634-U
-D ATTINY1634, BGA20 (5x4mm, 0.4mm), 16k Flash, 1k SRAM, 256B EEPROM
+D BGA20 (5x4mm, 0.4mm), 16k Flash, 1k SRAM, 256B EEPROM
 K AVR 8bit Microcontroller TinyAVR
 F http://www.atmel.com/Images/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY167-AM
-D ATTINY167, MLF32, 16k Flash, 512B SRAM, 512B EEPROM, Debug Wire
+D MLF32, 16k Flash, 512B SRAM, 512B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY167-AS
-D ATTINY167, SO20, 16k Flash, 512B SRAM, 512B EEPROM, Debug Wire
+D SO20, 16k Flash, 512B SRAM, 512B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY167-AX
-D ATTINY167, TSSOP20, 16k Flash, 512B SRAM, 512B EEPROM, Debug Wire
+D TSSOP20, 16k Flash, 512B SRAM, 512B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY20-MM
-D ATTINY20, VQFN20, 2k Flash, 128B SRAM, No EEPROM
+D VQFN20, 2k Flash, 128B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY20-SS
-D ATTINY20, S014, 2k Flash, 128B SRAM, No EEPROM
+D S014, 2k Flash, 128B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY20-X
-D ATTINY20, TSS0P14, 2k Flash, 128B SRAM, No EEPROM
+D TSS0P14, 2k Flash, 128B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY22-P
-D ATTINY22, PDIP8, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP8, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1273.pdf
 $ENDCMP
 #
 $CMP ATTINY22-S
-D ATTINY22, SO8 Wide, 2k Flash, 128B SRAM, 128B EEPROM
+D SO8 Wide, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1273.pdf
 $ENDCMP
 #
 $CMP ATTINY2313-M
-D ATTINY2313, MLF20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
+D MLF20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2543.pdf
 $ENDCMP
 #
 $CMP ATTINY2313-P
-D ATTINY2313, PDIP20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
+D PDIP20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2543.pdf
 $ENDCMP
 #
 $CMP ATTINY2313-S
-D ATTINY2313, SO20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
+D SO20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc2543.pdf
 $ENDCMP
 #
 $CMP ATTINY2313A-P
-D ATTINY2313A, PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8246.pdf
 $ENDCMP
 #
 $CMP ATTINY2313A-S
-D ATTINY2313A, SO20, 2k Flash, 128B SRAM, 128B EEPROM
+D SO20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8246.pdf
 $ENDCMP
 #
 $CMP ATTINY24-M
-D ATTINY24, QFN/MLF20, 2k Flash, 128B SRAM, 128B EEPROM, dW
+D QFN/MLF20, 2k Flash, 128B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY24-P
-D ATTINY24, PDIP14, 2k Flash, 128B SRAM, 128B EEPROM, dW
+D PDIP14, 2k Flash, 128B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY24-SS
-D ATTINY24, SO14, 2k Flash, 128B SRAM, 128B EEPROM, dW
+D SO14, 2k Flash, 128B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY24A-M
-D ATTINY24A, QFN/MLF20, 2k Flash, 128B SRAM, 128B EEPROM, dW
+D QFN/MLF20, 2k Flash, 128B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY24A-MM
-D ATTINY24A, VQFN20, 2k Flash, 128B SRAM, 128B EEPROM, dW
+D VQFN20, 2k Flash, 128B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY24A-P
-D ATTINY24A, PDIP14, 2k Flash, 128B SRAM, 128B EEPROM, dW
+D PDIP14, 2k Flash, 128B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY24A-SS
-D ATTINY24A, SO14, 2k Flash, 128B SRAM, 128B EEPROM, dW
+D SO14, 2k Flash, 128B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY25-M
-D ATTINY25, QFN/MLF20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
+D QFN/MLF20, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY25-P
-D ATTINY25, PDIP8, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
+D PDIP8, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY25-S
-D ATTINY25, SO8 Wide, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
+D SO8 Wide, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY25-SS
-D ATTINY25, SO8, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
+D SO8, 2k Flash, 128B SRAM, 128B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY26-M
-D ATTINY26, QFN/MLF32, 2k Flash, 128B SRAM, 128B EEPROM
+D QFN/MLF32, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1477.pdf
 $ENDCMP
 #
 $CMP ATTINY26-P
-D ATTINY26, PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1477.pdf
 $ENDCMP
 #
 $CMP ATTINY26-S
-D ATTINY26, SO20, 2k Flash, 128B SRAM, 128B EEPROM
+D SO20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc1477.pdf
 $ENDCMP
 #
 $CMP ATTINY261-M
-D ATTINY261, QFN/MLF32, 2k Flash, 128B SRAM, 128B EEPROM
+D QFN/MLF32, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY261-P
-D ATTINY261, PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY261-S
-D ATTINY261, PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY261A-M
-D ATTINY261A, QFN/MLF32, 2k Flash, 128B SRAM, 128B EEPROM
+D QFN/MLF32, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY261A-P
-D ATTINY261A, PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
+D PDIP20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY261A-S
-D ATTINY261A, SO20, 2k Flash, 128B SRAM, 128B EEPROM
+D SO20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY261A-X
-D ATTINY261A, TSSOP20, 2k Flash, 128B SRAM, 128B EEPROM
+D TSSOP20, 2k Flash, 128B SRAM, 128B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY28-A
-D ATTINY28, TQFP32, 2k Flash, No SRAM, No EEPROM
+D TQFP32, 2k Flash, No SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR IR
 F http://www.atmel.com/Images/doc1062.pdf
 $ENDCMP
 #
 $CMP ATTINY28-M
-D ATTINY28, MLF/QFN32, 2k Flash, No SRAM, No EEPROM
+D MLF/QFN32, 2k Flash, No SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR IR
 F http://www.atmel.com/Images/doc1062.pdf
 $ENDCMP
 #
 $CMP ATTINY28-P
-D ATTINY28, PDIP28 Narrow, 2k Flash, No SRAM, No EEPROM
+D PDIP28 Narrow, 2k Flash, No SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR IR
 F http://www.atmel.com/Images/doc1062.pdf
 $ENDCMP
 #
 $CMP ATTINY4-TS
-D ATTINY4, SOT-23-6, 512B Flash, 32B SRAM, No EEPROM
+D SOT-23-6, 512B Flash, 32B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8127-avr-8-bit-microcontroller-attiny4-attiny5-attiny9-attiny10_datasheet-summary.pdf
 $ENDCMP
 #
 $CMP ATTINY40-MM
-D ATTINY40, MLF/VQFN20, 4k Flash, 256B SRAM, No EEPROM
+D MLF/VQFN20, 4k Flash, 256B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8263-8-bit-avr-microcontroller-tinyavr-attiny40_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY40-SU
-D ATTINY40, S020 Wide, 4k Flash, 256B SRAM, No EEPROM
+D S020 Wide, 4k Flash, 256B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8263-8-bit-avr-microcontroller-tinyavr-attiny40_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY40-X
-D ATTINY40, TSS0P20, 4k Flash, 256B SRAM, No EEPROM
+D TSS0P20, 4k Flash, 256B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8263-8-bit-avr-microcontroller-tinyavr-attiny40_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY4313-P
-D ATTINY4313, PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
+D PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8246.pdf
 $ENDCMP
 #
 $CMP ATTINY4313-S
-D ATTINY4313, SO20, 4k Flash, 256B SRAM, 256B EEPROM
+D SO20, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8246.pdf
 $ENDCMP
 #
 $CMP ATTINY43U-M
-D ATTINY43U, MLF/QFN20, 4k Flash, 256B SRAM, 64B EEPROM
+D MLF/QFN20, 4k Flash, 256B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR Battery Boost
 F http://www.atmel.com/Images/doc8048.pdf
 $ENDCMP
 #
 $CMP ATTINY43U-S
-D ATTINY43U, SO20, 4k Flash, 256B SRAM, 64B EEPROM
+D SO20, 4k Flash, 256B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR Battery Boost
 F http://www.atmel.com/Images/doc8048.pdf
 $ENDCMP
 #
 $CMP ATTINY44-M
-D ATTINY44, QFN/MLF20, 4k Flash, 256B SRAM, 256B EEPROM, dW
+D QFN/MLF20, 4k Flash, 256B SRAM, 256B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY44-P
-D ATTINY44, PDIP14, 4k Flash, 256B SRAM, 256B EEPROM, dW
+D PDIP14, 4k Flash, 256B SRAM, 256B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY44-S
-D ATTINY44, SO14, 4k Flash, 256B SRAM, 128B EEPROM, dW
+D SO14, 4k Flash, 256B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY441-MMH
-D ATTINY441-MMH, WQFN20, 4k Flash, 256B SRAM, 256B EEPROM, ADC, ACI, dW
+D WQFN20, 4k Flash, 256B SRAM, 256B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY441-MU
-D ATTINY441-MU, MLF/QFN20, 4k Flash, 256B SRAM, 256B EEPROM, ADC, ACI, dW
+D MLF/QFN20, 4k Flash, 256B SRAM, 256B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY441-SSU
-D ATTINY441-SSU, SO14, 4k Flash, 256B SRAM, 256B EEPROM, ADC, ACI, dW
+D SO14, 4k Flash, 256B SRAM, 256B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY44A-M
-D ATTINY44A, QFN/MLF20, 4k Flash, 256B SRAM, 256B EEPROM, dW
+D QFN/MLF20, 4k Flash, 256B SRAM, 256B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY44A-MM
-D ATTINY44A, VQFN20, 4k Flash, 256B SRAM, 256B EEPROM, dW
+D VQFN20, 4k Flash, 256B SRAM, 256B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY44A-P
-D ATTINY44A, PDIP14, 4k Flash, 256B SRAM, 256B EEPROM, dW
+D PDIP14, 4k Flash, 256B SRAM, 256B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY44A-SS
-D ATTINY44A, SO14, 4k Flash, 256B SRAM, 256B EEPROM, dW
+D SO14, 4k Flash, 256B SRAM, 256B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
@@ -1909,145 +1909,145 @@ F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-atti
 $ENDCMP
 #
 $CMP ATTINY45-P
-D ATTINY45, PDIP8, 4k Flash, 256B SRAM, 256B EEPROM, Debug Wire
+D PDIP8, 4k Flash, 256B SRAM, 256B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY45-S
-D ATTINY45, SO8 Wide, 4k Flash, 256B SRAM, 256B EEPROM, Debug Wire
+D SO8 Wide, 4k Flash, 256B SRAM, 256B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY461-M
-D ATTINY461, QFN/MLF32, 4k Flash, 256B SRAM, 256B EEPROM
+D QFN/MLF32, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY461-P
-D ATTINY461, PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
+D PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY461-S
-D ATTINY461, PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
+D PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY461A-M
-D ATTINY461A, QFN/MLF32, 4k Flash, 256B SRAM, 256B EEPROM
+D QFN/MLF32, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY461A-P
-D ATTINY461A, PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
+D PDIP20, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY461A-S
-D ATTINY461A, SO20, 4k Flash, 256B SRAM, 256B EEPROM
+D SO20, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY461A-X
-D ATTINY461A, TSSOP20, 4k Flash, 256B SRAM, 256B EEPROM
+D TSSOP20, 4k Flash, 256B SRAM, 256B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY48-A
-D ATTINY48, TQFP32, 4k Flash, 256B SRAM, 64B EEPROM
+D TQFP32, 4k Flash, 256B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY48-M
-D ATTINY48, QFN/MLF32, 4k Flash, 256B SRAM, 64B EEPROM
+D QFN/MLF32, 4k Flash, 256B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY48-MM
-D ATTINY48, QFN/MLF28, 4k Flash, 256B SRAM, 64B EEPROM
+D QFN/MLF28, 4k Flash, 256B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY48-P
-D ATTINY48, PDIP28 Narrow, 4k Flash, 256B SRAM, 64B EEPROM
+D PDIP28 Narrow, 4k Flash, 256B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY5-TS
-D ATTINY5, SOT-23-6, 512B Flash, 32B SRAM, No EEPROM, ADC
+D SOT-23-6, 512B Flash, 32B SRAM, No EEPROM, ADC
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8127-avr-8-bit-microcontroller-attiny4-attiny5-attiny9-attiny10_datasheet-summary.pdf
 $ENDCMP
 #
 $CMP ATTINY84-M
-D ATTINY84, QFN/MLF20, 8k Flash, 512B SRAM, 512B EEPROM, dW
+D QFN/MLF20, 8k Flash, 512B SRAM, 512B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY84-P
-D ATTINY84, PDIP14, 8k Flash, 512B SRAM, 512B EEPROM, dW
+D PDIP14, 8k Flash, 512B SRAM, 512B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY84-S
-D ATTINY84, SO14, 8k Flash, 512B SRAM, 128B EEPROM, dW
+D SO14, 8k Flash, 512B SRAM, 128B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8006.pdf
 $ENDCMP
 #
 $CMP ATTINY841-MMH
-D ATTINY841-MMH, WQFN20, 8k Flash, 512B SRAM, 512B EEPROM, ADC, ACI, dW
+D WQFN20, 8k Flash, 512B SRAM, 512B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY841-MU
-D ATTINY841-MU, MLF/QFN20, 8k Flash, 512B SRAM, 512B EEPROM, ADC, ACI, dW
+D MLF/QFN20, 8k Flash, 512B SRAM, 512B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY841-SSU
-D ATTINY841-SSU, SO14, 8k Flash, 512B SRAM, 512B EEPROM, ADC, ACI, dW
+D SO14, 8k Flash, 512B SRAM, 512B EEPROM, ADC, ACI, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY84A-M
-D ATTINY84A, QFN/MLF20, 8k Flash, 512B SRAM, 512B EEPROM, dW
+D QFN/MLF20, 8k Flash, 512B SRAM, 512B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY84A-MM
-D ATTINY84A, VQFN20, 8k Flash, 512B SRAM, 512B EEPROM, dW
+D VQFN20, 8k Flash, 512B SRAM, 512B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY84A-P
-D ATTINY84A, PDIP14, 8k Flash, 512B SRAM, 512B EEPROM, dW
+D PDIP14, 8k Flash, 512B SRAM, 512B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
 #
 $CMP ATTINY84A-SS
-D ATTINY84A, SO14, 8k Flash, 512B SRAM, 512B EEPROM, dW
+D SO14, 8k Flash, 512B SRAM, 512B EEPROM, dW
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8183.pdf
 $ENDCMP
@@ -2071,349 +2071,349 @@ F http://www.atmel.com/images/atmel-2586-avr-8-bit-microcontroller-attiny25-atti
 $ENDCMP
 #
 $CMP ATTINY861-M
-D ATTINY861, QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM
+D QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY861-P
-D ATTINY861, PDIP20, 8k Flash, 512B SRAM, 512B EEPROM
+D PDIP20, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY861-S
-D ATTINY861, PDIP20, 8k Flash, 512B SRAM, 512B EEPROM
+D PDIP20, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY861A-M
-D ATTINY861A, QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM
+D QFN/MLF32, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY861A-P
-D ATTINY861A, PDIP20, 8k Flash, 512B SRAM, 512B EEPROM
+D PDIP20, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY861A-S
-D ATTINY861A, SO20, 8k Flash, 512B SRAM, 512B EEPROM
+D SO20, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY861A-X
-D ATTINY861A, TSSOP20, 8k Flash, 512B SRAM, 512B EEPROM
+D TSSOP20, 8k Flash, 512B SRAM, 512B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8197.pdf
 $ENDCMP
 #
 $CMP ATTINY87-AM
-D ATTINY87, MLF32, 8k Flash, 512B SRAM, 512B EEPROM, Debug Wire
+D MLF32, 8k Flash, 512B SRAM, 512B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY87-AS
-D ATTINY87, S020, 8k Flash, 512B SRAM, 512B EEPROM, Debug Wire
+D S020, 8k Flash, 512B SRAM, 512B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY87-AX
-D ATTINY87, TSSOP20, 8k Flash, 512B SRAM, 512B EEPROM, Debug Wire
+D TSSOP20, 8k Flash, 512B SRAM, 512B EEPROM, Debug Wire
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
 $CMP ATTINY88-A
-D ATTINY88, TQFP32, 8k Flash, 512B SRAM, 64B EEPROM
+D TQFP32, 8k Flash, 512B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY88-AZ
-D ATTINY88, TQFP32, 8k Flash, 512B SRAM, 64B EEPROM
+D TQFP32, 8k Flash, 512B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/doc9157.pdf
 $ENDCMP
 #
 $CMP ATTINY88-M
-D ATTINY88, QFN/MLF32, 8k Flash, 512B SRAM, 64B EEPROM
+D QFN/MLF32, 8k Flash, 512B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY88-MM
-D ATTINY88, QFN/MLF28, 8k Flash, 512B SRAM, 64B EEPROM
+D QFN/MLF28, 8k Flash, 512B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY88-MZ
-D ATTINY88, MLF/QFN32, 8k Flash, 512B SRAM, 64B EEPROM
+D MLF/QFN32, 8k Flash, 512B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://www.atmel.com/Images/doc9157.pdf
 $ENDCMP
 #
 $CMP ATTINY88-P
-D ATTINY88, PDIP28 Narrow, 8k Flash, 512B SRAM, 64B EEPROM
+D PDIP28 Narrow, 8k Flash, 512B SRAM, 64B EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/Images/doc8008.pdf
 $ENDCMP
 #
 $CMP ATTINY9-TS
-D ATTINY9, SOT-23-6, 1024B Flash, 32B SRAM, No EEPROM
+D SOT-23-6, 1024B Flash, 32B SRAM, No EEPROM
 K AVR 8bit Microcontroller tinyAVR
 F http://www.atmel.com/images/atmel-8127-avr-8-bit-microcontroller-attiny4-attiny5-attiny9-attiny10_datasheet-summary.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A1-A
-D ATXMEGA128A1, TQFP100, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D TQFP100, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A1U-A
-D ATXMEGA128A1U, TQFP100, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, USB, JTAG
+D TQFP100, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, USB, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A3-A
-D ATXMEGA128A3, TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A3-M
-D ATXMEGA128A3, QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A3U-A
-D ATXMEGA128A3U, TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
+D TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A3U-M
-D ATXMEGA128A3U, QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
+D QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A4-A
-D ATXMEGA128A4, TQFP44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D TQFP44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A4-M
-D ATXMEGA128A4, VQFN44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D VQFN44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A4U-A
-D ATXMEGA128A4U, TQFP44, 128k Flash, 8k Boot, 2k SRAM, 1k EEPROM, JTAG, USB
+D TQFP44, 128k Flash, 8k Boot, 2k SRAM, 1k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128A4U-M
-D ATXMEGA128A4U, QFN44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
+D QFN44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128B1-A
-D ATXMEGA128B1, TQFP100, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB, LCD
+D TQFP100, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB, LCD
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8330-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B1-ATxmega128B1_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128B3-A
-D ATXMEGA128B3, TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB, LCD
+D TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB, LCD
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128B3-M
-D ATXMEGA128B3, QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB, LCD
+D QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB, LCD
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128C3-A
-D ATXMEGA128C3, TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
+D TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128C3-M
-D ATXMEGA128C3, QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
+D QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128D3-A
-D ATXMEGA128D3, TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D TQFP64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128D3-M
-D ATXMEGA128D3, QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D QFN64, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128D4-A
-D ATXMEGA128D4, TQFP44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D TQFP44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA128D4-M
-D ATXMEGA128D4, VQFN44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
+D VQFN44, 128k Flash, 8k Boot, 8k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16A4-A
-D ATXMEGA16A4, TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
+D TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16A4-M
-D ATXMEGA16A4, VQFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
+D VQFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16A4U-A
-D ATXMEGA16A4U, TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG, USB
+D TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16A4U-M
-D ATXMEGA16A4U, QFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG, USB
+D QFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16C4-A
-D ATXMEGA16C4, TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
+D TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16C4-M
-D ATXMEGA16C4, VQFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
+D VQFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16D4-A
-D ATXMEGA16D4, TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
+D TQFP44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16D4-M
-D ATXMEGA16D4, VQFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
+D VQFN44, 16k Flash, 4k Boot, 2k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16E5-A
-D ATXMEGA16E5, TQFP32, 16k Flash, 4k Boot, 2k SRAM, 512B EEPROM
+D TQFP32, 16k Flash, 4k Boot, 2k SRAM, 512B EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16E5-M4
-D ATXMEGA16E5, UQFN32, 16k Flash, 4k Boot, 2k SRAM, 512B EEPROM
+D UQFN32, 16k Flash, 4k Boot, 2k SRAM, 512B EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA16E5-MU
-D ATXMEGA16E5, VQFN32, 16k Flash, 4k Boot, 2k SRAM, 512B EEPROM
+D VQFN32, 16k Flash, 4k Boot, 2k SRAM, 512B EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192A1-A
-D ATXMEGA192A1, TQFP100, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
+D TQFP100, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192A3-A
-D ATXMEGA192A3, TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
+D TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192A3-M
-D ATXMEGA192A3, QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
+D QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192A3U-A
-D ATXMEGA192A3U, TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
+D TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192A3U-M
-D ATXMEGA192A3U, QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
+D QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192C3-A
-D ATXMEGA192C3, TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
+D TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192C3-M
-D ATXMEGA192C3, QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
+D QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192D3-A
-D ATXMEGA192D3, TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
+D TQFP64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA192D3-M
-D ATXMEGA192D3, QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
+D QFN64, 192k Flash, 8k Boot, 16k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256A1-A
-D ATXMEGA256A1, TQFP100, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
+D TQFP100, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256A3-A
-D ATXMEGA256A3, TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
+D TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
@@ -2425,73 +2425,73 @@ F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrolle
 $ENDCMP
 #
 $CMP ATXMEGA256A3B-A
-D ATXMEGA256A3B, TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
+D TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8116-8-and-16-bit-AVR-XMEGA-A3B-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256A3B-M
-D ATXMEGA256A3B, MLF/QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
+D MLF/QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8116-8-and-16-bit-AVR-XMEGA-A3B-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256A3BU-A
-D ATXMEGA256A3B, TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
+D TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8362-8-and-16bit-AVR-microcontroller-ATxmega256A3BU_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256A3BU-M
-D ATXMEGA256A3B, QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
+D QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8362-8-and-16bit-AVR-microcontroller-ATxmega256A3BU_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256A3U-A
-D ATXMEGA256A3U, TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
+D TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256A3U-M
-D ATXMEGA256A3U, QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
+D QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256C3-A
-D ATXMEGA256C3, TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
+D TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256C3-M
-D ATXMEGA256C3, QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
+D QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256D3-A
-D ATXMEGA256D3, TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
+D TQFP64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA256D3-M
-D ATXMEGA256D3, QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
+D QFN64, 256k Flash, 8k Boot, 16k SRAM, 4k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32A4-A
-D ATXMEGA32A4, TQFP44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
+D TQFP44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32A4-M
-D ATXMEGA32A4, VQFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
+D VQFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
@@ -2503,49 +2503,49 @@ F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A
 $ENDCMP
 #
 $CMP ATXMEGA32A4U-M
-D ATXMEGA32A4U, QFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG, USB
+D QFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32C4-A
-D ATXMEGA32C4, TQFP44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
+D TQFP44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32C4-M
-D ATXMEGA32C4, VQFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
+D VQFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32D4-A
-D ATXMEGA32D4, TQFP44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
+D TQFP44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32D4-M
-D ATXMEGA32D4, VQFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
+D VQFN44, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32E5-A
-D ATXMEGA32E5, TQFP32, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM
+D TQFP32, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32E5-M4
-D ATXMEGA32E5, UQFN32, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM
+D UQFN32, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA32E5-MU
-D ATXMEGA32E5, VQFN32, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM
+D VQFN32, 32k Flash, 4k Boot, 4k SRAM, 1k EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
@@ -2557,133 +2557,133 @@ F http://www.atmel.com/Images/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxme
 $ENDCMP
 #
 $CMP ATXMEGA64A1-A
-D ATXMEGA64A1, TQFP100, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D TQFP100, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A1U-A
-D ATXMEGA64A1U, TQFP100, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, USB, JTAG
+D TQFP100, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, USB, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A3-A
-D ATXMEGA64A3, TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A3-M
-D ATXMEGA64A3, QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A3U-A
-D ATXMEGA64A3U, TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
+D TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A3U-M
-D ATXMEGA64A3U, QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
+D QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A4-A
-D ATXMEGA64A4, TQFP44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D TQFP44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A4-M
-D ATXMEGA64A4, VQFN44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D VQFN44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8069-8-and-16-bit-AVR-AMEGA-A4-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A4U-A
-D ATXMEGA64A4U, TQFP44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
+D TQFP44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64A4U-M
-D ATXMEGA64A4U, QFN44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
+D QFN44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64B1-A
-D ATXMEGA64B1, TQFP100, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB, LCD
+D TQFP100, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB, LCD
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8330-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B1-ATxmega128B1_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64B3-A
-D ATXMEGA64B3, TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB, LCD
+D TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB, LCD
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64B3-M
-D ATXMEGA64B3, QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB, LCD
+D QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB, LCD
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64C3-A
-D ATXMEGA64C3, TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
+D TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64C3-M
-D ATXMEGA64C3, QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
+D QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG, USB
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64D3-A
-D ATXMEGA64D3, TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D TQFP64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64D3-M
-D ATXMEGA64D3, QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D QFN64, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64D4-A
-D ATXMEGA64D4, TQFP44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D TQFP44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA64D4-M
-D ATXMEGA64D4, VQFN44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
+D VQFN44, 64k Flash, 4k Boot, 4k SRAM, 2k EEPROM, JTAG
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA8E5-A
-D ATXMEGA8E5, TQFP32, 8k Flash, 2k Boot, 1k SRAM, 512B EEPROM
+D TQFP32, 8k Flash, 2k Boot, 1k SRAM, 512B EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA8E5-M4
-D ATXMEGA8E5, UQFN32, 8k Flash, 2k Boot, 1k SRAM, 512B EEPROM
+D UQFN32, 8k Flash, 2k Boot, 1k SRAM, 512B EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
 $CMP ATXMEGA8E5-MU
-D ATXMEGA8E5, VQFN32, 8k Flash, 2k Boot, 1k SRAM, 512B EEPROM
+D VQFN32, 8k Flash, 2k Boot, 1k SRAM, 512B EEPROM
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://www.atmel.com/Images/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
@@ -2714,169 +2714,169 @@ K IDC6 Male Connector
 $ENDCMP
 #
 $CMP SAMD20E14A-A
-D SAMD20E14A-A, TQFP32, 16K Flash, 2K RAM, 48MHz, CortexM0+
+D TQFP32, 16K Flash, 2K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20E14A-M
-D SAMD20E14A-M, QFN32, 16K Flash, 2K RAM, 48MHz, CortexM0+
+D QFN32, 16K Flash, 2K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20E15A-A
-D SAMD20E15A-A, TQFP32, 32K Flash, 4K RAM, 48MHz, CortexM0+
+D TQFP32, 32K Flash, 4K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20E15A-M
-D SAMD20E15A-M, QFN32, 32K Flash, 4K RAM, 48MHz, CortexM0+
+D QFN32, 32K Flash, 4K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20E16A-A
-D SAMD20E16A-A, TQFP32, 64K Flash, 8K RAM, 48MHz, CortexM0+
+D TQFP32, 64K Flash, 8K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20E16A-M
-D SAMD20E16A-M, QFN32, 64K Flash, 8K RAM, 48MHz, CortexM0+
+D QFN32, 64K Flash, 8K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20E17A-A
-D SAMD20E17A-A, TQFP32, 128K Flash, 16K RAM, 48MHz, CortexM0+
+D TQFP32, 128K Flash, 16K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20E17A-M
-D SAMD20E17A-M, QFN32, 128K Flash, 16K RAM, 48MHz, CortexM0+
+D QFN32, 128K Flash, 16K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G14A-A
-D SAMD20G14A-A, TQFP48, 16K Flash, 2K RAM, 48MHz, CortexM0+
+D TQFP48, 16K Flash, 2K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G14A-M
-D SAMD20G14A-M, QFN48, 16K Flash, 2K RAM, 48MHz, CortexM0+
+D QFN48, 16K Flash, 2K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G15A-A
-D SAMD20G15A-A, TQFP48, 32K Flash, 4K RAM, 48MHz, CortexM0+
+D TQFP48, 32K Flash, 4K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G15A-M
-D SAMD20G15A-M, QFN48, 32K Flash, 4K RAM, 48MHz, CortexM0+
+D QFN48, 32K Flash, 4K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G16A-A
-D SAMD20G16A-A, TQFP48, 64K Flash, 8K RAM, 48MHz, CortexM0+
+D TQFP48, 64K Flash, 8K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G16A-M
-D SAMD20G16A-M, QFN48, 64K Flash, 8K RAM, 48MHz, CortexM0+
+D QFN48, 64K Flash, 8K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G17A-A
-D SAMD20G17A-A, TQFP48, 128K Flash, 16K RAM, 48MHz, CortexM0+
+D TQFP48, 128K Flash, 16K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G17A-M
-D SAMD20G17A-M, QFN48, 128K Flash, 16K RAM, 48MHz, CortexM0+
+D QFN48, 128K Flash, 16K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G18A-A
-D SAMD20G18A-A, TQFP48, 256K Flash, 32K RAM, 48MHz, CortexM0+
+D TQFP48, 256K Flash, 32K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20G18A-M
-D SAMD20G18A-M, QFN48, 256K Flash, 32K RAM, 48MHz, CortexM0+
+D QFN48, 256K Flash, 32K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J14A-A
-D SAMD20J14A-A, TQFP64, 16K Flash, 2K RAM, 48MHz, CortexM0+
+D TQFP64, 16K Flash, 2K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J14A-M
-D SAMD20J14A-M, QFN64, 16K Flash, 2K RAM, 48MHz, CortexM0+
+D QFN64, 16K Flash, 2K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J15A-A
-D SAMD20J15A-A, TQFP64, 32K Flash, 4K RAM, 48MHz, CortexM0+
+D TQFP64, 32K Flash, 4K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J15A-M
-D SAMD20J15A-M, QFN64, 32K Flash, 4K RAM, 48MHz, CortexM0+
+D QFN64, 32K Flash, 4K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J16A-A
-D SAMD20J16A-A, TQFP64, 64K Flash, 8K RAM, 48MHz, CortexM0+
+D TQFP64, 64K Flash, 8K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J16A-M
-D SAMD20J16A-M, QFN64, 64K Flash, 8K RAM, 48MHz, CortexM0+
+D QFN64, 64K Flash, 8K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J17A-A
-D SAMD20J17A-A, TQFP64, 128K Flash, 16K RAM, 48MHz, CortexM0+
+D TQFP64, 128K Flash, 16K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J17A-M
-D SAMD20J17A-M, QFN64, 128K Flash, 16K RAM, 48MHz, CortexM0+
+D QFN64, 128K Flash, 16K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J18A-A
-D SAMD20J18A-A, TQFP64, 256K Flash, 32K RAM, 48MHz, CortexM0+
+D TQFP64, 256K Flash, 32K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
 #
 $CMP SAMD20J18A-M
-D SAMD20J18A-M, QFN64, 256K Flash, 32K RAM, 48MHz, CortexM0+
+D QFN64, 256K Flash, 32K RAM, 48MHz, CortexM0+
 K ARM 32bit Microcontroller 48MHz CortexM0+
 F http://www.atmel.com/Images/Atmel-42129-SAM-D20_Datasheet.pdf
 $ENDCMP
diff --git a/library/audio.dcm b/library/audio.dcm
index 239803d1..8929ec73 100644
--- a/library/audio.dcm
+++ b/library/audio.dcm
@@ -1,49 +1,49 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP LM1875
-D LM1875, 20W Audio Power Amplifier, TO220-5
+D 20W Audio Power Amplifier, TO220-5
 K LM1875 Amplifier 20W
 F http://www.national.com/ds/LM/LM1875.pdf
 $ENDCMP
 #
 $CMP LM1876
-D LM1876, Dual 20W Overture Seriers Audio Power Amplifier, with Mute Standby Mode, TO220-15 (MultiWatt)
+D Dual 20W Overture Seriers Audio Power Amplifier, with Mute Standby Mode, TO220-15 (MultiWatt)
 K LM1876 Overture Amplifier Dual 20W
 F http://www.national.com/ds/LM/LM1876.pdf
 $ENDCMP
 #
 $CMP LM1877M
-D LM1877M, 2W/8R Dual Audio Power Amplifier, Supply Voltage 6-24V, SO14L
+D 2W/8R Dual Audio Power Amplifier, Supply Voltage 6-24V, SO14L
 K Dual Audio Amplifier 2W 24V
 F ns/lm1877.pdf
 $ENDCMP
 #
 $CMP LM1877N
-D LM1877N, 2W/8R Dual Audio Power Amplifier, Supply Voltage 6-24V, DIP14
+D 2W/8R Dual Audio Power Amplifier, Supply Voltage 6-24V, DIP14
 K Dual Audio Amplifier 2W 24V
 F ns/lm1877.pdf
 $ENDCMP
 #
 $CMP LM3886T
-D LM3886, Single 68W Overture Seriers Audio Power Amplifier, with Mute Mode, TO220-11 (MultiWatt)
+D Single 68W Overture Seriers Audio Power Amplifier, with Mute Mode, TO220-11 (MultiWatt)
 K LM3886 Overture Amplifier Single 86W
 F http://www.ti.com/lit/ds/symlink/lm3886.pdf
 $ENDCMP
 #
 $CMP LM3886TF
-D LM3886, Single 68W Overture Seriers Audio Power Amplifier, with Mute Mode, PFM-11 (Plastic MultiWatt)
+D Single 68W Overture Seriers Audio Power Amplifier, with Mute Mode, PFM-11 (Plastic MultiWatt)
 K LM3886 Overture Amplifier Single 86W
 F http://www.ti.com/lit/ds/symlink/lm3886.pdf
 $ENDCMP
 #
 $CMP LM4950TA
-D LM4950TA, Audio 3.1W Stereo Power Amplifier, TO220-9
+D Audio 3.1W Stereo Power Amplifier, TO220-9
 K LM4950 Stereo Power Aplifier 3.1W
 F http://www.ti.com/lit/ds/symlink/lm4950.pdf
 $ENDCMP
 #
 $CMP LM4950TS
-D LM4950TS, Audio 3.1W Stereo Power Amplifier, TO263-9
+D Audio 3.1W Stereo Power Amplifier, TO263-9
 K LM4950 Stereo Power Aplifier 3.1W
 F http://www.ti.com/lit/ds/symlink/lm4950.pdf
 $ENDCMP
@@ -97,22 +97,22 @@ K AUDIO
 $ENDCMP
 #
 $CMP STK433
-D STK433, Dual 5W Audio Power Amplifier, 4009
+D Dual 5W Audio Power Amplifier, 4009
 K STK433 Dual 5W Amplifier Audio
 $ENDCMP
 #
 $CMP STK435
-D STK435, Dual 7W Audio Power Amplifier, 4009
+D Dual 7W Audio Power Amplifier, 4009
 K STK435 Dual 7W Amplifier Audio
 $ENDCMP
 #
 $CMP STK436
-D STK436, Dual 10W Audio Power Amplifier, 4009
+D Dual 10W Audio Power Amplifier, 4009
 K STK436 Dual 10W Amplifier Audio
 $ENDCMP
 #
 $CMP STK437
-D STK437, Dual 10W Audio Power Amplifier, 4009
+D Dual 10W Audio Power Amplifier, 4009
 K STK437 Dual 10W Amplifier Audio
 $ENDCMP
 #
@@ -122,53 +122,53 @@ K STK435 Dual 15W Amplifier Audio
 $ENDCMP
 #
 $CMP STK441
-D STK441, Dual 20W Audio Power Amplifier, 4010
+D Dual 20W Audio Power Amplifier, 4010
 K STK441 Dual 20W Amplifier Audio
 $ENDCMP
 #
 $CMP STK443
-D STK443, Dual 25W Audio Power Amplifier, 4010
+D Dual 25W Audio Power Amplifier, 4010
 K STK443 Dual 25W Amplifier Audio
 $ENDCMP
 #
 $CMP TDA2003H
-D TDA2003H, 10W Car Radio Audio Amplifier, TO220-5 (PentaWatt5H)
+D 10W Car Radio Audio Amplifier, TO220-5 (PentaWatt5H)
 K TDA2003H Amplifier 10W Pentawatt
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00000123.pdf
 $ENDCMP
 #
 $CMP TDA2003V
-D TDA2003V, 10W Car Radio Audio Amplifier, PentaWatt5V
+D 10W Car Radio Audio Amplifier, PentaWatt5V
 K TDA2003V Amplifier 10W Pentawatt
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00000123.pdf
 $ENDCMP
 #
 $CMP TDA2005R
-D TDA2005R, 20W Bidge/Stereo Audio Amplifier for Car Radio, TO220-11 (MultiWatt11)
+D 20W Bidge/Stereo Audio Amplifier for Car Radio, TO220-11 (MultiWatt11)
 K TDA2005 Amplifier 20W Multiwatt
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00000124.pdf
 $ENDCMP
 #
 $CMP TDA2030
-D TDA2030, 14W Hi-Fi Audio Amplifier, TO220-5 (PentaWatt)
+D 14W Hi-Fi Audio Amplifier, TO220-5 (PentaWatt)
 K TDA2030 Amplifier14W Pentawatt
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00000128.pdf
 $ENDCMP
 #
 $CMP TDA2050
-D TDA2050, 32W Hi-Fi Audio Amplifier, TO220-5 (PentaWatt)
+D 32W Hi-Fi Audio Amplifier, TO220-5 (PentaWatt)
 K TDA2050 Amplifier 32W Pentawatt
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00000131.pdf
 $ENDCMP
 #
 $CMP TDA7294HS
-D TDA7294HS, Single 100W Audio Power Amplifier, with Mute and Standby Mode, MultiWatt15H
+D Single 100W Audio Power Amplifier, with Mute and Standby Mode, MultiWatt15H
 K TDA7294 Amplifier Single 100W
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00000017.pdf
 $ENDCMP
 #
 $CMP TDA7294V
-D TDA7294V, Single 100W Audio Power Amplifier, with Mute and Standby Mode, TO220-15 (MultiWatt15V)
+D Single 100W Audio Power Amplifier, with Mute and Standby Mode, TO220-15 (MultiWatt15V)
 K TDA7294 Amplifier Single 100W
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00000017.pdf
 $ENDCMP
diff --git a/library/conn.dcm b/library/conn.dcm
index 797e2426..3d86c989 100644
--- a/library/conn.dcm
+++ b/library/conn.dcm
@@ -62,7 +62,7 @@ K CONN
 $ENDCMP
 #
 $CMP DIN_5
-D DIN 5 pins connector, 41524
+D 5 pins connector, 41524
 K CONN DIN 5-pins 41524
 $ENDCMP
 #
@@ -132,37 +132,37 @@ F http://portal.fciconnect.com/Comergent//fci/drawing/10067847.pdf
 $ENDCMP
 #
 $CMP TEST
-D Test point
+D point
 K point tp
 $ENDCMP
 #
 $CMP USB_A
-D USB A connector
+D A connector
 K USB USB_A
 $ENDCMP
 #
 $CMP USB_B
-D USB B connector
+D B connector
 K USB USB_B
 $ENDCMP
 #
 $CMP USB_OTG
-D USB OTG micro/mini connector
+D micro/mini connector
 K USB USB_OTG USB_mini USB_micro
 $ENDCMP
 #
 $CMP XLR3
-D XLR 3 pins
+D 3 pins
 K CONN
 $ENDCMP
 #
 $CMP XLR4
-D XLR 4 pins
+D 4 pins
 K CONN
 $ENDCMP
 #
 $CMP XLR5
-D XLR 5 pins
+D 5 pins
 K CONN
 $ENDCMP
 #
diff --git a/library/contrib.dcm b/library/contrib.dcm
index 00365876..9a4709c3 100644
--- a/library/contrib.dcm
+++ b/library/contrib.dcm
@@ -1,7 +1,7 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP FX614
-D FX614, Bell 202 Compatible Modem, DIP-16/SO-16
+D Bell 202 Compatible Modem, DIP-16/SO-16
 K Bell Modem
 F contrib/fx614ds.pdf
 $ENDCMP
diff --git a/library/cypress.dcm b/library/cypress.dcm
index c1170bf1..c927db3b 100644
--- a/library/cypress.dcm
+++ b/library/cypress.dcm
@@ -1,37 +1,37 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP CY8CMBR3002
-D CY8CMBR3002, CapSense Controller, 2 Sensors, SOIC-8
+D CapSense Controller, 2 Sensors, SOIC-8
 K Touch Sensor 2ch
 F http://www.cypress.com/?docID=49119
 $ENDCMP
 #
 $CMP CY8CMBR3102
-D CY8CMBR3102, CapSense Controller, 2 Sensors, SOIC-8
+D CapSense Controller, 2 Sensors, SOIC-8
 K Touch Sensor 2ch
 F http://www.cypress.com/?docID=49119
 $ENDCMP
 #
 $CMP CY8CMBR3106S
-D CY8CMBR3106S, CapSense Controller, 16 Sensors w/ Slider, QFN-24+EP
+D CapSense Controller, 16 Sensors w/ Slider, QFN-24+EP
 K Touch Sensor 16ch Slider
 F http://www.cypress.com/?docID=49119
 $ENDCMP
 #
 $CMP CY8CMBR3108
-D CY8CMBR3108, CapSense Controller, 8 Sensors, QFN-16+EP
+D CapSense Controller, 8 Sensors, QFN-16+EP
 K Touch Sensor 8ch
 F http://www.cypress.com/?docID=49119
 $ENDCMP
 #
 $CMP CY8CMBR3110
-D CY8CMBR3110, CapSense Controller, 10 Sensors, SOIC-16
+D CapSense Controller, 10 Sensors, SOIC-16
 K Touch Sensor 10ch
 F http://www.cypress.com/?docID=49119
 $ENDCMP
 #
 $CMP CY8CMBR3116
-D CY8CMBR3116, CapSense Controller, 16 Sensors, QFN-24+EP
+D CapSense Controller, 16 Sensors, QFN-24+EP
 K Touch Sensor 16ch
 F http://www.cypress.com/?docID=49119
 $ENDCMP
diff --git a/library/dc-dc.dcm b/library/dc-dc.dcm
index c469264a..1ca1c0e7 100644
--- a/library/dc-dc.dcm
+++ b/library/dc-dc.dcm
@@ -7,22 +7,22 @@ F http://www.analog.com/media/en/technical-documentation/data-sheets/ADP2108.pdf
 $ENDCMP
 #
 $CMP APE1707H-12-HF
-D APE1707H-12-HF, 12V 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
+D 12V 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
 K 12V 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
 $CMP APE1707H-33-HF
-D APE1707H-33-HF, 3.3V 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
+D 3.3V 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
 K 3.3V 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
 $CMP APE1707H-50-HF
-D APE1707H-50-HF, 5.0V 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
+D 5.0V 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
 K 5V 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
 $CMP APE1707H-HF
-D APE1707H-HF, Adjustable 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
+D Adjustable 2A, 150KHz PWM Buck DC/DC Converter, TO252-5 (D-PAK)
 K Adjustable 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
@@ -32,166 +32,166 @@ K 12V 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
 $CMP APE1707M-33-HF
-D APE1707M-33-HF, 3.3V 2A, 150KHz PWM Buck DC/DC Converter, SO8
+D 3.3V 2A, 150KHz PWM Buck DC/DC Converter, SO8
 K 3.3V 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
 $CMP APE1707M-50-HF
-D APE1707M-50-HF, 5.0V 2A, 150KHz PWM Buck DC/DC Converter, SO8
+D 5.0V 2A, 150KHz PWM Buck DC/DC Converter, SO8
 K 5V 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
 $CMP APE1707M-HF
-D APE1707M-HF, Adjustable 2A, 150KHz PWM Buck DC/DC Converter, SO8
+D Adjustable 2A, 150KHz PWM Buck DC/DC Converter, SO8
 K Adjustable 2A 150KHz PWM Buck DC/DC
 $ENDCMP
 #
 $CMP BD9001F
-D BD9001F, 48V 2A, Flexible Step-Down Switching Regulator, SO8
+D 48V 2A, Flexible Step-Down Switching Regulator, SO8
 K DC-DC Step-Down Switching Regulator
 F http://rohmfs.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator/bd9778f-e.pdf
 $ENDCMP
 #
 $CMP BD9778F
-D BD9778F, 35V 2A, Flexible Step-Down Switching Regulator, SO8
+D 35V 2A, Flexible Step-Down Switching Regulator, SO8
 K DC-DC Step-Down Switching Regulator
 F http://rohmfs.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator/bd9778f-e.pdf
 $ENDCMP
 #
 $CMP BD9778HFP
-D BD9778HFP, 35V 2A, Flexible Step-Down Switching Regulator, HRP7
+D 35V 2A, Flexible Step-Down Switching Regulator, HRP7
 K DC-DC Step-Down Switching Regulator
 F http://rohmfs.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator/bd9778f-e.pdf
 $ENDCMP
 #
 $CMP BD9781HFP
-D BD9781HFP, 35V 4A, Flexible Step-Down Switching Regulator, HRP7
+D 35V 4A, Flexible Step-Down Switching Regulator, HRP7
 K DC-DC Step-Down Switching Regulator
 F http://rohmfs.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator/bd9778f-e.pdf
 $ENDCMP
 #
 $CMP BD9G341EFJ
-D BD9G341EFJ, 12V-76V input voltage range 3A output current
+D 12V-76V input voltage range 3A output current
 K BD9G341EFJ, Buck Converter
 F http://rohmfs.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator/bd9778f-e.pdf
 $ENDCMP
 #
 $CMP GL2576-12SF8DR
-D GL2576-12SF8DR, 12V 3A, 52KHz Step Down Converter, SO8
+D 12V 3A, 52KHz Step Down Converter, SO8
 K 12V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-12TA5PR
-D GL2576-12TA5PR, 12V 3A, 52KHz Step Down Converter, TD2P-5
+D 12V 3A, 52KHz Step Down Converter, TD2P-5
 K 12V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-12TA5R
-D GL2576-12TA5R, 12V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
+D 12V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
 K 12V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-12TB5T
-D GL2576-12TB5T, 12V 3A, 52KHz Step Down Converter, TO220-5
+D 12V 3A, 52KHz Step Down Converter, TO220-5
 K 12V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-15SF8DR
-D GL2576-15SF8DR, 15V 3A, 52KHz Step Down Converter, SO8
+D 15V 3A, 52KHz Step Down Converter, SO8
 K 15V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-15TA5PR
-D GL2576-15TA5PR, 15V 3A, 52KHz Step Down Converter, TD2P-5
+D 15V 3A, 52KHz Step Down Converter, TD2P-5
 K 15V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-15TA5R
-D GL2576-15TA5R, 15V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
+D 15V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
 K 15V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-15TB5T
-D GL2576-15TB5T, 15V 3A, 52KHz Step Down Converter, TO220-5
+D 15V 3A, 52KHz Step Down Converter, TO220-5
 K 15V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-3.3SF8DR
-D GL2576-3.3SF8DR, 3.3V 3A, 52KHz Step Down Converter, SO8
+D 3.3V 3A, 52KHz Step Down Converter, SO8
 K 3.3V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-3.3TA5PR
-D GL2576-3.3TA5PR, 3.3V 3A, 52KHz Step Down Converter, TD2P-5
+D 3.3V 3A, 52KHz Step Down Converter, TD2P-5
 K 3.3V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-3.3TA5R
-D GL2576-3.3TA5R, 3.3V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
+D 3.3V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
 K 3.3V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-3.3TB5T
-D GL2576-3.3TB5T, 3.3V 3A, 52KHz Step Down Converter, TO220-5
+D 3.3V 3A, 52KHz Step Down Converter, TO220-5
 K 3.3V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-5.0SF8DR
-D GL2576-5.0SF8DR, 5V 3A, 52KHz Step Down Converter, SO8
+D 5V 3A, 52KHz Step Down Converter, SO8
 K 5V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-5.0TA5PR
-D GL2576-5.0TA5PR, 5V 3A, 52KHz Step Down Converter, TD2P-5
+D 5V 3A, 52KHz Step Down Converter, TD2P-5
 K 5V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-5.0TA5R
-D GL2576-5.0TA5R, 5V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
+D 5V 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
 K 5V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-5.0TB5T
-D GL2576-5.0TB5T, 5V 3A, 52KHz Step Down Converter, TO220-5
+D 5V 3A, 52KHz Step Down Converter, TO220-5
 K 5V 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-ASF8DR
-D GL2576-ASF8DR, Adjustable 3A, 52KHz Step Down Converter, SO8
+D Adjustable 3A, 52KHz Step Down Converter, SO8
 K Adjustable 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-ATA5PR
-D GL2576-ATA5PR, Adjustable 3A, 52KHz Step Down Converter, TD2P-5
+D Adjustable 3A, 52KHz Step Down Converter, TD2P-5
 K Adjustable 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-ATA5R
-D GL2576-ATA5R, Adjustable 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
+D Adjustable 3A, 52KHz Step Down Converter, TO263-5 (D2-PAK)
 K Adjustable 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
 #
 $CMP GL2576-ATB5T
-D GL2576-ATB5T, Adjustable 3A, 52KHz Step Down Converter, TO220-5
+D Adjustable 3A, 52KHz Step Down Converter, TO220-5
 K Adjustable 3A 52KHz Buck DC/DC
 F http://www.dianyuan.com/bbs/u/54/437861181916300.pdf
 $ENDCMP
@@ -227,61 +227,61 @@ F www.national.com/ds/LM/LM2574.pdf
 $ENDCMP
 #
 $CMP LM2574N-12
-D LM2574N, 12V, 0.5A Step-Down VR
+D 12V, 0.5A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 500mA
 F www.national.com/ds/LM/LM2574.pdf
 $ENDCMP
 #
 $CMP LM2574N-15
-D LM2574N, 15V, 0.5A Step-Down VR
+D 15V, 0.5A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 15V 500mA
 F www.national.com/ds/LM/LM2574.pdf
 $ENDCMP
 #
 $CMP LM2574N-3.3
-D LM2574N, 3.3V, 0.5A Step-Down VR
+D 3.3V, 0.5A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 500mA
 F www.national.com/ds/LM/LM2574.pdf
 $ENDCMP
 #
 $CMP LM2574N-5
-D LM2574N, 5V, 0.5A Step-Down VR
+D 5V, 0.5A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 500mA
 F www.national.com/ds/LM/LM2574.pdf
 $ENDCMP
 #
 $CMP LM2574N-ADJ
-D LM2574N, Adjustable Output, 0.5A Step-Down VR
+D Adjustable Output, 0.5A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator Adjustable 500mA
 F www.national.com/ds/LM/LM2574.pdf
 $ENDCMP
 #
 $CMP LM2576HVS-12
-D LM2576HVS, TO-263, 12V 3A Step-Down VR High Voltage Input
+D TO-263, 12V 3A Step-Down VR High Voltage Input
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 3A High Voltage
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576HVS-15
-D LM2576HVS, TO-263, 15V 3A Step-Down VR High Voltage Input
+D TO-263, 15V 3A Step-Down VR High Voltage Input
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 15V 3A High Voltage
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576HVS-3.3
-D LM2576HVS, TO-263, 3.3V 3A Step-Down VR High Voltage Input
+D TO-263, 3.3V 3A Step-Down VR High Voltage Input
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 3A High Voltage
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576HVS-5
-D LM2576HVS, TO-263, 5V 3A Step-Down VR High Voltage Input
+D TO-263, 5V 3A Step-Down VR High Voltage Input
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 3A High Voltage
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576HVS-ADJ
-D LM2576HVS, TO-263, Adjustable Output 3A Step-Down VR High Voltage Input
+D TO-263, Adjustable Output 3A Step-Down VR High Voltage Input
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3A Adjustable High Voltage
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
@@ -317,31 +317,31 @@ F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576S-12
-D LM2576S, TO-263, 12V 3A Step-Down VR
+D TO-263, 12V 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576S-15
-D LM2576S, TO-263, 15V 3A Step-Down VR
+D TO-263, 15V 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 15V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576S-3.3
-D LM2576S, TO-263, 3.3V 3A Step-Down VR
+D TO-263, 3.3V 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576S-5
-D LM2576S, TO-263, 5V 3A Step-Down VR
+D TO-263, 5V 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2576S-ADJ
-D LM2576S, TO-263, Adjustable Output 3A Step-Down VR
+D TO-263, Adjustable Output 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3A Adjustable
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
@@ -377,25 +377,25 @@ F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2595S-12
-D LM2595S, 12V, 1A Step-Down VR
+D 12V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 1A
 F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
 #
 $CMP LM2595S-3.3
-D LM2595S, 3.3V, 1A Step-Down VR
+D 3.3V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 1A
 F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
 #
 $CMP LM2595S-5
-D LM2595S, 5V, 1A Step-Down VR
+D 5V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 1A
 F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
 #
 $CMP LM2595S-ADJ
-D LM2595S, Adjustable Output 1A Step-Down VR
+D Adjustable Output 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 1A Adjustable
 F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
@@ -407,127 +407,127 @@ F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
 #
 $CMP LM2595T-3.3
-D LM2595T, 3.3V, 1A Step-Down VR
+D 3.3V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 1A
 F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
 #
 $CMP LM2595T-5
-D LM2595T, 5V, 1A Step-Down VR
+D 5V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 1A
 F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
 #
 $CMP LM2595T-ADJ
-D LM2595T, Adjustable Output 1A Step-Down VR
+D Adjustable Output 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 1A Adjustable
 F www.national.com/ds/LM/LM2595.pdf
 $ENDCMP
 #
 $CMP LM2596S-12
-D LM2596S, TO-263, 12V 3A Step-Down VR
+D TO-263, 12V 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2596S-3.3
-D LM2596S, TO-263, 3.3V 3A Step-Down VR
+D TO-263, 3.3V 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2596S-5
-D LM2596S, TO-263, 5V 3A Step-Down VR
+D TO-263, 5V 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2596S-ADJ
-D LM2596S, TO-263, Adjustable 3A Step-Down VR
+D TO-263, Adjustable 3A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator Adjustable 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2596T-12
-D LM2596T, TO220-5, 12V 3A 150kHz Step-Down VR
+D TO220-5, 12V 3A 150kHz Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2596T-3.3
-D LM2596T, TO220-5, 3.3V 3A 150kHz Step-Down VR
+D TO220-5, 3.3V 3A 150kHz Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2596T-5
-D LM2596T, TO220-5, 5V 3A 150kHz Step-Down VR
+D TO220-5, 5V 3A 150kHz Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2596T-ADJ
-D LM2596T, TO220-5, Adjustable 3A 150kHz Step-Down VR
+D TO220-5, Adjustable 3A 150kHz Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator Adjustable 3A
 F http://www.ti.com/lit/ds/symlink/lm2576.pdf
 $ENDCMP
 #
 $CMP LM2672M-12
-D LM2672M, 12V, 1A Step-Down VR
+D 12V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 1A
 F www.national.com/ds/LM/LM2672.pdf
 $ENDCMP
 #
 $CMP LM2672M-3.3
-D LM2672M, 3.3V, 1A Step-Down VR
+D 3.3V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 1A
 F www.national.com/ds/LM/LM2672.pdf
 $ENDCMP
 #
 $CMP LM2672M-ADJ
-D LM2672M, Adjustable Output, 1A Step-Down VR
+D Adjustable Output, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator
 F www.national.com/ds/LM/LM2672.pdf
 $ENDCMP
 #
 $CMP LM2672N-12
-D LM2672N, 12V, 1A Step-Down VR
+D 12V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 1A
 F www.national.com/ds/LM/LM2672.pdf
 $ENDCMP
 #
 $CMP LM2672N-3.3
-D LM2672N, 3.3V, 1A Step-Down VR
+D 3.3V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 1A
 F www.national.com/ds/LM/LM2672.pdf
 $ENDCMP
 #
 $CMP LM2672N-ADJ
-D LM2672N, Adjustable Output, 1A Step-Down VR
+D Adjustable Output, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator
 F www.national.com/ds/LM/LM2672.pdf
 $ENDCMP
 #
 $CMP LM2674M-12
-D LM2674M, 12V, 500 mA Step-Down VR
+D 12V, 500 mA Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 500mA
 F www.national.com/ds/LM/LM2674.pdf
 $ENDCMP
 #
 $CMP LM2674M-3.3
-D LM2674M, 3.3V, 500 mA Step-Down VR
+D 3.3V, 500 mA Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator
 F www.national.com/ds/LM/LM2674.pdf
 $ENDCMP
 #
 $CMP LM2674M-5.0
-D LM2674M, 5V, 500 mA Step-Down VR
+D 5V, 500 mA Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator
 F www.national.com/ds/LM/LM2674.pdf
 $ENDCMP
 #
 $CMP LM2674M-ADJ
-D LM2674M, Adjustable Output, 500 mA Step-Down VR
+D Adjustable Output, 500 mA Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator
 F www.national.com/ds/LM/LM2674.pdf
 $ENDCMP
@@ -557,25 +557,25 @@ F www.national.com/ds/LM/LM2674.pdf
 $ENDCMP
 #
 $CMP LM2675M-12
-D LM2675M, 12V, 1A Step-Down VR
+D 12V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 12V 1A
 F www.national.com/ds/LM/LM2675.pdf
 $ENDCMP
 #
 $CMP LM2675M-3.3
-D LM2675M, 3.3V, 1A Step-Down VR
+D 3.3V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 3.3V 1A
 F www.national.com/ds/LM/LM2675.pdf
 $ENDCMP
 #
 $CMP LM2675M-5
-D LM2675M, 5V, 1A Step-Down VR
+D 5V, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator 5V 1A
 F www.national.com/ds/LM/LM2675.pdf
 $ENDCMP
 #
 $CMP LM2675M-ADJ
-D LM2675M, Adjustable Output, 1A Step-Down VR
+D Adjustable Output, 1A Step-Down VR
 K SIMPLE SWITCHER® Step-Down Voltage Regulator Adjustable
 F www.national.com/ds/LM/LM2675.pdf
 $ENDCMP
@@ -605,7 +605,7 @@ F www.national.com/ds/LM/LM2675.pdf
 $ENDCMP
 #
 $CMP LM27313XMF
-D LM27313, 1A, 28Vout Boost Voltage Regulator, 1.6MHz Frequency, SOT-23-5
+D 1A, 28Vout Boost Voltage Regulator, 1.6MHz Frequency, SOT-23-5
 K Miniature Step-Up Boost Voltage Regulator
 F http://www.ti.com/lit/ds/symlink/lm27313.pdf
 $ENDCMP
@@ -641,7 +641,7 @@ F http://www.ti.com/lit/ds/symlink/lm2735.pdf
 $ENDCMP
 #
 $CMP LM3407MY
-D LM3407MY, LED Lighting CC Floating Buck Switching Regulator, eMSOP-8
+D LED Lighting CC Floating Buck Switching Regulator, eMSOP-8
 K LED Step-Down Switching Regulator
 F http://www.ti.com/lit/ds/symlink/lm3407.pdf
 $ENDCMP
@@ -653,67 +653,67 @@ F www.ti.com/lit/ds/symlink/lm3670.pdf
 $ENDCMP
 #
 $CMP LM5006MM
-D LM5006, 600 mA, 80V Constant On-Time Buck Switching Regulator
+D 600 mA, 80V Constant On-Time Buck Switching Regulator
 K Constant On-Time Buck Switching Regulator
 F http://www.ti.com/lit/ds/symlink/lm5006.pdf
 $ENDCMP
 #
 $CMP LM5007MM
-D LM5007, 700 mA, 80V Step-Down Switching Regulator
+D 700 mA, 80V Step-Down Switching Regulator
 K Step-Down Switching Regulator
 F www.national.com/ds/LM/LM5007.pdf
 $ENDCMP
 #
 $CMP LM5007SD
-D LM5007, 700 mA, 80V Step-Down Switching Regulator
+D 700 mA, 80V Step-Down Switching Regulator
 K Step-Down Switching Regulator
 F www.national.com/ds/LM/LM5007.pdf
 $ENDCMP
 #
 $CMP LM5008MM
-D LM5008, 500 mA, 100V Step-Down Switching Regulator
+D 500 mA, 100V Step-Down Switching Regulator
 K Step-Down Switching Regulator
 F www.national.com/ds/LM/LM5008.pdf
 $ENDCMP
 #
 $CMP LM5008SD
-D LM5008, 500 mA, 100V Step-Down Switching Regulator
+D 500 mA, 100V Step-Down Switching Regulator
 K Step-Down Switching Regulator
 F www.national.com/ds/LM/LM5008.pdf
 $ENDCMP
 #
 $CMP LM5008SDC
-D LM5008, 500 mA, 100V Step-Down Switching Regulator
+D 500 mA, 100V Step-Down Switching Regulator
 K Step-Down Switching Regulator
 F www.national.com/ds/LM/LM5008.pdf
 $ENDCMP
 #
 $CMP LM5009MM
-D LM5009, 150 mA, 100V Step-Down Switching Regulator
+D 150 mA, 100V Step-Down Switching Regulator
 K Step-Down Switching Regulator
 F www.national.com/ds/LM/LM5009.pdf
 $ENDCMP
 #
 $CMP LM5017MR
-D LM5017, 600 mA, 100V Step-Down Switching Regulator
+D 600 mA, 100V Step-Down Switching Regulator
 K Step-Down Switching Regulator High Voltage
 F http://www.national.com/ds/LM/LM5017.pdf
 $ENDCMP
 #
 $CMP LM5017SD
-D LM5017, 600 mA, 100V Step-Down Switching Regulator
+D 600 mA, 100V Step-Down Switching Regulator
 K Step-Down Switching Regulator High Voltage High Frequency
 F http://www.national.com/ds/LM/LM5017.pdf
 $ENDCMP
 #
 $CMP LMR10510XMF
-D LMR10510, 1A, 5.5V Step-Down Voltage Regulator, 1.6MHz Frequency, SOT-23-5
+D 1A, 5.5V Step-Down Voltage Regulator, 1.6MHz Frequency, SOT-23-5
 K Miniature Step-Down Buck Voltage Regulator
 F http://www.ti.com/lit/ds/symlink/lmr10510.pdf
 $ENDCMP
 #
 $CMP LMR10510YMF
-D LMR10510, 1A, 5.5V Step-Down Voltage Regulator, 3MHz Frequency, SOT-23-5
+D 1A, 5.5V Step-Down Voltage Regulator, 3MHz Frequency, SOT-23-5
 K Miniature Step-Down Buck Voltage Regulator
 F http://www.ti.com/lit/ds/symlink/lmr10510.pdf
 $ENDCMP
@@ -725,19 +725,19 @@ F http://www.ti.com/lit/ds/symlink/lmr10510.pdf
 $ENDCMP
 #
 $CMP LMR62014XMF
-D LMR62014, 1.4A, 20Vout Step-Up Voltage Regulator, 1.6MHz Frequency, SOT-23-5
+D 1.4A, 20Vout Step-Up Voltage Regulator, 1.6MHz Frequency, SOT-23-5
 K Miniature Step-Up Boost Voltage Regulator
 F http://www.ti.com/lit/ds/symlink/lmr62014.pdf
 $ENDCMP
 #
 $CMP LMR62421XMF
-D LMR62421, 2.1A, 24Vout Boost/SEPIC Voltage Regulator, 1.6MHz Frequency, SOT-23-5
+D 2.1A, 24Vout Boost/SEPIC Voltage Regulator, 1.6MHz Frequency, SOT-23-5
 K Miniature Step-Up Boost SEPIC Voltage Regulator
 F http://www.ti.com/lit/ds/symlink/lmr62421.pdf
 $ENDCMP
 #
 $CMP LMR62421XSD
-D LMR62421, 2.1A, 24Vout Step-Up Voltage Regulator, 1.6MHz Frequency
+D 2.1A, 24Vout Step-Up Voltage Regulator, 1.6MHz Frequency
 K Miniature Step-Up Boost SEPIC Voltage Regulator
 F http://www.ti.com/lit/ds/symlink/lmr62421.pdf
 $ENDCMP
@@ -754,102 +754,102 @@ F regulator/lt3439.pdf
 $ENDCMP
 #
 $CMP MAX5035AASA
-D MAX5035AASA, 3.3V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
+D 3.3V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
 K 3.3V 1A Step-Down Converter 76V Hi-Temp
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035AUPA
-D MAX5035AUPA, 3.3V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
+D 3.3V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
 K 3.3V 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035AUSA
-D MAX5035AUSA, 3.3V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
+D 3.3V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
 K 3.3V 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035BASA
-D MAX5035BASA, 5V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
+D 5V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
 K 5V 1A Step-Down Converter 76V Hi-Temp
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035BUPA
-D MAX5035BUPA, 5V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
+D 5V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
 K 5V 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035BUSA
-D MAX5035BUSA, 5V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
+D 5V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
 K 5V 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035CASA
-D MAX5035CASA, 12V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
+D 12V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
 K 12V 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035CUPA
-D MAX5035CUPA, 12V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
+D 12V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
 K 12V 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035CUSA
-D MAX5035CUSA, 12V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
+D 12V 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
 K 12V 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035DASA
-D MAX5035DASA, AdjustableV 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
+D AdjustableV 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
 K Adjustable V 1A Step-Down Converter 76V Hi-Temp
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035DUPA
-D MAX5035DUPA, Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
+D Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, PDIP-8
 K Adjustable 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035DUSA
-D MAX5035DUSA, Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
+D Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
 K Adjustable 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035EASA
-D MAX5035EASA, Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
+D Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, High Temperature Grade, SO8
 K Adjustable 1A Step-Down Converter 76V Hi-Temp
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP MAX5035EUSA
-D MAX5035EUSA, Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
+D Adjustable 1A, High-Efficiency Step-Down DC-DC Converter, Vin 76V, SO8
 K Adjustable 1A Step-Down Converter 76V
 F http://datasheets.maximintegrated.com/en/ds/MAX5035.pdf
 $ENDCMP
 #
 $CMP NID60
-D NID60, 60W, 250kHz Step Down Converter
+D 60W, 250kHz Step Down Converter
 K 60W, 250KHz Buck DC/DC
 F https://www.meanwell-web.com/en/download_datasheet.php?products_id=NID60S24-12&type=3
 $ENDCMP
 #
 $CMP ST1CC40PHR
-D ST1CC40PHR, DC/DC Buck CC Converter for LED's, Vin 18V, 3A, Power SO-8  (Preliminary)
+D DC/DC Buck CC Converter for LED's, Vin 18V, 3A, Power SO-8  (Preliminary)
 K DC/DC Buck Conwerter 3A Low Voltage Input LED Lighting
 $ENDCMP
 #
 $CMP ST1S10PHR
-D ST1S10PHR, DC/DC Buck Converter, Vin 18V, 3A, Power SO-8
+D DC/DC Buck Converter, Vin 18V, 3A, Power SO-8
 K DC/DC Buck Conwerter 3A Low Voltage Input
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00169322.pdf
 $ENDCMP
@@ -861,103 +861,103 @@ F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASH
 $ENDCMP
 #
 $CMP ST1S14PHR
-D ST1S14PHR, DC/DC Buck Converter, Vin 48V, 3A, Power SO-8
+D DC/DC Buck Converter, Vin 48V, 3A, Power SO-8
 K DC/DC Buck Conwerter 3A
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00285678.pdf
 $ENDCMP
 #
 $CMP TPS5430DDA
-D TPS5430DDA, 36V 3A, Step Down Swift Converter, HSOIC8
+D 36V 3A, Step Down Swift Converter, HSOIC8
 K Step-Down DC-DC Switching Regulator
 F http://www.ti.com/lit/ds/symlink/tps5430.pdf
 $ENDCMP
 #
 $CMP TPS5431DDA
-D TPS5431DDA, 23V 3A, Step Down Swift Converter, HSOIC8
+D 23V 3A, Step Down Swift Converter, HSOIC8
 K Step-Down DC-DC Switching Regulator
 F http://www.ti.com/lit/ds/symlink/tps5430.pdf
 $ENDCMP
 #
 $CMP TPS54340DDA
-D TPS54340DDA, 42V 3.5 A, Step Down DC-DC Converter with Eco-mode, HSOIC8
+D 42V 3.5 A, Step Down DC-DC Converter with Eco-mode, HSOIC8
 K Step-Down DC-DC Switching Regulator High Voltage High Frequency
 F http://www.ti.com/lit/ds/symlink/tps54340.pdf
 $ENDCMP
 #
 $CMP TPS54360DDA
-D TPS54360DDA, 60V 3.5 A, Step Down DC-DC Converter with Eco-mode, HSOIC8
+D 60V 3.5 A, Step Down DC-DC Converter with Eco-mode, HSOIC8
 K Step-Down DC-DC Switching Regulator High Voltage High Frequency
 F http://www.ti.com/lit/ds/symlink/tps54360.pdf
 $ENDCMP
 #
 $CMP TPS60500DGS
-D TPS60500DGS, 250mA Step-Down Charge Pump Regulator, Adjustable
+D 250mA Step-Down Charge Pump Regulator, Adjustable
 K Regulator Step-Down Charge Pump TPS Texas Instruments Ti
 F http://www.ti.com/lit/ds/symlink/tps60503.pdf
 $ENDCMP
 #
 $CMP TPS60501DGS
-D TPS60501DGS, 250mA Step-Down Charge Pump Regulator, 3.3V
+D 250mA Step-Down Charge Pump Regulator, 3.3V
 K Regulator Step-Down Charge Pump TPS Texas Instruments Ti
 F http://www.ti.com/lit/ds/symlink/tps60503.pdf
 $ENDCMP
 #
 $CMP TPS60502DGS
-D TPS60502DGS, 250mA Step-Down Charge Pump Regulator, 1.8V
+D 250mA Step-Down Charge Pump Regulator, 1.8V
 K Regulator Step-Down Charge Pump TPS Texas Instruments Ti
 F http://www.ti.com/lit/ds/symlink/tps60503.pdf
 $ENDCMP
 #
 $CMP TPS60503DGS
-D TPS60503DGS, 250mA Step-Down Charge Pump Regulator, 1.5V
+D 250mA Step-Down Charge Pump Regulator, 1.5V
 K Regulator Step-Down Charge Pump TPS Texas Instruments Ti
 F http://www.ti.com/lit/ds/symlink/tps60503.pdf
 $ENDCMP
 #
 $CMP TPS62200DBV
-D TPS62200DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, Adjustable
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, Adjustable
 K TPS62200DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
 #
 $CMP TPS62201DBV
-D TPS62201DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.5V
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.5V
 K TPS62201DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
 #
 $CMP TPS62202DBV
-D TPS62202DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.8V
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.8V
 K TPS62202DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
 #
 $CMP TPS62203DBV
-D TPS62203DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 3.3V
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 3.3V
 K TPS62203DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
 #
 $CMP TPS62204DBV
-D TPS62204DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.6V
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.6V
 K TPS62204DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
 #
 $CMP TPS62205DBV
-D TPS62205DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 2.5V
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 2.5V
 K TPS62205DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
 #
 $CMP TPS62207DBV
-D TPS62207DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.2V
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.2V
 K TPS62207DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
 #
 $CMP TPS62208DBV
-D TPS62208DBV, SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.875V
+D SOT-23-5, High-Efficiency Step-Down DC-DC Converter, 1.875V
 K TPS62208DBV Step-Down DC-DC Converter SOT-23-5
 F http://www.ti.com/lit/ds/symlink/tps62201.pdf
 $ENDCMP
diff --git a/library/device.dcm b/library/device.dcm
index 57b3e5d1..337c27f4 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -62,62 +62,62 @@ D Diode Schottky
 $ENDCMP
 #
 $CMP D_Schottky_x2_ACom_AKK
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_ACom_KAK
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_ACom_KKA
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_KCom_AAK
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_KCom_AKA
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_KCom_KAA
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_ACK
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_AKC
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_CAK
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_CKA
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_KAC
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_KCA
-D Double diode Shottky (Serie)
+D Double diode Schottky (Serie)
 K DEV DIODE
 $ENDCMP
 #
@@ -209,7 +209,7 @@ D Led
 $ENDCMP
 #
 $CMP Led_x2
-D LED DOUBLE type Bicolore
+D DOUBLE type Bicolore
 K LED
 $ENDCMP
 #
@@ -526,7 +526,7 @@ K switch
 $ENDCMP
 #
 $CMP SWITCH_INV
-D Switch inverseur
+D inverseur
 K switch
 $ENDCMP
 #
@@ -536,7 +536,7 @@ K switch
 $ENDCMP
 #
 $CMP SW_PUSH
-D Push Button
+D Button
 K Switch
 $ENDCMP
 #
diff --git a/library/digital-audio.dcm b/library/digital-audio.dcm
index fc9dda01..1c48af01 100644
--- a/library/digital-audio.dcm
+++ b/library/digital-audio.dcm
@@ -6,13 +6,13 @@ K 24bit Sigma Delta Audio ADC 2ch
 $ENDCMP
 #
 $CMP AK5393VS
-D AK5393VS, Enhanced Audio ADC, 2 channels Sigma Delta, 24bit 96kHz, SO28
+D Enhanced Audio ADC, 2 channels Sigma Delta, 24bit 96kHz, SO28
 K 96kHz 24bit Sigma Delta Audio ADC 2ch
 F http://www.akm.com/akm/en/file/datasheet/AK5393VS.pdf
 $ENDCMP
 #
 $CMP AK5394AVS
-D AK5394AVS, Super High Performance Audio ADC, 2 channels Sigma Delta, 24bit 192kHz, SO28
+D Super High Performance Audio ADC, 2 channels Sigma Delta, 24bit 192kHz, SO28
 K 192kHz 24bit Sigma Delta Audio ADC 2ch
 F http://www.akm.com/akm/en/file/datasheet/AK5394AVS.pdf
 $ENDCMP
@@ -77,19 +77,19 @@ F http://cirrus.com/en/pubs/proDatasheet/CS8420_F4.pdf
 $ENDCMP
 #
 $CMP LM4811
-D LM4811, Dual105mW Headphone Amplifier, Digital Volume Control, Shutdown Mode
+D Dual105mW Headphone Amplifier, Digital Volume Control, Shutdown Mode
 K headphone amplifier digital volume
 F http://www.ti.com/lit/ds/symlink/lm4811.pdf
 $ENDCMP
 #
 $CMP TLV320AIC23BPW
-D TLV320AIC23BPW, 8-96kHz Stero Audio CODEC w/ Headphone Amp, TSSOP28
+D 8-96kHz Stero Audio CODEC w/ Headphone Amp, TSSOP28
 K Stero Audio CODEC 96kHz Headphone
 F www.ti.com/lit/ds/symlink/tlv320aic23b.pdf
 $ENDCMP
 #
 $CMP TLV320AIC23BRHD
-D TLV320AIC23BRHD, 8-96kHz Stero Audio CODEC w/ Headphone Amp, QFN28
+D 8-96kHz Stero Audio CODEC w/ Headphone Amp, QFN28
 K Stero Audio CODEC 96kHz Headphone
 F www.ti.com/lit/ds/symlink/tlv320aic23b.pdf
 $ENDCMP
diff --git a/library/display.dcm b/library/display.dcm
index 84fea81d..6d2e995e 100644
--- a/library/display.dcm
+++ b/library/display.dcm
@@ -6,7 +6,7 @@ K DEV
 $ENDCMP
 #
 $CMP AG12864E
-D AG12864E, Graphics Display 128x64px,  1/64 Duty, KS108B Controller, AMPIRE
+D Graphics Display 128x64px,  1/64 Duty, KS108B Controller, AMPIRE
 K LCD Graphics 128x64 KS108 Ampire
 $ENDCMP
 #
@@ -44,7 +44,7 @@ D DISPLAY EA7123-12C
 $ENDCMP
 #
 $CMP DOT-BAR
-D BAR GRAPH unit
+D GRAPH unit
 K BAR DOT
 F Display/HDSP-48xx.pdf
 $ENDCMP
diff --git a/library/dsp.dcm b/library/dsp.dcm
index c384020a..3c980f39 100644
--- a/library/dsp.dcm
+++ b/library/dsp.dcm
@@ -1,13 +1,13 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP DSP96002
-D DSP96002, 32-bit General Purpose Floating-point DSP, Dual Port, PGA-223
+D 32-bit General Purpose Floating-point DSP, Dual Port, PGA-223
 K DSP 32bit Dual Port Processor
 F http://cache.freescale.com/files/dsp/doc/inactive/DSP96002.pdf
 $ENDCMP
 #
 $CMP TMS320LF2406PZ
-D TMS320LF2406PZ, 16bit DSP Controller 32Kx16B Flash 2.5Kx16B RAM, Obsolete NRND, PQFP-100
+D 16bit DSP Controller 32Kx16B Flash 2.5Kx16B RAM, Obsolete NRND, PQFP-100
 K 16BIT DSP TMS320 Obsolete
 F http://www.ti.com/lit/ds/symlink/tms320lf2406.pdf
 $ENDCMP
diff --git a/library/ftdi.dcm b/library/ftdi.dcm
index 59570344..12249695 100644
--- a/library/ftdi.dcm
+++ b/library/ftdi.dcm
@@ -1,43 +1,43 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP FT200XD
-D FT200XD, Full Speed USB to I2C Bridge, DFN-10
+D Full Speed USB to I2C Bridge, DFN-10
 K FTDI USB I2C Interface Converter
 F http://www.ftdichip.com/Products/ICs/FT200XD.html
 $ENDCMP
 #
 $CMP FT201XQ
-D FT201XQ, Full Speed USB to I2C Bridge, QFN-10
+D Full Speed USB to I2C Bridge, QFN-10
 K FTDI USB I2C interface Converter
 F http://www.ftdichip.com/Products/ICs/FT201X.html
 $ENDCMP
 #
 $CMP FT201XS
-D FT201XS, Full Speed USB to I2C Bridge, SSOP-16
+D Full Speed USB to I2C Bridge, SSOP-16
 K FTDI USB I2C Interface Converter
 F http://www.ftdichip.com/Products/ICs/FT201X.html
 $ENDCMP
 #
 $CMP FT220XQ
-D FT220XQ, Full Speed USB to 4-Bit SPI / FT1248 Bridge, QFN-16
+D Full Speed USB to 4-Bit SPI / FT1248 Bridge, QFN-16
 K FTDI USB SPI FT1248 Interface Converter
 F http://www.ftdichip.com/Products/ICs/FT220X.html
 $ENDCMP
 #
 $CMP FT220XS
-D FT220XS, Full Speed USB to 4-Bit SPI / FT1248 Bridge, SSOP-16
+D Full Speed USB to 4-Bit SPI / FT1248 Bridge, SSOP-16
 K FTDI USB SPI FT1248 Interface Converter
 F http://www.ftdichip.com/Products/ICs/FT220X.html
 $ENDCMP
 #
 $CMP FT221XQ
-D FT221XQ, Full Speed USB to 8-Bit SPI / FT1248 Bridge, QFN-20
+D Full Speed USB to 8-Bit SPI / FT1248 Bridge, QFN-20
 K FTDI USB SPI FT1248 interface converter
 F http://www.ftdichip.com/Products/ICs/FT221X.html
 $ENDCMP
 #
 $CMP FT221XS
-D FT221XS, Full Speed USB to 8-Bit SPI / FT1248 Bridge, SSOP-20
+D Full Speed USB to 8-Bit SPI / FT1248 Bridge, SSOP-20
 K FTDI USB SPI FT1248 interface converter
 F http://www.ftdichip.com/Products/ICs/FT221X.html
 $ENDCMP
@@ -49,31 +49,31 @@ F http://www.ftdichip.com/Products/ICs/FT2232H.html
 $ENDCMP
 #
 $CMP FT230XQ
-D FT230XQ, Full Speed USB to Basic UART, QFN-16
+D Full Speed USB to Basic UART, QFN-16
 K FTDI USB UART interface converter
 F http://www.ftdichip.com/Products/ICs/FT230X.html
 $ENDCMP
 #
 $CMP FT230XS
-D FT230XS, Full Speed USB to Basic UART, SSOP-16
+D Full Speed USB to Basic UART, SSOP-16
 K FTDI USB UART interface converter
 F http://www.ftdichip.com/Products/ICs/FT230X.html
 $ENDCMP
 #
 $CMP FT231XQ
-D FT231XQ, Full Speed USB to Full Handshake UART, QFN-20
+D Full Speed USB to Full Handshake UART, QFN-20
 K FTDI USB UART interface converter
 F http://www.ftdichip.com/Products/ICs/FT231X.html
 $ENDCMP
 #
 $CMP FT231XS
-D FT231XS, Full Speed USB to Full Handshake UART, SSOP-20
+D Full Speed USB to Full Handshake UART, SSOP-20
 K FTDI USB UART interface converter
 F http://www.ftdichip.com/Products/ICs/FT231X.html
 $ENDCMP
 #
 $CMP FT232BM
-D FT232BM, Hi Speed Single Channel USB UART/FIFO, LQFP-32
+D Hi Speed Single Channel USB UART/FIFO, LQFP-32
 K USB Single UART FIFO
 F http://www.ftdichip.com/Products/ICs/FT232BM.htm
 $ENDCMP
@@ -85,31 +85,31 @@ F http://www.ftdichip.com/Products/ICs/FT232H.htm
 $ENDCMP
 #
 $CMP FT232RL
-D FT232RL, USB to Serial Interface, SSOP-28
+D USB to Serial Interface, SSOP-28
 K USB Serial
 F http://www.ftdichip.com/Products/ICs/FT232RL.htm
 $ENDCMP
 #
 $CMP FT240XQ
-D FT240XQ, Full Speed USB to 8-Bit FIFO, QFN-24
+D Full Speed USB to 8-Bit FIFO, QFN-24
 K FTDI USB FIFO interface converter
 F http://www.ftdichip.com/Products/ICs/FT240X.html
 $ENDCMP
 #
 $CMP FT240XS
-D FT240XS, Full Speed USB to 8-Bit FIFO, SSOP-24
+D Full Speed USB to 8-Bit FIFO, SSOP-24
 K FTDI USB FIFO interface converter
 F http://www.ftdichip.com/Products/ICs/FT240X.html
 $ENDCMP
 #
 $CMP FT245BM
-D FT245BM, Full Speed USB to 8-Bit FIFO, LQFP-32
+D Full Speed USB to 8-Bit FIFO, LQFP-32
 K FTDI USB FIFO Interface Converter
 F http://www.ftdichip.com/Products/ICs/FT245B.html
 $ENDCMP
 #
 $CMP FT4232H
-D FT4232H, Hi Speed Quad Channel USB UART/FIFO, LQFP/QFN-64
+D Hi Speed Quad Channel USB UART/FIFO, LQFP/QFN-64
 K USB Quad UART FIFO
 F http://www.ftdichip.com/Products/ICs/FT4232H.htm
 $ENDCMP
diff --git a/library/hc11.dcm b/library/hc11.dcm
index be825160..58eab6f2 100644
--- a/library/hc11.dcm
+++ b/library/hc11.dcm
@@ -1,12 +1,12 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP MC68HC11A0CC
-D MC68HC11A0CC, ROMless, 256B RAM
+D ROMless, 256B RAM
 K HC11 MCU Microcotroller
 $ENDCMP
 #
 $CMP MC68HC11A1CC
-D MC68HC11A1CC, ROMLess, 256B RAM, 512B EEPROM
+D ROMLess, 256B RAM, 512B EEPROM
 K HC11 MCU Microcotroller
 $ENDCMP
 #
@@ -16,12 +16,12 @@ K HC11 MCU Microcotroller
 $ENDCMP
 #
 $CMP MC68HC11A8CC
-D MC68HC11A8CC, 8K ROM, 256B RAM, 512B EEPROM
+D 8K ROM, 256B RAM, 512B EEPROM
 K HC11 MCU Microcotroller
 $ENDCMP
 #
 $CMP MC68HC11F1CC
-D MC68HC11F1CC, ROMless, 1K RAM, 512B EEPROM, PLCC-68
+D ROMless, 1K RAM, 512B EEPROM, PLCC-68
 K HC11 MCU Microcontroller
 F http://cache.freescale.com/files/microcontrollers/doc/data_sheet/MC68HC11F1.pdf
 $ENDCMP
diff --git a/library/intel.dcm b/library/intel.dcm
index 5a565a44..a8e4c247 100644
--- a/library/intel.dcm
+++ b/library/intel.dcm
@@ -12,32 +12,32 @@ F http://www.ti.com/lit/ds/symlink/pc16550d.pdf
 $ENDCMP
 #
 $CMP 8035
-D 8035, MCS-48 8-bit Microcontroller, No (EP)ROM, 64B RAM, DIP-40
+D MCS-48 8-bit Microcontroller, No (EP)ROM, 64B RAM, DIP-40
 K MCS-48 uC Microcontroller
 $ENDCMP
 #
 $CMP 8039
-D 8039, MCS-48 8-bit Microcontroller, No (EP)ROM, 128B RAM, DIP-40
+D MCS-48 8-bit Microcontroller, No (EP)ROM, 128B RAM, DIP-40
 K MCS-48 uC Microcontroller
 $ENDCMP
 #
 $CMP 8040
-D 8040, MCS-48 8-bit Microcontroller, No (EP)ROM, 256B RAM, DIP-40
+D MCS-48 8-bit Microcontroller, No (EP)ROM, 256B RAM, DIP-40
 K MCS-48 uC Microcontroller
 $ENDCMP
 #
 $CMP 8048
-D 8048, MCS-48 8-bit Microcontroller, 1KB Mask ROM, 64B RAM, DIP-40
+D MCS-48 8-bit Microcontroller, 1KB Mask ROM, 64B RAM, DIP-40
 K MCS-48 uC Microcontroller
 $ENDCMP
 #
 $CMP 8049
-D 8049, MCS-48 8-bit Microcontroller, 2KB Mask ROM, 128B RAM, DIP-40
+D MCS-48 8-bit Microcontroller, 2KB Mask ROM, 128B RAM, DIP-40
 K MCS-48 uC Microcontroller
 $ENDCMP
 #
 $CMP 8050
-D 8050, MCS-48 8-bit Microcontroller, 4KB Mask ROM, 256B RAM, DIP-40
+D MCS-48 8-bit Microcontroller, 4KB Mask ROM, 256B RAM, DIP-40
 K MCS-48 uC Microcontroller
 $ENDCMP
 #
@@ -47,17 +47,17 @@ K 1ch UART
 $ENDCMP
 #
 $CMP 8252
-D 8252, Universal Asynchronous Receiver/Transmitter, PDIP-28
+D Universal Asynchronous Receiver/Transmitter, PDIP-28
 K UART Serial Interface
 $ENDCMP
 #
 $CMP 82720
-D 82720, Graphics Display Controller, PDIP-40
+D Graphics Display Controller, PDIP-40
 K Graphics Controller
 $ENDCMP
 #
 $CMP 8284
-D 8284, Clock Generator and Driver for i8086/88 Microcontrollers, PDIP-18
+D Clock Generator and Driver for i8086/88 Microcontrollers, PDIP-18
 K Clock Generator
 $ENDCMP
 #
diff --git a/library/interface.dcm b/library/interface.dcm
index 5e837940..46a88331 100644
--- a/library/interface.dcm
+++ b/library/interface.dcm
@@ -25,13 +25,13 @@ F analog-dev/AD5293.pdf
 $ENDCMP
 #
 $CMP AD9834
-D AD9834, 10 bit 75 MHz Complete Direct Digital Synthesizer, 2.3 V to 5.5 V, 20 mW, TSSOP20
+D 10 bit 75 MHz Complete Direct Digital Synthesizer, 2.3 V to 5.5 V, 20 mW, TSSOP20
 K Direct Digital Synthesizer DDS
 F http://www.analog.com/static/imported-files/data_sheets/AD9834.pdf
 $ENDCMP
 #
 $CMP AD9951
-D AD9951, 14-Bit Direct Digital Synthesizer with 400MSPS DAC, 1.8V, TQFP48
+D 14-Bit Direct Digital Synthesizer with 400MSPS DAC, 1.8V, TQFP48
 K Direct Digital Synthesizer DDS
 F http://www.analog.com/static/imported-files/data_sheets/AD9951.pdf
 $ENDCMP
@@ -49,73 +49,73 @@ F http://www.analog.com/media/en/technical-documentation/data-sheets/ADM222_232A
 $ENDCMP
 #
 $CMP ADuM1200BR
-D ADuM1200BR, Dual-Channel Digital Isolator, 10Mbps 50ns, SO8
+D Dual-Channel Digital Isolator, 10Mbps 50ns, SO8
 K 2Ch Dual Digital Isolator 10Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1200CR
-D ADuM1200CR, Dual-Channel Digital Isolator, 25Mbps 45ns, SO8
+D Dual-Channel Digital Isolator, 25Mbps 45ns, SO8
 K 2Ch Dual Digital Isolator 25Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1200WS
-D ADuM1200WS, Dual-Channel Digital Isolator, 1Mbps 150ns, Highest Tem. Grade, SO8
+D Dual-Channel Digital Isolator, 1Mbps 150ns, Highest Tem. Grade, SO8
 K 2Ch Dual Digital Isolator 1Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1200WT
-D ADuM1200WT, Dual-Channel Digital Isolator, 10Mbps 50ns, Highest Tem. Grade, SO8
+D Dual-Channel Digital Isolator, 10Mbps 50ns, Highest Tem. Grade, SO8
 K 2Ch Dual Digital Isolator 10Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1200WU
-D ADuM1200WU, Dual-Channel Digital Isolator, 25Mbps 45ns, Highest Tem. Grade, SO8
+D Dual-Channel Digital Isolator, 25Mbps 45ns, Highest Tem. Grade, SO8
 K 2Ch Dual Digital Isolator 25Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1201BR
-D ADuM1201BR, Dual-Channel Digital Isolator, 10Mbps 50ns, SO8
+D Dual-Channel Digital Isolator, 10Mbps 50ns, SO8
 K 2Ch Dual Digital Isolator 10Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1201CR
-D ADuM1201CR, Dual-Channel Digital Isolator, 25Mbps 45ns, SO8
+D Dual-Channel Digital Isolator, 25Mbps 45ns, SO8
 K 2Ch Dual Digital Isolator 25Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1201WS
-D ADuM1201WS, Dual-Channel Digital Isolator, 1Mbps 150ns, Highest Temp. Grade, SO8
+D Dual-Channel Digital Isolator, 1Mbps 150ns, Highest Temp. Grade, SO8
 K 2Ch Dual Digital Isolator 1Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1201WT
-D ADuM1201WT, Dual-Channel Digital Isolator, 10Mbps 50ns, Hihgest Temp. Grade, SO8
+D Dual-Channel Digital Isolator, 10Mbps 50ns, Hihgest Temp. Grade, SO8
 K 2Ch Dual Digital Isolator 10Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP ADuM1201WU
-D ADuM1201WU, Dual-Channel Digital Isolator, 25Mbps 45ns, Highest Temp. Grade, SO8
+D Dual-Channel Digital Isolator, 25Mbps 45ns, Highest Temp. Grade, SO8
 K 2Ch Dual Digital Isolator 25Mbps
 F http://www.analog.com/static/imported-files/data_sheets/ADuM1200_1201.pdf
 $ENDCMP
 #
 $CMP CH376T
-D CH376T, File Management USB Flash Card SD Interface, TSSOP20
+D File Management USB Flash Card SD Interface, TSSOP20
 K File Management USB Flash Card SD Interface
 F http://iteadstudio.com/store/images/produce/Platform/FPGA/BlackGold/CH376DS1.PDF
 $ENDCMP
 #
 $CMP DP83848C
-D DP83848C, MII/RMII Single 10/100Mbps Ethernet Physical Layer Transciever, LQFP48
+D MII/RMII Single 10/100Mbps Ethernet Physical Layer Transciever, LQFP48
 K Ethernet PHY MII RMII 10/100Mpbs
 F http://www.ti.com/lit/ds/symlink/dp83848c.pdf
 $ENDCMP
@@ -125,43 +125,43 @@ D Translateur TTL->VMOS. Double driver VMOS
 $ENDCMP
 #
 $CMP GD65232DB
-D GD65232DB, Multiple RS-232 Driver and Receiver, SSOP-20
+D Multiple RS-232 Driver and Receiver, SSOP-20
 K RS232 UART Driver Receiver Interface
 F http://www.ti.com/lit/ds/symlink/gd75232.pdf
 $ENDCMP
 #
 $CMP GD65232DW
-D GD65232DW, Multiple RS-232 Driver and Receiver, SOIC20
+D Multiple RS-232 Driver and Receiver, SOIC20
 K RS232 UART Driver Receiver Interface
 F http://www.ti.com/lit/ds/symlink/gd75232.pdf
 $ENDCMP
 #
 $CMP GD65232PW
-D GD65232PW, Multiple RS-232 Driver and Receiver, TSSOP-20
+D Multiple RS-232 Driver and Receiver, TSSOP-20
 K RS232 UART Driver Receiver Interface
 F http://www.ti.com/lit/ds/symlink/gd75232.pdf
 $ENDCMP
 #
 $CMP GD75232DB
-D GD75232DB, Multiple RS-232 Driver and Receiver, SSOP-20
+D Multiple RS-232 Driver and Receiver, SSOP-20
 K RS232 UART Driver Receiver Interface
 F http://www.ti.com/lit/ds/symlink/gd75232.pdf
 $ENDCMP
 #
 $CMP GD75232DW
-D GD75232DW, Multiple RS-232 Driver and Receiver, SOIC20
+D Multiple RS-232 Driver and Receiver, SOIC20
 K RS232 UART Driver Receiver Interface
 F http://www.ti.com/lit/ds/symlink/gd75232.pdf
 $ENDCMP
 #
 $CMP GD75232N
-D GD75232N, Multiple RS-232 Driver and Receiver, PDIP-20
+D Multiple RS-232 Driver and Receiver, PDIP-20
 K RS232 UART Driver Receiver Interface
 F http://www.ti.com/lit/ds/symlink/gd75232.pdf
 $ENDCMP
 #
 $CMP GD75232PW
-D GD75232PW, Multiple RS-232 Driver and Receiver, TSSOP-20
+D Multiple RS-232 Driver and Receiver, TSSOP-20
 K RS232 UART Driver Receiver Interface
 F http://www.ti.com/lit/ds/symlink/gd75232.pdf
 $ENDCMP
@@ -191,13 +191,13 @@ F http://www.linear.com/docs/46014
 $ENDCMP
 #
 $CMP LTC2983
-D LTC2983, Multi-Sensor Temperature Measurement System, High Accuracy, LQFP-48 (7x7mm)
+D Multi-Sensor Temperature Measurement System, High Accuracy, LQFP-48 (7x7mm)
 K Flexible Temperature Measurement RTD NTC Cold Junction Termocouple
 F http://cds.linear.com/docs/en/datasheet/2983f.pdf
 $ENDCMP
 #
 $CMP LTC2990
-D LTC2990, Temperature Voltage and Current Monitor, I2C Interface, MSOP-10
+D Temperature Voltage and Current Monitor, I2C Interface, MSOP-10
 K Temperature Voltage Current Monitor I2C AFE
 F http://cds.linear.com/docs/en/datasheet/2990fd.pdf
 $ENDCMP
@@ -225,43 +225,43 @@ F datasheets.maximintegrated.com/en/ds/MAX3051.pdf
 $ENDCMP
 #
 $CMP MAX31855EASA
-D MAX31855EASA, Cold Junction E-type Termocouple Interface, SPI, SO8
+D Cold Junction E-type Termocouple Interface, SPI, SO8
 K Cold Junction Termocouple Interface SPI
 F http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
 $ENDCMP
 #
 $CMP MAX31855JASA
-D MAX31855JASA, Cold Junction J-type Termocouple Interface, SPI, SO8
+D Cold Junction J-type Termocouple Interface, SPI, SO8
 K Cold Junction Termocouple Interface SPI
 F http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
 $ENDCMP
 #
 $CMP MAX31855KASA
-D MAX31855KASA, Cold Junction K-type Termocouple Interface, SPI, SO8
+D Cold Junction K-type Termocouple Interface, SPI, SO8
 K Cold Junction Termocouple Interface SPI
 F http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
 $ENDCMP
 #
 $CMP MAX31855NASA
-D MAX31855NASA, Cold Junction N-type Termocouple Interface, SPI, SO8
+D Cold Junction N-type Termocouple Interface, SPI, SO8
 K Cold Junction Termocouple Interface SPI
 F http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
 $ENDCMP
 #
 $CMP MAX31855RASA
-D MAX31855RASA, Cold Junction R-type Termocouple Interface, SPI, SO8
+D Cold Junction R-type Termocouple Interface, SPI, SO8
 K Cold Junction Termocouple Interface SPI
 F http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
 $ENDCMP
 #
 $CMP MAX31855SASA
-D MAX31855SASA, Cold Junction S-type Termocouple Interface, SPI, SO8
+D Cold Junction S-type Termocouple Interface, SPI, SO8
 K Cold Junction Termocouple Interface SPI
 F http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
 $ENDCMP
 #
 $CMP MAX31855TASA
-D MAX31855TASA, Cold Junction T-type Termocouple Interface, SPI, SO8
+D Cold Junction T-type Termocouple Interface, SPI, SO8
 K Cold Junction Termocouple Interface SPI
 F http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
 $ENDCMP
@@ -279,13 +279,13 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/11187f.pdf
 $ENDCMP
 #
 $CMP MCP2551-I/P
-D MCP2551-I/P, High-Speed CAN Transceiver, PDIP8
+D High-Speed CAN Transceiver, PDIP8
 K High-Speed CAN Transceiver
 F http://ww1.microchip.com/downloads/en/devicedoc/21667d.pdf
 $ENDCMP
 #
 $CMP MCP2551-I/SN
-D MCP2551-I/SN, High-Speed CAN Transceiver, SO8
+D High-Speed CAN Transceiver, SO8
 K High-Speed CAN Transceiver
 F http://ww1.microchip.com/downloads/en/devicedoc/21667d.pdf
 $ENDCMP
@@ -351,49 +351,49 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/11195c.pdf
 $ENDCMP
 #
 $CMP SP3481CN
-D SP3481CN, 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
+D 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
 #
 $CMP SP3481CP
-D SP3481CP, 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
+D 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
 #
 $CMP SP3481EN
-D SP3481EN, Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
+D Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
 #
 $CMP SP3481EP
-D SP3481EP, Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
+D Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
 #
 $CMP SP3485CN
-D SP3485CN, 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
+D 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
 #
 $CMP SP3485CP
-D SP3485CP, 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
+D 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
 #
 $CMP SP3485EN
-D SP3485EN, Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
+D Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, SO8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
 #
 $CMP SP3485EP
-D SP3485EP, Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
+D Industrial 3.3V Low Power Half-Duplex RS-485 Transceiver 10Mbps, DIP8
 K Low Power Half-Duplex RS-485 Transceiver 10Mbps
 F http://www.icbase.com/pdf/SPX/SPX00480106.pdf
 $ENDCMP
@@ -404,13 +404,13 @@ F microchip/TCM809_reset_controller.pdf
 $ENDCMP
 #
 $CMP XTR115U
-D XTR115U, 4-20mA Current Loop Transmitter, SO8
+D 4-20mA Current Loop Transmitter, SO8
 K 4-20mA Current Loop Transmitter
 F http://www.ti.com/lit/ds/symlink/xtr115.pdf
 $ENDCMP
 #
 $CMP XTR116U
-D XTR116U, 4-20mA Current Loop Transmitter, SO8
+D 4-20mA Current Loop Transmitter, SO8
 K 4-20mA Current Loop Transmitter
 F http://www.ti.com/lit/ds/symlink/xtr115.pdf
 $ENDCMP
diff --git a/library/ir.dcm b/library/ir.dcm
index 02529bc3..7caec31f 100644
--- a/library/ir.dcm
+++ b/library/ir.dcm
@@ -1,17 +1,17 @@
 EESchema-DOCLIB  Version 2.0  Date: Thu 14 May 2015 19:28:54 SAST
 #
 $CMP AUIPS7111S
-D AUIPS7111S - CURRENT SENSE HIGH SIDE SWITCH
+D - CURRENT SENSE HIGH SIDE SWITCH
 F http://www.irf.com/product-info/datasheets/data/auips7111s.pdf
 $ENDCMP
 #
 $CMP AUIPS7121R
-D AUIPS7121R - CURRENT SENSE HIGH SIDE SWITCH
+D - CURRENT SENSE HIGH SIDE SWITCH
 F http://www.irf.com/product-info/datasheets/data/auips7121.pdf
 $ENDCMP
 #
 $CMP IR2104
-D IR2104 - HIGH AND LOW SIDE DRIVER
+D - HIGH AND LOW SIDE DRIVER
 F http://www.irf.com/product-info/datasheets/data/ir2104.pdf
 $ENDCMP
 #
@@ -21,7 +21,7 @@ F http://www.irf.com/product-info/datasheets/data/ir2110.pdf
 $ENDCMP
 #
 $CMP IR2110PBF
-D IR2110 - HIGH AND LOW SIDE DRIVER
+D - HIGH AND LOW SIDE DRIVER
 F http://www.irf.com/product-info/datasheets/data/ir2110.pdf
 $ENDCMP
 #
diff --git a/library/memory.dcm b/library/memory.dcm
index 71e3d6c8..e230b223 100644
--- a/library/memory.dcm
+++ b/library/memory.dcm
@@ -169,163 +169,163 @@ D 128 Megabit (8 M x 16-Bit/4 M x 32-Bit), Simultaneous Operation Flash Memory w
 $ENDCMP
 #
 $CMP AT24CS01-MAHM
-D AT24CS01-MAHM, 1Kb (128x8) Serial EEPROM with Unique Serial Number, UDFN8
+D 1Kb (128x8) Serial EEPROM with Unique Serial Number, UDFN8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS01-SSHM
-D AT24CS01-SSHM, 1Kb (128x8) Serial EEPROM with Unique Serial Number, SO8
+D 1Kb (128x8) Serial EEPROM with Unique Serial Number, SO8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS01-STUM
-D AT24CS01-STUM, 1Kb (128x8) Serial EEPROM with Unique Serial Number, SOT-23-5
+D 1Kb (128x8) Serial EEPROM with Unique Serial Number, SOT-23-5
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS01-XHM
-D AT24CS01-XHM, 1Kb (128x8) Serial EEPROM with Unique Serial Number, TSSOP8
+D 1Kb (128x8) Serial EEPROM with Unique Serial Number, TSSOP8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS02-MAHM
-D AT24CS02-MAHM, 2Kb (256x8) Serial EEPROM with Unique Serial Number, UDFN8
+D 2Kb (256x8) Serial EEPROM with Unique Serial Number, UDFN8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS02-SSHM
-D AT24CS02-SSHM, 2Kb (256x8) Serial EEPROM with Unique Serial Number, SO8
+D 2Kb (256x8) Serial EEPROM with Unique Serial Number, SO8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS02-STUM
-D AT24CS02-STUM, 2Kb (256x8) Serial EEPROM with Unique Serial Number, SOT-23-5
+D 2Kb (256x8) Serial EEPROM with Unique Serial Number, SOT-23-5
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS02-XHM
-D AT24CS02-XHM, 2Kb (256x8) Serial EEPROM with Unique Serial Number, TSSOP8
+D 2Kb (256x8) Serial EEPROM with Unique Serial Number, TSSOP8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8815-SEEPROM-AT24CS01-02-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS04-MAHM
-D AT24CS04-MAHM, 4Kb (512x8) Serial EEPROM with Unique Serial Number, UDFN8
+D 4Kb (512x8) Serial EEPROM with Unique Serial Number, UDFN8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS04-SSHM
-D AT24CS04-SSHM, 4Kb (512x8) Serial EEPROM with Unique Serial Number, SO8
+D 4Kb (512x8) Serial EEPROM with Unique Serial Number, SO8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS04-STUM
-D AT24CS04-STUM, 4Kb (512x8) Serial EEPROM with Unique Serial Number, SOT-23-5
+D 4Kb (512x8) Serial EEPROM with Unique Serial Number, SOT-23-5
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS04-XHM
-D AT24CS04-XHM, 4Kb (512x8) Serial EEPROM with Unique Serial Number, TSSOP8
+D 4Kb (512x8) Serial EEPROM with Unique Serial Number, TSSOP8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS08-MAHM
-D AT24CS08-MAHM, 8Kb (1024x8) Serial EEPROM with Unique Serial Number, UDFN8
+D 8Kb (1024x8) Serial EEPROM with Unique Serial Number, UDFN8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS08-SSHM
-D AT24CS08-SSHM, 8Kb (1024x8) Serial EEPROM with Unique Serial Number, SO8
+D 8Kb (1024x8) Serial EEPROM with Unique Serial Number, SO8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS08-STUM
-D AT24CS08-STUM, 8Kb (1024x8) Serial EEPROM with Unique Serial Number, SOT-23-5
+D 8Kb (1024x8) Serial EEPROM with Unique Serial Number, SOT-23-5
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS08-XHM
-D AT24CS08-XHM, 8Kb (1024x8) Serial EEPROM with Unique Serial Number, TSSOP8
+D 8Kb (1024x8) Serial EEPROM with Unique Serial Number, TSSOP8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8766-SEEPROM-AT24CS04-08-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS16-MAHM
-D AT24CS16-MAHM, 16Kb (2048x8) Serial EEPROM with Unique Serial Number, UDFN8
+D 16Kb (2048x8) Serial EEPROM with Unique Serial Number, UDFN8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8859-SEEPROM-AT24CS16-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS16-SSHM
-D AT24CS16-SSHM, 16Kb (2048x8) Serial EEPROM with Unique Serial Number, SO8
+D 16Kb (2048x8) Serial EEPROM with Unique Serial Number, SO8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8859-SEEPROM-AT24CS16-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS16-STUM
-D AT24CS16-STUM, 16Kb (2048x8) Serial EEPROM with Unique Serial Number, SOT-23-5
+D 16Kb (2048x8) Serial EEPROM with Unique Serial Number, SOT-23-5
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8859-SEEPROM-AT24CS16-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS16-XHM
-D AT24CS16-XHM, 16Kb (2048x8) Serial EEPROM with Unique Serial Number, TSSOP8
+D 16Kb (2048x8) Serial EEPROM with Unique Serial Number, TSSOP8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8859-SEEPROM-AT24CS16-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS32-MAHM
-D AT24CS32-MAHM, 32Kb (4096x8) Serial EEPROM with Unique Serial Number, UDFN8
+D 32Kb (4096x8) Serial EEPROM with Unique Serial Number, UDFN8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8869-SEEPROM-AT24CS32-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS32-SSHM
-D AT24CS32-SSHM, 32Kb (4096x8) Serial EEPROM with Unique Serial Number, SO8
+D 32Kb (4096x8) Serial EEPROM with Unique Serial Number, SO8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8869-SEEPROM-AT24CS32-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS32-STUM
-D AT24CS32-STUM, 32Kb (4096x8) Serial EEPROM with Unique Serial Number, SOT-23-5
+D 32Kb (4096x8) Serial EEPROM with Unique Serial Number, SOT-23-5
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8869-SEEPROM-AT24CS32-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS32-XHM
-D AT24CS32-XHM, 32Kb (4096x8) Serial EEPROM with Unique Serial Number, TSSOP8
+D 32Kb (4096x8) Serial EEPROM with Unique Serial Number, TSSOP8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8869-SEEPROM-AT24CS32-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS64-MAHM
-D AT24CS64-MAHM, 64Kb (8192x8) Serial EEPROM with Unique Serial Number, UDFN8
+D 64Kb (8192x8) Serial EEPROM with Unique Serial Number, UDFN8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8870-SEEPROM-AT24CS64-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS64-SSHM
-D AT24CS64-SSHM, 64Kb (8192x8) Serial EEPROM with Unique Serial Number, SO8
+D 64Kb (8192x8) Serial EEPROM with Unique Serial Number, SO8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8870-SEEPROM-AT24CS64-Datasheet.pdf
 $ENDCMP
 #
 $CMP AT24CS64-XHM
-D AT24CS64-XHM, 64Kb (8192x8) Serial EEPROM with Unique Serial Number, TSSOP8
+D 64Kb (8192x8) Serial EEPROM with Unique Serial Number, TSSOP8
 K I2C Serial EEPROM Nonvolatile Memory
 F http://www.atmel.com/Images/Atmel-8870-SEEPROM-AT24CS64-Datasheet.pdf
 $ENDCMP
@@ -337,43 +337,43 @@ F http://www.atmel.com/products/Memories/serial/spi.aspx
 $ENDCMP
 #
 $CMP AT45DB161-JC
-D AT45DB161-JC, 16Mb Serial DataFlash, PLCC32, Vcc=2.7V
+D 16Mb Serial DataFlash, PLCC32, Vcc=2.7V
 K Atmel DataFlash
 F http://www.atmel.com/Images/doc0807.pdf
 $ENDCMP
 #
 $CMP AT45DB161-RC
-D AT45DB161-RC, 16Mb Serial DataFlash, SOIC28, Vcc=2.7V
+D 16Mb Serial DataFlash, SOIC28, Vcc=2.7V
 K Atmel DataFlash
 F http://www.atmel.com/Images/doc0807.pdf
 $ENDCMP
 #
 $CMP AT45DB161-TC
-D AT45DB161-TC, 16Mb Serial DataFlash, TSSOP28, Vcc=2.7V
+D 16Mb Serial DataFlash, TSSOP28, Vcc=2.7V
 K Atmel DataFlash
 F http://www.atmel.com/Images/doc0807.pdf
 $ENDCMP
 #
 $CMP AT45DB161B-RC
-D AT45DB161B-RC, 16Mb Serial DataFlash, SOIC28, Vcc=2.7V
+D 16Mb Serial DataFlash, SOIC28, Vcc=2.7V
 K Atmel DataFlash
 F http://www.atmel.com/Images/doc2224.pdf
 $ENDCMP
 #
 $CMP AT45DB161B-RC-2.5
-D AT45DB161B-RC-2.5, 16Mb Serial DataFlash, SOIC28, Vcc=2.5V
+D 16Mb Serial DataFlash, SOIC28, Vcc=2.5V
 K Atmel DataFlash
 F http://www.atmel.com/Images/doc2224.pdf
 $ENDCMP
 #
 $CMP AT45DB161B-TC
-D AT45DB161B-TC, 16Mb Serial DataFlash, TSSOP28, Vcc=2.7V
+D 16Mb Serial DataFlash, TSSOP28, Vcc=2.7V
 K Atmel DataFlash
 F http://www.atmel.com/Images/doc2224.pdf
 $ENDCMP
 #
 $CMP AT45DB161B-TC-2.5
-D AT45DB161B-TC-2.5, 16Mb Serial DataFlash, TSSOP28, Vcc=2.5V
+D 16Mb Serial DataFlash, TSSOP28, Vcc=2.5V
 K Atmel DataFlash
 F http://www.atmel.com/Images/doc2224.pdf
 $ENDCMP
@@ -396,25 +396,25 @@ K DRAM 2MO
 $ENDCMP
 #
 $CMP FM1608B-SG
-D FM1608B-SG, FRAM Nonvolatile Memory 8Kx8 (64Kb), 5V only, SOIC28
+D FRAM Nonvolatile Memory 8Kx8 (64Kb), 5V only, SOIC28
 K FRAM  Nonvolatile Memory 8K 8bit
 F http://www.cypress.com/?mpn=FM1608B-SG
 $ENDCMP
 #
 $CMP FM16W08-SG
-D FM16W08-SG, FRAM Nonvolatile Memory 8Kx8 (64Kb), SOIC28
+D FRAM Nonvolatile Memory 8Kx8 (64Kb), SOIC28
 K FRAM  Nonvolatile Memory 8K 8bit
 F http://www.cypress.com/?mpn=FM16W08-SG
 $ENDCMP
 #
 $CMP FM1808B-SG
-D FM1808B-SG, FRAM Nonvolatile Memory 32Kx8 (256Kb), 5V only, SOIC28
+D FRAM Nonvolatile Memory 32Kx8 (256Kb), 5V only, SOIC28
 K FRAM  Nonvolatile Memory 32K 8bit
 F http://www.cypress.com/?mpn=FM1808B-SG
 $ENDCMP
 #
 $CMP FM18W08-SG
-D FM18W08-SG, FRAM Nonvolatile Memory 32Kx8 (256Kb), SOIC28
+D FRAM Nonvolatile Memory 32Kx8 (256Kb), SOIC28
 K FRAM  Nonvolatile Memory 32K 8bit
 F http://www.cypress.com/?mpn=FM18W08-SG
 $ENDCMP
@@ -543,37 +543,37 @@ K RAM SRAM
 $ENDCMP
 #
 $CMP MT48LC16M4A2P
-D MT48LC16M4A2P, PC100/PC133 Compliant SDRAM, 64Mb (16Mb x 4), TSOP II 54pin
+D PC100/PC133 Compliant SDRAM, 64Mb (16Mb x 4), TSOP II 54pin
 K SDRAM Synchronus DRAM PC133 PC100 64Mb 16Mbx4
 F http://download.micron.com/pdf/datasheets/dram/sdram/64MSDRAM.pdf
 $ENDCMP
 #
 $CMP MT48LC16M4A2TG
-D MT48LC16M4A2TG, PC100/PC133 Compliant SDRAM, 64Mb (16Mb x 4), TSOP II 54pin
+D PC100/PC133 Compliant SDRAM, 64Mb (16Mb x 4), TSOP II 54pin
 K SDRAM Synchronus DRAM PC133 PC100 64Mb 16Mbx4
 F http://download.micron.com/pdf/datasheets/dram/sdram/64MSDRAM.pdf
 $ENDCMP
 #
 $CMP MT48LC4M16A2P
-D MT48LC4M16A2P, PC100/PC133 Compliant SDRAM, 64Mb (4Mb x 16), TSOP II 54pin
+D PC100/PC133 Compliant SDRAM, 64Mb (4Mb x 16), TSOP II 54pin
 K SDRAM Synchronus DRAM PC133 PC100 64Mb 4Mbx16
 F http://download.micron.com/pdf/datasheets/dram/sdram/64MSDRAM.pdf
 $ENDCMP
 #
 $CMP MT48LC4M16A2TG
-D MT48LC4M16A2TG, PC100/PC133 Compliant SDRAM, 64Mb (4Mb x 16), TSOP II 54pin
+D PC100/PC133 Compliant SDRAM, 64Mb (4Mb x 16), TSOP II 54pin
 K SDRAM Synchronus DRAM PC133 PC100 64Mb 4Mbx16
 F http://download.micron.com/pdf/datasheets/dram/sdram/64MSDRAM.pdf
 $ENDCMP
 #
 $CMP MT48LC8M8A2P
-D MT48LC8M8A2P, PC100/PC133 Compliant SDRAM, 64Mb (8Mb x 8), TSOP II 54pin
+D PC100/PC133 Compliant SDRAM, 64Mb (8Mb x 8), TSOP II 54pin
 K SDRAM Synchronus DRAM PC133 PC100 64Mb 8Mbx8
 F http://download.micron.com/pdf/datasheets/dram/sdram/64MSDRAM.pdf
 $ENDCMP
 #
 $CMP MT48LC8M8A2TG
-D MT48LC8M8A2TG, PC100/PC133 Compliant SDRAM, 64Mb (8Mb x 8), TSOP II 54pin
+D PC100/PC133 Compliant SDRAM, 64Mb (8Mb x 8), TSOP II 54pin
 K SDRAM Synchronus DRAM PC133 PC100 64Mb 8Mbx8
 F http://download.micron.com/pdf/datasheets/dram/sdram/64MSDRAM.pdf
 $ENDCMP
diff --git a/library/microchip.dcm b/library/microchip.dcm
index d4d5f441..12dd0d06 100644
--- a/library/microchip.dcm
+++ b/library/microchip.dcm
@@ -25,7 +25,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/39662a.pdf
 $ENDCMP
 #
 $CMP USB3300
-D USB3300 Hi-Speed USB Host, Device or OTG PHY with ULPI Interface
+D Hi-Speed USB Host, Device or OTG PHY with ULPI Interface
 K USB OTG Hi-Speed PHY ULPI Interface
 F http://microchip.com/downloads/en/DeviceDoc/00001783A.pdf
 $ENDCMP
diff --git a/library/microchip_dspic33dsc.dcm b/library/microchip_dspic33dsc.dcm
index a50ce354..528dc7e7 100644
--- a/library/microchip_dspic33dsc.dcm
+++ b/library/microchip_dspic33dsc.dcm
@@ -1,61 +1,61 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP DSPIC33FJ128GP204
-D dsPIC33FJ128GP204, 40MIPS, 128k Flash, 8k SRAM
+D 40MIPS, 128k Flash, 8k SRAM
 K 16-bit Digital Signal Controller Microchip dsPIC
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70292G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ128GP804
-D dsPIC33FJ128GP804, 40MIPS, 128k Flash, 16k SRAM, ECAN, Audio DAC
+D 40MIPS, 128k Flash, 16k SRAM, ECAN, Audio DAC
 K 16-bit Digital Signal Controller Microchip dsPIC
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70292G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ128MC204
-D dsPIC33FJ128MC204, 40MIPS, 128k Flash, 8k SRAM
+D 40MIPS, 128k Flash, 8k SRAM
 K 16-bit Digital Signal Controller Microchip dsPIC Motor Control
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70291G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ128MC804
-D dsPIC33FJ128MC804, 40MIPS, 128k Flash, 16k SRAM, ECAN, 16-bit DAC
+D 40MIPS, 128k Flash, 16k SRAM, ECAN, 16-bit DAC
 K 16-bit Digital Signal Controller Microchip dsPIC Motor Control
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70291G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ32GP304
-D dsPIC33FJ32GP304, 40MIPS, 32k Flash, 4k SRAM
+D 40MIPS, 32k Flash, 4k SRAM
 K 16-bit Digital Signal Controller Microchip dsPIC
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70292G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ32MC304
-D dsPIC33FJ32MC304, 40MIPS, 32k Flash, 8k SRAM
+D 40MIPS, 32k Flash, 8k SRAM
 K 16-bit Digital Signal Controller Microchip dsPIC Motor Control
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70291G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ64GP204
-D dsPIC33FJ64GP204, 40MIPS, 64k Flash, 8k SRAM
+D 40MIPS, 64k Flash, 8k SRAM
 K 16-bit Digital Signal Controller Microchip dsPIC
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70292G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ64GP804
-D dsPIC33FJ64GP804, 40MIPS, 64k Flash, 16k SRAM, ECAN, Audio DAC
+D 40MIPS, 64k Flash, 16k SRAM, ECAN, Audio DAC
 K 16-bit Digital Signal Controller Microchip dsPIC33
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70292G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ64MC204
-D dsPIC33FJ64MC204, 40MIPS, 64k Flash, 8k SRAM
+D 40MIPS, 64k Flash, 8k SRAM
 K 16-bit Digital Signal Controller Microchip dsPIC Motor Control
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70291G.pdf
 $ENDCMP
 #
 $CMP DSPIC33FJ64MC804
-D dsPIC33FJ64MC804, 40MIPS, 64k Flash, 16k SRAM, ECAN, 16-bit DAC
+D 40MIPS, 64k Flash, 16k SRAM, ECAN, 16-bit DAC
 K 16-bit Digital Signal Controller Microchip dsPIC Motor Control
 F http://ww1.microchip.com/downloads/en/DeviceDoc/70291G.pdf
 $ENDCMP
diff --git a/library/microchip_pic10mcu.dcm b/library/microchip_pic10mcu.dcm
index 36893726..f178a251 100644
--- a/library/microchip_pic10mcu.dcm
+++ b/library/microchip_pic10mcu.dcm
@@ -13,7 +13,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41585A.pdf
 $ENDCMP
 #
 $CMP PIC10(L)F320-I/P
-D PIC10(L)F320, 256W Flash, 64B SRAM, PDIP8
+D 256W Flash, 64B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41585A.pdf
 $ENDCMP
@@ -31,7 +31,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41585A.pdf
 $ENDCMP
 #
 $CMP PIC10(L)F322-I/P
-D PIC10(L)F322, 512W Flash, 64B SRAM, PDIP8
+D 512W Flash, 64B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41585A.pdf
 $ENDCMP
@@ -49,7 +49,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
 #
 $CMP PIC10F200-I/P
-D PIC10F200, 256W Flash, 16B SRAM, PDIP8
+D 256W Flash, 16B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
@@ -67,7 +67,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
 #
 $CMP PIC10F202-I/P
-D PIC10F202, 512W Flash, 24B SRAM, PDIP8
+D 512W Flash, 24B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
@@ -85,7 +85,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
 #
 $CMP PIC10F204-I/P
-D PIC10F204, 256W Flash, 16B SRAM, PDIP8
+D 256W Flash, 16B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
@@ -103,7 +103,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
 #
 $CMP PIC10F206-I/P
-D PIC10F206, 512W Flash, 24B SRAM, PDIP8
+D 512W Flash, 24B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41239D.pdf
 $ENDCMP
@@ -121,7 +121,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41270E.pdf
 $ENDCMP
 #
 $CMP PIC10F220-I/P
-D PIC10F220, 256W Flash, 16B SRAM, PDIP8
+D 256W Flash, 16B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41270E.pdf
 $ENDCMP
@@ -139,7 +139,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41270E.pdf
 $ENDCMP
 #
 $CMP PIC10F222-I/P
-D PIC10F222, 512W Flash, 24B SRAM, PDIP8
+D 512W Flash, 24B SRAM, PDIP8
 K FLASH 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41270E.pdf
 $ENDCMP
diff --git a/library/microchip_pic12mcu.dcm b/library/microchip_pic12mcu.dcm
index e281abfd..3fd0052c 100644
--- a/library/microchip_pic12mcu.dcm
+++ b/library/microchip_pic12mcu.dcm
@@ -13,7 +13,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41615A.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1501-I/P
-D PIC12(L)F1501, 1024W FLASH, 64B SRAM, PDIP8
+D 1024W FLASH, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41615A.pdf
 $ENDCMP
@@ -31,7 +31,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41413B.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1822-I/P
-D PIC12(L)F1822, 2kW FLASH, 128B SRAM, 256 EEPROM, PDIP8
+D 2kW FLASH, 128B SRAM, 256 EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41413B.pdf
 $ENDCMP
@@ -49,7 +49,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41441B.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1840-I/P
-D PIC12(L)F1840, 4kW FLASH, 256B SRAM, 256B EEPROM, PDIP8
+D 4kW FLASH, 256B SRAM, 256B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41441B.pdf
 $ENDCMP
@@ -67,7 +67,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508-I/P
-D PIC12C508, 512W EPROM, 25B SRAM, PDIP8
+D 512W EPROM, 25B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
@@ -85,7 +85,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508A-I/P
-D PIC12C508A, 512W EPROM, 25B SRAM, PDIP8
+D 512W EPROM, 25B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
@@ -109,7 +109,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509-I/P
-D PIC12C509, 1024W EPROM, 41B SRAM, PDIP8
+D 1024W EPROM, 41B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
@@ -151,7 +151,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12C671-I/P
-D PIC12C671, 1024W EPROM, 128B SRAM, PDIP8
+D 1024W EPROM, 128B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
@@ -169,7 +169,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12C672-I/P
-D PIC12C672, 2048W EPROM, 128B SRAM, PDIP8
+D 2048W EPROM, 128B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
@@ -187,7 +187,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE518-I/P
-D PIC12CE518, 512W EPROM, 25B SRAM, PDIP8
+D 512W EPROM, 25B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
@@ -211,7 +211,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE519-I/P
-D PIC12CE519, 1024W EPROM, 41B SRAM, PDIP8
+D 1024W EPROM, 41B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
@@ -235,7 +235,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CE673-I/P
-D PIC12CE673, 1024W EPROM, 128B SRAM, 128B EPROM, PDIP8
+D 1024W EPROM, 128B SRAM, 128B EPROM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
@@ -247,13 +247,13 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CE674-I/P
-D PIC12CE674, 2048W EPROM, 128B SRAM, 128B EPROM, PDIP8
+D 2048W EPROM, 128B SRAM, 128B EPROM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CR509A-I/P
-D PIC12CR509A, 1024W ROM, 41B SRAM, PDIP8
+D 1024W ROM, 41B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
@@ -283,7 +283,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F508-I/P
-D PIC12F508, 512W Flash, 25B SRAM, PDIP8
+D 512W Flash, 25B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
@@ -307,7 +307,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F509-I/P
-D PIC12F509, 1024W Flash, 41B SRAM, PDIP8
+D 1024W Flash, 41B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
@@ -331,7 +331,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41268D.pdf
 $ENDCMP
 #
 $CMP PIC12F510-I/P
-D PIC12F510, 1024W FLASH, 38B SRAM, PDIP8
+D 1024W FLASH, 38B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41268D.pdf
 $ENDCMP
@@ -355,7 +355,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41319B.pdf
 $ENDCMP
 #
 $CMP PIC12F519-I/P
-D PIC12F519, 1024W Flash, 41B SRAM, 64B EEPROM, PDIP8
+D 1024W Flash, 41B SRAM, 64B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41319B.pdf
 $ENDCMP
@@ -379,7 +379,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F609-I/P
-D PIC12F609, 1024W Flash, 64B SRAM, PDIP8
+D 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
@@ -403,7 +403,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F615-I/P
-D PIC12F615, 1024W Flash, 64B SRAM, PDIP8
+D 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
@@ -427,7 +427,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F617-I/P
-D PIC12F617, 2048W Flash, 128B SRAM, PDIP8
+D 2048W Flash, 128B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
@@ -445,7 +445,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F629-I/P
-D PIC12F629, 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
+D 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
@@ -463,7 +463,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41232D.pdf
 $ENDCMP
 #
 $CMP PIC12F635-I/P
-D PIC12F635, 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
+D 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41232D.pdf
 $ENDCMP
@@ -481,7 +481,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F675-I/P
-D PIC12F675, 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
+D 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
@@ -499,7 +499,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41211D_.pdf
 $ENDCMP
 #
 $CMP PIC12F683-I/P
-D PIC12F683, 2048W Flash, 128B SRAM, 256B EEPROM, PDIP8
+D 2048W Flash, 128B SRAM, 256B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41232D.pdf
 $ENDCMP
@@ -517,7 +517,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12F752-I/P
-D PIC12F752, 1024W Flash, 64B SRAM, PDIP8
+D 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
@@ -541,7 +541,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV609-I/P
-D PIC12HV609, 1024W Flash, 64B SRAM, PDIP8
+D 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
@@ -565,7 +565,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV615-I/P
-D PIC12HV615, 1024W Flash, 64B SRAM, PDIP8
+D 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
@@ -583,7 +583,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12HV752-I/P
-D PIC12HV752, 1024W Flash, 64B SRAM, PDIP8
+D 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
diff --git a/library/microchip_pic16mcu.dcm b/library/microchip_pic16mcu.dcm
index e2141eaa..8124a362 100644
--- a/library/microchip_pic16mcu.dcm
+++ b/library/microchip_pic16mcu.dcm
@@ -7,7 +7,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41639A.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F1454-I/P
-D PIC16(L)F1454, 8192W FLASH, 1024B SRAM, PDIP-14
+D 8192W FLASH, 1024B SRAM, PDIP-14
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41639A.pdf
 $ENDCMP
@@ -43,7 +43,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41607A.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F1503-I/P
-D PIC16(L)F1503, 2048W FLASH, 128B SRAM, PDIP-14
+D 2048W FLASH, 128B SRAM, PDIP-14
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41607A.pdf
 $ENDCMP
@@ -67,7 +67,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41586A.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F1507-I/P
-D PIC16(L)F1507, 2048W FLASH, 128B SRAM, PDIP-20
+D 2048W FLASH, 128B SRAM, PDIP-20
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41586A.pdf
 $ENDCMP
@@ -91,7 +91,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41609A.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F1508-I/P
-D PIC16(L)F1508, 4096W FLASH, 256B SRAM, PDIP-20
+D 4096W FLASH, 256B SRAM, PDIP-20
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41609A.pdf
 $ENDCMP
@@ -115,7 +115,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41609A.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F1509-I/P
-D PIC16(L)F1509, 8192W FLASH, 512B SRAM, PDIP-20
+D 8192W FLASH, 512B SRAM, PDIP-20
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41609A.pdf
 $ENDCMP
@@ -211,7 +211,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41452B.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F1517-I/P
-D PIC16(L)F1517, 8192W FLASH, 512B SRAM, PDIP-40
+D 8192W FLASH, 512B SRAM, PDIP-40
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41452B.pdf
 $ENDCMP
@@ -253,7 +253,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41452B.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F1519-I/P
-D PIC16(L)F1519, 16384W FLASH, 1024B SRAM, PDIP-40
+D 16384W FLASH, 1024B SRAM, PDIP-40
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41452B.pdf
 $ENDCMP
@@ -325,7 +325,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41288F.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F610-I/P
-D PIC16(L)F610, 1024W FLASH, 64B SRAM, PDIP-14
+D 1024W FLASH, 64B SRAM, PDIP-14
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41288F.pdf
 $ENDCMP
@@ -337,31 +337,31 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41288F.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F616-I/P
-D PIC16(L)F616, 2048W FLASH, 128B SRAM, PDIP-14
+D 2048W FLASH, 128B SRAM, PDIP-14
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41288F.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F627-xxI/P
-D PIC16(L)F627-xx, 1024W Flash, 224B SRAM, 128B EEPROM, DIP18
+D 1024W Flash, 224B SRAM, 128B EEPROM, DIP18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F627-xxI/SO
-D PIC16(L)F627-xx, 1024W Flash, 224B SRAM, 128B EEPROM, SO18
+D 1024W Flash, 224B SRAM, 128B EEPROM, SO18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F627-xxI/SS
-D PIC16(L)F627-xx, 1024W Flash, 224B SRAM, 128B EEPROM, SSOP20
+D 1024W Flash, 224B SRAM, 128B EEPROM, SSOP20
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F627A-I/P
-D PIC16(L)F627A, 1024W Flash, 224B SRAM, 128B EEPROM, DIP18
+D 1024W Flash, 224B SRAM, 128B EEPROM, DIP18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
@@ -379,25 +379,25 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/40044G.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F628-xxI/P
-D PIC16(L)F628-xx, 2048W Flash, 224B SRAM, 128B EEPROM, DIP18
+D 2048W Flash, 224B SRAM, 128B EEPROM, DIP18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F628-xxI/SO
-D PIC16(L)F628-xx, 2048W Flash, 224B SRAM, 128B EEPROM, SO18
+D 2048W Flash, 224B SRAM, 128B EEPROM, SO18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F628-xxI/SS
-D PIC16(L)F628-xx, 2048W Flash, 224B SRAM, 128B EEPROM, SSOP20
+D 2048W Flash, 224B SRAM, 128B EEPROM, SSOP20
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F628A-I/P
-D PIC16(L)F628A, 2048W Flash, 224B SRAM, 128B EEPROM, DIP18
+D 2048W Flash, 224B SRAM, 128B EEPROM, DIP18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
@@ -415,7 +415,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/40044G.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F648A-I/P
-D PIC16(L)F648A, 4096W Flash, 256B SRAM, 256B EEPROM, DIP18
+D 4096W Flash, 256B SRAM, 256B EEPROM, DIP18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40300c.pdf
 $ENDCMP
@@ -439,7 +439,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41202F-print.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F684-I/P
-D PIC16(L)F684 , 2048W FLASH, 128B SRAM, 256B EEPROM, PDIP-14
+D 2048W FLASH, 128B SRAM, 256B EEPROM, PDIP-14
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41202F-print.pdf
 $ENDCMP
@@ -469,7 +469,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30325b.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F74-I/P
-D PIC16(L)F74, 4K Flash, 192B SRAM, ADC, PWM, DIP40
+D 4K Flash, 192B SRAM, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30325b.pdf
 $ENDCMP
@@ -499,7 +499,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30325b.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F77-I/P
-D PIC16(L)F77, 8K Flash, 368B SRAM, ADC, PWM, DIP40
+D 8K Flash, 368B SRAM, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30325b.pdf
 $ENDCMP
@@ -511,7 +511,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39598F.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F818-I/P
-D PIC16(L)F818, 1792B Flash, 128B SRAM, 128B EEPROM, ADC, DIP18
+D 1792B Flash, 128B SRAM, 128B EEPROM, ADC, DIP18
 K Flash-Based 8-Bit Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39598F.pdf
 $ENDCMP
@@ -535,7 +535,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39598F.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F819-I/P
-D PIC16(L)F819, 3584B Flash, 256B SRAM, 256B EEPROM, ADC, DIP18
+D 3584B Flash, 256B SRAM, 256B EEPROM, ADC, DIP18
 K Flash-Based 8-Bit Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39598F.pdf
 $ENDCMP
@@ -571,13 +571,13 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30569b.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F871-I/L
-D PIC16(L)F871, 2K Flash, 128B SRAM, 64B EEPROM, PLCC44
+D 2K Flash, 128B SRAM, 64B EEPROM, PLCC44
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30569b.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F871-I/P
-D PIC16(L)F871, 2K Flash, 128B SRAM, 64B EEPROM, DIP40
+D 2K Flash, 128B SRAM, 64B EEPROM, DIP40
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30569b.pdf
 $ENDCMP
@@ -607,7 +607,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30292C.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F874A-I/P
-D PIC16(L)F874A, 4W Flash, 192B SRAM, 128B EEPROM, DIP40
+D 4W Flash, 192B SRAM, 128B EEPROM, DIP40
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39582b.pdf
 $ENDCMP
@@ -637,25 +637,25 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/30292C.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F877A-I/P
-D PIC16(L)F877A, 8W Flash, 386B SRAM, 256B EEPROM, DIP40
+D 8W Flash, 386B SRAM, 256B EEPROM, DIP40
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39582b.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F884-I/P
-D PIC16(L)F884, 4K Flash, 256B SRAM, 256B EEPROM, DIP40
+D 4K Flash, 256B SRAM, 256B EEPROM, DIP40
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41291D.pdf
 $ENDCMP
 #
 $CMP PIC16(L)F887-I/P
-D PIC16(L)F887, 8K Flash, 368B SRAM, 256B EEPROM, DIP40
+D 8K Flash, 368B SRAM, 256B EEPROM, DIP40
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41291D.pdf
 $ENDCMP
 #
 $CMP PIC16C505-I/P
-D PIC16C505, 1024W ROM, 72B SRAM, DIP14
+D 1024W ROM, 72B SRAM, DIP14
 K ROM-Based 8bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
@@ -679,7 +679,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC16F505-I/P
-D PIC16F505, 1024W FLASH, 72B SRAM, DIP14
+D 1024W FLASH, 72B SRAM, DIP14
 K FLASH-Based 8bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
@@ -697,7 +697,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC16F54-I/P
-D PIC16F54, 512W FLASH, 25B SRAM, DIP18
+D 512W FLASH, 25B SRAM, DIP18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41213D.pdf
 $ENDCMP
@@ -715,7 +715,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41213D.pdf
 $ENDCMP
 #
 $CMP PIC16F631-I/P
-D PIC16F631, 1024W Flash, 64B SRAM, 128B EEPROM, DIP20
+D 1024W Flash, 64B SRAM, 128B EEPROM, DIP20
 K Flash-Based 8-Bit CMOS Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
@@ -733,7 +733,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
 #
 $CMP PIC16F677-I/P
-D PIC16F677, 2048W Flash, 128B SRAM, 128B EEPROM, DIP20
+D 2048W Flash, 128B SRAM, 128B EEPROM, DIP20
 K Flash-Based 8-Bit CMOS Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
@@ -751,7 +751,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
 #
 $CMP PIC16F685-I/P
-D PIC16F685, 4096W Flash, 256B SRAM, 256B EEPROM, DIP20
+D 4096W Flash, 256B SRAM, 256B EEPROM, DIP20
 K Flash-Based 8-Bit CMOS Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
@@ -769,7 +769,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
 #
 $CMP PIC16F687-I/P
-D PIC16F687, 2048W Flash, 128B SRAM, 256B EEPROM, DIP20
+D 2048W Flash, 128B SRAM, 256B EEPROM, DIP20
 K Flash-Based 8-Bit CMOS Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
@@ -787,7 +787,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
 #
 $CMP PIC16F689-I/P
-D PIC16F689, 4096W Flash, 256B SRAM, 256B EEPROM, DIP20
+D 4096W Flash, 256B SRAM, 256B EEPROM, DIP20
 K Flash-Based 8-Bit CMOS Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
@@ -805,7 +805,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
 #
 $CMP PIC16F690-I/P
-D PIC16F690, 4096W Flash, 256B SRAM, 256B EEPROM, DIP20
+D 4096W Flash, 256B SRAM, 256B EEPROM, DIP20
 K Flash-Based 8-Bit CMOS Microcontroller nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
@@ -823,7 +823,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/41262E.pdf
 $ENDCMP
 #
 $CMP PIC16F716-I/P
-D PIC16F716, 2048W Flash, 128B SRAM, DIP18
+D 2048W Flash, 128B SRAM, DIP18
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41206B.pdf
 $ENDCMP
@@ -883,19 +883,19 @@ F http://ww1.microchip.com/downloads/en/devicedoc/35007b.pdf
 $ENDCMP
 #
 $CMP PIC16F882-I/P
-D PIC16F882, 2K Flash, 128B SRAM, 128B EEPROM, XLP, DIP28
+D 2K Flash, 128B SRAM, 128B EEPROM, XLP, DIP28
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41291D.pdf
 $ENDCMP
 #
 $CMP PIC16F883-I/P
-D PIC16F883, 4K Flash, 256B SRAM, 256B EEPROM, XLP, DIP28
+D 4K Flash, 256B SRAM, 256B EEPROM, XLP, DIP28
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41291D.pdf
 $ENDCMP
 #
 $CMP PIC16F886-I/P
-D PIC16F886, 8K Flash, 256B SRAM, 256B EEPROM, XLP, DIP28
+D 8K Flash, 256B SRAM, 256B EEPROM, XLP, DIP28
 K Flash-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41291D.pdf
 $ENDCMP
diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 0efd1ff7..2c383c00 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -1,7 +1,7 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP PIC18(L)F13K50-E/P
-D PIC18(L)F13K50, 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
+D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
@@ -19,7 +19,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F14K50-E/P
-D PIC18(L)F14K50, 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
+D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
@@ -121,7 +121,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4331-I/P
-D PIC18(L)F4331, 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
@@ -133,7 +133,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F442-I/P
-D PIC18(L)F442, 16K Flash, 768B SRAM, 256 EEPROM, ADC, DIP40
+D 16K Flash, 768B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
@@ -151,7 +151,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4431-I/P
-D PIC18(L)F4431, 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
@@ -169,7 +169,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4450-I/P
-D PIC18(L)F4450, 16K Flash, 8K SRAM, USB, nanoWatt XLP, PDIP40
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, PDIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
@@ -187,7 +187,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4455-I/P
-D PIC18(L)F4455, 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
@@ -199,19 +199,19 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F448-I/P
-D PIC18(L)F448, 16K Flash, 768B SRAM, 256 EEPROM, CAN, DIP40
+D 16K Flash, 768B SRAM, 256 EEPROM, CAN, DIP40
 K Flash-Based 8-Bit Microcontroller CAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F44J10-I/P
-D PIC18(L)F44J10, 16K Flash, 1K SRAM, ADC, DIP40
+D 16K Flash, 1K SRAM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F452-I/P
-D PIC18(L)F452, 32K Flash, 1536B SRAM, 256 EEPROM, ADC, DIP40
+D 32K Flash, 1536B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
@@ -229,7 +229,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4550-I/P
-D PIC18(L)F4550, 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
@@ -241,13 +241,13 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F458-I/P
-D PIC18(L)F458, 32K Flash, 1536B SRAM, 256 EEPROM, CAN, DIP40
+D 32K Flash, 1536B SRAM, 256 EEPROM, CAN, DIP40
 K Flash-Based 8-Bit Microcontroller CAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F45J10-I/P
-D PIC18(L)F45J10, 32K Flash, 1K SRAM, ADC, DIP40
+D 32K Flash, 1K SRAM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
 $ENDCMP
diff --git a/library/microcontrollers.dcm b/library/microcontrollers.dcm
index 01a14fb9..e5ae4310 100644
--- a/library/microcontrollers.dcm
+++ b/library/microcontrollers.dcm
@@ -1,7 +1,7 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP ADUC816
-D ADuC816, 8KB Flash, 256B SRAM, 640B EEPROM, 16-bit ADC, 12-bit DAC, MQFP-52
+D 8KB Flash, 256B SRAM, 640B EEPROM, 16-bit ADC, 12-bit DAC, MQFP-52
 K 8051 CORE MCU ADC DAC
 F http://www.analog.com/static/imported-files/data_sheets/ADUC816.pdf
 $ENDCMP
@@ -13,31 +13,31 @@ F http://www.nxp.com/documents/data_sheet/P89LPC932A1.pdf
 $ENDCMP
 #
 $CMP SAB80C515-M
-D SAB80C515-M, 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PMQFP-80
+D 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PMQFP-80
 K CMOS MCU 8-bit
 F http://pdf.datasheetcatalog.com/datasheet/infineon/1-d80515.pdf
 $ENDCMP
 #
 $CMP SAB80C515-N
-D SAB80C515-N, 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PLCC-68
+D 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PLCC-68
 K CMOS MCU 8-bit
 F http://pdf.datasheetcatalog.com/datasheet/infineon/1-d80515.pdf
 $ENDCMP
 #
 $CMP SAB80C515-XX-N
-D SAB80C515-XX-N, 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PLCC-68
+D 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PLCC-68
 K CMOS MCU 8-bit
 F http://pdf.datasheetcatalog.com/datasheet/infineon/1-d80515.pdf
 $ENDCMP
 #
 $CMP SAB80C535-M
-D SAB80C535-M, 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PMQFP-80
+D 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PMQFP-80
 K CMOS MCU 8-bit
 F http://pdf.datasheetcatalog.com/datasheet/infineon/1-d80515.pdf
 $ENDCMP
 #
 $CMP SAB80C535-N
-D SAB80C535-N, 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PLCC-68
+D 8KB ROM, 256B RAM, 8-bit CMOS High Performace Single-Chip Microcontroller, PLCC-68
 K CMOS MCU 8-bit
 F http://pdf.datasheetcatalog.com/datasheet/infineon/1-d80515.pdf
 $ENDCMP
diff --git a/library/msp430.dcm b/library/msp430.dcm
index 15afddec..425277d4 100644
--- a/library/msp430.dcm
+++ b/library/msp430.dcm
@@ -1,613 +1,613 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP MSP430AFE221IPW
-D MSP430AFE221, 24pin TSSOP, 4KB Flash Memory, 256B RAM
+D 24pin TSSOP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE222IPW
-D MSP430AFE222, 24pin TSSOP, 4KB Flash Memory, 256B RAM
+D 24pin TSSOP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE223IPW
-D MSP430AFE223, 24pin TSSOP, 4KB Flash Memory, 256B RAM
+D 24pin TSSOP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE231IPW
-D MSP430AFE231, 24pin TSSOP, 8KB Flash Memory, 512B RAM
+D 24pin TSSOP, 8KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE232IPW
-D MSP430AFE232, 24pin TSSOP, 8KB Flash Memory, 512B RAM
+D 24pin TSSOP, 8KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE233IPW
-D MSP430AFE233, 24pin TSSOP, 8KB Flash Memory, 512B RAM
+D 24pin TSSOP, 8KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE251IPW
-D MSP430AFE251, 24pin TSSOP, 16KB Flash Memory, 512B RAM
+D 24pin TSSOP, 16KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE252IPW
-D MSP430AFE252, 24pin TSSOP, 16KB Flash Memory, 512B RAM
+D 24pin TSSOP, 16KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430AFE253IPW
-D MSP430AFE253, 24pin TSSOP, 16KB Flash Memory, 512B RAM
+D 24pin TSSOP, 16KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430afe222.pdf
 $ENDCMP
 #
 $CMP MSP430F1101AIDGV
-D MSP430F1101A, 20pin TVSOP, 1KB + 128B Flash Memory, 128B RAM
+D 20pin TVSOP, 1KB + 128B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1101AIDW
-D MSP430F1101A, 20pin SOWB, 1KB + 128B Flash Memory, 128B RAM
+D 20pin SOWB, 1KB + 128B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1101AIPW
-D MSP430F1101A, 20pin TSSOP, 1KB + 128B Flash Memory, 128B RAM
+D 20pin TSSOP, 1KB + 128B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1101AIRGE
-D MSP430F1101A, 24pin QFN, 1KB + 128B Flash Memory, 128B RAM
+D 24pin QFN, 1KB + 128B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1111AIDGV
-D MSP430F1111A, 20pin TVSOP, 2KB + 256B Flash Memory, 128B RAM
+D 20pin TVSOP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1111AIDW
-D MSP430F1111A, 20pin SOWB, 2KB + 256B Flash Memory, 128B RAM
+D 20pin SOWB, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1111AIPW
-D MSP430F1111A, 20pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
+D 20pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1111AIRGE
-D MSP430F1111A, 24pin QFN, 2KB + 256B Flash Memory, 128B RAM
+D 24pin QFN, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1121AIDGV
-D MSP430F1121A, 20pin TVSOP, 4KB + 256B Flash Memory, 256B RAM
+D 20pin TVSOP, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1121AIDW
-D MSP430F1121A, 20pin SOWB, 4KB + 256B Flash Memory, 256B RAM
+D 20pin SOWB, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1121AIPW
-D MSP430F1121A, 20pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
+D 20pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1121AIRGE
-D MSP430F1121A, 24pin QFN, 4KB + 256B Flash Memory, 256B RAM
+D 24pin QFN, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1101a.pdf
 $ENDCMP
 #
 $CMP MSP430F1122IDW
-D MSP430F1122, 20pin SOWB, 4KB + 256B Flash Memory, 256B RAM
+D 20pin SOWB, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1122IPW
-D MSP430F1122, 20pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
+D 20pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1122IRHB
-D MSP430F1122, 32pin QFN, 4KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1132IDW
-D MSP430F1132, 20pin SOWB, 8KB + 256B Flash Memory, 256B RAM
+D 20pin SOWB, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1132IPW
-D MSP430F1132, 20pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
+D 20pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1132IRHB
-D MSP430F1132, 32pin QFN, 8KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1222IDW
-D MSP430F1222, 28pin SOWB, 4KB + 256B Flash Memory, 256B RAM
+D 28pin SOWB, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1222IPW
-D MSP430F1222, 28pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
+D 28pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1222IRHB
-D MSP430F1222, 32pin QFN, 4KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F122IDW
-D MSP430F122, 28pin SOWB, 4KB + 256B Flash Memory, 256B RAM
+D 28pin SOWB, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f122.pdf
 $ENDCMP
 #
 $CMP MSP430F122IPW
-D MSP430F122, 28pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
+D 28pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f122.pdf
 $ENDCMP
 #
 $CMP MSP430F122IRHB
-D MSP430F122, 32pin QFN, 4KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1232IDW
-D MSP430F1232, 28pin SOWB, 8KB + 256B Flash Memory, 256B RAM
+D 28pin SOWB, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1232IPW
-D MSP430F1232, 28pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
+D 28pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F1232IRHB
-D MSP430F1232, 32pin QFN, 8KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F123IDW
-D MSP430F123, 28pin SOWB, 8KB + 256B Flash Memory, 256B RAM
+D 28pin SOWB, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f122.pdf
 $ENDCMP
 #
 $CMP MSP430F123IPW
-D MSP430F123, 28pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
+D 28pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f122.pdf
 $ENDCMP
 #
 $CMP MSP430F123IRHB
-D MSP430F123, 32pin QFN, 8KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f1122.pdf
 $ENDCMP
 #
 $CMP MSP430F2001IN
-D MSP430F2001, 14pin PDIP, 1KB + 256B Flash Memory, 128B RAM
+D 14pin PDIP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2001IPW
-D MSP430F2001, 14pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
+D 14pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2001IRSA
-D MSP430F2001, 16pin QFN, 1KB + 256B Flash Memory, 128B RAM
+D 16pin QFN, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2002IN
-D MSP430F2002, 14pin PDIP, 1KB + 256B Flash Memory, 128B RAM
+D 14pin PDIP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2002IPW
-D MSP430F2002, 14pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
+D 14pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2002IRSA
-D MSP430F2002, 16pin QFN, 1KB + 256B Flash Memory, 128B RAM
+D 16pin QFN, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2003IN
-D MSP430F2003, 14pin PDIP, 1KB + 256B Flash Memory, 128B RAM
+D 14pin PDIP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2003IPW
-D MSP430F2003, 14pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
+D 14pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2003IRSA
-D MSP430F2003, 16pin QFN, 1KB + 256B Flash Memory, 128B RAM
+D 16pin QFN, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2011IN
-D MSP430F2011, 14pin PDIP, 2KB + 256B Flash Memory, 128B RAM
+D 14pin PDIP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2011IPW
-D MSP430F2011, 14pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
+D 14pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2011IRSA
-D MSP430F2011, 16pin QFN, 2KB + 256B Flash Memory, 128B RAM
+D 16pin QFN, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2012IN
-D MSP430F2012, 14pin PDIP, 2KB + 256B Flash Memory, 128B RAM
+D 14pin PDIP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2012IPW
-D MSP430F2012, 14pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
+D 14pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2012IRSA
-D MSP430F2012, 16pin QFN, 2KB + 256B Flash Memory, 128B RAM
+D 16pin QFN, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2013IN
-D MSP430F2013, 14pin PDIP, 2KB + 256B Flash Memory, 128B RAM
+D 14pin PDIP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2013IPW
-D MSP430F2013, 14pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
+D 14pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2013IRSA
-D MSP430F2013, 16pin QFN, 2KB + 256B Flash Memory, 128B RAM
+D 16pin QFN, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2001.pdf
 $ENDCMP
 #
 $CMP MSP430F2101IDGV
-D MSP430F2101, 20pin TVSOP, 1KB + 256B Flash Memory, 128B RAM
+D 20pin TVSOP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2101IDW
-D MSP430F2101, 20pin SOWB, 1KB + 256B Flash Memory, 128B RAM
+D 20pin SOWB, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2101IPW
-D MSP430F2101, 20pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
+D 20pin TSSOP, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2101IRGE
-D MSP430F2101, 24pin QFN, 1KB + 256B Flash Memory, 128B RAM
+D 24pin QFN, 1KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2111IDGV
-D MSP430F2111, 20pin TVSOP, 2KB + 256B Flash Memory, 128B RAM
+D 20pin TVSOP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2111IDW
-D MSP430F2111, 20pin SOWB, 2KB + 256B Flash Memory, 128B RAM
+D 20pin SOWB, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2111IPW
-D MSP430F2111, 20pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
+D 20pin TSSOP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2111IRGE
-D MSP430F2111, 24pin QFN, 2KB + 256B Flash Memory, 128B RAM
+D 24pin QFN, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2112IPW
-D MSP430F2112, 28pin TSSOP, 2KB + 256B Flash Memory, 256B RAM
+D 28pin TSSOP, 2KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2112IRHB
-D MSP430F2112, 32pin QFN, 2KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 2KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2112IRTV
-D MSP430F2112, 32pin QFN, 2KB + 256B Flash Memory, 256B RAM
+D 32pin QFN, 2KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2121IDGV
-D MSP430F2121, 20pin TVSOP, 4KB + 256B Flash Memory, 256B RAM
+D 20pin TVSOP, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2121IDW
-D MSP430F2121, 20pin SOWB, 4KB + 256B Flash Memory, 256B RAM
+D 20pin SOWB, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2121IPW
-D MSP430F2121, 20pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
+D 20pin TSSOP, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2121IRGE
-D MSP430F2121, 24pin QFN, 4KB + 256B Flash Memory, 256B RAM
+D 24pin QFN, 4KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2122IPW
-D MSP430F2122, 28pin TSSOP, 4KB + 256B Flash Memory, 512B RAM
+D 28pin TSSOP, 4KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2122IRHB
-D MSP430F2122, 32pin QFN, 4KB + 256B Flash Memory, 512B RAM
+D 32pin QFN, 4KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2122IRTV
-D MSP430F2122, 32pin QFN, 4KB + 256B Flash Memory, 512B RAM
+D 32pin QFN, 4KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2131IDGV
-D MSP430F2131, 20pin TVSOP, 8KB + 256B Flash Memory, 256B RAM
+D 20pin TVSOP, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2131IDW
-D MSP430F2131, 20pin SOWB, 8KB + 256B Flash Memory, 256B RAM
+D 20pin SOWB, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2131IPW
-D MSP430F2131, 20pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
+D 20pin TSSOP, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2131IRGE
-D MSP430F2131, 24pin QFN, 8KB + 256B Flash Memory, 256B RAM
+D 24pin QFN, 8KB + 256B Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2101.pdf
 $ENDCMP
 #
 $CMP MSP430F2132IPW
-D MSP430F2132, 28pin TSSOP, 8KB + 256B Flash Memory, 512B RAM
+D 28pin TSSOP, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2132IRHB
-D MSP430F2132, 32pin QFN, 8KB + 256B Flash Memory, 512B RAM
+D 32pin QFN, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2132IRTV
-D MSP430F2132, 32pin QFN, 8KB + 256B Flash Memory, 512B RAM
+D 32pin QFN, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2112.pdf
 $ENDCMP
 #
 $CMP MSP430F2232IDA
-D MSP430F2232, 38pin TSSOP, 8KB + 256B Flash Memory, 512B RAM
+D 38pin TSSOP, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2232IRHA
-D MSP430F2232, 40pin QFN, 8KB + 256B Flash Memory, 512B RAM
+D 40pin QFN, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2232IYFF
-D MSP430F2232, 49ball BGA, 8KB + 256B Flash Memory, 512B RAM
+D 49ball BGA, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2234IDA
-D MSP430F2234, 38pin TSSOP, 8KB + 256B Flash Memory, 512B RAM
+D 38pin TSSOP, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2234IRHA
-D MSP430F2234, 40pin QFN, 8KB + 256B Flash Memory, 512B RAM
+D 40pin QFN, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2234IYFF
-D MSP430F2234, 49ball BGA, 8KB + 256B Flash Memory, 512B RAM
+D 49ball BGA, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2252IDA
-D MSP430F2252, 38pin TSSOP, 16KB + 256B Flash Memory, 512B RAM
+D 38pin TSSOP, 16KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2252IRHA
-D MSP430F2252, 40pin QFN, 16KB + 256B Flash Memory, 512B RAM
+D 40pin QFN, 16KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2252IYFF
-D MSP430F2252, 49ball BGA, 16KB + 256B Flash Memory, 512B RAM
+D 49ball BGA, 16KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2254IDA
-D MSP430F2254, 38pin TSSOP, 16KB + 256B Flash Memory, 512B RAM
+D 38pin TSSOP, 16KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2254IRHA
-D MSP430F2254, 40pin QFN, 16KB + 256B Flash Memory, 512B RAM
+D 40pin QFN, 16KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2254IYFF
-D MSP430F2254, 49ball BGA, 16KB + 256B Flash Memory, 512B RAM
+D 49ball BGA, 16KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2272IDA
-D MSP430F2272, 38pin TSSOP, 32KB + 256B Flash Memory, 1KB RAM
+D 38pin TSSOP, 32KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2272IRHA
-D MSP430F2272, 40pin QFN, 32KB + 256B Flash Memory, 1KB RAM
+D 40pin QFN, 32KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2272IYFF
-D MSP430F2272, 49ball BGA, 32KB + 256B Flash Memory, 1KB RAM
+D 49ball BGA, 32KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2274IDA
-D MSP430F2274, 38pin TSSOP, 32KB + 256B Flash Memory, 1KB RAM
+D 38pin TSSOP, 32KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2274IRHA
-D MSP430F2274, 40pin QFN, 32KB + 256B Flash Memory, 1KB RAM
+D 40pin QFN, 32KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2274IYFF
-D MSP430F2274, 49ball BGA, 32KB + 256B Flash Memory, 1KB RAM
+D 49ball BGA, 32KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430f2232.pdf
 $ENDCMP
 #
 $CMP MSP430F2330IRHA
-D MSP430F2330, 40pin QFN, 8KB + 256B Flash Memory, 1KB RAM
+D 40pin QFN, 8KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f2330.pdf
 $ENDCMP
 #
 $CMP MSP430F2330IYFF
-D MSP430F2330, 49ball BGA, 8KB + 256B Flash Memory, 1KB RAM
+D 49ball BGA, 8KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f2330.pdf
 $ENDCMP
@@ -619,67 +619,67 @@ F http://www.ti.com/lit/ds/symlink/msp430f2330.pdf
 $ENDCMP
 #
 $CMP MSP430F2350IYFF
-D MSP430F2350, 49ball BGA, 16KB + 256B Flash Memory, 2KB RAM
+D 49ball BGA, 16KB + 256B Flash Memory, 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f2330.pdf
 $ENDCMP
 #
 $CMP MSP430F2370IRHA
-D MSP430F2370, 40pin QFN, 32KB + 256B Flash Memory, 2KB RAM
+D 40pin QFN, 32KB + 256B Flash Memory, 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f2330.pdf
 $ENDCMP
 #
 $CMP MSP430F2370IYFF
-D MSP430F2370, 49ball BGA, 32KB + 256B Flash Memory, 2KB RAM
+D 49ball BGA, 32KB + 256B Flash Memory, 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f2330.pdf
 $ENDCMP
 #
 $CMP MSP430F5217IRGC
-D MSP430F5217, 64pin QFN, 64KB Flash Memory, 8KB RAM
+D 64pin QFN, 64KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
 #
 $CMP MSP430F5217IYFF
-D MSP430F5217, 64ball BGA, 64KB Flash Memory, 8KB RAM
+D 64ball BGA, 64KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
 #
 $CMP MSP430F5219IRGC
-D MSP430F5219, 64pin QFN, 128KB Flash Memory, 8KB RAM
+D 64pin QFN, 128KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
 #
 $CMP MSP430F5219IYFF
-D MSP430F5219, 64ball BGA, 128KB Flash Memory, 8KB RAM
+D 64ball BGA, 128KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
 #
 $CMP MSP430F5227IRGC
-D MSP430F5227, 64pin QFN, 64KB Flash Memory, 8KB RAM
+D 64pin QFN, 64KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
 #
 $CMP MSP430F5227IYFF
-D MSP430F5227, 64ball BGA, 64KB Flash Memory, 8KB RAM
+D 64ball BGA, 64KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
 #
 $CMP MSP430F5229IRGC
-D MSP430F5229, 64pin QFN, 128KB Flash Memory, 8KB RAM
+D 64pin QFN, 128KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
 #
 $CMP MSP430F5229IYFF
-D MSP430F5229, 64ball BGA, 128KB Flash Memory, 8KB RAM
+D 64ball BGA, 128KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5227.pdf
 $ENDCMP
@@ -697,13 +697,13 @@ F http://www.ti.com/lit/ds/symlink/msp430f5242.pdf
 $ENDCMP
 #
 $CMP MSP430F5237IRGC
-D MSP430F5237, 64pin QFN, 64KB Flash Memory, 8KB RAM
+D 64pin QFN, 64KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5242.pdf
 $ENDCMP
 #
 $CMP MSP430F5239IRGC
-D MSP430F5239, 64pin QFN, 128KB Flash Memory, 8KB RAM
+D 64pin QFN, 128KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5242.pdf
 $ENDCMP
@@ -721,157 +721,157 @@ F http://www.ti.com/lit/ds/symlink/msp430f5242.pdf
 $ENDCMP
 #
 $CMP MSP430F5247IRGC
-D MSP430F5247, 64pin QFN, 64KB Flash Memory, 8KB RAM
+D 64pin QFN, 64KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5242.pdf
 $ENDCMP
 #
 $CMP MSP430F5249IRGC
-D MSP430F5249, 64pin QFN, 128KB Flash Memory, 8KB RAM
+D 64pin QFN, 128KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5242.pdf
 $ENDCMP
 #
 $CMP MSP430F5304IPT
-D MSP430F5304, 48pin LQFN, 8KB Flash Memory, 6KB RAM
+D 48pin LQFN, 8KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5304IRGZ
-D MSP430F5304, 48pin QFN, 8KB Flash Memory, 6KB RAM
+D 48pin QFN, 8KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5308IPT
-D MSP430F5308, 48pin LQFN, 16KB Flash Memory, 6KB RAM
+D 48pin LQFN, 16KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5308IRGC
-D MSP430F5308, 64pin QFN, 16KB Flash Memory, 6KB RAM
+D 64pin QFN, 16KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5308IRGZ
-D MSP430F5308, 48pin LQFN, 16KB Flash Memory, 6KB RAM
+D 48pin LQFN, 16KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5308IZQE
-D MSP430F5308, 80ball BGA, 16KB Flash Memory, 6KB RAM
+D 80ball BGA, 16KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5309IPT
-D MSP430F5309, 48pin LQFN, 24KB Flash Memory, 6KB RAM
+D 48pin LQFN, 24KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5309IRGC
-D MSP430F5309, 64pin QFN, 24KB Flash Memory, 6KB RAM
+D 64pin QFN, 24KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5309IRGZ
-D MSP430F5309, 48pin QFN, 24KB Flash Memory, 6KB RAM
+D 48pin QFN, 24KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5309IZQE
-D MSP430F5309, 80ball BGA, 24KB Flash Memory, 6KB RAM
+D 80ball BGA, 24KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5310IPT
-D MSP430F5310, 48pin LQFN, 32KB Flash Memory, 6KB RAM
+D 48pin LQFN, 32KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5310IRGC
-D MSP430F5310, 64pin QFN, 32KB Flash Memory, 6KB RAM
+D 64pin QFN, 32KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5310IRGZ
-D MSP430F5310, 48pin QFN, 32KB Flash Memory, 6KB RAM
+D 48pin QFN, 32KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5310IZQE
-D MSP430F5310, 80ball BGA, 32KB Flash Memory, 6KB RAM
+D 80ball BGA, 32KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5304.pdf
 $ENDCMP
 #
 $CMP MSP430F5333IPZ
-D MSP430F5333, 100pin VQFP, 128KB Flash Memory, 18KB RAM
+D 100pin VQFP, 128KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5333IZQW
-D MSP430F5333, 113ball BGA, 128KB Flash Memory, 18KB RAM
+D 113ball BGA, 128KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5335IPZ
-D MSP430F5335, 100pin VQFP, 256KB Flash Memory, 18KB RAM
+D 100pin VQFP, 256KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5335IZQW
-D MSP430F5335, 113ball BGA, 256KB Flash Memory, 18KB RAM
+D 113ball BGA, 256KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5336IPZ
-D MSP430F5336, 100pin VQFP, 128KB Flash Memory, 18KB RAM
+D 100pin VQFP, 128KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5336IZQW
-D MSP430F5336, 113ball BGA, 128KB Flash Memory, 18KB RAM
+D 113ball BGA, 128KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5338IPZ
-D MSP430F5338, 100pin VQFP, 256KB Flash Memory, 18KB RAM
+D 100pin VQFP, 256KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5338IZQW
-D MSP430F5338, 113ball BGA, 128KB Flash Memory, 18KB RAM
+D 113ball BGA, 128KB Flash Memory, 18KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5333.pdf
 $ENDCMP
 #
 $CMP MSP430F5340IRGZ
-D MSP430F5340, 48pin QFN, 64KB Flash Memory, 6KB RAM
+D 48pin QFN, 64KB Flash Memory, 6KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5340.pdf
 $ENDCMP
 #
 $CMP MSP430F5341IRGZ
-D MSP430F5341, 48pin QFN, 96KB Flash Memory, 8KB RAM
+D 48pin QFN, 96KB Flash Memory, 8KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5340.pdf
 $ENDCMP
@@ -883,229 +883,229 @@ F http://www.ti.com/lit/ds/symlink/msp430f5340.pdf
 $ENDCMP
 #
 $CMP MSP430F5358IZQW
-D MSP430F5358, 113ball BGA, 384KB Flash Memory, 34KB RAM
+D 113ball BGA, 384KB Flash Memory, 34KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5358.pdf
 $ENDCMP
 #
 $CMP MSP430F5359IZQW
-D MSP430F5359, 113ball BGA, 512KB Flash Memory, 66KB RAM
+D 113ball BGA, 512KB Flash Memory, 66KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5358.pdf
 $ENDCMP
 #
 $CMP MSP430F5500IRGZ
-D MSP430F5500, 48pin QFN, 8KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 8KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5501IRGZ
-D MSP430F5501, 48pin QFN, 16KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 16KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5502IRGZ
-D MSP430F5502, 48pin QFN, 24KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 24KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5503IRGZ
-D MSP430F5503, 48pin QFN, 32KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 32KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5504IRGZ
-D MSP430F5504, 48pin QFN, 8KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 8KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5505IRGZ
-D MSP430F5505, 48pin QFN, 16KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 16KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5506IRGZ
-D MSP430F5506, 48pin QFN, 24KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 24KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5507IRGZ
-D MSP430F5507, 48pin QFN, 32KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 32KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5508IRGZ
-D MSP430F5508, 48pin QFN, 16KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 16KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5509IRGZ
-D MSP430F5509, 48pin QFN, 24KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 24KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5510IRGZ
-D MSP430F5510, 48pin QFN, 32KB Flash Memory, 4 + 2KB SRAM
+D 48pin QFN, 32KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5510.pdf
 $ENDCMP
 #
 $CMP MSP430F5524IYFF
-D MSP430F5524, 64ball BGA, 64KB Flash Memory, 4 + 2KB SRAM
+D 64ball BGA, 64KB Flash Memory, 4 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5524.pdf
 $ENDCMP
 #
 $CMP MSP430F5526IYFF
-D MSP430F5526, 64ball BGA, 96KB Flash Memory, 6 + 2KB SRAM
+D 64ball BGA, 96KB Flash Memory, 6 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5524.pdf
 $ENDCMP
 #
 $CMP MSP430F5528IYFF
-D MSP430F5528, 64ball BGA, 128KB Flash Memory, 8 + 2KB SRAM
+D 64ball BGA, 128KB Flash Memory, 8 + 2KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5524.pdf
 $ENDCMP
 #
 $CMP MSP430F5630IZQW
-D MSP430F5630, 113ball BGA, 128KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 128KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5631IZQW
-D MSP430F5631, 113ball BGA, 192KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 192KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5632IZQW
-D MSP430F5632, 113ball BGA, 256KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 256KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5633IZQW
-D MSP430F5633, 113ball BGA, 128KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 128KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5634IZQW
-D MSP430F5634, 113ball BGA, 192KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 192KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5635IZQW
-D MSP430F5635, 113ball BGA, 256KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 256KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5636IZQW
-D MSP430F5636, 113ball BGA, 128KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 128KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5637IZQW
-D MSP430F5637, 113ball BGA, 192KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 192KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5638IZQW
-D MSP430F5638, 113ball BGA, 256KB Flash Memory, 16 + 2KB RAM
+D 113ball BGA, 256KB Flash Memory, 16 + 2KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5630.pdf
 $ENDCMP
 #
 $CMP MSP430F5658IZQW
-D MSP430F5658, 113ball BGA, 384KB Flash Memory, 34KB RAM
+D 113ball BGA, 384KB Flash Memory, 34KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5658.pdf
 $ENDCMP
 #
 $CMP MSP430F5659IZQW
-D MSP430F5659, 113ball BGA, 512KB Flash Memory, 66KB RAM
+D 113ball BGA, 512KB Flash Memory, 66KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430f5658.pdf
 $ENDCMP
 #
 $CMP MSP430FR5720IRGE
-D MSP430FR5720, 24pin QFN, 4KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 4KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5722IRGE
-D MSP430FR5722, 24pin QFN, 8KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 8KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5724IRGE
-D MSP430FR5724, 24pin QFN, 8KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 8KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5726IRGE
-D MSP430FR5726, 24pin QFN, 16KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 16KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5728IRGE
-D MSP430FR5728, 24pin QFN, 16KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 16KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5730IRGE
-D MSP430FR5730, 24pin QFN, 4KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 4KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5732IRGE
-D MSP430FR5732, 24pin QFN, 8KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 8KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5734IRGE
-D MSP430FR5734, 24pin QFN, 8KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 8KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5736IRGE
-D MSP430FR5736, 24pin QFN, 16KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 16KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430FR5738IRGE
-D MSP430FR5738, 24pin QFN, 16KB FRAM Memory, 1KB SRAM
+D 24pin QFN, 16KB FRAM Memory, 1KB SRAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430fr5720.pdf
 $ENDCMP
 #
 $CMP MSP430G2001IN14
-D MSP430G2001, 14pin PDIP, 512B Flash Memory, 128B RAM
+D 14pin PDIP, 512B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
@@ -1123,7 +1123,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
 #
 $CMP MSP430G2101IN14
-D MSP430G2101, 14pin PDIP, 1KB Flash Memory, 128B RAM
+D 14pin PDIP, 1KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
@@ -1141,7 +1141,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
 #
 $CMP MSP430G2102IN20
-D MSP430G2102, 20pin PDIP, 1KB Flash Memory, 128B RAM
+D 20pin PDIP, 1KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1165,7 +1165,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2111IN14
-D MSP430G2111, 14pin PDIP, 1KB Flash Memory, 128B RAM
+D 14pin PDIP, 1KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
@@ -1183,7 +1183,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
 #
 $CMP MSP430G2112IN20
-D MSP430G2112, 20pin PDIP, 1KB Flash Memory, 128B RAM
+D 20pin PDIP, 1KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1213,7 +1213,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
 #
 $CMP MSP430G2121IN14
-D MSP430G2121, 14pin PDIP, 1KB Flash Memory, 128B RAM
+D 14pin PDIP, 1KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2121.pdf
 $ENDCMP
@@ -1249,7 +1249,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2121.pdf
 $ENDCMP
 #
 $CMP MSP430G2132IN20
-D MSP430G2132, 20pin PDIP, 1KB Flash Memory, 128B RAM
+D 20pin PDIP, 1KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1273,7 +1273,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2152IN20
-D MSP430G2152, 20pin PDIP, 1KB Flash Memory, 128B RAM
+D 20pin PDIP, 1KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1321,7 +1321,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2153.pdf
 $ENDCMP
 #
 $CMP MSP430G2201IN14
-D MSP430G2201, 14pin PDIP, 2KB Flash Memory, 128B RAM
+D 14pin PDIP, 2KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
@@ -1339,7 +1339,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
 #
 $CMP MSP430G2202IN20
-D MSP430G2202, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1363,7 +1363,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2203IN20
-D MSP430G2203, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2203.pdf
 $ENDCMP
@@ -1387,13 +1387,13 @@ F http://www.ti.com/lit/ds/symlink/msp430g2203.pdf
 $ENDCMP
 #
 $CMP MSP430G2210ID
-D MSP430G2210, 8pin PDIP, 2KB + 256B Flash Memory, 128B RAM
+D 8pin PDIP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2210.pdf
 $ENDCMP
 #
 $CMP MSP430G2211IN14
-D MSP430G2211, 14pin PDIP, 2KB Flash Memory, 128B RAM
+D 14pin PDIP, 2KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
@@ -1411,7 +1411,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2001.pdf
 $ENDCMP
 #
 $CMP MSP430G2212IN20
-D MSP430G2212, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1435,7 +1435,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
 #
 $CMP MSP430G2213IN20
-D MSP430G2213, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -1459,7 +1459,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2213.pdf
 $ENDCMP
 #
 $CMP MSP430G2221IN14
-D MSP430G2221, 14pin PDIP, 2KB Flash Memory, 128B RAM
+D 14pin PDIP, 2KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2121.pdf
 $ENDCMP
@@ -1477,13 +1477,13 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2121.pdf
 $ENDCMP
 #
 $CMP MSP430G2230ID
-D MSP430G2230, 8pin PDIP, 2KB + 256B Flash Memory, 128B RAM
+D 8pin PDIP, 2KB + 256B Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2210.pdf
 $ENDCMP
 #
 $CMP MSP430G2231IN14
-D MSP430G2231, 14pin PDIP, 2KB Flash Memory, 128B RAM
+D 14pin PDIP, 2KB Flash Memory, 128B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2121.pdf
 $ENDCMP
@@ -1501,7 +1501,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2121.pdf
 $ENDCMP
 #
 $CMP MSP430G2232IN20
-D MSP430G2232, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1525,7 +1525,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2233IN20
-D MSP430G2233, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2233.pdf
 $ENDCMP
@@ -1549,7 +1549,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2233.pdf
 $ENDCMP
 #
 $CMP MSP430G2252IN20
-D MSP430G2252, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1573,7 +1573,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2152.pdf
 $ENDCMP
 #
 $CMP MSP430G2253IN20
-D MSP430G2253, 20pin PDIP, 2KB Flash Memory, 256B RAM
+D 20pin PDIP, 2KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -1597,7 +1597,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2153.pdf
 $ENDCMP
 #
 $CMP MSP430G2302IN20
-D MSP430G2302, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1621,7 +1621,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2303IN20
-D MSP430G2303, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2203.pdf
 $ENDCMP
@@ -1645,7 +1645,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2203.pdf
 $ENDCMP
 #
 $CMP MSP430G2312IN20
-D MSP430G2312, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1669,7 +1669,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
 #
 $CMP MSP430G2313IN20
-D MSP430G2313, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -1693,7 +1693,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2213.pdf
 $ENDCMP
 #
 $CMP MSP430G2332IN20
-D MSP430G2332, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1717,7 +1717,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2333IN20
-D MSP430G2333, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2233.pdf
 $ENDCMP
@@ -1741,7 +1741,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2233.pdf
 $ENDCMP
 #
 $CMP MSP430G2352IN20
-D MSP430G2352, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1765,7 +1765,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2152.pdf
 $ENDCMP
 #
 $CMP MSP430G2353IN20
-D MSP430G2353, 20pin PDIP, 4KB Flash Memory, 256B RAM
+D 20pin PDIP, 4KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -1789,7 +1789,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2153.pdf
 $ENDCMP
 #
 $CMP MSP430G2402IN20
-D MSP430G2402, 20pin PDIP, 8KB Flash Memory, 256B RAM
+D 20pin PDIP, 8KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1813,7 +1813,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2403IN20
-D MSP430G2403, 20pin PDIP, 8KB Flash Memory, 512B RAM
+D 20pin PDIP, 8KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2203.pdf
 $ENDCMP
@@ -1837,7 +1837,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2203.pdf
 $ENDCMP
 #
 $CMP MSP430G2412IN20
-D MSP430G2412, 20pin PDIP, 8KB Flash Memory, 256B RAM
+D 20pin PDIP, 8KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1861,7 +1861,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
 #
 $CMP MSP430G2413IN20
-D MSP430G2413, 20pin PDIP, 8KB Flash Memory, 512B RAM
+D 20pin PDIP, 8KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -1885,7 +1885,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2213.pdf
 $ENDCMP
 #
 $CMP MSP430G2432IN20
-D MSP430G2432, 20pin PDIP, 8KB Flash Memory, 256B RAM
+D 20pin PDIP, 8KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
@@ -1909,7 +1909,7 @@ F http://focus.ti.com/lit/ds/symlink/msp430g2102.pdf
 $ENDCMP
 #
 $CMP MSP430G2433IN20
-D MSP430G2433, 20pin PDIP, 8KB Flash Memory, 512B RAM
+D 20pin PDIP, 8KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2233.pdf
 $ENDCMP
@@ -1945,13 +1945,13 @@ F http://www.ti.com/lit/ds/symlink/msp430g2444.pdf
 $ENDCMP
 #
 $CMP MSP430G2444IYFF
-D MSP430G2444, 49ball BGA, 8KB + 256B Flash Memory, 512B RAM
+D 49ball BGA, 8KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2444.pdf
 $ENDCMP
 #
 $CMP MSP430G2452IN20
-D MSP430G2452, 20pin PDIP, 8KB Flash Memory, 256B RAM
+D 20pin PDIP, 8KB Flash Memory, 256B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2112.pdf
 $ENDCMP
@@ -1975,7 +1975,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2152.pdf
 $ENDCMP
 #
 $CMP MSP430G2453IN20
-D MSP430G2453, 20pin PDIP, 8KB Flash Memory, 512B RAM
+D 20pin PDIP, 8KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -1999,7 +1999,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2153.pdf
 $ENDCMP
 #
 $CMP MSP430G2513IN20
-D MSP430G2513, 20pin PDIP, 16KB Flash Memory, 512B RAM
+D 20pin PDIP, 16KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -2023,7 +2023,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2213.pdf
 $ENDCMP
 #
 $CMP MSP430G2533IN20
-D MSP430G2533, 20pin PDIP, 16KB Flash Memory, 512B RAM
+D 20pin PDIP, 16KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2233.pdf
 $ENDCMP
@@ -2059,13 +2059,13 @@ F http://www.ti.com/lit/ds/symlink/msp430g2444.pdf
 $ENDCMP
 #
 $CMP MSP430G2544IYFF
-D MSP430G2544, 49ball BGA, 16KB + 256B Flash Memory, 512B RAM
+D 49ball BGA, 16KB + 256B Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2444.pdf
 $ENDCMP
 #
 $CMP MSP430G2553IN20
-D MSP430G2553, 20pin PDIP, 16KB Flash Memory, 512B RAM
+D 20pin PDIP, 16KB Flash Memory, 512B RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2553.pdf
 $ENDCMP
@@ -2101,7 +2101,7 @@ F http://www.ti.com/lit/ds/symlink/msp430g2444.pdf
 $ENDCMP
 #
 $CMP MSP430G2744IYFF
-D MSP430G2744, 49ball BGA, 32KB + 256B Flash Memory, 1KB RAM
+D 49ball BGA, 32KB + 256B Flash Memory, 1KB RAM
 K MSP430 MIXED SIGNAL MICROCONTROLLER
 F http://www.ti.com/lit/ds/symlink/msp430g2444.pdf
 $ENDCMP
diff --git a/library/nxp_armmcu.dcm b/library/nxp_armmcu.dcm
index 93c1d37b..45a6a4de 100644
--- a/library/nxp_armmcu.dcm
+++ b/library/nxp_armmcu.dcm
@@ -1,127 +1,127 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP LPC1102UK
-D LPC1102UK, 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8kB SRAM, UART, SPI, ADC 5ch
+D 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8kB SRAM, UART, SPI, ADC 5ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1102.pdf
 $ENDCMP
 #
 $CMP LPC1111FHN33/101
-D LPC1111FHN33/101, 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1111FHN33/102
-D LPC1111FHN33/102, 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1111FHN33/201
-D LPC1111FHN33/201, 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1111FHN33/202
-D LPC1111FHN33/202, 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 8kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1112FHN33/101
-D LPC1112FHN33/101, 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1112FHN33/102
-D LPC1112FHN33/102, 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 2k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1112FHN33/201
-D LPC1112FHN33/201, 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1112FHN33/202
-D LPC1112FHN33/202, 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 16kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1113FBD48/301
-D LPC1113FBD48/301, 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1113FBD48/302
-D LPC1113FBD48/302, 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1113FHN33/201
-D LPC1113FHN33/201, 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1113FHN33/202
-D LPC1113FHN33/202, 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1113FHN33/301
-D LPC1113FHN33/301, 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1113FHN33/302
-D LPC1113FHN33/302, 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 24kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1114FBD48/301
-D LPC1114FBD48/301, 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1114FBD48/302
-D LPC1114FBD48/302, 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1114FHN33/201
-D LPC1114FHN33/201, 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1114FHN33/202
-D LPC1114FHN33/202, 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 4k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1114FHN33/301
-D LPC1114FHN33/301, 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
+D 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
 #
 $CMP LPC1114FHN33/302
-D LPC1114FHN33/302, 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
+D 32-bit ARM Cortex-M0 microcontroller, 32kB Flash, 8k SRAM, UART, I2C, SPI, ADC 8ch, Power Profile
 K ARM, 32bit, CortexM0, M0, NXP, Microcontroller
 F http://www.nxp.com/documents/data_sheet/LPC1111_12_13_14.pdf
 $ENDCMP
diff --git a/library/onsemi.dcm b/library/onsemi.dcm
index 07fd3862..22ca18a3 100644
--- a/library/onsemi.dcm
+++ b/library/onsemi.dcm
@@ -1,7 +1,7 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP NCP45560
-D NCP45560 - Controlled Load Switch with Low Ron
+D - Controlled Load Switch with Low Ron
 F http://www.onsemi.com/pub/Collateral/NCP45560-D.PDF
 $ENDCMP
 #
diff --git a/library/opto.dcm b/library/opto.dcm
index 39e0a8d3..914f0c4d 100644
--- a/library/opto.dcm
+++ b/library/opto.dcm
@@ -1,23 +1,23 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP 4N25
-D 4N25, DIP6, DC Optocoupler Base Connected, Vce 30V, CTR 20%, Viso 2500V
+D DIP6, DC Optocoupler Base Connected, Vce 30V, CTR 20%, Viso 2500V
 K NPN DC Optocoupler Base Connected
 $ENDCMP
 #
 $CMP 4N26
-D 4N26, DIP6, DC Optocoupler Base Connected, Vce 30V, CTR 20%, Viso 1500V
+D DIP6, DC Optocoupler Base Connected, Vce 30V, CTR 20%, Viso 1500V
 K NPN DC Optocoupler Base Connected
 $ENDCMP
 #
 $CMP 6N135
-D 6N135, DIP8, High Speed Optocoupler, TTL Compatible, CTR 18%
+D DIP8, High Speed Optocoupler, TTL Compatible, CTR 18%
 K High Speed Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/6N135_6N136_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP 6N136
-D 6N136, DIP8, High Speed Optocoupler, TTL Compatible, CTR 24%
+D DIP8, High Speed Optocoupler, TTL Compatible, CTR 24%
 K High Speed Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/6N135_6N136_en_datasheet_071001.pdf
 $ENDCMP
@@ -28,143 +28,143 @@ F http://www.avagotech.com/docs/AV02-2589EN
 $ENDCMP
 #
 $CMP CNY17-1
-D CNY17-1, DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 40-80%, Viso 5000V (RMS)
+D DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 40-80%, Viso 5000V (RMS)
 K NPN DC Optocoupler Base Connected
 F http://www.vishay.com/docs/83606/cny17.pdf
 $ENDCMP
 #
 $CMP CNY17-2
-D CNY17-2, DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 63-125%, Viso 5000V (RMS)
+D DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 63-125%, Viso 5000V (RMS)
 K NPN DC Optocoupler Base Connected
 F http://www.vishay.com/docs/83606/cny17.pdf
 $ENDCMP
 #
 $CMP CNY17-3
-D CNY17-3, DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 100-200%, Viso 5000V (RMS)
+D DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 100-200%, Viso 5000V (RMS)
 K NPN DC Optocoupler Base Connected
 F http://www.vishay.com/docs/83606/cny17.pdf
 $ENDCMP
 #
 $CMP CNY17-4
-D CNY17-4, DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 160-320%, Viso 5000V (RMS)
+D DIP6, DC Optocoupler Base Connected, Vce 70V, CTR 160-320%, Viso 5000V (RMS)
 K NPN DC Optocoupler Base Connected
 F http://www.vishay.com/docs/83606/cny17.pdf
 $ENDCMP
 #
 $CMP FOD420
-D FOD420, DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 0.75mA, Itm 300mA
+D DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 0.75mA, Itm 300mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/FO/FOD4218.pdf
 $ENDCMP
 #
 $CMP FOD4208
-D FOD4208, DIP6, Random Phase Opto-Triac, Vdrm 800V, Ift 0.75mA, Itm 300mA
+D DIP6, Random Phase Opto-Triac, Vdrm 800V, Ift 0.75mA, Itm 300mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/FO/FOD4218.pdf
 $ENDCMP
 #
 $CMP FOD4216
-D FOD4216, DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 0.75mA, Itm 300mA
+D DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 0.75mA, Itm 300mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/FO/FOD4218.pdf
 $ENDCMP
 #
 $CMP FOD4218
-D FOD4218, DIP6, Random Phase Opto-Triac, Vdrm 800V, Ift 0.75mA, Itm 300mA
+D DIP6, Random Phase Opto-Triac, Vdrm 800V, Ift 0.75mA, Itm 300mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/FO/FOD4218.pdf
 $ENDCMP
 #
 $CMP FODM3011
-D FODM3011, MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 250V, Ift 10mA
+D MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 250V, Ift 10mA
 K Opto-Triac Opto Triac Random Phase Mini-Flat
 F http://www.fairchildsemi.com/ds/FO/FODM3053.pdf
 $ENDCMP
 #
 $CMP FODM3012
-D FODM3012, MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 250V, Ift 5mA
+D MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 250V, Ift 5mA
 K Opto-Triac Opto Triac Random Phase Mini-Flat
 F http://www.fairchildsemi.com/ds/FO/FODM3053.pdf
 $ENDCMP
 #
 $CMP FODM3022
-D FODM3022, MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 400V, Ift 10mA
+D MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 400V, Ift 10mA
 K Opto-Triac Opto Triac Random Phase Mini-Flat
 F http://www.fairchildsemi.com/ds/FO/FODM3053.pdf
 $ENDCMP
 #
 $CMP FODM3023
-D FODM3023, MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 400V, Ift 5mA
+D MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 400V, Ift 5mA
 K Opto-Triac Opto Triac Random Phase Mini-Flat
 F http://www.fairchildsemi.com/ds/FO/FODM3053.pdf
 $ENDCMP
 #
 $CMP FODM3052
-D FODM3052, MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 600V, Ift 10mA
+D MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 600V, Ift 10mA
 K Opto-Triac Opto Triac Random Phase Mini-Flat
 F http://www.fairchildsemi.com/ds/FO/FODM3053.pdf
 $ENDCMP
 #
 $CMP FODM3053
-D FODM3053, MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 600V, Ift 5mA
+D MFP 4L, Full Pitch Mini-Flat Random Phase Opto-Triac, Vdrm 600V, Ift 5mA
 K Opto-Triac Opto Triac Random Phase Mini-Flat
 F http://www.fairchildsemi.com/ds/FO/FODM3053.pdf
 $ENDCMP
 #
 $CMP IL300
-D IL300, Isolated Linear Photocoupler, High Gain, Wideband, DIP8/SMD8
+D Isolated Linear Photocoupler, High Gain, Wideband, DIP8/SMD8
 K Isolated Linear Photocoupler
 F http://www.vishay.com/docs/83622/il300.pdf
 $ENDCMP
 #
 $CMP LTV-352T
-D LTV-352T, MFSOP6, DC Darlington Optocoupler, Vce 300V, CTR 1000%
+D MFSOP6, DC Darlington Optocoupler, Vce 300V, CTR 1000%
 K NPN Darlington DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-354T
-D LTV-354T, MFSOP6, AC/DC Optocoupler, Vce 35V, CTR 20%
+D MFSOP6, AC/DC Optocoupler, Vce 35V, CTR 20%
 K NPN AC DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-355T
-D LTV-355T, MFSOP6, DC Darlington Optocoupler, Vce 35V, CTR 600%
+D MFSOP6, DC Darlington Optocoupler, Vce 35V, CTR 600%
 K NPN Darlington DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-356T
-D LTV-356T, MFSOP6, DC Optocoupler, Vce 80V, CTR 50%
+D MFSOP6, DC Optocoupler, Vce 80V, CTR 50%
 K NPN DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-357T
-D LTV-357T, MFSOP6, DC Optocoupler, Vce 35V, CTR 50%
+D MFSOP6, DC Optocoupler, Vce 35V, CTR 50%
 K NPN DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-358T
-D LTV-358T, MFSOP6, DC Optocoupler, Vce 120V, CTR 50%
+D MFSOP6, DC Optocoupler, Vce 120V, CTR 50%
 K NPN DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-814
-D LTV-814, DIP4, AC/DC Optocoupler, Vce 35V, CTR 20%
+D DIP4, AC/DC Optocoupler, Vce 35V, CTR 20%
 K NPN AC DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-817
-D LTV-817, DIP-4, DC Optocoupler, Vce 35V, CTR 50%
+D DIP-4, DC Optocoupler, Vce 35V, CTR 50%
 K NPN DC Optocoupler
 F http://www.us.liteon.com/downloads/LTV-817-827-847.PDF
 $ENDCMP
 #
 $CMP LTV-824
-D LTV-824, DIP8, Dual AC/DC Optocoupler, Vce 35V, CTR 20%
+D DIP8, Dual AC/DC Optocoupler, Vce 35V, CTR 20%
 K Dual NPN AC DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-827
-D LTV-827, DIP-8, Dual DC Optocoupler, Vce 35V, CTR 50%
+D DIP-8, Dual DC Optocoupler, Vce 35V, CTR 50%
 K NPN DC Dual Optocoupler
 F http://www.us.liteon.com/downloads/LTV-817-827-847.PDF
 $ENDCMP
@@ -175,145 +175,145 @@ K Quad NPN AC DC Optocoupler
 $ENDCMP
 #
 $CMP LTV-847
-D LTV-847, DIP-16, Quad DC Optocoupler, Vce 35V, CTR 50%
+D DIP-16, Quad DC Optocoupler, Vce 35V, CTR 50%
 K NPN DC Quad Optocoupler
 F http://www.us.liteon.com/downloads/LTV-817-827-847.PDF
 $ENDCMP
 #
 $CMP MOC3010M
-D MOC3010M, DIP6, Random Phase Opto-Triac, Vdrm 250V, Ift 15mA
+D DIP6, Random Phase Opto-Triac, Vdrm 250V, Ift 15mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3020M.pdf
 $ENDCMP
 #
 $CMP MOC3011M
-D MOC3011M, DIP6, Random Phase Opto-Triac, Vdrm 250V, Ift 10mA
+D DIP6, Random Phase Opto-Triac, Vdrm 250V, Ift 10mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3020M.pdf
 $ENDCMP
 #
 $CMP MOC3012M
-D MOC3012M, DIP6, Random Phase Opto-Triac, Vdrm 250V, Ift 5mA
+D DIP6, Random Phase Opto-Triac, Vdrm 250V, Ift 5mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3020M.pdf
 $ENDCMP
 #
 $CMP MOC3020M
-D MOC3020M, DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 30mA
+D DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 30mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3020M.pdf
 $ENDCMP
 #
 $CMP MOC3021M
-D MOC3021M, DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 15mA
+D DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 15mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3020M.pdf
 $ENDCMP
 #
 $CMP MOC3022M
-D MOC3022M, DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 10mA
+D DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 10mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3020M.pdf
 $ENDCMP
 #
 $CMP MOC3023M
-D MOC3023M, DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 5mA
+D DIP6, Random Phase Opto-Triac, Vdrm 400V, Ift 5mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3020M.pdf
 $ENDCMP
 #
 $CMP MOC3031M
-D MOC3031M, DIP6,  Zero Cross Opto-Triac, Vdrm 250V, Ift 15mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 250V, Ift 15mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3031M.pdf
 $ENDCMP
 #
 $CMP MOC3032M
-D MOC3032M, DIP6,  Zero Cross Opto-Triac, Vdrm 250V, Ift 10mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 250V, Ift 10mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3031M.pdf
 $ENDCMP
 #
 $CMP MOC3033M
-D MOC3033M, DIP6,  Zero Cross Opto-Triac, Vdrm 250V, Ift 5mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 250V, Ift 5mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3031M.pdf
 $ENDCMP
 #
 $CMP MOC3041M
-D MOC3041M, DIP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 15mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 15mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3031M.pdf
 $ENDCMP
 #
 $CMP MOC3042M
-D MOC3042M, DIP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 10mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 10mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3031M.pdf
 $ENDCMP
 #
 $CMP MOC3043M
-D MOC3043M, DIP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 5mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 5mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3031M.pdf
 $ENDCMP
 #
 $CMP MOC3051M
-D MOC3051M, DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 15mA
+D DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 15mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3052M.pdf
 $ENDCMP
 #
 $CMP MOC3052M
-D MOC3052M, DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 10mA
+D DIP6, Random Phase Opto-Triac, Vdrm 600V, Ift 10mA
 K Opto-Triac Opto Triac Random Phase
 F http://www.fairchildsemi.com/ds/MO/MOC3052M.pdf
 $ENDCMP
 #
 $CMP MOC3061M
-D MOC3061M, DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 15mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 15mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3061M.pdf
 $ENDCMP
 #
 $CMP MOC3062M
-D MOC3062M, DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 10mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 10mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3061M.pdf
 $ENDCMP
 #
 $CMP MOC3063M
-D MOC3063M, DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 5mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 5mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3061M.pdf
 $ENDCMP
 #
 $CMP MOC3081M
-D MOC3081M, DIP6,  Zero Cross Opto-Triac, Vdrm 800V, Ift 15mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 800V, Ift 15mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3081M.pdf
 $ENDCMP
 #
 $CMP MOC3082M
-D MOC3082M, DIP6,  Zero Cross Opto-Triac, Vdrm 800V, Ift 10mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 800V, Ift 10mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3081M.pdf
 $ENDCMP
 #
 $CMP MOC3083M
-D MOC3083M, DIP6,  Zero Cross Opto-Triac, Vdrm 800V, Ift 5mA
+D DIP6,  Zero Cross Opto-Triac, Vdrm 800V, Ift 5mA
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3081M.pdf
 $ENDCMP
 #
 $CMP MOC3162M
-D MOC3162M, DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 10mA, dv/dt 1000
+D DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 10mA, dv/dt 1000
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3061M.pdf
 $ENDCMP
 #
 $CMP MOC3163M
-D MOC3163M, DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 5mA, dv/dt 1000
+D DIP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 5mA, dv/dt 1000
 K Opto-Triac Opto Triac Zero Cross
 F http://www.fairchildsemi.com/ds/MO/MOC3061M.pdf
 $ENDCMP
@@ -344,146 +344,146 @@ K Opto-Triac Opto Triac Random Phase
 $ENDCMP
 #
 $CMP PC3H4
-D PC3H4, SOP4, AC/DC Optocoupler, Vce 70V, CTR 100-250%
+D SOP4, AC/DC Optocoupler, Vce 70V, CTR 100-250%
 K NPN AC DC Optocoupler
 F http://www.sharpsme.com/download/pc3h4-epdf
 $ENDCMP
 #
 $CMP PC3H4A
-D PC3H4A, SOP4, AC/DC Optocoupler, Vce 70V, CTR 100-250%
+D SOP4, AC/DC Optocoupler, Vce 70V, CTR 100-250%
 K NPN AC DC Optocoupler
 F http://www.sharpsma.com/webfm_send/395
 $ENDCMP
 #
 $CMP PC817
-D PC817, DIP4, DC Optocoupler, Vce 35V, CTR 50-300%
+D DIP4, DC Optocoupler, Vce 35V, CTR 50-300%
 K NPN DC Optocoupler
 F http://www.soselectronic.cz/a_info/resource/d/pc817.pdf
 $ENDCMP
 #
 $CMP PC827
-D PC827, DIP8, DC Dual Optocoupler, Vce 35V, CTR 50-300%
+D DIP8, DC Dual Optocoupler, Vce 35V, CTR 50-300%
 K NPN DC Dual Optocoupler
 F http://www.soselectronic.cz/a_info/resource/d/pc817.pdf
 $ENDCMP
 #
 $CMP PC837
-D PC837, DIP12, DC Triple Optocoupler, Vce 35V, CTR 50-300%
+D DIP12, DC Triple Optocoupler, Vce 35V, CTR 50-300%
 K NPN DC Triple Optocoupler
 F http://www.soselectronic.cz/a_info/resource/d/pc817.pdf
 $ENDCMP
 #
 $CMP PC847
-D PC847, DIP16, DC Quad Optocoupler, Vce 35V, CTR 50-300%
+D DIP16, DC Quad Optocoupler, Vce 35V, CTR 50-300%
 K NPN DC Quad Optocoupler
 F http://www.soselectronic.cz/a_info/resource/d/pc817.pdf
 $ENDCMP
 #
 $CMP TLP127
-D TLP127, MFSOP6, DC Darlington Optocoupler, Vce 300V, CTR 1000%
+D MFSOP6, DC Darlington Optocoupler, Vce 300V, CTR 1000%
 K NPN Darlington DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP127_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP130
-D TLP130, MFSOP6, AC DC Optocoupler Base Connected, Vce 80V, CTR 50-100%
+D MFSOP6, AC DC Optocoupler Base Connected, Vce 80V, CTR 50-100%
 K NPN AC DC Optocoupler Base Connected
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP130_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP131
-D TLP131, MFSOP6, DC Optocoupler Base Connected, Vce 80V, CTR 50-200%
+D MFSOP6, DC Optocoupler Base Connected, Vce 80V, CTR 50-200%
 K NPN DC Optocoupler Base Connected
 F http://www.toshiba-components.com/docs/opto/TLP131_en_datasheet.pdf
 $ENDCMP
 #
 $CMP TLP137
-D TLP137, MFSOP6, DC Optocoupler Base Connected, Vce 80V, CTR 100-200%
+D MFSOP6, DC Optocoupler Base Connected, Vce 80V, CTR 100-200%
 K NPN DC Optocoupler Base Connected
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP137_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP141G
-D TLP141G, MFSOP6, DC Optocoupler Thyristor Based, Vdrm 400V, It 150mA, Viso 2500V
+D MFSOP6, DC Optocoupler Thyristor Based, Vdrm 400V, It 150mA, Viso 2500V
 K OptoThyristor DC Optocoupler
 F http://www.toshiba.com/taec/components2/Datasheet_Sync/209/4314.pdf
 $ENDCMP
 #
 $CMP TLP160G
-D TLP160G, MSOP6,  Random Phase Opto-Triac, Vdrm 400V, Ift 5mA
+D MSOP6,  Random Phase Opto-Triac, Vdrm 400V, Ift 5mA
 K Opto-Triac Opto Triac Random
 $ENDCMP
 #
 $CMP TLP160J
-D TLP160J, MSOP6,  Random Phase Opto-Triac, Vdrm 600V, Ift 7mA
+D MSOP6,  Random Phase Opto-Triac, Vdrm 600V, Ift 7mA
 K Opto-Triac Opto Triac Random
 $ENDCMP
 #
 $CMP TLP161G
-D TLP161G, MSOP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 5mA
+D MSOP6,  Zero Cross Opto-Triac, Vdrm 400V, Ift 5mA
 K Opto-Triac Opto Triac Zero Cross
 $ENDCMP
 #
 $CMP TLP161J
-D TLP161J, MSOP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 7mA
+D MSOP6,  Zero Cross Opto-Triac, Vdrm 600V, Ift 7mA
 K Opto-Triac Opto Triac Zero Cross
 $ENDCMP
 #
 $CMP TLP175A
-D TLP175A, SO6, MOSFET Photorelay 1-Form-A, Voff 60V, Ion 100mA
+D SO6, MOSFET Photorelay 1-Form-A, Voff 60V, Ion 100mA
 K MOSFET Output Photorelay 1-Form-A
 $ENDCMP
 #
 $CMP TLP184
-D TLP184, MFSOP6, AC/DC Optocoupler, Vce 80V, CTR 50-100%
+D MFSOP6, AC/DC Optocoupler, Vce 80V, CTR 50-100%
 K NPN AC DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP184_en_datasheet_120214.pdf
 $ENDCMP
 #
 $CMP TLP185
-D TLP185, MFSOP6, DC Optocoupler, Vce 80V, CTR 50-100%
+D MFSOP6, DC Optocoupler, Vce 80V, CTR 50-100%
 K NPN DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP185_en_datasheet_120214.pdf
 $ENDCMP
 #
 $CMP TLP222A
-D TLP222A, DIP4, MOSFET Photorelay 1-Form-A, Voff 60V, Ion 0,5A
+D DIP4, MOSFET Photorelay 1-Form-A, Voff 60V, Ion 0,5A
 K MOSFET Output Photorelay 1-Form-A
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP222A_TLP222A-2_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP222A-2
-D TLP222A-2, DIP8, Dual MOSFET Photorelay 1-Form-A, Voff 60V, Ion 0,5A
+D DIP8, Dual MOSFET Photorelay 1-Form-A, Voff 60V, Ion 0,5A
 K Dual MOSFET Output Photorelay 1-Form-A
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP222A_TLP222A-2_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP290
-D TLP290, SOP4, AC/DC Optocoupler, Vce 80V, CTR 50-100%
+D SOP4, AC/DC Optocoupler, Vce 80V, CTR 50-100%
 K NPN AC DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP290_en_datasheet_120426.pdf
 $ENDCMP
 #
 $CMP TLP290-4
-D TLP290-4, SOP16, Quad AC/DC Optocoupler, Vce 80V, CTR 50-100%
+D SOP16, Quad AC/DC Optocoupler, Vce 80V, CTR 50-100%
 K NPN AC DC Quad Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP290-4_en_datasheet_120322.pdf
 $ENDCMP
 #
 $CMP TLP291
-D TLP291, SOP4, DC Optocoupler, Vce 80V, CTR 50-100%
+D SOP4, DC Optocoupler, Vce 80V, CTR 50-100%
 K NPN DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP291_en_datasheet_120426.pdf
 $ENDCMP
 #
 $CMP TLP291-4
-D TLP291-4, SOP16, Quad DC Optocoupler, Vce 80V, CTR 50-100%
+D SOP16, Quad DC Optocoupler, Vce 80V, CTR 50-100%
 K NPN DC Quad Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP291-4_en_datasheet_120322.pdf
 $ENDCMP
 #
 $CMP TLP3021
-D TLP3021, DIP6, Photo-Triac, Vdrm 400V, Ift 15mA
+D DIP6, Photo-Triac, Vdrm 400V, Ift 15mA
 K Photo-Triac Opto Triac
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP3021(S)_TLP3023(S)_en_datasheet_101001.pdf
 $ENDCMP
@@ -501,31 +501,31 @@ F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP3021(S)_TLP3023(S)_
 $ENDCMP
 #
 $CMP TLP627
-D TLP627, DIP4, DC Darlington Optocoupler, Vce 300V, CTR 1000%
+D DIP4, DC Darlington Optocoupler, Vce 300V, CTR 1000%
 K NPN Darlington DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP627_TLP627-4_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP627-2
-D TLP627-2, DIP8, DC Dual Darlington Optocoupler, Vce 300V, CTR 1000%
+D DIP8, DC Dual Darlington Optocoupler, Vce 300V, CTR 1000%
 K NPN Dual Darlington DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP627_TLP627-4_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP627-4
-D TLP627-4, DIP16, DC Quad Darlington Optocoupler, Vce 300V, CTR 1000%
+D DIP16, DC Quad Darlington Optocoupler, Vce 300V, CTR 1000%
 K NPN Quad Darlington DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP627_TLP627-4_en_datasheet_071001.pdf
 $ENDCMP
 #
 $CMP TLP785
-D TLP785, DIP4, DC Optocoupler, Vce 80V, CTR 50-200%
+D DIP4, DC Optocoupler, Vce 80V, CTR 50-200%
 K NPN DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP785_TLP785F_en_datasheet_120220.pdf
 $ENDCMP
 #
 $CMP TLP785F
-D TLP785F, DIP4F (Wide), DC Optocoupler, Vce 80V, CTR 50-200%
+D DIP4F (Wide), DC Optocoupler, Vce 80V, CTR 50-200%
 K NPN DC Optocoupler
 F http://www.semicon.toshiba.co.jp/docs/datasheet/en/Opto/TLP785_TLP785F_en_datasheet_120220.pdf
 $ENDCMP
diff --git a/library/philips.dcm b/library/philips.dcm
index f9ee1e91..ee514cf0 100644
--- a/library/philips.dcm
+++ b/library/philips.dcm
@@ -1,72 +1,72 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP HTRC11001T
-D HTRC11001T, HITAG RF Reader Device, SOIC-14
+D HITAG RF Reader Device, SOIC-14
 K HITAG RFID
 F http://www.nxp.com/documents/data_sheet/HTRC11001T.pdf
 $ENDCMP
 #
 $CMP P82B96
-D P82B96, Dual I2C Bus Buffer, DIP8/SO8/TSSOP8
+D Dual I2C Bus Buffer, DIP8/SO8/TSSOP8
 K I2C Bus Buffer
 F http://www.nxp.com/documents/data_sheet/P82B96.pdf
 $ENDCMP
 #
 $CMP PCA82C251
-D PCA82C251, CAN Transceiver for 24V Systems, SOIC-8
+D CAN Transceiver for 24V Systems, SOIC-8
 K BUS CAN
 F http://www.nxp.com/documents/data_sheet/PCA82C251.pdf
 $ENDCMP
 #
 $CMP PCA9516
-D PCA9516, 5 channels I2C Hub, SO/TSSOP16
+D 5 channels I2C Hub, SO/TSSOP16
 K I2C Hub
 F http://www.nxp.com/documents/data_sheet/PCA9518.pdf
 $ENDCMP
 #
 $CMP PCF8563
-D PCF8563, Realtime Clock/Calendar I2C Interface, DIP/SOIC/TSSOP-8
+D Realtime Clock/Calendar I2C Interface, DIP/SOIC/TSSOP-8
 K I2C RTC Clock Calendar
 F http://www.nxp.com/documents/data_sheet/PCF8563.pdf
 $ENDCMP
 #
 $CMP PCF8574
-D PCF8574, 8 Bit Port/Expander to I2C Bus, DIP/SOIC-16
+D 8 Bit Port/Expander to I2C Bus, DIP/SOIC-16
 K I2C Expander
 F http://www.nxp.com/documents/data_sheet/PCF8574_PCF8574A.pdf
 $ENDCMP
 #
 $CMP PCF8574A
-D PCF8574A, 8 Bit Port/Expander to I2C Bus, DIP/SOIC-16
+D 8 Bit Port/Expander to I2C Bus, DIP/SOIC-16
 K I2C Expander
 F http://www.nxp.com/documents/data_sheet/PCF8574_PCF8574A.pdf
 $ENDCMP
 #
 $CMP PCF8584
-D PCF8584, I2C Bus Controller, DIP/SOIC-20
+D I2C Bus Controller, DIP/SOIC-20
 K I2C Bus
 F http://www.nxp.com/documents/data_sheet/PCF8584.pdf
 $ENDCMP
 #
 $CMP PCF8591
-D PCF8591, 4ch ADC, 1 DAC, I2C Bus Interface, DIP/SOIC-16
+D 4ch ADC, 1 DAC, I2C Bus Interface, DIP/SOIC-16
 K I2C ADC DAC
 F http://www.nxp.com/documents/data_sheet/PCF8591.pdf
 $ENDCMP
 #
 $CMP SAA7182
-D SAA7182, Digital Video Encoder, Obsolete
+D Digital Video Encoder, Obsolete
 K Video Encoder
 $ENDCMP
 #
 $CMP TDA8501
-D TDA8501, PAL/NTSC Encoder, RGB or Y/Y-R/Y-B Inputs, DIP/SOIC-20
+D PAL/NTSC Encoder, RGB or Y/Y-R/Y-B Inputs, DIP/SOIC-20
 K Video Encoder
 F http://www.nxp.com/documents/data_sheet/TDA8501.pdf
 $ENDCMP
 #
 $CMP TDA8772
-D TDA8772, Triple 8bit Video DAC, QFP-44
+D Triple 8bit Video DAC, QFP-44
 K Video DAC Colour 8bit
 $ENDCMP
 #
diff --git a/library/power.dcm b/library/power.dcm
index 4d05305f..c7e90297 100644
--- a/library/power.dcm
+++ b/library/power.dcm
@@ -157,7 +157,7 @@ K POWER, PWR
 $ENDCMP
 #
 $CMP Earth
-D Earth Ground
+D Ground
 K POWER, PWR, GND, GROUND
 $ENDCMP
 #
diff --git a/library/powerint.dcm b/library/powerint.dcm
index 42f5fa02..25148b79 100644
--- a/library/powerint.dcm
+++ b/library/powerint.dcm
@@ -1,157 +1,157 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP CAP002DG
-D CAP002DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax < 500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax < 500nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP003DG
-D CAP003DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 750nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 750nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 750nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP004DG
-D CAP004DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 1000nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 1000nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 1000nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP005DG
-D CAP005DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 1500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 1500nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 1500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP006DG
-D CAP006DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 2000nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 2000nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 2000nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP007DG
-D CAP007DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 2500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 2500nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 2500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP008DG
-D CAP008DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 3500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 3500nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 3500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP009DG
-D CAP009DG, CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 5000nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 875V, Cmax 5000nF, SO8
 K CapZero Automatic Capacitor Discarger 875V 5000nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP012DG
-D CAP012DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax < 500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax < 500nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP013DG
-D CAP013DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 750nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 750nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 750nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP014DG
-D CAP014DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 1000nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 1000nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 1000nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP015DG
-D CAP015DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 1500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 1500nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 1500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP016DG
-D CAP016DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 2000nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 2000nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 2000nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP017DG
-D CAP017DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 2500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 2500nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 2500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP018DG
-D CAP018DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 3500nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 3500nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 3500nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP CAP019DG
-D CAP019DG, CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 5000nF, SO8
+D CapZero Automatic Capacitor Discarger, Vdss 1000V, Cmax 5000nF, SO8
 K CapZero Automatic Capacitor Discarger 1000V 5000nF
 F http://www.powerint.com/sites/default/files/product-docs/capzero_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK302D
-D LNK302D, LinkSwitch-TN Family, 80mA Output Current
+D LinkSwitch-TN Family, 80mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK302G
-D LNK302G, LinkSwitch-TN Family, 80mA Output Current
+D LinkSwitch-TN Family, 80mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK302P
-D LNK302P, LinkSwitch-TN Family, 80mA Output Current
+D LinkSwitch-TN Family, 80mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK304D
-D LNK304D, LinkSwitch-TN Family, 170mA Output Current
+D LinkSwitch-TN Family, 170mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK304G
-D LNK304G, LinkSwitch-TN Family, 170mA Output Current
+D LinkSwitch-TN Family, 170mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK304P
-D LNK304P, LinkSwitch-TN Family, 170mA Output Current
+D LinkSwitch-TN Family, 170mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK305D
-D LNK305D, LinkSwitch-TN Family, 280mA Output Current
+D LinkSwitch-TN Family, 280mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK305G
-D LNK305G, LinkSwitch-TN Family, 280mA Output Current
+D LinkSwitch-TN Family, 280mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK305P
-D LNK305P, LinkSwitch-TN Family, 280mA Output Current
+D LinkSwitch-TN Family, 280mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK306D
-D LNK306D, LinkSwitch-TN Family, 360mA Output Current
+D LinkSwitch-TN Family, 360mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
@@ -163,797 +163,797 @@ F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK306P
-D LNK306P, LinkSwitch-TN Family, 360mA Output Current
+D LinkSwitch-TN Family, 360mA Output Current
 K Lowest Component Count, Energy-Efficient Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk302_304-306.pdf
 $ENDCMP
 #
 $CMP LNK362D
-D LNK362D, LinkSwitch-XT Family, 2.6W Output Power
+D LinkSwitch-XT Family, 2.6W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK362G
-D LNK362G, LinkSwitch-XT Family, 2.6W Output Power
+D LinkSwitch-XT Family, 2.6W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK362P
-D LNK362P, LinkSwitch-XT Family, 2.6W Output Power
+D LinkSwitch-XT Family, 2.6W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK363D
-D LNK363D, LinkSwitch-XT Family, 4.7W Output Power
+D LinkSwitch-XT Family, 4.7W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK363G
-D LNK363G, LinkSwitch-XT Family, 4.7W Output Power
+D LinkSwitch-XT Family, 4.7W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK363P
-D LNK363P, LinkSwitch-XT Family, 4.7W Output Power
+D LinkSwitch-XT Family, 4.7W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK364D
-D LNK364D, LinkSwitch-XT Family, 6W Output Power
+D LinkSwitch-XT Family, 6W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK364G
-D LNK364G, LinkSwitch-XT Family, 6W Output Power
+D LinkSwitch-XT Family, 6W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK364P
-D LNK364P, LinkSwitch-XT Family, 6W Output Power
+D LinkSwitch-XT Family, 6W Output Power
 K Energy Effi cient, Low Power Off-Line Switcher IC
 F http://www.powerint.com/sites/default/files/product-docs/lnk362-364.pdf
 $ENDCMP
 #
 $CMP LNK403EG
-D LNK403EG, LinkSwitch-PH Family, 12W Output Power
+D LinkSwitch-PH Family, 12W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Primary-Side Constant Current Control
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ph_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK404EG
-D LNK404EG, LinkSwitch-PH Family, 15W Output Power
+D LinkSwitch-PH Family, 15W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Primary-Side Constant Current Control
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ph_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK405EG
-D LNK405EG, LinkSwitch-PH Family, 18W Output Power
+D LinkSwitch-PH Family, 18W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Primary-Side Constant Current Control
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ph_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK406EG
-D LNK406EG, LinkSwitch-PH Family, 22W Output Power
+D LinkSwitch-PH Family, 22W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Primary-Side Constant Current Control
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ph_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK407EG
-D LNK407EG, LinkSwitch-PH Family, 25W Output Power
+D LinkSwitch-PH Family, 25W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Primary-Side Constant Current Control
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ph_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK408EG
-D LNK408EG, LinkSwitch-PH Family, 35W Output Power
+D LinkSwitch-PH Family, 35W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Primary-Side Constant Current Control
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ph_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK409EG
-D LNK409EG, LinkSwitch-PH Family, 50W Output Power
+D LinkSwitch-PH Family, 50W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Primary-Side Constant Current Control
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ph_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK454D
-D LNK454D, LinkSwitch-PL Family, 3W Output Power
+D LinkSwitch-PL Family, 3W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Constant Current Control for Non-Isolated Applications
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-pl_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK456D
-D LNK456D, LinkSwitch-PL Family, 6W Output Power
+D LinkSwitch-PL Family, 6W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Constant Current Control for Non-Isolated Applications
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-pl_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK457D
-D LNK457D, LinkSwitch-PL Family, 8W Output Power
+D LinkSwitch-PL Family, 8W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Constant Current Control for Non-Isolated Applications
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-pl_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK457V
-D LNK457V, LinkSwitch-PL Family, 8W Output Power
+D LinkSwitch-PL Family, 8W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Constant Current Control for Non-Isolated Applications
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-pl_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK458V
-D LNK458V, LinkSwitch-PL Family, 11.5W Output Power
+D LinkSwitch-PL Family, 11.5W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Constant Current Control for Non-Isolated Applications
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-pl_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK459V
-D LNK459V, LinkSwitch-PL Family, 16W Output Power
+D LinkSwitch-PL Family, 16W Output Power
 K LED Driver IC with TRIAC Dimming, Single-Stage PFC and Constant Current Control for Non-Isolated Applications
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-pl_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK562D
-D LNK562D, LinkSwitch-LP Family, 1.9W Output Power
+D LinkSwitch-LP Family, 1.9W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK562G
-D LNK562G, LinkSwitch-LP Family, 1.9W Output Power
+D LinkSwitch-LP Family, 1.9W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK562P
-D LNK562P, LinkSwitch-LP Family, 1.9W Output Power
+D LinkSwitch-LP Family, 1.9W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK563D
-D LNK563D, LinkSwitch-LP Family, 2.5W Output Power
+D LinkSwitch-LP Family, 2.5W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK563G
-D LNK563G, LinkSwitch-LP Family, 2.5W Output Power
+D LinkSwitch-LP Family, 2.5W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK563P
-D LNK563P, LinkSwitch-LP Family, 2.5W Output Power
+D LinkSwitch-LP Family, 2.5W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK564D
-D LNK564D, LinkSwitch-LP Family, 3W Output Power
+D LinkSwitch-LP Family, 3W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK564G
-D LNK564G, LinkSwitch-LP Family, 3W Output Power
+D LinkSwitch-LP Family, 3W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK564P
-D LNK564P, LinkSwitch-LP Family, 3W Output Power
+D LinkSwitch-LP Family, 3W Output Power
 K Energy Effi cient Off-Line Switcher IC for Linear Transformer Replacement
 F http://www.powerint.com/sites/default/files/product-docs/linklp_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK603DG
-D LNK603DG, LinkSwitch-II Family, 3.3W Output Power
+D LinkSwitch-II Family, 3.3W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK603PG
-D LNK603PG, LinkSwitch-II Family, 3.3W Output Power
+D LinkSwitch-II Family, 3.3W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK604DG
-D LNK604DG, LinkSwitch-II Family, 4.1W Output Power
+D LinkSwitch-II Family, 4.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK604PG
-D LNK604PG, LinkSwitch-II Family, 4.1W Output Power
+D LinkSwitch-II Family, 4.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK605DG
-D LNK605DG, LinkSwitch-II Family, 5.1W Output Power
+D LinkSwitch-II Family, 5.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK605PG
-D LNK605PG, LinkSwitch-II Family, 5.1W Output Power
+D LinkSwitch-II Family, 5.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK606DG
-D LNK606DG, LinkSwitch-II Family, 6.1W Output Power
+D LinkSwitch-II Family, 6.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK606GG
-D LNK606GG, LinkSwitch-II Family, 6.1W Output Power
+D LinkSwitch-II Family, 6.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK606PG
-D LNK606PG, LinkSwitch-II Family, 6.1W Output Power
+D LinkSwitch-II Family, 6.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK613DG
-D LNK613DG, LinkSwitch-II Family, 3.3W Output Power
+D LinkSwitch-II Family, 3.3W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK613PG
-D LNK613PG, LinkSwitch-II Family, 3.3W Output Power
+D LinkSwitch-II Family, 3.3W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK614DG
-D LNK614DG, LinkSwitch-II Family, 4.1W Output Power
+D LinkSwitch-II Family, 4.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK614PG
-D LNK614PG, LinkSwitch-II Family, 4.1W Output Power
+D LinkSwitch-II Family, 4.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK615DG
-D LNK615DG, LinkSwitch-II Family, 5.1W Output Power
+D LinkSwitch-II Family, 5.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK615PG
-D LNK615PG, LinkSwitch-II Family, 5.1W Output Power
+D LinkSwitch-II Family, 5.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK616DG
-D LNK616DG, LinkSwitch-II Family, 6.1W Output Power
+D LinkSwitch-II Family, 6.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK616GG
-D LNK616GG, LinkSwitch-II Family, 6.1W Output Power
+D LinkSwitch-II Family, 6.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK616PG
-D LNK616PG, LinkSwitch-II Family, 6.1W Output Power
+D LinkSwitch-II Family, 6.1W Output Power
 K Energy-Efficient, Accurate CV/CC Switcher for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK623DG
-D LNK623DG, LinkSwitch-CV Family, 6W Output Power
+D LinkSwitch-CV Family, 6W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK623PG
-D LNK623PG, LinkSwitch-CV Family, 6W Output Power
+D LinkSwitch-CV Family, 6W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK624DG
-D LNK624DG, LinkSwitch-CV Family, 6.5W Output Power
+D LinkSwitch-CV Family, 6.5W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK624PG
-D LNK624PG, LinkSwitch-CV Family, 6.5W Output Power
+D LinkSwitch-CV Family, 6.5W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK625DG
-D LNK625DG, LinkSwitch-CV Family, 8W Output Power
+D LinkSwitch-CV Family, 8W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK625PG
-D LNK625PG, LinkSwitch-CV Family, 8W Output Power
+D LinkSwitch-CV Family, 8W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK626DG
-D LNK626DG, LinkSwitch-CV Family, 10W Output Power
+D LinkSwitch-CV Family, 10W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK626PG
-D LNK626PG, LinkSwitch-CV Family, 10W Output Power
+D LinkSwitch-CV Family, 10W Output Power
 K Energy-Effi cient, Off-line Switcher with Accurate Primary-side Constant-Voltage Control
 F http://www.powerint.com/sites/default/files/product-docs/linkcv_family_datasheet.pdf
 $ENDCMP
 #
 $CMP LNK632DG
-D LNK632DG, LinkSwitch-II Family, 3.1W Output Power
+D LinkSwitch-II Family, 3.1W Output Power
 K Energy-Efficient, Accurate CV Switcher With CC Control for Adapters and Chargers
 F http://www.powerint.com/sites/default/files/product-docs/linkswitch-ii_632DG_datasheet.pdf
 $ENDCMP
 #
 $CMP TNY263G
-D TNY263G, TinySwitch-II Family, 7.5W Output Power
+D TinySwitch-II Family, 7.5W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY263P
-D TNY263P, TinySwitch-II Family, 7.5W Output Power
+D TinySwitch-II Family, 7.5W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY264G
-D TNY264G, TinySwitch-II Family, 9W Output Power
+D TinySwitch-II Family, 9W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY264P
-D TNY264P, TinySwitch-II Family, 9W Output Power
+D TinySwitch-II Family, 9W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY265G
-D TNY265G, TinySwitch-II Family, 11W Output Power
+D TinySwitch-II Family, 11W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY265P
-D TNY265P, TinySwitch-II Family, 11W Output Power
+D TinySwitch-II Family, 11W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY266G
-D TNY266G, TinySwitch-II Family, 15W Output Power
+D TinySwitch-II Family, 15W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY266P
-D TNY266P, TinySwitch-II Family, 15W Output Power
+D TinySwitch-II Family, 15W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY267G
-D TNY267G, TinySwitch-II Family, 19W Output Power
+D TinySwitch-II Family, 19W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY267P
-D TNY267P, TinySwitch-II Family, 19W Output Power
+D TinySwitch-II Family, 19W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY268G
-D TNY268G, TinySwitch-II Family, 23W Output Power
+D TinySwitch-II Family, 23W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY268P
-D TNY268P, TinySwitch-II Family, 23W Output Power
+D TinySwitch-II Family, 23W Output Power
 K Enhanced, Energy Effi cient, Low Power Off-line Switcher
 F http://www.powerint.com/sites/default/files/product-docs/tny263_268.pdf
 $ENDCMP
 #
 $CMP TNY274G
-D TNY274G, TinySwitch-III Family, 8.5W Output Power
+D TinySwitch-III Family, 8.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY274P
-D TNY274P, TinySwitch-III Family, 8.5W Output Power
+D TinySwitch-III Family, 8.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY275G
-D TNY275G, TinySwitch-III Family, 11.5W Output Power
+D TinySwitch-III Family, 11.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY275P
-D TNY275P, TinySwitch-III Family, 11.5W Output Power
+D TinySwitch-III Family, 11.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY276G
-D TNY276G, TinySwitch-III Family, 15W Output Power
+D TinySwitch-III Family, 15W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY276P
-D TNY276P, TinySwitch-III Family, 15W Output Power
+D TinySwitch-III Family, 15W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY277G
-D TNY277G, TinySwitch-III Family, 18W Output Power
+D TinySwitch-III Family, 18W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY277P
-D TNY277P, TinySwitch-III Family, 18W Output Power
+D TinySwitch-III Family, 18W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY278G
-D TNY278G, TinySwitch-III Family, 21.5W Output Power
+D TinySwitch-III Family, 21.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY278P
-D TNY278P, TinySwitch-III Family, 21.5W Output Power
+D TinySwitch-III Family, 21.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY279G
-D TNY279G, TinySwitch-III Family, 25W Output Power
+D TinySwitch-III Family, 25W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY279P
-D TNY279P, TinySwitch-III Family, 25W Output Power
+D TinySwitch-III Family, 25W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY280G
-D TNY280G, TinySwitch-III Family, 28.5W Output Power
+D TinySwitch-III Family, 28.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TNY280P
-D TNY280P, TinySwitch-III Family, 28.5W Output Power
+D TinySwitch-III Family, 28.5W Output Power
 K Energy-Effi cient, Off-Line Switcher With Enhanced Flexibility and Extended Power Range
 F http://www.powerint.com/sites/default/files/product-docs/tny274-280.pdf
 $ENDCMP
 #
 $CMP TOP100YN
-D TOP100YN, TOPSwitch Family, 20W Max Output Power
+D TOPSwitch Family, 20W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top100.pdf
 $ENDCMP
 #
 $CMP TOP101YN
-D TOP101YN, TOPSwitch Family, 35W Max Output Power
+D TOPSwitch Family, 35W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top100.pdf
 $ENDCMP
 #
 $CMP TOP102YN
-D TOP102YN, TOPSwitch Family, 45W Max Output Power
+D TOPSwitch Family, 45W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top100.pdf
 $ENDCMP
 #
 $CMP TOP103YN
-D TOP103YN, TOPSwitch Family, 55W Max Output Power
+D TOPSwitch Family, 55W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top100.pdf
 $ENDCMP
 #
 $CMP TOP104YN
-D TOP104YN, TOPSwitch Family, 60W Max Output Power
+D TOPSwitch Family, 60W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top100.pdf
 $ENDCMP
 #
 $CMP TOP200YAI
-D TOP200YAI, TOPSwitch Family, 12W Max Output Power
+D TOPSwitch Family, 12W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top200-204214.pdf
 $ENDCMP
 #
 $CMP TOP201YAI
-D TOP201YAI, TOPSwitch Family, 22W Max Output Power
+D TOPSwitch Family, 22W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top200-204214.pdf
 $ENDCMP
 #
 $CMP TOP202YAI
-D TOP202YAI, TOPSwitch Family, 30W Max Output Power
+D TOPSwitch Family, 30W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top200-204214.pdf
 $ENDCMP
 #
 $CMP TOP203YAI
-D TOP203YAI, TOPSwitch Family, 35W Max Output Power
+D TOPSwitch Family, 35W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top200-204214.pdf
 $ENDCMP
 #
 $CMP TOP204YAI
-D TOP204YAI, TOPSwitch Family, 50W Max Output Power
+D TOPSwitch Family, 50W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top200-204214.pdf
 $ENDCMP
 #
 $CMP TOP209G
-D TOP209G, TOPSwitch Family, 2W Max Output Power
+D TOPSwitch Family, 2W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top209210.pdf
 $ENDCMP
 #
 $CMP TOP209P
-D TOP209P, TOPSwitch Family, 2W Max Output Power
+D TOPSwitch Family, 2W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top209210.pdf
 $ENDCMP
 #
 $CMP TOP210G
-D TOP210G, TOPSwitch Family, 5W Max Output Power
+D TOPSwitch Family, 5W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top209210.pdf
 $ENDCMP
 #
 $CMP TOP210PFI
-D TOP210PFI, TOPSwitch Family, 5W Max Output Power
+D TOPSwitch Family, 5W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top209210.pdf
 $ENDCMP
 #
 $CMP TOP214YAI
-D TOP214YAI, TOPSwitch Family, 42W Max Output Power
+D TOPSwitch Family, 42W Max Output Power
 K Three-terminal Off-line PWM Switch
 F http://www.powerint.com/sites/default/files/product-docs/top200-204214.pdf
 $ENDCMP
 #
 $CMP TOP252EN
-D TOP252EN, TOPSwitch-HX Family, 21W Output Power
+D TOPSwitch-HX Family, 21W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP252GN
-D TOP252GN, TOPSwitch-HX Family, 15W Output Power
+D TOPSwitch-HX Family, 15W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP252MN
-D TOP252MN, TOPSwitch-HX Family, 15W Output Power
+D TOPSwitch-HX Family, 15W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP252PN
-D TOP252PN, TOPSwitch-HX Family, 15W Output Power
+D TOPSwitch-HX Family, 15W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP253EN
-D TOP253EN, TOPSwitch-HX Family, 43W Output Power
+D TOPSwitch-HX Family, 43W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP253GN
-D TOP253GN, TOPSwitch-HX Family, 25W Output Power
+D TOPSwitch-HX Family, 25W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP253MN
-D TOP253MN, TOPSwitch-HX Family, 25W Output Power
+D TOPSwitch-HX Family, 25W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP253PN
-D TOP253PN, TOPSwitch-HX Family, 25W Output Power
+D TOPSwitch-HX Family, 25W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP254EN
-D TOP254EN, TOPSwitch-HX Family, 62W Output Power
+D TOPSwitch-HX Family, 62W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP254GN
-D TOP254GN, TOPSwitch-HX Family, 28W Output Power
+D TOPSwitch-HX Family, 28W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP254MN
-D TOP254MN, TOPSwitch-HX Family, 28W Output Power
+D TOPSwitch-HX Family, 28W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP254PN
-D TOP254PN, TOPSwitch-HX Family, 28W Output Power
+D TOPSwitch-HX Family, 28W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP254YN
-D TOP254YN, TOPSwitch-HX Family, 62W Output Power
+D TOPSwitch-HX Family, 62W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP255EN
-D TOP255EN, TOPSwitch-HX Family, 81W Output Power
+D TOPSwitch-HX Family, 81W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP255GN
-D TOP255GN, TOPSwitch-HX Family, 30W Output Power
+D TOPSwitch-HX Family, 30W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP255MN
-D TOP255MN, TOPSwitch-HX Family, 30W Output Power
+D TOPSwitch-HX Family, 30W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP255PN
-D TOP255PN, TOPSwitch-HX Family, 30W Output Power
+D TOPSwitch-HX Family, 30W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP255YN
-D TOP255YN, TOPSwitch-HX Family, 81W Output Power
+D TOPSwitch-HX Family, 81W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP256EN
-D TOP256EN, TOPSwitch-HX Family, 119W Output Power
+D TOPSwitch-HX Family, 119W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP256GN
-D TOP256GN, TOPSwitch-HX Family, 34W Output Power
+D TOPSwitch-HX Family, 34W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP256MN
-D TOP256MN, TOPSwitch-HX Family, 34W Output Power
+D TOPSwitch-HX Family, 34W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP256PN
-D TOP256PN, TOPSwitch-HX Family, 34W Output Power
+D TOPSwitch-HX Family, 34W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP256YN
-D TOP256YN, TOPSwitch-HX Family, 119W Output Power
+D TOPSwitch-HX Family, 119W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP257EN
-D TOP257EN, TOPSwitch-HX Family, 157W Output Power
+D TOPSwitch-HX Family, 157W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP257GN
-D TOP257GN, TOPSwitch-HX Family, 41W Output Power
+D TOPSwitch-HX Family, 41W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP257MN
-D TOP257MN, TOPSwitch-HX Family, 41W Output Power
+D TOPSwitch-HX Family, 41W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP257PN
-D TOP257PN, TOPSwitch-HX Family, 41W Output Power
+D TOPSwitch-HX Family, 41W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP257YN
-D TOP257YN, TOPSwitch-HX Family, 157W Output Power
+D TOPSwitch-HX Family, 157W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP258EN
-D TOP258EN, TOPSwitch-HX Family, 195W Output Power
+D TOPSwitch-HX Family, 195W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP258GN
-D TOP258GN, TOPSwitch-HX Family, 48W Output Power
+D TOPSwitch-HX Family, 48W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP258MN
-D TOP258MN, TOPSwitch-HX Family, 48W Output Power
+D TOPSwitch-HX Family, 48W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP258PN
-D TOP258PN, TOPSwitch-HX Family, 48W Output Power
+D TOPSwitch-HX Family, 48W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP258YN
-D TOP258YN, TOPSwitch-HX Family, 195W Output Power
+D TOPSwitch-HX Family, 195W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP259EN
-D TOP259EN, TOPSwitch-HX Family, 238W Output Power
+D TOPSwitch-HX Family, 238W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP259YN
-D TOP259YN, TOPSwitch-HX Family, 238W Output Power
+D TOPSwitch-HX Family, 238W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP260EN
-D TOP260EN, TOPSwitch-HX Family, 275W Output Power
+D TOPSwitch-HX Family, 275W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP260YN
-D TOP260YN, TOPSwitch-HX Family, 275W Output Power
+D TOPSwitch-HX Family, 275W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP261EN
-D TOP261EN, TOPSwitch-HX Family, 333W Output Power
+D TOPSwitch-HX Family, 333W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
 $CMP TOP261YN
-D TOP261YN, TOPSwitch-HX Family, 333W Output Power
+D TOPSwitch-HX Family, 333W Output Power
 K Eco Smart Off-Line Switcher, Extendend Power Range
 $ENDCMP
 #
diff --git a/library/references.dcm b/library/references.dcm
index e7b319bd..c13368b7 100644
--- a/library/references.dcm
+++ b/library/references.dcm
@@ -103,61 +103,61 @@ F http://ww1.microchip.com/downloads/en/devicedoc/21653b.pdf
 $ENDCMP
 #
 $CMP REF02AP
-D REF02A, 5V ±15mV Precision Voltage Reference, PDIP-8
+D 5V ±15mV Precision Voltage Reference, PDIP-8
 K Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF02AU
-D REF02A, 5V ±15mV Precision Voltage Reference, SO8
+D 5V ±15mV Precision Voltage Reference, SO8
 K Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF02BP
-D REF02B, 5V ±10mV Precision Voltage Reference, PDIP-8
+D 5V ±10mV Precision Voltage Reference, PDIP-8
 K Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF02BU
-D REF02B, 5V ±10mV Precision Voltage Reference, SO8
+D 5V ±10mV Precision Voltage Reference, SO8
 K Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF102AP
-D REF102A, 10V ±10mV Precision Voltage Reference, PDIP-8
+D 10V ±10mV Precision Voltage Reference, PDIP-8
 K Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF102AU
-D REF102A, 10V ±10mV Precision Voltage Reference, SO8
+D 10V ±10mV Precision Voltage Reference, SO8
 K Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF102BP
-D REF102B, 10V ±5mV Precision Voltage Reference, PDIP-8
+D 10V ±5mV Precision Voltage Reference, PDIP-8
 K Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF102BU
-D REF102B, 10V ±5mV Precision Voltage Reference, SO8
+D 10V ±5mV Precision Voltage Reference, SO8
 K Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF102CP
-D REF102C, 10V ±2.5mV Precision Voltage Reference, PDIP-8
+D 10V ±2.5mV Precision Voltage Reference, PDIP-8
 K Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
 #
 $CMP REF102CU
-D REF102C, 10V ±2.5mV Precision Voltage Reference, SO8
+D 10V ±2.5mV Precision Voltage Reference, SO8
 K Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref02.pdf
 $ENDCMP
@@ -234,229 +234,229 @@ F http://www.ti.com/lit/ds/symlink/ref3240-ep.pdf
 $ENDCMP
 #
 $CMP REF5010AD
-D REF5010AD, 10V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
+D 10V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5010ADGK
-D REF5010ADGK, 10V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 10V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5010ID
-D REF5010ID, 10V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
+D 10V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5010IDGK
-D REF5010IDGK, 10V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 10V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 10V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5020AD
-D REF5020AD, 2.048V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
+D 2.048V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 2.048V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5020ADGK
-D REF5020ADGK, 2.048V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 2.048V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 2.048V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5020ID
-D REF5020ID, 2.048V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
+D 2.048V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 2.048V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5020IDGK
-D REF5020IDGK, 2.048V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 2.048V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 2.048V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5025AD
-D REF5025AD, 2.5V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
+D 2.5V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 2.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5025ADGK
-D REF5025ADGK, 2.5V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 2.5V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 2.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5025ID
-D REF5025ID, 2.5V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
+D 2.5V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 2.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5025IDGK
-D REF5025IDGK, 2.5V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 2.5V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 2.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5030AD
-D REF5030AD, 3V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
+D 3V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 3V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5030ADGK
-D REF5030ADGK, 3V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 3V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 3V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5030ID
-D REF5030ID, 3V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
+D 3V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 3V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5030IDGK
-D REF5030IDGK, 3V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 3V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 3V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5040AD
-D REF5040AD, 4.096V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
+D 4.096V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 4.096V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5040ADGK
-D REF5040ADGK, 4.096V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 4.096V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 4.096V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5040ID
-D REF5040ID, 4.096V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
+D 4.096V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 4.096V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5040IDGK
-D REF5040IDGK, 4.096V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 4.096V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 4.096V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5045AD
-D REF5045AD, 4.5V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
+D 4.5V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 4.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5045ADGK
-D REF5045ADGK, 4.5V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 4.5V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 4.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5045ID
-D REF5045ID, 4.5V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
+D 4.5V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 4.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5045IDGK
-D REF5045IDGK, 4.5V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 4.5V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 4.5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5050AD
-D REF5050AD, 5V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
+D 5V 0.1% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5050ADGK
-D REF5050ADGK, 5V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 5V 0.1% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5050ID
-D REF5050ID, 5V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
+D 5V 0.05% 10mA Low Noise Precision Voltage Reference, SO8
 K Low Noise Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP REF5050IDGK
-D REF5050IDGK, 5V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
+D 5V 0.05% 10mA Low Noise Precision Voltage Reference, MSOP-8
 K Low Noise Precision Voltage Reference 5V
 F http://www.ti.com/lit/ds/symlink/ref5030.pdf
 $ENDCMP
 #
 $CMP TL431D
-D TL431 Shunt Regulator, SO8
+D Shunt Regulator, SO8
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431DBV
-D TL431 Shunt Regulator, SOT-23-5
+D Shunt Regulator, SOT-23-5
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431DBZ
-D TL431 Shunt Regulator, SOT-23
+D Shunt Regulator, SOT-23
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431DCK
-D TL431 Shunt Regulator, SC-70
+D Shunt Regulator, SC-70
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431KTP
-D TL431 Shunt Regulator, TO-252
+D Shunt Regulator, TO-252
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431LP
-D TL431 Shunt Regulator, TO-92
+D Shunt Regulator, TO-92
 K diode device regulator shunt
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431P
-D TL431 Shunt Regulator, PDIP-8
+D Shunt Regulator, PDIP-8
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431PK
-D TL431 Shunt Regulator, SOT-89
+D Shunt Regulator, SOT-89
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431PS
-D TL431 Shunt Regulator, MSOP-8
+D Shunt Regulator, MSOP-8
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
 #
 $CMP TL431PW
-D TL431 Shunt Regulator, TSSOP-8
+D Shunt Regulator, TSSOP-8
 K diode device shunt regulator
 F http://www.ti.com/lit/ds/symlink/tl431.pdf
 $ENDCMP
diff --git a/library/regul.dcm b/library/regul.dcm
index d1337bfc..573e22d6 100644
--- a/library/regul.dcm
+++ b/library/regul.dcm
@@ -37,877 +37,877 @@ F linear-tec/lt1108.pdf
 $ENDCMP
 #
 $CMP AP1117
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117D15
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117D18
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117D25
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117D33
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117D50
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117E15
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117E18
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117E25
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117E33
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117E50
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117K15
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117K18
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117K25
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117K33
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117K50
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117T15
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117T18
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117T25
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117T33
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117T50
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117Y15
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117Y18
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117Y25
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117Y33
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP AP1117Y50
-D AP1117, Fixed/Adjustable 1A Low Dropout regulator, Positive
+D Fixed/Adjustable 1A Low Dropout regulator, Positive
 K REGULATOR LDO 1.5V 1.8V 2.5V 3.3V 5V
 F http://www.diodes.com/datasheets/AP1117.pdf
 $ENDCMP
 #
 $CMP APE8865N-12-HF-3
-D APE8865N-12-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-15-HF-3
-D APE8865N-15-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-16-HF-3
-D APE8865N-16-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-17-HF-3
-D APE8865N-17-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-18-HF-3
-D APE8865N-18-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-19-HF-3
-D APE8865N-19-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-20-HF-3
-D APE8865N-20-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-21-HF-3
-D APE8865N-21-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-22-HF-3
-D APE8865N-22-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-23-HF-3
-D APE8865N-23-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-24-HF-3
-D APE8865N-24-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-25-HF-3
-D APE8865N-25-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-26-HF-3
-D APE8865N-26-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-27-HF-3
-D APE8865N-27-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-28-HF-3
-D APE8865N-28-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-29-HF-3
-D APE8865N-29-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-30-HF-3
-D APE8865N-30-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-31-HF-3
-D APE8865N-31-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-32-HF-3
-D APE8865N-32-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865N-33-HF-3
-D APE8865N-33-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-12-HF-3
-D APE8865NL-12-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-15-HF-3
-D APE8865NL-15-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-16-HF-3
-D APE8865NL-16-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-17-HF-3
-D APE8865NL-17-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-18-HF-3
-D APE8865NL-18-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-19-HF-3
-D APE8865NL-19-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-20-HF-3
-D APE8865NL-20-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-21-HF-3
-D APE8865NL-21-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-22-HF-3
-D APE8865NL-22-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-23-HF-3
-D APE8865NL-23-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-24-HF-3
-D APE8865NL-24-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-25-HF-3
-D APE8865NL-25-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-26-HF-3
-D APE8865NL-26-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-27-HF-3
-D APE8865NL-27-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-28-HF-3
-D APE8865NL-28-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-29-HF-3
-D APE8865NL-29-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-30-HF-3
-D APE8865NL-30-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-31-HF-3
-D APE8865NL-31-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-32-HF-3
-D APE8865NL-32-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NL-33-HF-3
-D APE8865NL-33-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-12-HF-3
-D APE8865NR-12-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-15-HF-3
-D APE8865NR-15-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-16-HF-3
-D APE8865NR-16-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-17-HF-3
-D APE8865NR-17-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-18-HF-3
-D APE8865NR-18-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-19-HF-3
-D APE8865NR-19-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-20-HF-3
-D APE8865NR-20-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-21-HF-3
-D APE8865NR-21-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-22-HF-3
-D APE8865NR-22-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-23-HF-3
-D APE8865NR-23-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-24-HF-3
-D APE8865NR-24-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-25-HF-3
-D APE8865NR-25-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-26-HF-3
-D APE8865NR-26-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-27-HF-3
-D APE8865NR-27-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-28-HF-3
-D APE8865NR-28-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-29-HF-3
-D APE8865NR-29-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-30-HF-3
-D APE8865NR-30-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-31-HF-3
-D APE8865NR-31-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-32-HF-3
-D APE8865NR-32-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865NR-33-HF-3
-D APE8865NR-33-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-12-HF-3
-D APE8865U4-12-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-15-HF-3
-D APE8865U4-15-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-16-HF-3
-D APE8865U4-16-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-17-HF-3
-D APE8865U4-17-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-18-HF-3
-D APE8865U4-18-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-19-HF-3
-D APE8865U4-19-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-20-HF-3
-D APE8865U4-20-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-21-HF-3
-D APE8865U4-21-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-22-HF-3
-D APE8865U4-22-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-23-HF-3
-D APE8865U4-23-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-24-HF-3
-D APE8865U4-24-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-25-HF-3
-D APE8865U4-25-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-26-HF-3
-D APE8865U4-26-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-27-HF-3
-D APE8865U4-27-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-28-HF-3
-D APE8865U4-28-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-29-HF-3
-D APE8865U4-29-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-30-HF-3
-D APE8865U4-30-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-31-HF-3
-D APE8865U4-31-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-32-HF-3
-D APE8865U4-32-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U4-33-HF-3
-D APE8865U4-33-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SC-70-4
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SC-70-4
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-12-HF-3
-D APE8865U5-12-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-15-HF-3
-D APE8865U5-15-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-16-HF-3
-D APE8865U5-16-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-17-HF-3
-D APE8865U5-17-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-18-HF-3
-D APE8865U5-18-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-19-HF-3
-D APE8865U5-19-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-20-HF-3
-D APE8865U5-20-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-21-HF-3
-D APE8865U5-21-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-22-HF-3
-D APE8865U5-22-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-23-HF-3
-D APE8865U5-23-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-24-HF-3
-D APE8865U5-24-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-25-HF-3
-D APE8865U5-25-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-26-HF-3
-D APE8865U5-26-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-27-HF-3
-D APE8865U5-27-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-28-HF-3
-D APE8865U5-28-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-29-HF-3
-D APE8865U5-29-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-30-HF-3
-D APE8865U5-30-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-31-HF-3
-D APE8865U5-31-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-32-HF-3
-D APE8865U5-32-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865U5-33-HF-3
-D APE8865U5-33-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SC-70-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SC-70-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-12-HF-3
-D APE8865Y5-12-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-15-HF-3
-D APE8865Y5-15-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-16-HF-3
-D APE8865Y5-16-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.6V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-17-HF-3
-D APE8865Y5-17-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.7V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-18-HF-3
-D APE8865Y5-18-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-19-HF-3
-D APE8865Y5-19-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-20-HF-3
-D APE8865Y5-20-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.0V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-21-HF-3
-D APE8865Y5-21-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.1V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-22-HF-3
-D APE8865Y5-22-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.2V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-23-HF-3
-D APE8865Y5-23-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.3V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-24-HF-3
-D APE8865Y5-24-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.4V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-25-HF-3
-D APE8865Y5-25-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-26-HF-3
-D APE8865Y5-26-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-27-HF-3
-D APE8865Y5-27-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-28-HF-3
-D APE8865Y5-28-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-29-HF-3
-D APE8865Y5-29-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-30-HF-3
-D APE8865Y5-30-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-31-HF-3
-D APE8865Y5-31-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-32-HF-3
-D APE8865Y5-32-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
 #
 $CMP APE8865Y5-33-HF-3
-D APE8865Y5-33-HF-3, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.a-powerusa.com/docs/APE8865-3.pdf
 $ENDCMP
@@ -918,79 +918,79 @@ F regulator\bq2003.pdf
 $ENDCMP
 #
 $CMP KA378R05
-D KA378R05, Positive 3A 35V Linear Regulator with Disable Pin, LDO, Fixed Output 5V, TO-220F-4L
+D Positive 3A 35V Linear Regulator with Disable Pin, LDO, Fixed Output 5V, TO-220F-4L
 K Voltage Regulator 3A Positive LDO Disable Pin
 F http://www.fairchildsemi.com/ds/KA/KA378R05.pdf
 $ENDCMP
 #
 $CMP KA378R12C
-D KA378R12C, Positive 3A 35V Linear Regulator with Disable Pin, LDO, Fixed Output 12V, TO-220F-4L
+D Positive 3A 35V Linear Regulator with Disable Pin, LDO, Fixed Output 12V, TO-220F-4L
 K Voltage Regulator 3A Positive LDO Disable Pin
 F http://www.fairchildsemi.com/ds/KA/KA378R12CTU.pdf
 $ENDCMP
 #
 $CMP KA378R33
-D KA378R33, Positive 3A 35V Linear Regulator with Disable Pin, LDO, Fixed Output 3.3V, TO-220F-4L
+D Positive 3A 35V Linear Regulator with Disable Pin, LDO, Fixed Output 3.3V, TO-220F-4L
 K Voltage Regulator 3A Positive LDO Disable Pin
 F http://www.fairchildsemi.com/ds/KA/KA378R33.pdf
 $ENDCMP
 #
 $CMP LD1117S12CTR
-D LD1117S12CTR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.2V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.2V, SOT223
 K REGULATOR LDO 1.2V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S12TR
-D LD1117S12TR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.2V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.2V, SOT223
 K REGULATOR LDO 1.2V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S18CTR
-D LD1117S18CTR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.8V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.8V, SOT223
 K REGULATOR LDO 1.8V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S18TR
-D LD1117S18TR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.8V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.8V, SOT223
 K REGULATOR LDO 1.8V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S25CTR
-D LD1117S25CTR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 2.5V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 2.5V, SOT223
 K REGULATOR LDO 2.5V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S25TR
-D LD1117S25TR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 2.5V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 2.5V, SOT223
 K REGULATOR LDO 2.5V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S33CTR
-D LD1117S33CTR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT223
 K REGULATOR LDO 3.3V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S33TR
-D LD1117S33TR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT223
 K REGULATOR LDO 3.3V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S50CTR
-D LD1117S50CTR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 5.0V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 5.0V, SOT223
 K REGULATOR LDO 5.0V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
 #
 $CMP LD1117S50TR
-D LD1117S50TR, 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 5.0V, SOT223
+D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 5.0V, SOT223
 K REGULATOR LDO 5.0V
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf
 $ENDCMP
@@ -1002,55 +1002,55 @@ F http://www.st.com/internet/analog/product/69230.jsp
 $ENDCMP
 #
 $CMP LD3985G122R
-D LD3985G122R, 150 mA Low Dropout Voltage Regulator, Fixed Output 1.22V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 1.22V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G18R
-D LD3985G18R, 150 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G25R
-D LD3985G25R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G26R
-D LD3985G26R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G27R
-D LD3985G27R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G28R
-D LD3985G28R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G30R
-D LD3985G30R, 150 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G33R
-D LD3985G33R, 150 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985G47R
-D LD3985G47R, 150 mA Low Dropout Voltage Regulator, Fixed Output 4.7V, TSOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 4.7V, TSOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
@@ -1062,61 +1062,61 @@ F http://www.st.com/internet/analog/product/69230.jsp
 $ENDCMP
 #
 $CMP LD3985M122R
-D LD3985M122R, 150 mA Low Dropout Voltage Regulator, Fixed Output 1.22V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 1.22V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M18R
-D LD3985M18R, 150 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M25R
-D LD3985M25R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M26R
-D LD3985M26R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.6V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M27R
-D LD3985M27R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.7V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M28R
-D LD3985M28R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M29R
-D LD3985M29R, 150 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M30R
-D LD3985M30R, 150 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M33R
-D LD3985M33R, 150 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
 #
 $CMP LD3985M47R
-D LD3985M47R, 150 mA Low Dropout Voltage Regulator, Fixed Output 4.7V, SOT-23-5
+D 150 mA Low Dropout Voltage Regulator, Fixed Output 4.7V, SOT-23-5
 K 150mA LDO Regulator Fixed Positive
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00003395.pdf
 $ENDCMP
@@ -1158,31 +1158,31 @@ F http://www.ti.com/lit/ds/symlink/lm1084.pdf
 $ENDCMP
 #
 $CMP LM117E
-D LM117E, 0.5A 35V Adjustable Linear Regulator, LCC-20
+D 0.5A 35V Adjustable Linear Regulator, LCC-20
 K Adjustable Voltage Regulator 0.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM117H
-D LM117H, 0.5A 35V Adjustable Linear Regulator, TO-39
+D 0.5A 35V Adjustable Linear Regulator, TO-39
 K Adjustable Voltage Regulator 0.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM117K
-D LM117K, 1,5A 35V Adjustable Linear Regulator, TO-3
+D 1,5A 35V Adjustable Linear Regulator, TO-3
 K Adjustable Voltage Regulator 1,5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM137H
-D LM137H, Negative 0.5A 35V Adjustable Linear Regulator, TO-39
+D Negative 0.5A 35V Adjustable Linear Regulator, TO-39
 K Adjustable Voltage Regulator 0.5A Negative
 F http://www.ti.com/lit/ds/symlink/lm337-n.pdf
 $ENDCMP
 #
 $CMP LM137K
-D LM137K, Negative 1.5A 35V Adjustable Linear Regulator, TO-3
+D Negative 1.5A 35V Adjustable Linear Regulator, TO-3
 K Adjustable Voltage Regulator 1.5A Negative
 F http://www.ti.com/lit/ds/symlink/lm337-n.pdf
 $ENDCMP
@@ -1200,61 +1200,61 @@ F http://www.ti.com/lit/ds/symlink/lm2931-n.pdf
 $ENDCMP
 #
 $CMP LM317AEMP
-D LM317AEMP, 1A 35V Adjustable Linear Regulator, SOT-223
+D 1A 35V Adjustable Linear Regulator, SOT-223
 K Adjustable Voltage Regulator 1A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317AH
-D LM317AH, 0.5A 35V Adjustable Linear Regulator, TO-39
+D 0.5A 35V Adjustable Linear Regulator, TO-39
 K Adjustable Voltage Regulator 0.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317AMDT
-D LM317AMDT, 0.5A 35V Adjustable Linear Regulator, TO-252
+D 0.5A 35V Adjustable Linear Regulator, TO-252
 K Adjustable Voltage Regulator Adjustable 0.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317AT
-D LM317AT, 1.5A 35V Adjustable Linear Regulator, TO-220
+D 1.5A 35V Adjustable Linear Regulator, TO-220
 K Adjustable Voltage Regulator 1.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317EMP
-D LM317EMP, 1A 35V Adjustable Linear Regulator, SOT-223
+D 1A 35V Adjustable Linear Regulator, SOT-223
 K Adjustable Voltage Regulator 1A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317H
-D LM317H, 0.5A 35V Adjustable Linear Regulator, TO-39
+D 0.5A 35V Adjustable Linear Regulator, TO-39
 K Adjustable Voltage Regulator 0.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317K
-D LM317K, 1.5A 35V Adjustable Linear Regulator, TO-3
+D 1.5A 35V Adjustable Linear Regulator, TO-3
 K Adjustable Voltage Regulator 1.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317MDT
-D LM317MDT, 0.5A 35V Adjustable Linear Regulator, TO-252
+D 0.5A 35V Adjustable Linear Regulator, TO-252
 K Adjustable Voltage Regulator 0.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317S
-D LM317S, 1.5A 35V Adjustable Linear Regulator, TO-263
+D 1.5A 35V Adjustable Linear Regulator, TO-263
 K Adjustable Voltage Regulator 1.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
 #
 $CMP LM317T
-D LM317T, 1.5A 35V Adjustable Linear Regulator, TO-220
+D 1.5A 35V Adjustable Linear Regulator, TO-220
 K Adjustable Voltage Regulator 1.5A Positive
 F http://www.national.com/ds/LM/LM117.pdf
 $ENDCMP
@@ -1266,31 +1266,31 @@ F regulator/lm117.pdf
 $ENDCMP
 #
 $CMP LM337H
-D LM337H, Negative 0.5A 35V Adjustable Linear Regulator, TO-39
+D Negative 0.5A 35V Adjustable Linear Regulator, TO-39
 K Adjustable Voltage Regulator 0.5A Negative
 F http://www.ti.com/lit/ds/symlink/lm337-n.pdf
 $ENDCMP
 #
 $CMP LM337IMP
-D LM337IMP, Negative 1A 35V Adjustable Linear Regulator, SOT-223
+D Negative 1A 35V Adjustable Linear Regulator, SOT-223
 K Adjustable Voltage Regulator 1A Negative
 F http://www.ti.com/lit/ds/symlink/lm337-n.pdf
 $ENDCMP
 #
 $CMP LM337K
-D LM337K, Negative 1.5A 35V Adjustable Linear Regulator, TO-3
+D Negative 1.5A 35V Adjustable Linear Regulator, TO-3
 K Adjustable Voltage Regulator 1.5A Negative
 F http://www.ti.com/lit/ds/symlink/lm337-n.pdf
 $ENDCMP
 #
 $CMP LM337T
-D LM337T, Negative 1.5A 35V Adjustable Linear Regulator, TO-220
+D Negative 1.5A 35V Adjustable Linear Regulator, TO-220
 K Adjustable Voltage Regulator 1.5A Negative
 F http://www.ti.com/lit/ds/symlink/lm337-n.pdf
 $ENDCMP
 #
 $CMP LM350T
-D LM350T, 3A 33V Adjustable Linear Regulator, TO-220
+D 3A 33V Adjustable Linear Regulator, TO-220
 K Adjustable Voltage Regulator 3A Positive
 F http://www.fairchildsemi.com/ds/LM/LM350.pdf
 $ENDCMP
@@ -1313,55 +1313,55 @@ F regulator\lm78xx.pdf
 $ENDCMP
 #
 $CMP LM7805CT
-D LM7805CT, Positive 1A 35V Linear Regulator, Fixed Output 5V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 5V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7806ACT
-D LM7806ACT, Positive 1A 35V Linear Regulator, Fixed Output 6V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 6V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7806CT
-D LM7806CT, Positive 1A 35V Linear Regulator, Fixed Output 6V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 6V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7808ACT
-D LM7808ACT, Positive 1A 35V Linear Regulator, Fixed Output 8V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 8V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7808CT
-D LM7808CT, Positive 1A 35V Linear Regulator, Fixed Output 8V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 8V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7809ACT
-D LM7809ACT, Positive 1A 35V Linear Regulator, Fixed Output 9V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 9V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7809CT
-D LM7809CT, Positive 1A 35V Linear Regulator, Fixed Output 9V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 9V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7810ACT
-D LM7810ACT, Positive 1A 35V Linear Regulator, Fixed Output 10V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 10V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7810CT
-D LM7810CT, Positive 1A 35V Linear Regulator, Fixed Output 10V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 10V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
@@ -1373,67 +1373,67 @@ F regulator\lm78xx.pdf
 $ENDCMP
 #
 $CMP LM7812ACT
-D LM7812ACT, Positive 1A 35V Linear Regulator, Fixed Output 12V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 12V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7812CT
-D LM7812CT, Positive 1A 35V Linear Regulator, Fixed Output 12V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 12V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7815ACT
-D LM7815ACT, Positive 1A 35V Linear Regulator, Fixed Output 15V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 15V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7815CT
-D LM7815CT, Positive 1A 35V Linear Regulator, Fixed Output 15V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 15V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7818ACT
-D LM7818ACT, Positive 1A 35V Linear Regulator, Fixed Output 18V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 18V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7818CT
-D LM7818CT, Positive 1A 35V Linear Regulator, Fixed Output 18V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 18V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7824ACT
-D LM7824ACT, Positive 1A 35V Linear Regulator, Fixed Output 24V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 24V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM7824CT
-D LM7824CT, Positive 1A 35V Linear Regulator, Fixed Output 24V, TO-220
+D Positive 1A 35V Linear Regulator, Fixed Output 24V, TO-220
 K Voltage Regulator 1A Positive
 F http://www.fairchildsemi.com/ds/LM/LM7805.pdf
 $ENDCMP
 #
 $CMP LM78L05ACZ
-D LM78L05ACZ, Positive 100mA 30V Linear Regulator, Fixed Output 5V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 5V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP LM78L12ACZ
-D LM78L12ACZ, Positive 100mA 30V Linear Regulator, Fixed Output 12V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 12V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP LM78M05CT
-D LM78M05CT, Positive 0.5A 35V Linear Regulator, Fixed Output 5V, TO-220
+D Positive 0.5A 35V Linear Regulator, Fixed Output 5V, TO-220
 K Voltage Regulator 0.5A Positive
 F http://www.fairchildsemi.com/ds/LM/LM78M05.pdf
 $ENDCMP
@@ -1445,31 +1445,31 @@ F regulator\lm79xx.pdf
 $ENDCMP
 #
 $CMP LM7905CT
-D LM7905CT, Negative 1A 35V Linear Regulator, Fixed Output 5V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 5V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM7906CT
-D LM7906CT, Negative 1A 35V Linear Regulator, Fixed Output 6V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 6V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM7908CT
-D LM7908CT, Negative 1A 35V Linear Regulator, Fixed Output 8V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 8V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM7909CT
-D LM7909CT, Negative 1A 35V Linear Regulator, Fixed Output 9V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 9V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM7910CT
-D LM7910CT, Negative 1A 35V Linear Regulator, Fixed Output 10V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 10V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
@@ -1481,31 +1481,31 @@ F regulator\lm79xx.pdf
 $ENDCMP
 #
 $CMP LM7912CT
-D LM7912CT, Negative 1A 35V Linear Regulator, Fixed Output 12V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 12V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM7915CT
-D LM7915CT, Negative 1A 35V Linear Regulator, Fixed Output 15V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 15V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM7918CT
-D LM7918CT, Negative 1A 35V Linear Regulator, Fixed Output 18V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 18V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM7924CT
-D LM7924CT, Negative 1A 35V Linear Regulator, Fixed Output 24V, TO-220
+D Negative 1A 35V Linear Regulator, Fixed Output 24V, TO-220
 K Voltage Regulator 1A Negative
 F http://www.fairchildsemi.com/ds/LM/LM7905.pdf
 $ENDCMP
 #
 $CMP LM79M05CT
-D LM79M05CT, Negative 0.5A 35V Linear Regulator, Fixed Output 5V, TO-220
+D Negative 0.5A 35V Linear Regulator, Fixed Output 5V, TO-220
 K Voltage Regulator 0.5A Negative
 F http://www.fairchildsemi.com/ds/LM/LM79M05.pdf
 $ENDCMP
@@ -1683,133 +1683,133 @@ D Switching Regulator
 $ENDCMP
 #
 $CMP LT1129CQ
-D LT1129CQ, 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO263
+D 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO263
 K 700mA LDO Regulator Adjustable Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CQ-3.3
-D LT1129CQ-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO263
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO263
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CQ-5
-D LT1129CQ-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO263
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO263
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CS8
-D LT1129CS8, 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, SO8
+D 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, SO8
 K 700mA LDO Regulator Adjustable Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CS8-3.3
-D LT1129CS8-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SO8
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SO8
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CS8-5
-D LT1129CS8-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, SO8
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, SO8
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CST-3.3
-D LT1129CST-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SOT-223
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SOT-223
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CST-5
-D LT1129CST-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, SOT-223
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, SOT-223
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CT
-D LT1129CT, 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO220
+D 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO220
 K 700mA LDO Regulator Adjustable Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CT-3.3
-D LT1129CT-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO220
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO220
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129CT-5
-D LT1129CT-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO220
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO220
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IQ
-D LT1129IQ, 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO263
+D 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO263
 K 700mA LDO Regulator Adjustable Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IQ-3.3
-D LT1129IQ-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO263
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO263
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IQ-5
-D LT1129IQ-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO263
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO263
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IS8
-D LT1129IS8, 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, SO8
+D 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, SO8
 K 700mA LDO Regulator Adjustable Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IS8-3.3
-D LT1129IS8-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SO8
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SO8
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IS8-5
-D LT1129IS8-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, SO8
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, SO8
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IST-3.3
-D LT1129IST-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SOT-223
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, SOT-223
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IST-5
-D LT1129IST-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, SOT-223
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, SOT-223
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IT
-D LT1129IT, 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO220
+D 700 mA Low Dropout Voltage Regulator, Adjustable 3.75V-30V, TO220
 K 700mA LDO Regulator Adjustable Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IT-3.3
-D LT1129IT-3.3, 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO220
+D 700 mA Low Dropout Voltage Regulator, Fixed 3.3V, TO220
 K 700mA LDO Regulator 3.3V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
 #
 $CMP LT1129IT-5
-D LT1129IT-5, 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO220
+D 700 mA Low Dropout Voltage Regulator, Fixed 5V, TO220
 K 700mA LDO Regulator 5V Positive
 F http://cds.linear.com/docs/en/datasheet/112935ff.pdf
 $ENDCMP
@@ -1946,61 +1946,61 @@ F maxim\MAX1647-MAX1648.pdf
 $ENDCMP
 #
 $CMP MAX1658ESA
-D MAX1658ESA, 350mA Linear LDO Regulator, Fixed Output 3.3V, SO-8
+D 350mA Linear LDO Regulator, Fixed Output 3.3V, SO-8
 K Linear LDO Regulator 350mA 3.3V
 F http://datasheets.maximintegrated.com/en/ds/MAX1658-MAX1659.pdf
 $ENDCMP
 #
 $CMP MAX1659ESA
-D MAX1659ESA, 350mA Linear LDO Regulator, Fixed Output 5V, SO-8
+D 350mA Linear LDO Regulator, Fixed Output 5V, SO-8
 K Linear LDO Regulator 350mA 5V
 F http://datasheets.maximintegrated.com/en/ds/MAX1658-MAX1659.pdf
 $ENDCMP
 #
 $CMP MAX5092AATE
-D MAX5092AATE, 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 3.3V Preset Vout, TQFN-16
+D 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 3.3V Preset Vout, TQFN-16
 K High Voltage 72V Input LDO Boost Preregulator 250mA 3.3V
 F http://datasheets.maximintegrated.com/en/ds/MAX5092-MAX5093.pdf
 $ENDCMP
 #
 $CMP MAX5092BATE
-D MAX5092BATE, 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 5V Preset Vout, TQFN-16
+D 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 5V Preset Vout, TQFN-16
 K High Voltage 72V Input LDO Boost Preregulator 250mA 5V
 F http://datasheets.maximintegrated.com/en/ds/MAX5092-MAX5093.pdf
 $ENDCMP
 #
 $CMP MAX5093AATE
-D MAX5093AATE, 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 3.3V Preset Vout, TQFN-16
+D 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 3.3V Preset Vout, TQFN-16
 K High Voltage 72V Input LDO Boost Preregulator 250mA 3.3V
 F http://datasheets.maximintegrated.com/en/ds/MAX5092-MAX5093.pdf
 $ENDCMP
 #
 $CMP MAX5093BATE
-D MAX5093BATE, 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 5V Preset Vout, TQFN-16
+D 4V to 72V Input LDOs with Boost Preregulator, 250mA Output, 5V Preset Vout, TQFN-16
 K High Voltage 72V Input LDO Boost Preregulator 250mA 5V
 F http://datasheets.maximintegrated.com/en/ds/MAX5092-MAX5093.pdf
 $ENDCMP
 #
 $CMP MAX603CPA
-D MAX603CPA, 500mA Linear LDO Regulator, Fixed Output 5V, PDIP-8
+D 500mA Linear LDO Regulator, Fixed Output 5V, PDIP-8
 K Linear LDO Regulator 500mA 5V
 F http://datasheets.maximintegrated.com/en/ds/MAX603-MAX604.pdf
 $ENDCMP
 #
 $CMP MAX603CSA
-D MAX603CSA, 500mA Linear LDO Regulator, Fixed Output 5V, SO-8
+D 500mA Linear LDO Regulator, Fixed Output 5V, SO-8
 K Linear LDO Regulator 500mA 5V
 F http://datasheets.maximintegrated.com/en/ds/MAX603-MAX604.pdf
 $ENDCMP
 #
 $CMP MAX604CPA
-D MAX604CPA, 500mA Linear LDO Regulator, Fixed Output 3.3V, PDIP-8
+D 500mA Linear LDO Regulator, Fixed Output 3.3V, PDIP-8
 K Linear LDO Regulator 500mA 3.3V
 F http://datasheets.maximintegrated.com/en/ds/MAX603-MAX604.pdf
 $ENDCMP
 #
 $CMP MAX604CSA
-D MAX604CSA, 500mA Linear LDO Regulator, Fixed Output 3.3V, SO-8
+D 500mA Linear LDO Regulator, Fixed Output 3.3V, SO-8
 K Linear LDO Regulator 500mA 3.3V
 F http://datasheets.maximintegrated.com/en/ds/MAX603-MAX604.pdf
 $ENDCMP
@@ -2016,91 +2016,91 @@ F regulator/mc34063.pdf
 $ENDCMP
 #
 $CMP MC78L05AACP
-D MC78L05AACP, Positive 100mA 30V Linear Regulator, Fixed Output 5V, Highest Accurate, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 5V, Highest Accurate, TO-92
 K Voltage Regulator 100mA Positive Highest Accurate
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L05ACD
-D MC78L05ACD, Positive 100mA 30V Linear Regulator, Fixed Output 5V, SO-8
+D Positive 100mA 30V Linear Regulator, Fixed Output 5V, SO-8
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L05ACH
-D MC78L05ACH, Positive 100mA 30V Linear Regulator, Fixed Output 5V, SOT-89
+D Positive 100mA 30V Linear Regulator, Fixed Output 5V, SOT-89
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L05ACP
-D MC78L05ACP, Positive 100mA 30V Linear Regulator, Fixed Output 5V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 5V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L06ACP
-D MC78L06ACP, Positive 100mA 30V Linear Regulator, Fixed Output 6V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 6V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L08ACD
-D MC78L08ACD, Positive 100mA 30V Linear Regulator, Fixed Output 8V, SO-8
+D Positive 100mA 30V Linear Regulator, Fixed Output 8V, SO-8
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L08ACH
-D MC78L08ACH, Positive 100mA 30V Linear Regulator, Fixed Output 8V, SOT-89
+D Positive 100mA 30V Linear Regulator, Fixed Output 8V, SOT-89
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L08ACP
-D MC78L08ACP, Positive 100mA 30V Linear Regulator, Fixed Output 8V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 8V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L12ACD
-D MC78L12ACD, Positive 100mA 30V Linear Regulator, Fixed Output 12V, SO-8
+D Positive 100mA 30V Linear Regulator, Fixed Output 12V, SO-8
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L12ACH
-D MC78L12ACH, Positive 100mA 30V Linear Regulator, Fixed Output 12V, SOT-89
+D Positive 100mA 30V Linear Regulator, Fixed Output 12V, SOT-89
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L12ACP
-D MC78L12ACP, Positive 100mA 30V Linear Regulator, Fixed Output 12V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 12V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L15ACP
-D MC78L15ACP, Positive 100mA 30V Linear Regulator, Fixed Output 15V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 15V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L18ACP
-D MC78L18ACP, Positive 100mA 30V Linear Regulator, Fixed Output 18V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 18V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78L24ACP
-D MC78L24ACP, Positive 100mA 30V Linear Regulator, Fixed Output 24V, TO-92
+D Positive 100mA 30V Linear Regulator, Fixed Output 24V, TO-92
 K Voltage Regulator 100mA Positive
 F http://www.fairchildsemi.com/ds/LM/LM78L05A.pdf
 $ENDCMP
 #
 $CMP MC78M05CDT
-D MC78M05CDT, Positive 0.5A 35V Linear Regulator, Fixed Output 5V, TO-252 (D-PAK)
+D Positive 0.5A 35V Linear Regulator, Fixed Output 5V, TO-252 (D-PAK)
 K Voltage Regulator 0.5A Positive
 F http://www.fairchildsemi.com/ds/LM/LM78M05.pdf
 $ENDCMP
@@ -2148,43 +2148,43 @@ F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
 #
 $CMP NCP1117ST15T3G
-D NCP1117ST15T3G, 1A Low drop-out regulator, Fixed Output 1.5V, SOT223
+D 1A Low drop-out regulator, Fixed Output 1.5V, SOT223
 K REGULATOR LDO 1.5V
 F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
 #
 $CMP NCP1117ST18T3G
-D NCP1117ST18T3G, 1A Low drop-out regulator, Fixed Output 1.8V, SOT223
+D 1A Low drop-out regulator, Fixed Output 1.8V, SOT223
 K REGULATOR LDO 1.8V
 F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
 #
 $CMP NCP1117ST20T3G
-D NCP1117ST20T3G, 1A Low drop-out regulator, Fixed Output 2V, SOT223
+D 1A Low drop-out regulator, Fixed Output 2V, SOT223
 K REGULATOR LDO 2V
 F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
 #
 $CMP NCP1117ST25T3G
-D NCP1117ST25T3G, 1A Low drop-out regulator, Fixed Output 2.5V, SOT223
+D 1A Low drop-out regulator, Fixed Output 2.5V, SOT223
 K REGULATOR LDO 2.5V
 F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
 #
 $CMP NCP1117ST285T3G
-D NCP1117ST285T3G, 1A Low drop-out regulator, Fixed Output 2.85V, SOT223
+D 1A Low drop-out regulator, Fixed Output 2.85V, SOT223
 K REGULATOR LDO 2.85V
 F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
 #
 $CMP NCP1117ST33T3G
-D NCP1117ST33T3G, 1A Low drop-out regulator, Fixed Output 3.3V, SOT223
+D 1A Low drop-out regulator, Fixed Output 3.3V, SOT223
 K REGULATOR LDO 3.3V
 F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
 #
 $CMP NCP1117ST50T3G
-D NCP1117ST50T3G, 1A Low drop-out regulator, Fixed Output 5V, SOT223
+D 1A Low drop-out regulator, Fixed Output 5V, SOT223
 K REGULATOR LDO 5V
 F http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF
 $ENDCMP
@@ -2194,42 +2194,42 @@ D REG.ADJ.1A
 $ENDCMP
 #
 $CMP SPX2920M3-3.3
-D SPX2920M3-3.3, 400mA Low drop-out regulator, Fixed Output 3.3V, SOT223
+D 400mA Low drop-out regulator, Fixed Output 3.3V, SOT223
 K REGULATOR LDO 3.3V
 $ENDCMP
 #
 $CMP SPX2920M3-5.0
-D SPX2920M3-5.0, 400mA Low drop-out regulator, Fixed Output 5V, SOT223
+D 400mA Low drop-out regulator, Fixed Output 5V, SOT223
 K REGULATOR LDO 5V
 $ENDCMP
 #
 $CMP SPX2920S-3.3
-D SPX2920S-3.3, 400mA Fixed/Adjustable 1.2-20V Low Drop-out Voltage Regualtor, SO-8
+D 400mA Fixed/Adjustable 1.2-20V Low Drop-out Voltage Regualtor, SO-8
 K LDO Voltage Regulator 400mA 3.3V Adjustable
 $ENDCMP
 #
 $CMP SPX2920S-5.0
-D SPX2920S-5.0, 400mA Fixed/Adjustable 1.2-20V Low Drop-out Voltage Regualtor, SO-8
+D 400mA Fixed/Adjustable 1.2-20V Low Drop-out Voltage Regualtor, SO-8
 K LDO Voltage Regulator 400mA 5V Adjustable
 $ENDCMP
 #
 $CMP SPX2920T-3.3
-D SPX2920T-3.3, 400mA Low drop-out regulator, Fixed Output 3.3V, TO-263
+D 400mA Low drop-out regulator, Fixed Output 3.3V, TO-263
 K REGULATOR LDO 3.3V
 $ENDCMP
 #
 $CMP SPX2920T-5.0
-D SPX2920T-5.0, 400mA Low drop-out regulator, Fixed Output 5V, TO-263
+D 400mA Low drop-out regulator, Fixed Output 5V, TO-263
 K REGULATOR LDO 5V
 $ENDCMP
 #
 $CMP SPX2920U-3.3
-D SPX2920U-3.3, 400mA Low drop-out regulator, Fixed Output 3.3V, TO-220
+D 400mA Low drop-out regulator, Fixed Output 3.3V, TO-220
 K REGULATOR LDO 3.3V
 $ENDCMP
 #
 $CMP SPX2920U-5.0
-D SPX2920U-5.0, 400mA Low drop-out regulator, Fixed Output 5V, TO-220
+D 400mA Low drop-out regulator, Fixed Output 5V, TO-220
 K REGULATOR LDO 5V
 $ENDCMP
 #
@@ -2244,379 +2244,379 @@ F texas/tl497a.pdf
 $ENDCMP
 #
 $CMP TLV70012DCK
-D TLV70012DCK, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SC70-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SC70-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70012DDC
-D TLV70012DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70012DSE
-D TLV70012DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70013DDC
-D TLV70013DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.3V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.3V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70015DCK
-D TLV70015DCK, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SC70-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SC70-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70015DDC
-D TLV70015DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70015DSE
-D TLV70015DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70018DCK
-D TLV70018DCK, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SC70-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SC70-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70018DDC
-D TLV70018DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70018DSE
-D TLV70018DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70019DDC
-D TLV70019DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 1.9V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70025DCK
-D TLV70025DCK, 200 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SC70-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SC70-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70025DDC
-D TLV70025DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70025DSE
-D TLV70025DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70028DCK
-D TLV70028DCK, 200 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SC70-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SC70-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70028DSE
-D TLV70028DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70029DSE
-D TLV70029DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70030DCK
-D TLV70030DCK, 200 mA Low Dropout Voltage Regulator, Fixed Output 3V, SC70-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3V, SC70-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70030DDC
-D TLV70030DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.0V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70030DSE
-D TLV70030DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 3V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70031DSE
-D TLV70031DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70032DDC
-D TLV70032DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.2V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70033DCK
-D TLV70033DCK, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SC70-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SC70-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70033DDC
-D TLV70033DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70033DSE
-D TLV70033DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70036DDC
-D TLV70036DDC, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.6V, SOT-23-5
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.6V, SOT-23-5
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70036DSE
-D TLV70036DSE, 200 mA Low Dropout Voltage Regulator, Fixed Output 3.6V, WSON6
+D 200 mA Low Dropout Voltage Regulator, Fixed Output 3.6V, WSON6
 K 200mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70025.pdf
 $ENDCMP
 #
 $CMP TLV70212DBV
-D TLV70212DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.2V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70215DBV
-D TLV70215DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.5V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70218DBV
-D TLV70218DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.8V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70225DBV
-D TLV70225DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70225DSE
-D TLV70225DSE, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, WSON6
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.5V, WSON6
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70228DBV
-D TLV70228DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70228DSE
-D TLV70228DSE, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, WSON6
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.8V, WSON6
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70229DSE
-D TLV70229DSE, 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, WSON6
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 2.9V, WSON6
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70230DBV
-D TLV70230DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 3V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70231DBV
-D TLV70231DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.1V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70233DBV
-D TLV70233DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70233DSE
-D TLV70233DSE, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, WSON6
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.3V, WSON6
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70235DBV
-D TLV70235DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.5V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.5V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70236DSE
-D TLV70236DSE, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.6V, WSON6
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.6V, WSON6
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70237DBV
-D TLV70237DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.7V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.7V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70237DSE
-D TLV70237DSE, 300 mA Low Dropout Voltage Regulator, Fixed Output 3.7V, WSON6
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 3.7V, WSON6
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70242PDSE
-D TLV70242PDSE, 300 mA Low Dropout Voltage Regulator, Fixed Output 4.2V, WSON6
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 4.2V, WSON6
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV70245DBV
-D TLV70245DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 4.5V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 4.5V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV702475DBV
-D TLV702475DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 4.75V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 4.75V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv70225.pdf
 $ENDCMP
 #
 $CMP TLV71209DBV
-D TLV71209DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 0.9V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 0.9V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv71209.pdf
 $ENDCMP
 #
 $CMP TLV71210DBV
-D TLV71210DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.0V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.0V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv71209.pdf
 $ENDCMP
 #
 $CMP TLV71211DBV
-D TLV71211DBV, 300 mA Low Dropout Voltage Regulator, Fixed Output 1.1V, SOT-23-5
+D 300 mA Low Dropout Voltage Regulator, Fixed Output 1.1V, SOT-23-5
 K 300mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tlv71209.pdf
 $ENDCMP
 #
 $CMP TPS70202PWP
-D TPS70202PWP, 500mA/250mA Dual Adjustable Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
+D 500mA/250mA Dual Adjustable Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
 K Dual LDO Adjustable Regulator 500mA 250mA Voltage Supervisor
 F http://www.ti.com/lit/ds/symlink/tps70245.pdf
 $ENDCMP
 #
 $CMP TPS70245PWP
-D TPS70245PWP, 3.3V 500mA/1.2V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
+D 3.3V 500mA/1.2V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
 K Dual 3.3V 1.2V LDO Regulator 500mA 250mA Voltage Supervisor
 F http://www.ti.com/lit/ds/symlink/tps70245.pdf
 $ENDCMP
 #
 $CMP TPS70248PWP
-D TPS70248PWP, 3.3V 500mA/1.5V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
+D 3.3V 500mA/1.5V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
 K Dual 3.3V 1.5V LDO Regulator 500mA 250mA Voltage Supervisor
 F http://www.ti.com/lit/ds/symlink/tps70245.pdf
 $ENDCMP
 #
 $CMP TPS70251PWP
-D TPS70251PWP, 3.3V 500mA/1.8V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
+D 3.3V 500mA/1.8V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
 K Dual 3.3V 1.8V LDO Regulator 500mA 250mA Voltage Supervisor
 F http://www.ti.com/lit/ds/symlink/tps70245.pdf
 $ENDCMP
 #
 $CMP TPS70258PWP
-D TPS70258PWP, 3.3V 500mA/2.5V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
+D 3.3V 500mA/2.5V 250mA Dual Low Drop-out Regulator with Voltage Supervisor, PowerPAD TSSOP-20
 K Dual 3.3V 2.5V LDO Regulator 500mA 250mA Voltage Supervisor
 F http://www.ti.com/lit/ds/symlink/tps70245.pdf
 $ENDCMP
 #
 $CMP TPS7101QD
-D TPS7101QD, 500mA Adjustable 1.2-9.75V Low Drop-out Voltage Regualtor, SO-8
+D 500mA Adjustable 1.2-9.75V Low Drop-out Voltage Regualtor, SO-8
 K LDO Voltage Regulator 500mA Adjustable
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS7101QP
-D TPS7101QP, 500mA Adjustable 1.2-9.75V Low Drop-out Voltage Regualtor, DIP-8
+D 500mA Adjustable 1.2-9.75V Low Drop-out Voltage Regualtor, DIP-8
 K LDO Voltage Regulator 500mA Adjustable
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS7133QD
-D TPS7133QD, 500mA Low Drop-out Voltage Regualtor, Fixed Output 3.3V, SO-8
+D 500mA Low Drop-out Voltage Regualtor, Fixed Output 3.3V, SO-8
 K LDO Voltage Regulator 500mA
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS7133QP
-D TPS7133QP, 500mA Low Drop-out Voltage Regualtor, Fixed Output 3.3V, DIP-8
+D 500mA Low Drop-out Voltage Regualtor, Fixed Output 3.3V, DIP-8
 K LDO Voltage Regulator 500mA
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS7148QD
-D TPS7148QD, 500mA Low Drop-out Voltage Regualtor, Fixed Output 4.85V, SO-8
+D 500mA Low Drop-out Voltage Regualtor, Fixed Output 4.85V, SO-8
 K LDO Voltage Regulator 500mA
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS7148QP
-D TPS7148QP, 500mA Low Drop-out Voltage Regualtor, Fixed Output 4.85V, DIP-8
+D 500mA Low Drop-out Voltage Regualtor, Fixed Output 4.85V, DIP-8
 K LDO Voltage Regulator 500mA
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS7150QD
-D TPS7150QD, 500mA Low Drop-out Voltage Regualtor, Fixed Output 5V, SO-8
+D 500mA Low Drop-out Voltage Regualtor, Fixed Output 5V, SO-8
 K LDO Voltage Regulator 500mA
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS7150QP
-D TPS7150QP, 500mA Low Drop-out Voltage Regualtor, Fixed Output 5V, DIP-8
+D 500mA Low Drop-out Voltage Regualtor, Fixed Output 5V, DIP-8
 K LDO Voltage Regulator 500mA
 F http://www.ti.com/lit/ds/symlink/tps7133.pdf
 $ENDCMP
 #
 $CMP TPS75005RGW
-D TPS75005, Integrated MCU Power Solution, Dual Low Drop-Out Regulator 500mA with Supervisor, VQFN20
+D Integrated MCU Power Solution, Dual Low Drop-Out Regulator 500mA with Supervisor, VQFN20
 K Dual LDO Regulator Dual Integrated Power SVS Supervisor
 F http://www.ti.com/lit/ds/symlink/tps75005.pdf
 $ENDCMP
@@ -2628,121 +2628,121 @@ F http://www.ti.com/lit/ds/symlink/tps76950-q1.pdf
 $ENDCMP
 #
 $CMP TPS77701D
-D TPS77701D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.5-5.5V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.5-5.5V, SOIC8
 K 750mA LDO Regulator Adjustable Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77701PWP
-D TPS77701PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.5-5.5V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.5-5.5V, HTSSOP20
 K 750mA LDO Regulator Adjustable Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77715D
-D TPS77715D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77715PWP
-D TPS77715PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77718D
-D TPS77718D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77718PWP
-D TPS77718PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77725D
-D TPS77725D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77725PWP
-D TPS77725PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77733D
-D TPS77733D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77733PWP
-D TPS77733PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77801D
-D TPS77801D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.2-5.5V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.2-5.5V, SOIC8
 K 750mA LDO Regulator Adjustable Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77801PWP
-D TPS77801PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.2-5.5V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Adjustable Output 1.2-5.5V, HTSSOP20
 K 750mA LDO Regulator Adjustable Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77815D
-D TPS77815D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77815PWP
-D TPS77815PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.5V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77818D
-D TPS77818D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77818PWP
-D TPS77818PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 1.8V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77825D
-D TPS77825D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77825PWP
-D TPS77825PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 2.5V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77833D
-D TPS77833D, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, SOIC8
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, SOIC8
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
 #
 $CMP TPS77833PWP
-D TPS77833PWP, 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, HTSSOP20
+D 750 mA Fast-Transient Low Dropout Voltage Regulator, Fixed Output 3.3V, HTSSOP20
 K 750mA LDO Regulator Fixed Positive
 F http://www.ti.com/lit/ds/symlink/tps77725.pdf
 $ENDCMP
diff --git a/library/relays.dcm b/library/relays.dcm
index 6377a78d..0260193f 100644
--- a/library/relays.dcm
+++ b/library/relays.dcm
@@ -1,13 +1,13 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP AZ850-x
-D AZ850, Microminiature Polarised Dual Pole Relay
+D Microminiature Polarised Dual Pole Relay
 K Miniature Polarised Relay Dual Pole
 F http://www.azettler.com/pdfs/az850.pdf
 $ENDCMP
 #
 $CMP AZ850P1-x
-D AZ850P1, Microminiature Polarised Dual Pole Relay Bistable
+D Microminiature Polarised Dual Pole Relay Bistable
 K Miniature Polarised Relay Dual Pole Bistable
 F http://www.azettler.com/pdfs/az850.pdf
 $ENDCMP
@@ -235,7 +235,7 @@ F http://www.te.com/commerce/DocumentDelivery/DDEController?Action=srchrtrv&DocN
 $ENDCMP
 #
 $CMP RM50-xx11
-D RM50-xx11, Single Pole Relay, Sugar Cube, 15A
+D Single Pole Relay, Sugar Cube, 15A
 K Single Pole Relay Sugar Cube
 F http://www.relpol.pl/en/content/download/13683/165953/file/e_RM50.pdf
 $ENDCMP
diff --git a/library/rfcom.dcm b/library/rfcom.dcm
index ce18e847..0ac62e59 100644
--- a/library/rfcom.dcm
+++ b/library/rfcom.dcm
@@ -1,41 +1,41 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP BTM112
-D BTM112, Bluetooth SPP Module, UART, Class 2
+D Bluetooth SPP Module, UART, Class 2
 K Bluetooth BT SPP Module
 $ENDCMP
 #
 $CMP BTM222
-D BTM222, Bluetooth SPP Module, UART, Class 1
+D Bluetooth SPP Module, UART, Class 1
 K Bluetooth BT SPP Module
 $ENDCMP
 #
 $CMP CC1000
-D CC1000, Single Chip Low Power RF Transceiver, TSSOP28
+D Single Chip Low Power RF Transceiver, TSSOP28
 K Low Power RF Transciever
 F www.ti.com/lit/ds/symlink/cc1000.pdf
 $ENDCMP
 #
 $CMP CC1200
-D CC1200 Low-Power, High-Performance RF Transceiver
+D Low-Power, High-Performance RF Transceiver
 K RF Tx Rx
 F http://www.ti.com/lit/ds/symlink/cc1200.pdf
 $ENDCMP
 #
 $CMP HF-A11-SMT
-D HF-A11-SMT, WiFi IEEE802.11b/g/n with Ethernet Module, UART, GPIO
+D WiFi IEEE802.11b/g/n with Ethernet Module, UART, GPIO
 K WiFi IEEE802.11 b/g/n
 F http://www.hi-flying.com/products_detail/&productId=60326fef-3398-422b-9350-62f5f99a8dbc&comp_stats=comp-FrontProducts_list01-111.html
 $ENDCMP
 #
 $CMP NRF24L01
-D nRF24L01, Ultra low power 2.4GHz RF Transceiver, QFN20 4x4mm
+D Ultra low power 2.4GHz RF Transceiver, QFN20 4x4mm
 K Low Power RF Transciever
 F http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf
 $ENDCMP
 #
 $CMP SIM900
-D SIM900, GSM Quad-Band Communication Module, GPRS, Audio Engine, AT Command Set
+D GSM Quad-Band Communication Module, GPRS, Audio Engine, AT Command Set
 K GSM GPRS Quad-Band SMS FAX
 F http://www.simcom.us/act_admin/supportfile/SIM900_HD_V1.01(091226).pdf
 $ENDCMP
diff --git a/library/sensors.dcm b/library/sensors.dcm
index f7b426a7..6af83f30 100644
--- a/library/sensors.dcm
+++ b/library/sensors.dcm
@@ -1,84 +1,84 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP A1301EUA-T
-D A1301EUA-T, Linear Hall Effect Sensor, SIP 3pin
+D Linear Hall Effect Sensor, SIP 3pin
 K Hall Sensor
 F http://www.allegromicro.com/~/media/Files/Datasheets/A1301-2-Datasheet.ashx
 $ENDCMP
 #
 $CMP A1301KLHLT-T
-D A1301KLHLT-T, Linear Hall Effect Sensor, SOT-23W
+D Linear Hall Effect Sensor, SOT-23W
 K Hall Sensor
 F http://www.allegromicro.com/~/media/Files/Datasheets/A1301-2-Datasheet.ashx
 $ENDCMP
 #
 $CMP A1301KUA-T
-D A1301KUA-T, Linear Hall Effect Sensor, SIP 3pin
+D Linear Hall Effect Sensor, SIP 3pin
 K Hall Sensor
 F http://www.allegromicro.com/~/media/Files/Datasheets/A1301-2-Datasheet.ashx
 $ENDCMP
 #
 $CMP A1302ELHLT-T
-D A1302ELHLT-T, Linear Hall Effect Sensor, SOT-23W
+D Linear Hall Effect Sensor, SOT-23W
 K Hall Sensor
 F http://www.allegromicro.com/~/media/Files/Datasheets/A1301-2-Datasheet.ashx
 $ENDCMP
 #
 $CMP A1302KLHLT-T
-D A1302KLHLT-T, Linear Hall Effect Sensor, SOT-23W
+D Linear Hall Effect Sensor, SOT-23W
 K Hall Sensor
 F http://www.allegromicro.com/~/media/Files/Datasheets/A1301-2-Datasheet.ashx
 $ENDCMP
 #
 $CMP A1302KUA-T
-D A1302KUA-T, Linear Hall Effect Sensor, SIP 3pin
+D Linear Hall Effect Sensor, SIP 3pin
 K Hall Sensor
 F http://www.allegromicro.com/~/media/Files/Datasheets/A1301-2-Datasheet.ashx
 $ENDCMP
 #
 $CMP ACS706ELC-05C
-D ACS706ELC-05C, 15A, Hall Effect Linear Current Sensor, SO-8
+D 15A, Hall Effect Linear Current Sensor, SO-8
 K Hall Effect Current Monitor
 F http://www.allegromicro.com/~/media/Files/Datasheets/ACS706ELC-05C-Datasheet.ashx
 $ENDCMP
 #
 $CMP ACS711ELCTR-12AB
-D ACS711ELCTR-12AB, 12.5A, Hall Effect Linear Current Sensor w/ Overcurrent, SO-8
+D 12.5A, Hall Effect Linear Current Sensor w/ Overcurrent, SO-8
 K Hall Effect Current Monitor
 F http://www.allegromicro.com/~/Media/Files/Datasheets/ACS711-Datasheet.ashx
 $ENDCMP
 #
 $CMP ACS711ELCTR-25AB
-D ACS711ELCTR-25AB, 25A, Hall Effect Linear Current Sensor w/ Overcurrent, SO-8
+D 25A, Hall Effect Linear Current Sensor w/ Overcurrent, SO-8
 K Hall Effect Current Monitor
 F http://www.allegromicro.com/~/Media/Files/Datasheets/ACS711-Datasheet.ashx
 $ENDCMP
 #
 $CMP ACS712ELCTR-05B-T
-D ACS712ELCTR-05B-T, 5A Current Sensor with Hall Sensor, SO-8
+D 5A Current Sensor with Hall Sensor, SO-8
 K Hall Effect Current Sensor
 F sensors/AC712_current_sensor.pdf
 $ENDCMP
 #
 $CMP ACS712ELCTR-20A-T
-D ACS712ELCTR-20A-T, 5A Current Sensor with Hall Sensor, SO-8
+D 5A Current Sensor with Hall Sensor, SO-8
 K Hall Effect Current Sensor
 F sensors/AC712_current_sensor.pdf
 $ENDCMP
 #
 $CMP ACS712ELCTR-30A-T
-D ACS712ELCTR-30A-T, 30A Current Sensor with Hall Sensor, SO-8
+D 30A Current Sensor with Hall Sensor, SO-8
 K Hall Effect Current Sensor
 F sensors/AC712_current_sensor.pdf
 $ENDCMP
 #
 $CMP ACS713ELCTR-30A-T
-D ACS713ELCTR-30A-T, 30A Current Sensor with Hall-Effect Sensor, SOIC-8
+D 30A Current Sensor with Hall-Effect Sensor, SOIC-8
 K Hall Effect Current Sensor
 $ENDCMP
 #
 $CMP ACS754SCB-200
-D ACS754SCB-200, 200A Hall Effect Linear Current Sensor, 5pin CB package
+D 200A Hall Effect Linear Current Sensor, 5pin CB package
 K Hall Current Sensor
 F http://www.allegromicro.com/~/media/Files/Datasheets/ACS754-200-Datasheet.ashx
 $ENDCMP
@@ -90,13 +90,13 @@ F http://www.allegromicro.com/~/media/Files/Datasheets/ACS756-Datasheet.ashx?la=
 $ENDCMP
 #
 $CMP BMP085
-D BMP085, 19-Bit Digital Barometer, LCC-8
+D 19-Bit Digital Barometer, LCC-8
 K Digital Barometer
 F www.bosch-sensortec.com/content/language1/downloads/BST-BMP085-DS000-06.pdf
 $ENDCMP
 #
 $CMP DHT11
-D DHT11 - Temperature and humidity module
+D - Temperature and humidity module
 K digital temperature humidity sensor
 F http://akizukidenshi.com/download/ds/aosong/DHT11.pdf
 $ENDCMP
@@ -138,13 +138,13 @@ F http://www.ti.com/lit/gpn/ina193
 $ENDCMP
 #
 $CMP L3G4200D
-D L3G4200D, 16-bit 3 Axis Digital MEMS Gyroscope, LGA-16
+D 16-bit 3 Axis Digital MEMS Gyroscope, LGA-16
 K 3-Axis MEMS Gyroscope
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00265057.pdf
 $ENDCMP
 #
 $CMP L3GD20
-D L3GD20, 16-bit 3 Axis Digital MEMS Gyroscope, LGA-16
+D 16-bit 3 Axis Digital MEMS Gyroscope, LGA-16
 K 3-Axis MEMS Gyroscope
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00036465.pdf
 $ENDCMP
@@ -156,7 +156,7 @@ F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datas
 $ENDCMP
 #
 $CMP LSM303DLHC
-D LSM303DLHC, 16-bit 3 Axis Digital MEMS Accelerometer + Magnetometer, LGA-14
+D 16-bit 3 Axis Digital MEMS Accelerometer + Magnetometer, LGA-14
 K 3-Axis MEMS Accelerometer Magnetometer
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00027543.pdf
 $ENDCMP
@@ -216,13 +216,13 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/20001942F.pdf
 $ENDCMP
 #
 $CMP MP45DT02
-D MP45DT02, MEMS Omnidirectional Digital Microphone, HLGA-6
+D MEMS Omnidirectional Digital Microphone, HLGA-6
 K MEMS Microphone
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00025467.pdf
 $ENDCMP
 #
 $CMP TMP411
-D TMP411 - Remote and Local TEMPERATURE SENSOR
+D - Remote and Local TEMPERATURE SENSOR
 K Temperature sensor remote local i2c
 F http://www.ti.com.cn/cn/lit/ds/symlink/tmp411.pdf
 $ENDCMP
diff --git a/library/stm32.dcm b/library/stm32.dcm
index cc96c88a..cb16e1b2 100644
--- a/library/stm32.dcm
+++ b/library/stm32.dcm
@@ -1,49 +1,49 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP STM32F030K6
-D STM32F030K6, 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 32KB Flash, 4KB RAM, RTC, LQFP32
+D 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 32KB Flash, 4KB RAM, RTC, LQFP32
 K STM32 ARM Cortex-M0 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00088500.pdf
 $ENDCMP
 #
 $CMP STM32F050C4
-D STM32F050C4, 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 16KB Flash, 4KB RAM, RTC, VQFP48
+D 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 16KB Flash, 4KB RAM, RTC, VQFP48
 K STM32 ARM Cortex-M0 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/DM00052629.pdf
 $ENDCMP
 #
 $CMP STM32F050C6
-D STM32F050C6, 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 32KB Flash, 4KB RAM, RTC, VQFP48
+D 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 32KB Flash, 4KB RAM, RTC, VQFP48
 K STM32 ARM Cortex-M0 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/DM00052629.pdf
 $ENDCMP
 #
 $CMP STM32F050K4
-D STM32F050K4, 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 16KB Flash, 4KB RAM, RTC, VQFP32
+D 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 16KB Flash, 4KB RAM, RTC, VQFP32
 K STM32 ARM Cortex-M0 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/DM00052629.pdf
 $ENDCMP
 #
 $CMP STM32F050K6
-D STM32F050K6, 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 32KB Flash, 4KB RAM, RTC, VQFP32
+D 32-bit ARM Cortex-M0 Microcontroller, 48MHz, 32KB Flash, 4KB RAM, RTC, VQFP32
 K STM32 ARM Cortex-M0 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/DM00052629.pdf
 $ENDCMP
 #
 $CMP STM32F100C4
-D STM32F100C4, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 16KB Flash, 4KB RAM, RTC, VQFP48
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 16KB Flash, 4KB RAM, RTC, VQFP48
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F100C6
-D STM32F100C6, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 32KB Flash, 4KB RAM, RTC, VQFP48
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 32KB Flash, 4KB RAM, RTC, VQFP48
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F100C8
-D STM32F100C8, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 64KB Flash, 8KB RAM, RTC, VQFP48
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 64KB Flash, 8KB RAM, RTC, VQFP48
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
@@ -55,217 +55,217 @@ F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASH
 $ENDCMP
 #
 $CMP STM32F100R4
-D STM32F100R4, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 16KB Flash, 4KB RAM, RTC, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 16KB Flash, 4KB RAM, RTC, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F100R6
-D STM32F100R6, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 32KB Flash, 4KB RAM, RTC, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 32KB Flash, 4KB RAM, RTC, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F100R8
-D STM32F100R8, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 64KB Flash, 8KB RAM, RTC, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 64KB Flash, 8KB RAM, RTC, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F100RB
-D STM32F100RB, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 128KB Flash, 8KB RAM, RTC, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 128KB Flash, 8KB RAM, RTC, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F100V8
-D STM32F100V8, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 64KB Flash, 8KB RAM, RTC, VQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 64KB Flash, 8KB RAM, RTC, VQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F100VB
-D STM32F100VB, 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 128KB Flash, 8KB RAM, RTC, VQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 24MHz, 128KB Flash, 8KB RAM, RTC, VQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00251732.pdf
 $ENDCMP
 #
 $CMP STM32F103C4
-D STM32F103C4, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 16KB Flash, 6KB RAM, USB, CAN, LQFP48
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 16KB Flash, 6KB RAM, USB, CAN, LQFP48
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00210843.pdf
 $ENDCMP
 #
 $CMP STM32F103C6
-D STM32F103C6, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 32KB Flash, 10KB RAM, USB, CAN, LQFP48
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 32KB Flash, 10KB RAM, USB, CAN, LQFP48
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00210843.pdf
 $ENDCMP
 #
 $CMP STM32F103C8
-D STM32F103C8, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 20KB RAM, USB, CAN, LQFP48
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 20KB RAM, USB, CAN, LQFP48
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf
 $ENDCMP
 #
 $CMP STM32F103CB
-D STM32F103CB, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 20KB RAM, USB, CAN, LQFP48
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 20KB RAM, USB, CAN, LQFP48
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf
 $ENDCMP
 #
 $CMP STM32F103R4
-D STM32F103R4, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 16KB Flash, 6KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 16KB Flash, 6KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00210843.pdf
 $ENDCMP
 #
 $CMP STM32F103R6
-D STM32F103R6, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 32KB Flash, 10KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 32KB Flash, 10KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00210843.pdf
 $ENDCMP
 #
 $CMP STM32F103R8
-D STM32F103R8, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 20KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 20KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf
 $ENDCMP
 #
 $CMP STM32F103RB
-D STM32F103RB, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 20KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 20KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf
 $ENDCMP
 #
 $CMP STM32F103RC
-D STM32F103RC, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 48KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 48KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00191185.pdf
 $ENDCMP
 #
 $CMP STM32F103RD
-D STM32F103RD, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 384KB Flash, 64KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 384KB Flash, 64KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00191185.pdf
 $ENDCMP
 #
 $CMP STM32F103RE
-D STM32F103RE, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 512KB Flash, 64KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 512KB Flash, 64KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00191185.pdf
 $ENDCMP
 #
 $CMP STM32F103RF
-D STM32F103RF, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 768KB Flash, 96KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 768KB Flash, 96KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00253742.pdf
 $ENDCMP
 #
 $CMP STM32F103RG
-D STM32F103RG, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 1024KB Flash, 96KB RAM, USB, CAN, LQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 1024KB Flash, 96KB RAM, USB, CAN, LQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00253742.pdf
 $ENDCMP
 #
 $CMP STM32F103V8
-D STM32F103V8, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 20KB RAM, USB, CAN, LQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 20KB RAM, USB, CAN, LQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf
 $ENDCMP
 #
 $CMP STM32F103VB
-D STM32F103VB, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 20KB RAM, USB, CAN, LQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 20KB RAM, USB, CAN, LQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf
 $ENDCMP
 #
 $CMP STM32F103VC
-D STM32F103VC, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 48KB RAM, USB, CAN, LQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 48KB RAM, USB, CAN, LQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00191185.pdf
 $ENDCMP
 #
 $CMP STM32F103VD
-D STM32F103VD, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 384KB Flash, 64KB RAM, USB, CAN, LQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 384KB Flash, 64KB RAM, USB, CAN, LQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00191185.pdf
 $ENDCMP
 #
 $CMP STM32F103VE
-D STM32F103VE, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 512KB Flash, 64KB RAM, USB, CAN, LQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 512KB Flash, 64KB RAM, USB, CAN, LQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00191185.pdf
 $ENDCMP
 #
 $CMP STM32F103VF
-D STM32F103VF, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 768KB Flash, 96KB RAM, USB, CAN, LQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 768KB Flash, 96KB RAM, USB, CAN, LQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00253742.pdf
 $ENDCMP
 #
 $CMP STM32F103VG
-D STM32F103VG, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 1024KB Flash, 96KB RAM, USB, CAN, LQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 1024KB Flash, 96KB RAM, USB, CAN, LQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00253742.pdf
 $ENDCMP
 #
 $CMP STM32F105R8
-D STM32F105R8, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F105RB
-D STM32F105RB, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F105RC
-D STM32F105RC, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F105V8
-D STM32F105V8, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 64KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F105VB
-D STM32F105VB, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F105VC
-D STM32F105VC, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, VQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F107RB
-D STM32F107RB, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F107RC
-D STM32F107RC, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP64
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP64
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F107VB
-D STM32F107VB, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 128KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
 #
 $CMP STM32F107VC
-D STM32F107VC, 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP100
+D 32-bit ARM Cortex-M3 Microcontroller, 72MHz, 256KB Flash, 64KB RAM, RTC, CAN, USB OTG, ETH MAC, VQFP100
 K STM32 ARM Cortex-M3 MCU
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00220364.pdf
 $ENDCMP
@@ -283,7 +283,7 @@ F http://www.st.com/internet/mcu/product/252149.jsp
 $ENDCMP
 #
 $CMP STM32F407VG
-D STM32F407VG, 32-bit ARM Cortex-M4F microcontroller, 168 MHz, 1024 kB Flash, 192 kB SRAM, FPU, Ethernet, DCMI
+D 32-bit ARM Cortex-M4F microcontroller, 168 MHz, 1024 kB Flash, 192 kB SRAM, FPU, Ethernet, DCMI
 K ARM 32bit CortexM4F M4F STM Microcontroller FPU
 F http://www.st.com/internet/mcu/product/252140.jsp
 $ENDCMP
diff --git a/library/stm8.dcm b/library/stm8.dcm
index ecb7a4eb..b5593467 100644
--- a/library/stm8.dcm
+++ b/library/stm8.dcm
@@ -1,31 +1,31 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP STM8L051F3P
-D STM8L051F3P, 16MHz, 8K Flash, 1k RAM, 256 EEPROM, RTC, USART, I2C, SPI, ADC, TSSOP20
+D 16MHz, 8K Flash, 1k RAM, 256 EEPROM, RTC, USART, I2C, SPI, ADC, TSSOP20
 K STM8L Microcontroller Value Line Low Power
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00060484.pdf
 $ENDCMP
 #
 $CMP STM8L101F2P
-D STM8L101F2P, 16MHz, 4K Flash, 1.5k RAM, USART, I2C, SPI, AC, TSSOP20
+D 16MHz, 4K Flash, 1.5k RAM, USART, I2C, SPI, AC, TSSOP20
 K STM8L Microcontroller Value Line Low Power
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00220591.pdf
 $ENDCMP
 #
 $CMP STM8L101F3P
-D STM8L101F3, 16MHz, 8K Flash, 1.5k RAM, 2k EEPROM, USART, I2C, SPI, AC, TSSOP20
+D 16MHz, 8K Flash, 1.5k RAM, 2k EEPROM, USART, I2C, SPI, AC, TSSOP20
 K STM8L Microcontroller Value Line Low Power
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00220591.pdf
 $ENDCMP
 #
 $CMP STM8S003F3P
-D STM8S003F3P, 16MHz, 8K Flash, 1k RAM, 128 EEPROM, USART, I2C, SPI, TSSOP20
+D 16MHz, 8K Flash, 1k RAM, 128 EEPROM, USART, I2C, SPI, TSSOP20
 K STM8S Mainstream Value line 8-bit, 16MHz, 1k RAM, 128 EEPROM
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00024550.pdf
 $ENDCMP
 #
 $CMP STM8S003K3T
-D STM8S003K3T, 16MHz, 8K Flash, 1K RAM, 128 EEPROM, LQFP32 (7x7mm, 0.8mm pitch)
+D 16MHz, 8K Flash, 1K RAM, 128 EEPROM, LQFP32 (7x7mm, 0.8mm pitch)
 K STM8 Microcontroller Value Line
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00024550.pdf
 $ENDCMP
diff --git a/library/supertex.dcm b/library/supertex.dcm
index fefd8906..dbe3fec1 100644
--- a/library/supertex.dcm
+++ b/library/supertex.dcm
@@ -1,91 +1,91 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP CL220K4-G
-D CL220K4-G, Temperature Compensated Constant Current LED IC, D-PAK
+D Temperature Compensated Constant Current LED IC, D-PAK
 K Constant Current LED Driver IC
 F http://www.supertex.com/pdf/datasheets/CL220x.pdf
 $ENDCMP
 #
 $CMP CL220N5-G
-D CL220N5-G, Temperature Compensated Constant Current LED IC, TO-220
+D Temperature Compensated Constant Current LED IC, TO-220
 K Constant Current LED Driver IC
 F http://www.supertex.com/pdf/datasheets/CL220x.pdf
 $ENDCMP
 #
 $CMP HV100K5-G
-D HV100K5-G, Hot-Swap Current Limiter Controller, SOT223
+D Hot-Swap Current Limiter Controller, SOT223
 K Hot-Swap Current Limiter
 F http://www.supertex.com/pdf/datasheets/HV100.pdf
 $ENDCMP
 #
 $CMP HV101K5-G
-D HV101K5-G, Hot-Swap Current Limiter Controller, SOT223
+D Hot-Swap Current Limiter Controller, SOT223
 K Hot-Swap Current Limiter
 F http://www.supertex.com/pdf/datasheets/HV100.pdf
 $ENDCMP
 #
 $CMP HV9921N8-G
-D HV9921N8-G, 3pin Constant Current 20mA LED Driver, SOT89
+D 3pin Constant Current 20mA LED Driver, SOT89
 K CC LED Driver High Voltage
 F http://www.supertex.com/pdf/datasheets/HV9921.pdf
 $ENDCMP
 #
 $CMP HV9922N8-G
-D HV9922N8-G, 3pin Constant Current 50mA LED Driver, SOT89
+D 3pin Constant Current 50mA LED Driver, SOT89
 K CC LED Driver High Voltage
 F http://www.supertex.com/pdf/datasheets/HV9922.pdf
 $ENDCMP
 #
 $CMP HV9923N8-G
-D HV9923N8-G, 3pin Constant Current 30mA LED Driver, SOT89
+D 3pin Constant Current 30mA LED Driver, SOT89
 K CC LED Driver High Voltage
 F http://www.supertex.com/pdf/datasheets/HV9923.pdf
 $ENDCMP
 #
 $CMP HV9925SG-G
-D HV9925SG-G, Programmable Current LED Lamp Driver, SO8 w/Heat Slug
+D Programmable Current LED Lamp Driver, SO8 w/Heat Slug
 K Programmable Current LED Lamp Driver High Voltage
 F http://www.supertex.com/pdf/datasheets/HV9925.pdf
 $ENDCMP
 #
 $CMP HV9930LG-G
-D HV9930LG-G, Boost-Buck LED Lamp Driver, SO8
+D Boost-Buck LED Lamp Driver, SO8
 K Buck-Boost LED Lamp Driver High Voltage
 F http://www.supertex.com/pdf/datasheets/HV9930.pdf
 $ENDCMP
 #
 $CMP HV9931LG-G
-D HV9931LG-G, PFC Boost-Buck LED Lamp Driver, SO8
+D PFC Boost-Buck LED Lamp Driver, SO8
 K Buck-Boost LED Lamp Driver High Voltage PFC
 F http://www.supertex.com/pdf/datasheets/HV9931.pdf
 $ENDCMP
 #
 $CMP HV9961LG-G
-D HV9961LG-G, Buck LED Lamp Driver Average-Mode Constant Current, SO8
+D Buck LED Lamp Driver Average-Mode Constant Current, SO8
 K Buck LED Lamp Driver High Voltage Average CC
 F http://www.supertex.com/pdf/datasheets/HV9961.pdf
 $ENDCMP
 #
 $CMP HV9961NG-G
-D HV9961NG-G, Buck LED Lamp Driver Average-Mode Constant Current, SO16
+D Buck LED Lamp Driver Average-Mode Constant Current, SO16
 K Buck LED Lamp Driver High Voltage Average CC
 F http://www.supertex.com/pdf/datasheets/HV9961.pdf
 $ENDCMP
 #
 $CMP HV9967BK7-G
-D HV9967BK7-G, Buck LED Lamp Driver Average-Mode Constant Current, DFN8 (3x3mm)
+D Buck LED Lamp Driver Average-Mode Constant Current, DFN8 (3x3mm)
 K Buck LED Lamp Driver Low Voltage Average CC
 F http://www.supertex.com/pdf/datasheets/HV9967B.pdf
 $ENDCMP
 #
 $CMP HV9967BMG-G
-D HV9967BMG-G, Buck LED Lamp Driver Average-Mode Constant Current, MSOP8
+D Buck LED Lamp Driver Average-Mode Constant Current, MSOP8
 K Buck LED Lamp Driver Low Voltage Average CC
 F http://www.supertex.com/pdf/datasheets/HV9967B.pdf
 $ENDCMP
 #
 $CMP HV9972LG-G
-D HV9972LG-G, Isolated LED Lamp Driver Constant Current, SO8
+D Isolated LED Lamp Driver Constant Current, SO8
 K Isolated LED Lamp Driver High Voltage CC
 F http://www.supertex.com/pdf/datasheets/HV9972.pdf
 $ENDCMP
diff --git a/library/texas.dcm b/library/texas.dcm
index c91ec9e1..f7b0cd83 100644
--- a/library/texas.dcm
+++ b/library/texas.dcm
@@ -1,115 +1,115 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP LM3S6911-EQC50
-D LM3S6911-EQC50, Ti Stellaris ARM-M3 MCU Ethernet PHY, LQFP100
+D Ti Stellaris ARM-M3 MCU Ethernet PHY, LQFP100
 K MCU ARM M3 Stellaris PHY ETH NRND
 F http://www.ti.com/lit/ds/symlink/lm3s6911.pdf
 $ENDCMP
 #
 $CMP LM3S6911-IQC50
-D LM3S6911-IQC50, Ti Stellaris ARM-M3 MCU Ethernet PHY, Industrial grade, LQFP100
+D Ti Stellaris ARM-M3 MCU Ethernet PHY, Industrial grade, LQFP100
 K MCU ARM M3 Stellaris PHY ETH NRND
 F http://www.ti.com/lit/ds/symlink/lm3s6911.pdf
 $ENDCMP
 #
 $CMP LM4F110B2QR
-D LM4F110B2QR, Replaced by TM4C1231C3PM, LQFP64
+D Replaced by TM4C1231C3PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1231c3pm.pdf
 $ENDCMP
 #
 $CMP LM4F110C4QR
-D LM4F110C4QR, Replaced by TM4C1231D5PM, LQFP64
+D Replaced by TM4C1231D5PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1231d5pm.pdf
 $ENDCMP
 #
 $CMP LM4F110E5QR
-D LM4F110E5QR, Replaced by TM4C1231E6PM, LQFP64
+D Replaced by TM4C1231E6PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1231e6pm.pdf
 $ENDCMP
 #
 $CMP LM4F110H5QR
-D LM4F110H5QR, Replaced by TM4C1231H6PM, LQFP64
+D Replaced by TM4C1231H6PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1231h6pm.pdf
 $ENDCMP
 #
 $CMP LM4F111B2QR
-D LM4F111B2QR, Replaced by TM4C1230C3PM, LQFP64
+D Replaced by TM4C1230C3PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1230c3pm.pdf
 $ENDCMP
 #
 $CMP LM4F111C4QR
-D LM4F111C4QR, Replaced by TM4C1230D5PM, LQFP64
+D Replaced by TM4C1230D5PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1230d5pm.pdf
 $ENDCMP
 #
 $CMP LM4F111E5QR
-D LM4F111E5QR, Replaced by TM4C1230E6PM, LQFP64
+D Replaced by TM4C1230E6PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1230c3pm.pdf
 $ENDCMP
 #
 $CMP LM4F111H5QR
-D LM4F111H5QR, Relpaced by TM4C1230H6PM, LQFP64
+D Relpaced by TM4C1230H6PM, LQFP64
 K ARM Stellaris Cortex M4 MCU NRND
 F http://www.ti.com/lit/ds/symlink/tm4c1230h6pm.pdf
 $ENDCMP
 #
 $CMP TM4C1230C3PM
-D TM4C1230C3PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 32kB Flash, 12kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 32kB Flash, 12kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1230c3pm.pdf
 $ENDCMP
 #
 $CMP TM4C1230D5PM
-D TM4C1230D5PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 64kB Flash, 24kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 64kB Flash, 24kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1230d5pm.pdf
 $ENDCMP
 #
 $CMP TM4C1230E6PM
-D TM4C1230E6PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 128kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 128kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1230e6pm.pdf
 $ENDCMP
 #
 $CMP TM4C1230H6PM
-D TM4C1230H6PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 256kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 256kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1230h6pm.pdf
 $ENDCMP
 #
 $CMP TM4C1231C3PM
-D TM4C1231C3PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 32kB Flash, 12kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 32kB Flash, 12kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1231c3pm.pdf
 $ENDCMP
 #
 $CMP TM4C1231D5PM
-D TM4C1231D5PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 64kB Flash, 24kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 64kB Flash, 24kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1231d5pm.pdf
 $ENDCMP
 #
 $CMP TM4C1231E6PM
-D TM4C1231E6PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 128kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 128kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1231e6pm.pdf
 $ENDCMP
 #
 $CMP TM4C1231H6PM
-D TM4C1231H6PM, Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 256kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
+D Tiva ARM 32bit CortexM4 Microcotroller, 80MHz, 256kB Flash, 32kB SRAM, 2k EEPROM, LQFP64
 K ARM Tiva Cortex M4 MCU
 F http://www.ti.com/lit/ds/symlink/tm4c1231h6pm.pdf
 $ENDCMP
 #
 $CMP TMS470R1B768
-D TMS470R1B768, ARM7TDM Microcontroller, 768KB Flash, 48KB RAM, PQFP-144
+D ARM7TDM Microcontroller, 768KB Flash, 48KB RAM, PQFP-144
 K ARM 7TDM uC TMS470
 F http://www.ti.com/lit/ds/symlink/tms470r1b768.pdf
 $ENDCMP
diff --git a/library/transistors.dcm b/library/transistors.dcm
index da466d4d..8b24888b 100644
--- a/library/transistors.dcm
+++ b/library/transistors.dcm
@@ -1,450 +1,450 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP 2SA1016
-D 2SA1016, 50V Vce, 0.15A Ic, Low Noise Audio PNP Transistor, TO-92
+D 50V Vce, 0.15A Ic, Low Noise Audio PNP Transistor, TO-92
 K Low Noise Audio PNP Transistor
 F http://www.datasheetcatalog.org/datasheet/toshiba/905.pdf
 $ENDCMP
 #
 $CMP 2SB631
-D 2SB631, Vce 100V, Ic 1A, High Voltage Power Transistor, TO-126
+D Vce 100V, Ic 1A, High Voltage Power Transistor, TO-126
 K High Voltage Transistor
 $ENDCMP
 #
 $CMP 2SB817
-D 2SB817, 12A Ic, 140V Vce, Silicon Power Transistors PNP, TO-3PB
+D 12A Ic, 140V Vce, Silicon Power Transistors PNP, TO-3PB
 K Power Transistor PNP
 $ENDCMP
 #
 $CMP 2SC1815
-D 2SC1815, 50V Vce, 0.15A Ic, Low Noise Audio NPN Transistor, TO-92
+D 50V Vce, 0.15A Ic, Low Noise Audio NPN Transistor, TO-92
 K Low Noise Audio NPN Transistor
 $ENDCMP
 #
 $CMP 2SC1941
-D 2SC1941, 160V Vce, 0.05A Ic, Audio High Voltage NPN Transistor, TO-92
+D 160V Vce, 0.05A Ic, Audio High Voltage NPN Transistor, TO-92
 K Audio High Voltage NPN Transistor
 $ENDCMP
 #
 $CMP 2SC1945
-D 2SC1945, 6A Ic, 80V Vce, Silicon 27MHz RF Power Transistors NPN, TO-220
+D 6A Ic, 80V Vce, Silicon 27MHz RF Power Transistors NPN, TO-220
 K RF Power Transistor NPN 
 $ENDCMP
 #
 $CMP 2SD1047
-D 2SD1047, 12A Ic, 140V Vce, Silicon Power Transistors NPN, TO-3PB
+D 12A Ic, 140V Vce, Silicon Power Transistors NPN, TO-3PB
 K Power Transistor NPN
 $ENDCMP
 #
 $CMP 2SD600
-D 2SD600, Vce 100V, Ic 1A, High Voltage Power Transistor, TO-126
+D Vce 100V, Ic 1A, High Voltage Power Transistor, TO-126
 K High Voltage Power Transistor
 $ENDCMP
 #
 $CMP 3SK263
-D 3SK263, 30mA Id, 15V Vds, N-Channel Dual Gate MOSFET, SOT-143/343
+D 30mA Id, 15V Vds, N-Channel Dual Gate MOSFET, SOT-143/343
 K NMOS Dual Gate
 F http://www.onsemi.com/pub_link/Collateral/EN4423-D.PDF
 $ENDCMP
 #
 $CMP BC237
-D BC237, Vce 50V, Ic 100mA, NPN Epitaxial Silicon Transistor, TO-92
+D Vce 50V, Ic 100mA, NPN Epitaxial Silicon Transistor, TO-92
 K NPN Epitaxial Silicon Transistor
 F http://www.onsemi.com/pub_link/Collateral/BC237-D.PDF
 $ENDCMP
 #
 $CMP BC307
-D BC307, Vce 45V, Ic 100mA, PNP Epitaxial Silicon Transistor, TO-92
+D Vce 45V, Ic 100mA, PNP Epitaxial Silicon Transistor, TO-92
 K PNP Epitaxial Silicon Transistor
 F http://www.onsemi.com/pub_link/Collateral/BC307-D.PDF
 $ENDCMP
 #
 $CMP BC413
-D BC413, 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC413 NPN Transistor
 F http://www.cdil.com/datasheets/bc413_14_b_c.pdf
 $ENDCMP
 #
 $CMP BC413B
-D BC413B, 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC413 NPN Transistor
 F http://www.cdil.com/datasheets/bc413_14_b_c.pdf
 $ENDCMP
 #
 $CMP BC413C
-D BC413C, 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC413 NPN Transistor
 F http://www.cdil.com/datasheets/bc413_14_b_c.pdf
 $ENDCMP
 #
 $CMP BC414
-D BC414, 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC414 NPN Transistor
 F http://www.cdil.com/datasheets/bc413_14_b_c.pdf
 $ENDCMP
 #
 $CMP BC414B
-D BC414B, 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC414 NPN Transistor
 F http://www.cdil.com/datasheets/bc413_14_b_c.pdf
 $ENDCMP
 #
 $CMP BC414C
-D BC414C, 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC413 NPN Transistor
 F http://www.cdil.com/datasheets/bc413_14_b_c.pdf
 $ENDCMP
 #
 $CMP BC516
-D BC516, 30V Vce, 1A Ic, PNP Darlington Transistor, TO-92
+D 30V Vce, 1A Ic, PNP Darlington Transistor, TO-92
 K BC516 PNP Darlington Darl Transistor
 F http://www.fairchildsemi.com/ds/BC/BC516.pdf
 $ENDCMP
 #
 $CMP BC517
-D BC517, 30V Vce, 1A Ic, NPN Darlington Transistor, TO-92
+D 30V Vce, 1A Ic, NPN Darlington Transistor, TO-92
 K BC517 NPN Darlington Darl Transistor
 F http://www.fairchildsemi.com/ds/BC/BC517.pdf
 $ENDCMP
 #
 $CMP BC546
-D BC546, 65V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 65V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC546 NPN Transistor
 F http://www.fairchildsemi.com/ds/BC/BC547.pdf
 $ENDCMP
 #
 $CMP BC547
-D BC547, 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC547 NPN Transistor
 F http://www.fairchildsemi.com/ds/BC/BC547.pdf
 $ENDCMP
 #
 $CMP BC548
-D BC548, 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC548 NPN Transistor
 F http://www.fairchildsemi.com/ds/BC/BC547.pdf
 $ENDCMP
 #
 $CMP BC549
-D BC549, 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 30V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC549 NPN Transistor
 F http://www.fairchildsemi.com/ds/BC/BC547.pdf
 $ENDCMP
 #
 $CMP BC550
-D BC550, 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
+D 45V Vce, 0.1A Ic, NPN, Small Signal Transistor, TO-92
 K BC550 NPN Transistor
 F http://www.fairchildsemi.com/ds/BC/BC547.pdf
 $ENDCMP
 #
 $CMP BC556
-D BC556, 65V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
+D 65V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
 K BC556 PNP Transistor
 F http://www.fairchildsemi.com/ds/BC/BC557.pdf
 $ENDCMP
 #
 $CMP BC557
-D BC557, 45V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
+D 45V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
 K BC557 PNP Transistor
 F http://www.fairchildsemi.com/ds/BC/BC557.pdf
 $ENDCMP
 #
 $CMP BC558
-D BC558, 30V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
+D 30V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
 K BC558 PNP Transistor
 F http://www.fairchildsemi.com/ds/BC/BC557.pdf
 $ENDCMP
 #
 $CMP BC559
-D BC559, 30V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
+D 30V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
 K BC559 PNP Transistor
 F http://www.fairchildsemi.com/ds/BC/BC557.pdf
 $ENDCMP
 #
 $CMP BC560
-D BC560, 45V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
+D 45V Vce, 0.1A Ic, PNP Small Signal Transistor, TO-92
 K BC560 PNP Transistor
 F http://www.fairchildsemi.com/ds/BC/BC557.pdf
 $ENDCMP
 #
 $CMP BC636
-D BC636, 45V Vce, 1A Ic, PNP Medium Power Transistor, TO-92
+D 45V Vce, 1A Ic, PNP Medium Power Transistor, TO-92
 K BC636 PNP Transistor
 F http://www.fairchildsemi.com/ds/BC/BC636.pdf
 $ENDCMP
 #
 $CMP BC807-40
-D BC807-40, 45V Vce, 0.8A Ic, PNP, SOT-23
+D 45V Vce, 0.8A Ic, PNP, SOT-23
 K BC807 BC327 Equivalent
 F http://www.fairchildsemi.com/ds/BC/BC807.pdf
 $ENDCMP
 #
 $CMP BC808-40
-D BC808-40, 25V Vce, 0.8A Ic, PNP, SOT-23
+D 25V Vce, 0.8A Ic, PNP, SOT-23
 K BC808 BC328 Equivalent
 F http://www.fairchildsemi.com/ds/BC/BC807.pdf
 $ENDCMP
 #
 $CMP BC817-40
-D BC817-40, 45V Vce, 0.8A Ic, NPN, SOT-23
+D 45V Vce, 0.8A Ic, NPN, SOT-23
 K BC817 BC337 Equivalent
 F http://www.fairchildsemi.com/ds/BC/BC817.pdf
 $ENDCMP
 #
 $CMP BC818-40
-D BC818-40, 25V Vce, 0.8A Ic, NPN, SOT-23
+D 25V Vce, 0.8A Ic, NPN, SOT-23
 K BC818 BC337 Equivalent
 F http://www.fairchildsemi.com/ds/BC/BC817.pdf
 $ENDCMP
 #
 $CMP BC849
-D BC849, 30V Vce, 0.1A Ic, Low noise, NPN, SOT-23
+D 30V Vce, 0.1A Ic, Low noise, NPN, SOT-23
 K NPN Low Noise Small Signal Transistor
 F http://www.fairchildsemi.com/ds/BC/BC850.pdf
 $ENDCMP
 #
 $CMP BC850
-D BC850, 45V Vce, 0.1A Ic, Low noise, NPN, SOT-23
+D 45V Vce, 0.1A Ic, Low noise, NPN, SOT-23
 K NPN Low Noise Small Signal Transistor
 F http://www.fairchildsemi.com/ds/BC/BC850.pdf
 $ENDCMP
 #
 $CMP BC856
-D BC856, 65V Vce, 0.1A Ic, PNP, SOT-23
+D 65V Vce, 0.1A Ic, PNP, SOT-23
 K BC856 BC556 Equivalent
 F http://www.fairchildsemi.com/ds/BC/BC856.pdf
 $ENDCMP
 #
 $CMP BC857
-D BC857, 45V Vce, 0.1A Ic, PNP, SOT-23
+D 45V Vce, 0.1A Ic, PNP, SOT-23
 K BC857 BC557 Equivalent
 F http://www.fairchildsemi.com/ds/BC/BC856.pdf
 $ENDCMP
 #
 $CMP BC858
-D BC858, 30V Vce, 0.1A Ic, PNP, SOT-23
+D 30V Vce, 0.1A Ic, PNP, SOT-23
 K BC858 BC558 Equivalent
 F http://www.fairchildsemi.com/ds/BC/BC856.pdf
 $ENDCMP
 #
 $CMP BCP51
-D BCP51, 45V Vce, 1A Ic, PNP Medium Power Transistor, SOT-223
+D 45V Vce, 1A Ic, PNP Medium Power Transistor, SOT-223
 K BCP51 PNP Transistor
 F http://www.fairchildsemi.com/ds/BC/BCP51.pdf
 $ENDCMP
 #
 $CMP BCX51
-D BCX51, 45V Vce, 1A Ic, PNP Medium Power Transistor, SOT-89
+D 45V Vce, 1A Ic, PNP Medium Power Transistor, SOT-89
 K BCX51 PNP Transistor
 F http://www.infineon.com/dgdl/bcx51_bcx52_bcx53.pdf
 $ENDCMP
 #
 $CMP BCX52
-D BCX52, 60V Vce, 1A Ic, PNP Medium Power Transistor, SOT-89
+D 60V Vce, 1A Ic, PNP Medium Power Transistor, SOT-89
 K BCX52 PNP Transistor
 F http://www.infineon.com/dgdl/bcx51_bcx52_bcx53.pdf
 $ENDCMP
 #
 $CMP BCX53
-D BCX53, 80V Vce, 1A Ic, PNP Medium Power Transistor, SOT-89
+D 80V Vce, 1A Ic, PNP Medium Power Transistor, SOT-89
 K BCX53 PNP Transistor
 F http://www.infineon.com/dgdl/bcx51_bcx52_bcx53.pdf
 $ENDCMP
 #
 $CMP BD135
-D BD135, Vce 45V, Ic 1.5A, Low Voltage Transistor, TO-126
+D Vce 45V, Ic 1.5A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001225.pdf
 $ENDCMP
 #
 $CMP BD136
-D BD136, Vce 45V, Ic 1.5A, Low Voltage Transistor, TO-126
+D Vce 45V, Ic 1.5A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001225.pdf
 $ENDCMP
 #
 $CMP BD137
-D BD137, Vce 60V, Ic 1.5A, Low Voltage Transistor, TO-126
+D Vce 60V, Ic 1.5A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001225.pdf
 $ENDCMP
 #
 $CMP BD138
-D BD138, Vce 60V, Ic 1.5A, Low Voltage Transistor, TO-126
+D Vce 60V, Ic 1.5A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001225.pdf
 $ENDCMP
 #
 $CMP BD139
-D BD139, Vce 80V, Ic 1.5A, Low Voltage Transistor, TO-126
+D Vce 80V, Ic 1.5A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001225.pdf
 $ENDCMP
 #
 $CMP BD140
-D BD140, Vce 80V, Ic 1.5A, Low Voltage Transistor, TO-126
+D Vce 80V, Ic 1.5A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001225.pdf
 $ENDCMP
 #
 $CMP BD233
-D BD233, Vce 45V, Ic 2A, Low Voltage Transistor, TO-126
+D Vce 45V, Ic 2A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.fairchildsemi.com/ds/BD/BD233.pdf
 $ENDCMP
 #
 $CMP BD234
-D BD234, Vce 45V, Ic 2A, Low Voltage Transistor, TO-126
+D Vce 45V, Ic 2A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.electronica-pt.com/datasheets/bd/BD234.pdf
 $ENDCMP
 #
 $CMP BD235
-D BD235, Vce 60V, Ic 2A, Low Voltage Transistor, TO-126
+D Vce 60V, Ic 2A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.fairchildsemi.com/ds/BD/BD233.pdf
 $ENDCMP
 #
 $CMP BD236
-D BD236, Vce 60V, 2A, Low Voltage Transistor, TO-126
+D Vce 60V, 2A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.electronica-pt.com/datasheets/bd/BD234.pdf
 $ENDCMP
 #
 $CMP BD237
-D BD237, Vce 80V, Ic 2A, Low Voltage Transistor, TO-126
+D Vce 80V, Ic 2A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.fairchildsemi.com/ds/BD/BD233.pdf
 $ENDCMP
 #
 $CMP BD238
-D BD238, Vce 80V, Ic 2A, Low Voltage Transistor, TO-126
+D Vce 80V, Ic 2A, Low Voltage Transistor, TO-126
 K Low Voltage Transistor
 F http://www.electronica-pt.com/datasheets/bd/BD234.pdf
 $ENDCMP
 #
 $CMP BD249
-D BD249, 25A Ic, 55V Vce, Silicon Power Transistors NPN, SOT-93
+D 25A Ic, 55V Vce, Silicon Power Transistors NPN, SOT-93
 K  Power Transistor NPN
 F http://www.bourns.com/data/global/pdfs/bd249.pdf
 $ENDCMP
 #
 $CMP BD249A
-D BD249A, 25A Ic, 70V Vce, Silicon Power Transistors NPN, SOT-93
+D 25A Ic, 70V Vce, Silicon Power Transistors NPN, SOT-93
 K  Power Transistor NPN
 F http://www.bourns.com/data/global/pdfs/bd249.pdf
 $ENDCMP
 #
 $CMP BD249B
-D BD249B, 25A Ic, 90V Vce, Silicon Power Transistors NPN, SOT-93
+D 25A Ic, 90V Vce, Silicon Power Transistors NPN, SOT-93
 K  Power Transistor NPN
 F http://www.bourns.com/data/global/pdfs/bd249.pdf
 $ENDCMP
 #
 $CMP BD249C
-D BD249C, 25A Ic, 115V Vce, Silicon Power Transistors NPN, SOT-93
+D 25A Ic, 115V Vce, Silicon Power Transistors NPN, SOT-93
 K  Power Transistor NPN
 F http://www.bourns.com/data/global/pdfs/bd249.pdf
 $ENDCMP
 #
 $CMP BD250
-D BD250, 25A Ic, 55V Vce, Silicon Power Transistors PNP, SOT-93
+D 25A Ic, 55V Vce, Silicon Power Transistors PNP, SOT-93
 K  Power Transistor PNP
 F http://www.bourns.com/data/global/pdfs/bd250.pdf
 $ENDCMP
 #
 $CMP BD250A
-D BD250A, 25A Ic, 70V Vce, Silicon Power Transistors PNP, SOT-93
+D 25A Ic, 70V Vce, Silicon Power Transistors PNP, SOT-93
 K  Power Transistor PNP
 F http://www.bourns.com/data/global/pdfs/bd250.pdf
 $ENDCMP
 #
 $CMP BD250B
-D BD250B, 25A Ic, 90V Vce, Silicon Power Transistors PNP, SOT-93
+D 25A Ic, 90V Vce, Silicon Power Transistors PNP, SOT-93
 K  Power Transistor PNP
 F http://www.bourns.com/data/global/pdfs/bd250.pdf
 $ENDCMP
 #
 $CMP BD250C
-D BD250C, 25A Ic, 115V Vce, Silicon Power Transistors PNP, SOT-93
+D 25A Ic, 115V Vce, Silicon Power Transistors PNP, SOT-93
 K  Power Transistor PNP
 F http://www.bourns.com/data/global/pdfs/bd250.pdf
 $ENDCMP
 #
 $CMP BD433
-D BD433, 22V Vce, 4A Ic, NPN Power Transistor, TO-126
+D 22V Vce, 4A Ic, NPN Power Transistor, TO-126
 K BD433 NPN Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD434
-D BD434, 22V Vce, 4A Ic, PNP Power Transistor, TO-126
+D 22V Vce, 4A Ic, PNP Power Transistor, TO-126
 K BD434 PNP Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD435
-D BD435, 32V Vce, 4A Ic, NPN Power Transistor, TO-126
+D 32V Vce, 4A Ic, NPN Power Transistor, TO-126
 K BD435 NPN Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD436
-D BD436, 32V Vce, 4A Ic, PNP Power Transistor, TO-126
+D 32V Vce, 4A Ic, PNP Power Transistor, TO-126
 K BD436 PNP Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD437
-D BD437, 45V Vce, 4A Ic, NPN Power Transistor, TO-126
+D 45V Vce, 4A Ic, NPN Power Transistor, TO-126
 K BD437 NPN Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD438
-D BD438, 45V Vce, 4A Ic, PNP Power Transistor, TO-126
+D 45V Vce, 4A Ic, PNP Power Transistor, TO-126
 K BD438 PNP Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD439
-D BD439, 60V Vce, 4A Ic, NPN Power Transistor, TO-126
+D 60V Vce, 4A Ic, NPN Power Transistor, TO-126
 K BD439 NPN Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD440
-D BD440, 60V Vce, 4A Ic, PNP Power Transistor, TO-126
+D 60V Vce, 4A Ic, PNP Power Transistor, TO-126
 K BD440 PNP Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD441
-D BD441, 80V Vce, 4A Ic, NPN Power Transistor, TO-126
+D 80V Vce, 4A Ic, NPN Power Transistor, TO-126
 K BD441 NPN Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD442
-D BD442, 80V Vce, 4A Ic, PNP Power Transistor, TO-126
+D 80V Vce, 4A Ic, PNP Power Transistor, TO-126
 K BD442 PNP Power Transistor
 F http://www.cdil.com/datasheets/bd433_42.pdf
 $ENDCMP
 #
 $CMP BD909
-D BD909, 15A, Silicon Power Transistors NPN, TO-220
+D 15A, Silicon Power Transistors NPN, TO-220
 K Power Transistor NPN
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001277.pdf
 $ENDCMP
 #
 $CMP BD910
-D BD910, 15A, Silicon Power Transistors PNP, TO-220
+D 15A, Silicon Power Transistors PNP, TO-220
 K  Power Transistor PNP
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001277.pdf
 $ENDCMP
 #
 $CMP BD911
-D BD911, 15A, Silicon Power Transistors NPN, TO-220
+D 15A, Silicon Power Transistors NPN, TO-220
 K  Power Transistor NPN
 F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00001277.pdf
 $ENDCMP
@@ -456,142 +456,142 @@ F http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASH
 $ENDCMP
 #
 $CMP BF240
-D BF240, 40V Vce, 0.05A Ic, NPN, RF Signal Transistor, TO-92
+D 40V Vce, 0.05A Ic, NPN, RF Signal Transistor, TO-92
 K BF240 NPN RF Transistor
 F http://www.fairchildsemi.com/ds/BF/BF240.pdf
 $ENDCMP
 #
 $CMP BF244A
-D BF244A, 30V Vgs, 0.05A Id, N-Cannel FET Transistor, TO-92
+D 30V Vgs, 0.05A Id, N-Cannel FET Transistor, TO-92
 K N-Channel FET Transistor Low Voltage
 F http://www.fairchildsemi.com/ds/BF/BF244A.pdf
 $ENDCMP
 #
 $CMP BF244B
-D BF244B, 30V Vgs, 0.05A Id, N-Cannel FET Transistor, TO-92
+D 30V Vgs, 0.05A Id, N-Cannel FET Transistor, TO-92
 K N-Channel FET Transistor Low Voltage
 F http://www.fairchildsemi.com/ds/BF/BF244A.pdf
 $ENDCMP
 #
 $CMP BF244C
-D BF244C, 30V Vgs, 0.05A Id, N-Cannel FET Transistor, TO-92
+D 30V Vgs, 0.05A Id, N-Cannel FET Transistor, TO-92
 K N-Channel FET Transistor Low Voltage
 F http://www.fairchildsemi.com/ds/BF/BF244A.pdf
 $ENDCMP
 #
 $CMP BF245A
-D BF245A, 30V Vgs, 0.01A Id, N-Cannel FET Transistor, TO-92
+D 30V Vgs, 0.01A Id, N-Cannel FET Transistor, TO-92
 K N-Channel FET Transistor Low Voltage
 F http://www.fairchildsemi.com/ds/BF/BF245A.pdf
 $ENDCMP
 #
 $CMP BF245B
-D BF245B, 30V Vgs, 0.01A Id, N-Cannel FET Transistor, TO-92
+D 30V Vgs, 0.01A Id, N-Cannel FET Transistor, TO-92
 K N-Channel FET Transistor Low Voltage
 F http://www.fairchildsemi.com/ds/BF/BF245A.pdf
 $ENDCMP
 #
 $CMP BF245C
-D BF245C, 30V Vgs, 0.01A Id, N-Cannel FET Transistor, TO-92
+D 30V Vgs, 0.01A Id, N-Cannel FET Transistor, TO-92
 K N-Channel FET Transistor Low Voltage
 F http://www.fairchildsemi.com/ds/BF/BF245A.pdf
 $ENDCMP
 #
 $CMP BF457
-D BF457, 160V Vce, 0.1A Ic, NPN, High Voltage Transistor, TO-126
+D 160V Vce, 0.1A Ic, NPN, High Voltage Transistor, TO-126
 K BF457 NPN HV High Voltage Transistor
 $ENDCMP
 #
 $CMP BF458
-D BF458, 250V Vce, 0.1A Ic, NPN, High Voltage Transistor, TO-126
+D 250V Vce, 0.1A Ic, NPN, High Voltage Transistor, TO-126
 K BF458 NPN HV High Voltage Transistor
 $ENDCMP
 #
 $CMP BF459
-D BF459, 300V Vce, 0.1A Ic, NPN, High Voltage Transistor, TO-126
+D 300V Vce, 0.1A Ic, NPN, High Voltage Transistor, TO-126
 K BF457 NPN HV High Voltage Transistor
 $ENDCMP
 #
 $CMP BFR92
-D BFR92, 15V Vce, 0.025A Ic, NPN 5GHz Wideband Transistor, SOT-323
+D 15V Vce, 0.025A Ic, NPN 5GHz Wideband Transistor, SOT-323
 K RF 5GHz NPN Transistor
 F http://www.nxp.com/documents/data_sheet/BFR92A_N.pdf
 $ENDCMP
 #
 $CMP BFT92
-D BFT92, 15V Vce, 0.025A Ic, PNP 5GHz Wideband Transistor, SOT-23
+D 15V Vce, 0.025A Ic, PNP 5GHz Wideband Transistor, SOT-23
 K RF 5GHz NPN Transistor
 F http://www.nxp.com/documents/data_sheet/BFT92_CNV.pdf
 $ENDCMP
 #
 $CMP BS107
-D BS107, 200V Vds, N-Channel MOSFET, TO-92
+D 200V Vds, N-Channel MOSFET, TO-92
 K N-Channel MOSFET
 F http://www.vishay.com/docs/70215/70215.pdf
 $ENDCMP
 #
 $CMP BS170
-D BS170, 60V Vds 0.5A Id, N-Channel MOSFET, TO-92
+D 60V Vds 0.5A Id, N-Channel MOSFET, TO-92
 K N-Channel MOSFET
 F http://www.fairchildsemi.com/ds/BS/BS170.pdf
 $ENDCMP
 #
 $CMP BSS138
-D BSS138, 50V Vds, 0.22A Id, N-Channel MOSFET, SOT-23
+D 50V Vds, 0.22A Id, N-Channel MOSFET, SOT-23
 K N-Channel MOSFET Logic Level
 F http://www.fairchildsemi.com/ds/BS/BSS138.pdf
 $ENDCMP
 #
 $CMP BUT11
-D BUT11, 5A 400V, Silicon Power Transistors NPN, TO-220
+D 5A 400V, Silicon Power Transistors NPN, TO-220
 K High Voltage Power Transistor NPN
 F http://www.fairchildsemi.com/ds/BU/BUT11.pdf
 $ENDCMP
 #
 $CMP BUT11A
-D BUT11A, 5A 450V, Silicon Power Transistors NPN, TO-220
+D 5A 450V, Silicon Power Transistors NPN, TO-220
 K High Voltage Power Transistor NPN
 F http://www.fairchildsemi.com/ds/BU/BUT11.pdf
 $ENDCMP
 #
 $CMP BUZ11
-D BUZ11, 50V Vds, 30A Id, N-Channel Power MOSFET, TO-220
+D 50V Vds, 30A Id, N-Channel Power MOSFET, TO-220
 K N-Channel Power MOSFET
 F http://www.fairchildsemi.com/ds/BU/BUZ11.pdf
 $ENDCMP
 #
 $CMP DTA113T
-D DTA113T, Digital Transistor, 1k/NONE, SOT-23
+D Digital Transistor, 1k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA113Z
-D DTA113Z, Digital Transistor, 1k/10k, SOT-23
+D Digital Transistor, 1k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA114E
-D DTA114E, Digital Transistor, 10k/10k, SOT-23
+D Digital Transistor, 10k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA114G
-D DTA114G, Digital Transistor, 0k/10k, SOT-23
+D Digital Transistor, 0k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA114T
-D DTA114T, Digital Transistor, 10k/NONE, SOT-23
+D Digital Transistor, 10k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA114W
-D DTA114W, Digital Transistor, 10k/4.7k, SOT-23
+D Digital Transistor, 10k/4.7k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA114Y
-D DTA114Y, Digital Transistor, 10k/47k, SOT-23
+D Digital Transistor, 10k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
@@ -601,12 +601,12 @@ K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA115G
-D DTA115G, Digital Transistor, 0k/100k, SOT-23
+D Digital Transistor, 0k/100k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA115T
-D DTA115T, Digital Transistor, 100k/NONE, SOT-23
+D Digital Transistor, 100k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
@@ -616,682 +616,682 @@ K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA123E
-D DTA123E, Digital Transistor, 2k2/2k2, SOT-23
+D Digital Transistor, 2k2/2k2, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA123J
-D DTA123J, Digital Transistor, 2k2/47k, SOT-23
+D Digital Transistor, 2k2/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA123Y
-D DTA123Y, Digital Transistor, 2k2/10k, SOT-23
+D Digital Transistor, 2k2/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA124E
-D DTA124E, Digital Transistor, 22k/22k, SOT-23
+D Digital Transistor, 22k/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA124G
-D DTA124G, Digital Transistor, 0k/22k, SOT-23
+D Digital Transistor, 0k/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA124T
-D DTA124T, Digital Transistor, 22k/NONE, SOT-23
+D Digital Transistor, 22k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA124X
-D DTA124X, Digital Transistor, 22k/47k, SOT-23
+D Digital Transistor, 22k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA125T
-D DTA125T, Digital Transistor, 200k/NONE, SOT-23
+D Digital Transistor, 200k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA143E
-D DTA143E, Digital Transistor, 4k7/4k7, SOT-23
+D Digital Transistor, 4k7/4k7, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA143T
-D DTA143T, Digital Transistor, 4k7/NONE, SOT-23
+D Digital Transistor, 4k7/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA143X
-D DTA143X, Digital Transistor, 4k7/10k, SOT-23
+D Digital Transistor, 4k7/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA143Y
-D DTA143Y, Digital Transistor, 4k7/22k, SOT-23
+D Digital Transistor, 4k7/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA143Z
-D DTA143Z, Digital Transistor, 4k7/47k, SOT-23
+D Digital Transistor, 4k7/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA144E
-D DTA144E, Digital Transistor, 47k/47k, SOT-23
+D Digital Transistor, 47k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA144G
-D DTA144G, Digital Transistor, 0k/47k, SOT-23
+D Digital Transistor, 0k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA144T
-D DTA144T, Digital Transistor, 47k/NONE, SOT-23
+D Digital Transistor, 47k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA144V
-D DTA144V, Digital Transistor, 47k/10k, SOT-23
+D Digital Transistor, 47k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA144W
-D DTA144W, Digital Transistor, 47k/22k, SOT-23
+D Digital Transistor, 47k/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA1D3R
-D DTA1D3R, Digital Transistor, 2k7/1k, SOT-23
+D Digital Transistor, 2k7/1k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTA214Y
-D DTA214Y, Digital Transistor, 10k/47k, SOT-23
+D Digital Transistor, 10k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB113E
-D DTB113E, Digital Transistor, 1k/1k, SOT-23
+D Digital Transistor, 1k/1k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB113Z
-D DTB113Z, Digital Transistor, 1k/10k, SOT-23
+D Digital Transistor, 1k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB114E
-D DTB114E, Digital Transistor, 10k/10k, SOT-23
+D Digital Transistor, 10k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB114G
-D DTB114G, Digital Transistor, 0k/10k, SOT-23
+D Digital Transistor, 0k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB114T
-D DTB114T, Digital Transistor, 10k/NONE, SOT-23
+D Digital Transistor, 10k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB122J
-D DTB122J, Digital Transistor, 0k22/4k7, SOT-23
+D Digital Transistor, 0k22/4k7, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB123E
-D DTB123E, Digital Transistor, 2k2/2k2, SOT-23
+D Digital Transistor, 2k2/2k2, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB123T
-D DTB123T, Digital Transistor, 2k2/NONE, SOT-23
+D Digital Transistor, 2k2/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB123Y
-D DTB123Y, Digital Transistor, 2k2/10k, SOT-23
+D Digital Transistor, 2k2/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB133H
-D DTB133H, Digital Transistor, 3k3/10k, SOT-23
+D Digital Transistor, 3k3/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB143T
-D DTB143T, Digital Transistor, 4k7/NONE, SOT-23
+D Digital Transistor, 4k7/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTB163T
-D DTB163T, Digital Transistor, 6k8/NONE, SOT-23
+D Digital Transistor, 6k8/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC113T
-D DTC113T, Digital Transistor, 1k/NONE, SOT-23
+D Digital Transistor, 1k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC113Z
-D DTC113Z, Digital Transistor, 1k/10k, SOT-23
+D Digital Transistor, 1k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC114E
-D DTC114E, Digital Transistor, 10k/10k, SOT-23
+D Digital Transistor, 10k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC114G
-D DTC114G, Digital Transistor, 0k/10k, SOT-23
+D Digital Transistor, 0k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC114T
-D DTC114T, Digital Transistor, 10k/NONE, SOT-23
+D Digital Transistor, 10k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC114W
-D DTC114W, Digital Transistor, 10k/4k7, SOT-23
+D Digital Transistor, 10k/4k7, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC114Y
-D DTC114Y, Digital Transistor, 10k/47k, SOT-23
+D Digital Transistor, 10k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC115E
-D DTC115E, Digital Transistor, 100k/100k, SOT-23
+D Digital Transistor, 100k/100k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC115G
-D DTC115G, Digital Transistor, 0k/100k, SOT-23
+D Digital Transistor, 0k/100k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC115T
-D DTC115T, Digital Transistor, 100k/NONE, SOT-23
+D Digital Transistor, 100k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC115U
-D DTC115U, Digital Transistor, 100k/10k, SOT-23
+D Digital Transistor, 100k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC123E
-D DTC123E, Digital Transistor, 2k2/2k2, SOT-23
+D Digital Transistor, 2k2/2k2, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC123J
-D DTC123J, Digital Transistor, 2k2/47k, SOT-23
+D Digital Transistor, 2k2/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC123Y
-D DTC123Y, Digital Transistor, 2k2/10k, SOT-23
+D Digital Transistor, 2k2/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC124E
-D DTC124E, Digital Transistor, 22k/22k, SOT-23
+D Digital Transistor, 22k/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC124G
-D DTC124G, Digital Transistor, 0k/22k, SOT-23
+D Digital Transistor, 0k/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC124T
-D DTC124T, Digital Transistor, 22k/NONE, SOT-23
+D Digital Transistor, 22k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC124X
-D DTC124X, Digital Transistor, 22k/47k, SOT-23
+D Digital Transistor, 22k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC125T
-D DTC125T, Digital Transistor, 200k/NONE, SOT-23
+D Digital Transistor, 200k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC143E
-D DTC143E, Digital Transistor, 4k7/4k7, SOT-23
+D Digital Transistor, 4k7/4k7, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC143T
-D DTC143T, Digital Transistor, 4k7/NONE, SOT-23
+D Digital Transistor, 4k7/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC143X
-D DTC143X, Digital Transistor, 4k7/10k, SOT-23
+D Digital Transistor, 4k7/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC143Y
-D DTC143Y, Digital Transistor, 4k7/22k, SOT-23
+D Digital Transistor, 4k7/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC143Z
-D DTC143Z, Digital Transistor, 4k7/47k, SOT-23
+D Digital Transistor, 4k7/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC144E
-D DTC144E, Digital Transistor, 47k/47k, SOT-23
+D Digital Transistor, 47k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC144G
-D DTC144G, Digital Transistor, 0k/47k, SOT-23
+D Digital Transistor, 0k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC144T
-D DTC144T, Digital Transistor, 47k/NONE, SOT-23
+D Digital Transistor, 47k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC144V
-D DTC144V, Digital Transistor, 47k/10k, SOT-23
+D Digital Transistor, 47k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC144W
-D DTC144W, Digital Transistor, 47k/22k, SOT-23
+D Digital Transistor, 47k/22k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC1D3R
-D DTC1D3R, Digital Transistor, 2k7/1k, SOT-23
+D Digital Transistor, 2k7/1k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTC214Y
-D DTC214Y, Digital Transistor, 10k/47k, SOT-23
+D Digital Transistor, 10k/47k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD113E
-D DTD113E, Digital Transistor, 1k/1k, SOT-23
+D Digital Transistor, 1k/1k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD113Z
-D DTD113Z, Digital Transistor, 1k/10k, SOT-23
+D Digital Transistor, 1k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD114E
-D DTD114E, Digital Transistor, 10k/10k, SOT-23
+D Digital Transistor, 10k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD114G
-D DTD114G, Digital Transistor, 0k/10k, SOT-23
+D Digital Transistor, 0k/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD114T
-D DTD114T, Digital Transistor, 10k/NONE, SOT-23
+D Digital Transistor, 10k/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD122J
-D DTD122J, Digital Transistor, 0k22/4k7, SOT-23
+D Digital Transistor, 0k22/4k7, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD123E
-D DTD123E, Digital Transistor, 2k2/2k2, SOT-23
+D Digital Transistor, 2k2/2k2, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD123T
-D DTD123T, Digital Transistor, 2k2/NONE, SOT-23
+D Digital Transistor, 2k2/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD123Y
-D DTD123Y, Digital Transistor, 2k2/10k, SOT-23
+D Digital Transistor, 2k2/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD133H
-D DTD133H, Digital Transistor, 3k3/10k, SOT-23
+D Digital Transistor, 3k3/10k, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD143T
-D DTD143T, Digital Transistor, 4k7/NONE, SOT-23
+D Digital Transistor, 4k7/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP DTD163T
-D DTD163T, Digital Transistor, 6k8/NONE, SOT-23
+D Digital Transistor, 6k8/NONE, SOT-23
 K ROHM Digital Transistor
 $ENDCMP
 #
 $CMP FDG1024NZ
-D FDG1024NZ, 20V Vds, 1.2A Id, 175mOhm Rds, Dual N-Channel MOSFET, SC-70-6
+D 20V Vds, 1.2A Id, 175mOhm Rds, Dual N-Channel MOSFET, SC-70-6
 K Dual N-Channel MOSFET Logic Level
 F http://www.fairchildsemi.com/ds/FD/FDG1024NZ.pdf
 $ENDCMP
 #
 $CMP FDS6890A
-D FDS6890A, 20V Vds, 7.5A Id, 18mOhm Rds, Dual N-Channel MOSFET, SO-8
+D 20V Vds, 7.5A Id, 18mOhm Rds, Dual N-Channel MOSFET, SO-8
 K Dual N-Channel MOSFET
 F http://www.fairchildsemi.com/ds/FD/FDS6890A.pdf
 $ENDCMP
 #
 $CMP FDS6892A
-D FDS6892A, 20V Vds, 7.5A Id, 18mOhm Rds, Dual N-Channel MOSFET PWM Optimized, SO-8
+D 20V Vds, 7.5A Id, 18mOhm Rds, Dual N-Channel MOSFET PWM Optimized, SO-8
 K Dual N-Channel MOSFET Low Gate Charge
 F http://www.fairchildsemi.com/ds/FD/FDS6892A.pdf
 $ENDCMP
 #
 $CMP FDS6898A
-D FDS6898A, 20V Vds, 9.4A Id, 14mOhm Rds, Dual N-Channel MOSFET, SO-8
+D 20V Vds, 9.4A Id, 14mOhm Rds, Dual N-Channel MOSFET, SO-8
 K Dual N-Channel MOSFET
 F http://www.fairchildsemi.com/ds/FD/FDS6898A.pdf
 $ENDCMP
 #
 $CMP FDS9926A
-D FDS9926A, 20V Vds, 6.5A Id, 30mOhm Rds, Dual N-Channel MOSFET, SO-8
+D 20V Vds, 6.5A Id, 30mOhm Rds, Dual N-Channel MOSFET, SO-8
 K Dual N-Channel MOSFET
 F http://www.fairchildsemi.com/ds/FD/FDS9926A.pdf
 $ENDCMP
 #
 $CMP IPS6011PBF
-D IPS6011PbF, 39V, 60A, Intelligent Power Switch High Side, TO-220-5
+D 39V, 60A, Intelligent Power Switch High Side, TO-220-5
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6011pbf.pdf
 $ENDCMP
 #
 $CMP IPS6011RPBF
-D IPS6011RPbF, 39V, 60A, Intelligent Power Switch High Side, D-PAK 5pin
+D 39V, 60A, Intelligent Power Switch High Side, D-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6011pbf.pdf
 $ENDCMP
 #
 $CMP IPS6011SPBF
-D IPS6011SPbF, 39V, 60A, Intelligent Power Switch High Side, D2-PAK 5pin
+D 39V, 60A, Intelligent Power Switch High Side, D2-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6011pbf.pdf
 $ENDCMP
 #
 $CMP IPS6021PBF
-D IPS6021PbF, 39V, 32A, Intelligent Power Switch High Side, TO-220-5
+D 39V, 32A, Intelligent Power Switch High Side, TO-220-5
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6021pbf.pdf
 $ENDCMP
 #
 $CMP IPS6021RPBF
-D IPS6021RPbF, 39V, 32A, Intelligent Power Switch High Side, D-PAK 5pin
+D 39V, 32A, Intelligent Power Switch High Side, D-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6021pbf.pdf
 $ENDCMP
 #
 $CMP IPS6021SPBF
-D IPS6021SPbF, 39V, 32A, Intelligent Power Switch High Side, D2-PAK 5pin
+D 39V, 32A, Intelligent Power Switch High Side, D2-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6021pbf.pdf
 $ENDCMP
 #
 $CMP IPS6031PBF
-D IPS6031PbF, 39V, 16A, Intelligent Power Switch High Side, TO-220-5
+D 39V, 16A, Intelligent Power Switch High Side, TO-220-5
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6031pbf.pdf
 $ENDCMP
 #
 $CMP IPS6031RPBF
-D IPS6031RPbF, 39V, 16A, Intelligent Power Switch High Side, D-PAK 5pin
+D 39V, 16A, Intelligent Power Switch High Side, D-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6031pbf.pdf
 $ENDCMP
 #
 $CMP IPS6031SPBF
-D IPS6031SPbF, 39V, 16A, Intelligent Power Switch High Side, D2-PAK 5pin
+D 39V, 16A, Intelligent Power Switch High Side, D2-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6031pbf.pdf
 $ENDCMP
 #
 $CMP IPS6041GPBF
-D IPS6041GPbF, 39V, 5A, Intelligent Power Switch High Side, SO-8
+D 39V, 5A, Intelligent Power Switch High Side, SO-8
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6041pbf.pdf
 $ENDCMP
 #
 $CMP IPS6041PBF
-D IPS6041PbF, 39V, 5A, Intelligent Power Switch High Side, TO-220
+D 39V, 5A, Intelligent Power Switch High Side, TO-220
 K Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6041pbf.pdf
 $ENDCMP
 #
 $CMP IPS6041RPBF
-D IPS6041RPbF, 39V, 5A, Intelligent Power Switch High Side, DPAK 5pin
+D 39V, 5A, Intelligent Power Switch High Side, DPAK 5pin
 K Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6041pbf.pdf
 $ENDCMP
 #
 $CMP IPS6041SPBF
-D IPS6041SPbF, 39V, 5A, Intelligent Power Switch High Side, D2PAK 5pin
+D 39V, 5A, Intelligent Power Switch High Side, D2PAK 5pin
 K Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips6041pbf.pdf
 $ENDCMP
 #
 $CMP IPS7091GPBF
-D IPS7091GPbF, 70V, 5A, Intelligent Power Switch High Side, D2-PAK 5pin
+D 70V, 5A, Intelligent Power Switch High Side, D2-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips7091.pdf
 $ENDCMP
 #
 $CMP IPS7091PBF
-D IPS7091PbF, 70V, 5A, Intelligent Power Switch High Side, TO-220-5
+D 70V, 5A, Intelligent Power Switch High Side, TO-220-5
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips7091.pdf
 $ENDCMP
 #
 $CMP IPS7091SPBF
-D IPS7091SPbF, 70V, 5A, Intelligent Power Switch High Side, D2-PAK 5pin
+D 70V, 5A, Intelligent Power Switch High Side, D2-PAK 5pin
 K  Intelligent Power Switch High Side MOSFET
 F http://www.irf.com/product-info/datasheets/data/ips7091.pdf
 $ENDCMP
 #
 $CMP IRF540N
-D IRF540N, 100V Vds, 33A Id, HEXFET N-Channel MOSFET, TO-220
+D 100V Vds, 33A Id, HEXFET N-Channel MOSFET, TO-220
 K HEXFET N-Channel MOSFET
 F http://www.irf.com/product-info/datasheets/data/irf540n.pdf
 $ENDCMP
 #
 $CMP IRF7309IPBF
-D IRF7309IPBF, 30V Vds, 3A Id, Dual HEXFET MOSFET, SO-8
+D 30V Vds, 3A Id, Dual HEXFET MOSFET, SO-8
 K Dual HEXFET N-Channel P-Channel MOSFET
 F http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf
 $ENDCMP
 #
 $CMP IRF7343PBF
-D IRF7343PBF, 55V Vds, 4A Id, Dual HEXFET MOSFET, SO-8
+D 55V Vds, 4A Id, Dual HEXFET MOSFET, SO-8
 K Dual HEXFET N-Channel P-Channel MOSFET
 F http://www.irf.com/product-info/datasheets/data/irf7343ipbf.pdf
 $ENDCMP
 #
 $CMP IRF7606PBF
-D IRF7606PBF, HexFET P-MOS Power Mosfet, Vds -30V, Rdson 0.09R, Id -3.6A, Micro8
+D HexFET P-MOS Power Mosfet, Vds -30V, Rdson 0.09R, Id -3.6A, Micro8
 K HexFET Power Mosfet P-MOS
 F http://www.irf.com/product-info/datasheets/data/irf7606pbf.pdf
 $ENDCMP
 #
 $CMP IRF7607PBF
-D IRF7607PBF, HexFET N-MOS Power Mosfet, Vds 20V, Rdson 0.03R, Id 5.2A, Micro8
+D HexFET N-MOS Power Mosfet, Vds 20V, Rdson 0.03R, Id 5.2A, Micro8
 K HexFET Power Mosfet N-MOS
 F http://www.irf.com/product-info/datasheets/data/irf7607pbf.pdf
 $ENDCMP
 #
 $CMP IRF8721PBF-1
-D IRF8721PBF-1, 30V Vds, 14A Id, HEXFET MOSFET, SO-8
+D 30V Vds, 14A Id, HEXFET MOSFET, SO-8
 K HEXFET N-Channel MOSFET
 F http://www.irf.com/product-info/datasheets/data/irf8721pbf-1.pdf
 $ENDCMP
 #
 $CMP IRF9540N
-D IRF9540N, -100V Vds, -23A Id, HEXFET P-Channel MOSFET, TO-220
+D -100V Vds, -23A Id, HEXFET P-Channel MOSFET, TO-220
 K HEXFET P-Channel MOSFET
 F http://www.irf.com/product-info/datasheets/data/irf9540n.pdf
 $ENDCMP
 #
 $CMP IRG4PF50W
-D IRG4PF50W, 28A, 900V, N-Channel IGBT
+D 28A, 900V, N-Channel IGBT
 K N-Channel IGBT Power Transistor
 F http://www.irf.com/product-info/datasheets/data/irg4pf50w.pdf
 $ENDCMP
 #
 $CMP KTD1624
-D KTD1624, EPITAXIAL PLANAR NPN TRANSISTOR, SOT-89
+D EPITAXIAL PLANAR NPN TRANSISTOR, SOT-89
 K NPN Switching Transistor
 F http://www2.kec.co.kr/data/databook/pdf/KTD/Eng/KTD1624.pdf
 $ENDCMP
 #
 $CMP MAT02
-D MAT02, Precision Dual Monolithic Transistor, Low Noise, Low Offset, Vce 40V, Ic 20mA, TO-78
+D Precision Dual Monolithic Transistor, Low Noise, Low Offset, Vce 40V, Ic 20mA, TO-78
 K Precision Dual Monolithic Transistor Low Noise EOL
 F http://www.elenota.pl/datasheet_download/93431/MAT02
 $ENDCMP
 #
 $CMP MJE13003
-D MJE13003, 1.5A Ic, 400V Vce, Silicon Switching Power Transistor NPN, TO-225
+D 1.5A Ic, 400V Vce, Silicon Switching Power Transistor NPN, TO-225
 K Switching Power High Voltage Transistor NPN
 F http://www.onsemi.com/pub_link/Collateral/MJE13003-D.PDF
 $ENDCMP
 #
 $CMP MJE13005G
-D MJE13005G, 4A Ic, 400V Vce, Silicon Switching Power Transistors NPN, TO-220
+D 4A Ic, 400V Vce, Silicon Switching Power Transistors NPN, TO-220
 K Switching Power Transistor NPN
 F http://www.onsemi.com/pub_link/Collateral/MJE13005-D.PDF
 $ENDCMP
 #
 $CMP MJE13007G
-D MJE13007G, 8A Ic, 400V Vce, Silicon Switching Power Transistors NPN, TO-220
+D 8A Ic, 400V Vce, Silicon Switching Power Transistors NPN, TO-220
 K Switching Power Transistor NPN
 F http://www.onsemi.com/pub_link/Collateral/MJE13007-D.PDF
 $ENDCMP
 #
 $CMP MJE13009G
-D MJE13009G, 12A Ic, 400V Vce, Silicon Switching Power Transistors NPN, TO-220
+D 12A Ic, 400V Vce, Silicon Switching Power Transistors NPN, TO-220
 K Switching Power Transistor NPN
 F http://www.onsemi.com/pub_link/Collateral/MJE13009-D.PDF
 $ENDCMP
 #
 $CMP MMBF170
-D MMBF170, 60V Vds 0.5A Id, N-Channel MOSFET, SOT-23
+D 60V Vds 0.5A Id, N-Channel MOSFET, SOT-23
 K N-Channel MOSFET
 F http://www.fairchildsemi.com/ds/BS/BS170.pdf
 $ENDCMP
 #
 $CMP MMBT3904
-D MMBT3904, 40V Vce, 0.2A Ic, NPN, Small Signal Transistor, SOT-23
+D 40V Vce, 0.2A Ic, NPN, Small Signal Transistor, SOT-23
 K MMBT3904 NPN Transistor
 F http://www.nxp.com/documents/data_sheet/MMBT3904.pdf
 $ENDCMP
 #
 $CMP MMBT3906
-D MMBT3906, 40V Vce, 0.2A Ic, PNP, Small Signal Transistor, SOT-23
+D 40V Vce, 0.2A Ic, PNP, Small Signal Transistor, SOT-23
 K MMBT3904 PNP Transistor
 F http://www.nxp.com/documents/data_sheet/MMBT3906.pdf
 $ENDCMP
 #
 $CMP MPSA42
-D MPSA42, Vce 300V, Ic 500mA, NPN High Voltage Transistor, TO-92
+D Vce 300V, Ic 500mA, NPN High Voltage Transistor, TO-92
 K NPN High Voltage Transistor
 F http://www.onsemi.com/pub_link/Collateral/MPSA42-D.PDF
 $ENDCMP
 #
 $CMP MPSA92
-D MPSA92, Vce 300V, Ic 500mA, PNP High Voltage Transistor, TO-92
+D Vce 300V, Ic 500mA, PNP High Voltage Transistor, TO-92
 K PNP High Voltage Transistor
 F http://www.onsemi.com/pub_link/Collateral/MPSA92-D.PDF
 $ENDCMP
 #
 $CMP PN2222A
-D PN2222A, 40V Vce, 1A Ic, NPN, General Purpose Transistor, TO-92
+D 40V Vce, 1A Ic, NPN, General Purpose Transistor, TO-92
 K NPN General Puprose Transistor
 F http://www.fairchildsemi.com/ds/PN/PN2222A.pdf
 $ENDCMP
 #
 $CMP PZT2222A
-D PZT2222A, 40V Vce, 1A Ic, NPN, General Purpose Transistor, SOT-223
+D 40V Vce, 1A Ic, NPN, General Purpose Transistor, SOT-223
 K NPN General Puprose Transistor SMD
 F http://www.fairchildsemi.com/ds/PN/PN2222A.pdf
 $ENDCMP
 #
 $CMP PZTA42
-D PZTA42, 300V Vce, 0.2A Ic, NPN, High Voltage Transistor, SOT-223
+D 300V Vce, 0.2A Ic, NPN, High Voltage Transistor, SOT-223
 K NPN High Voltage Transistor SMD
 F http://www.fairchildsemi.com/ds/MP/MPSA42.pdf
 $ENDCMP
 #
 $CMP S8050
-D S8050, 20V Vce, 0.7A Ic, NPN, Low Voltage High Current Transistor, TO-92
+D 20V Vce, 0.7A Ic, NPN, Low Voltage High Current Transistor, TO-92
 K S8050 NPN Low Voltage High Current Transistor
 F http://www.unisonic.com.tw/datasheet/S8050.pdf
 $ENDCMP
 #
 $CMP S8550
-D S8550, 20V Vce, 0.7A Ic, PNP Low Voltage High Current Transistor, TO-92
+D 20V Vce, 0.7A Ic, PNP Low Voltage High Current Transistor, TO-92
 K S8550 PNP Low Voltage High Current Transistor
 F http://www.unisonic.com.tw/datasheet/S8550.pdf
 $ENDCMP
 #
 $CMP TIP120
-D TIP120, 5A Ic, 60V Vce, Silicon Darlington Power Transistor NPN, TO-220
+D 5A Ic, 60V Vce, Silicon Darlington Power Transistor NPN, TO-220
 K Darlington Power Transistor NPN
 F http://www.fairchildsemi.com/ds/TI/TIP120.pdf
 $ENDCMP
 #
 $CMP TIP121
-D TIP121, 5A Ic, 80V Vce, Silicon Darlington Power Transistor NPN, TO-220
+D 5A Ic, 80V Vce, Silicon Darlington Power Transistor NPN, TO-220
 K Darlington Power Transistor NPN
 F http://www.fairchildsemi.com/ds/TI/TIP120.pdf
 $ENDCMP
 #
 $CMP TIP122
-D TIP122, 5A Ic, 100V Vce, Silicon Darlington Power Transistor NPN, TO-220
+D 5A Ic, 100V Vce, Silicon Darlington Power Transistor NPN, TO-220
 K Darlington Power Transistor NPN
 F http://www.fairchildsemi.com/ds/TI/TIP120.pdf
 $ENDCMP
 #
 $CMP TIP125
-D TIP125, 5A Ic, 60V Vce, Silicon Darlington Power Transistor PNP, TO-220
+D 5A Ic, 60V Vce, Silicon Darlington Power Transistor PNP, TO-220
 K Darlington Power Transistor PNP
 F http://www.fairchildsemi.com/ds/TI/TIP125.pdf
 $ENDCMP
 #
 $CMP TIP126
-D TIP126, 5A Ic, 80V Vce, Silicon Darlington Power Transistor PNP, TO-220
+D 5A Ic, 80V Vce, Silicon Darlington Power Transistor PNP, TO-220
 K Darlington Power Transistor PNP
 F http://www.fairchildsemi.com/ds/TI/TIP125.pdf
 $ENDCMP
 #
 $CMP TIP127
-D TIP127, 5A Ic, 100V Vce, Silicon Darlington Power Transistor PNP, TO-220
+D 5A Ic, 100V Vce, Silicon Darlington Power Transistor PNP, TO-220
 K Darlington Power Transistor PNP
 F http://www.fairchildsemi.com/ds/TI/TIP125.pdf
 $ENDCMP
diff --git a/library/video.dcm b/library/video.dcm
index 9ce4eed1..c80a7617 100644
--- a/library/video.dcm
+++ b/library/video.dcm
@@ -1,25 +1,25 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP AD9891
-D AD9891, CCD Signal Processor, 20MHz 10bits, CSPBGA-64
+D CCD Signal Processor, 20MHz 10bits, CSPBGA-64
 K CCD Signal Processor
 F http://www.analog.com/static/imported-files/data_sheets/AD9891_9895.pdf
 $ENDCMP
 #
 $CMP AD9895
-D AD9895, CCD Signal Processor, 30MHz 12bits, CSPBGA-64
+D CCD Signal Processor, 30MHz 12bits, CSPBGA-64
 K CCD Signal Processor
 F http://www.analog.com/static/imported-files/data_sheets/AD9891_9895.pdf
 $ENDCMP
 #
 $CMP CXD3400N
-D CXD3400N, 6-channel Vertical Clock Driver for CCD Image Sensor, SSOP-20
+D 6-channel Vertical Clock Driver for CCD Image Sensor, SSOP-20
 K CCD Clock Driver
 F video\cxd3400n.pdf
 $ENDCMP
 #
 $CMP ICX415AQ
-D ICX415AQ, Diagonal 8mm B/W Progressive Scan CCD Image Sensor with Square Pixel, CERDIP-22
+D Diagonal 8mm B/W Progressive Scan CCD Image Sensor with Square Pixel, CERDIP-22
 K CCD B/W Image Sensor
 $ENDCMP
 #
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-DO-214AB.wings b/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-DO-214AB.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/DO-214AB.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-DO-214AB.wrl b/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-DO-214AB.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/DO-214AB.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB_Handsoldering.wings
new file mode 100644
index 00000000..d22cdf06
Binary files /dev/null and b/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB_Handsoldering.wings differ
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB_Handsoldering.wrl
new file mode 100644
index 00000000..68ac5d36
--- /dev/null
+++ b/modules/packages3d/Diodes_SMD.3dshapes/DO-214AB_Handsoldering.wrl
@@ -0,0 +1,5326 @@
+#VRML V2.0 utf8
+#Exported from Wings 3D 1.5.3
+DEF DoCN214Ab_Cas Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material DEF MaterialCO002 Material {
+          diffuseColor 0.027450980392156862 0.027450980392156862 0.027450980392156862
+          emissiveColor 0.0 0.0 0.0
+          specularColor 1.0 1.0 1.0
+          ambientIntensity 0.027450980392156862
+          transparency 0.0
+          shininess 1.0
+        }
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          -3.5692803859710693 -3.1191532611846924 1.472639799118042,
+          -3.404409646987915 -2.920319080352783 2.6457598209381104,
+          -3.4044086933135986 2.920320510864258 2.645759105682373,
+          -3.569279432296753 3.119154691696167 1.4726390838623042,
+          3.4044082164764404 -2.9203200340270996 2.6457605361938477,
+          3.404409170150757 2.9203195571899414 2.6457598209381104,
+          3.569279909133911 3.1191537380218506 1.472640037536621,
+          3.568578004837036 3.119999408721924 1.4676480293273926,
+          -3.568577527999878 3.1200003623962402 1.4676470756530757,
+          3.5685770511627197 -3.119999885559082 1.4676487445831303,
+          3.5692789554595947 -3.119154214859009 1.4726407527923588,
+          -3.5685784816741943 -3.1199989318847656 1.4676477909088135,
+          -3.5671756267547607 -3.1199989318847656 1.4576637744903564,
+          -3.404409408569336 -2.9496841430664063 0.29951986670494074,
+          -3.5671746730804443 3.1200003623962402 1.4576630592346187,
+          -3.4044084548950195 2.9496850967407227 0.2995191812515255,
+          3.567174196243286 -3.119999885559082 1.4576647281646733,
+          3.4044084548950195 -2.9496850967407227 0.2995207905769352,
+          3.404409408569336 2.9496841430664063 0.29952010512351995,
+          3.5671751499176025 3.119999408721924 1.4576640129089355,
+          -2.246399402618408 2.9496848583221436 0.29951933026313754,
+          -2.246399402618408 2.9203200340270996 0.09983934462070433,
+          2.2464003562927246 2.9496843814849854 0.2995199263095855,
+          2.2464003562927246 2.9203195571899414 0.09983994811773296,
+          -2.2464003562927246 -2.9496843814849854 0.2995200455188752,
+          2.246399402618408 -2.9496848583221436 0.29952064156532315,
+          -2.2464003562927246 -2.9203195571899414 0.0998400375247002,
+          2.246399402618408 -2.9203200340270996 0.09984064102172883 ] }
+        coordIndex [
+          0, 1, 2, -1,
+          0, 2, 3, -1,
+          0, 3, 15, -1,
+          0, 11, 1, -1,
+          0, 12, 11, -1,
+          0, 13, 12, -1,
+          0, 15, 13, -1,
+          1, 4, 5, -1,
+          1, 5, 2, -1,
+          1, 9, 4, -1,
+          1, 11, 9, -1,
+          2, 5, 7, -1,
+          2, 7, 8, -1,
+          2, 8, 3, -1,
+          3, 8, 14, -1,
+          3, 14, 15, -1,
+          4, 9, 10, -1,
+          4, 10, 5, -1,
+          5, 6, 7, -1,
+          5, 10, 6, -1,
+          6, 10, 17, -1,
+          6, 17, 18, -1,
+          6, 18, 19, -1,
+          6, 19, 7, -1,
+          7, 19, 8, -1,
+          8, 19, 14, -1,
+          9, 11, 16, -1,
+          9, 16, 10, -1,
+          10, 16, 17, -1,
+          11, 12, 16, -1,
+          12, 13, 24, -1,
+          12, 24, 25, -1,
+          12, 25, 16, -1,
+          13, 15, 20, -1,
+          13, 20, 24, -1,
+          14, 19, 22, -1,
+          14, 20, 15, -1,
+          14, 22, 20, -1,
+          16, 25, 17, -1,
+          17, 25, 18, -1,
+          18, 22, 19, -1,
+          18, 25, 22, -1,
+          20, 21, 24, -1,
+          20, 22, 21, -1,
+          21, 22, 23, -1,
+          21, 23, 26, -1,
+          21, 26, 24, -1,
+          22, 25, 23, -1,
+          23, 25, 27, -1,
+          23, 27, 26, -1,
+          24, 26, 25, -1,
+          25, 26, 27, -1 ]
+        normal Normal { vector [
+          -0.9863253266806227 -0.16377194704117878 -0.01846887410494483,
+          -0.24224313281977444 -0.7237758934269019 0.6461166463540087,
+          -0.4975972613304285 0.7432487861031111 0.4471892300499968,
+          -0.9699941761979216 0.24159676029787633 -0.027245248313894695,
+          0.37313005714782127 -0.7432289067290219 0.5553240069142037,
+          0.5176318421322419 0.5154498345700406 0.6829119592249792,
+          0.9795168483650739 0.19517214102392993 -0.04954370935939242,
+          0.24167157336515366 0.9663225453520652 0.0884058197830715,
+          -0.24153896008699124 0.9692237007219313 0.04758517331038463,
+          0.24167138768156543 -0.9663225906119937 0.08840583266386888,
+          0.9807061795647685 -0.19540930786271513 0.005530982199465938,
+          -0.24153914369179624 -0.9692236546461471 0.04758517982523323,
+          -0.44084349317168053 -0.8833700295341244 -0.15910501390299045,
+          -0.6033183147091945 -0.3013843255412078 -0.7383593294965052,
+          -0.44084328636941883 0.8833700827572981 -0.1591052914028148,
+          -0.8488866370954713 0.2827044281816305 -0.4466202902323615,
+          0.4419641119494151 -0.8879910021723985 -0.12704213399350778,
+          0.8488866486016216 -0.2827050758879752 -0.4466198583729582,
+          0.6033183817248052 0.3013846927036422 -0.738359124868714,
+          0.4419643310327542 0.8879908711179855 -0.12704228786467692,
+          -0.25200870050983704 0.7479818522963981 -0.6140152795351206,
+          -0.6461038619714635 0.6392288915617541 -0.4170566193435745,
+          0.18746558296451166 0.9273530096218707 -0.3238410887287691,
+          0.6461040726990637 0.3196142108799898 -0.6931062569658744,
+          -0.5185985418575297 -0.769620190207648 -0.37247861040331937,
+          0.33375127807884947 -0.8254998993864928 -0.4551483280136542,
+          -0.3136668042597195 -0.6206582675247144 -0.7186072994749739,
+          0.5512349564876111 -0.5453694221646528 -0.6314366287394912 ] }
+        normalIndex [
+          0, 1, 2, -1,
+          0, 2, 3, -1,
+          0, 3, 15, -1,
+          0, 11, 1, -1,
+          0, 12, 11, -1,
+          0, 13, 12, -1,
+          0, 15, 13, -1,
+          1, 4, 5, -1,
+          1, 5, 2, -1,
+          1, 9, 4, -1,
+          1, 11, 9, -1,
+          2, 5, 7, -1,
+          2, 7, 8, -1,
+          2, 8, 3, -1,
+          3, 8, 14, -1,
+          3, 14, 15, -1,
+          4, 9, 10, -1,
+          4, 10, 5, -1,
+          5, 6, 7, -1,
+          5, 10, 6, -1,
+          6, 10, 17, -1,
+          6, 17, 18, -1,
+          6, 18, 19, -1,
+          6, 19, 7, -1,
+          7, 19, 8, -1,
+          8, 19, 14, -1,
+          9, 11, 16, -1,
+          9, 16, 10, -1,
+          10, 16, 17, -1,
+          11, 12, 16, -1,
+          12, 13, 24, -1,
+          12, 24, 25, -1,
+          12, 25, 16, -1,
+          13, 15, 20, -1,
+          13, 20, 24, -1,
+          14, 19, 22, -1,
+          14, 20, 15, -1,
+          14, 22, 20, -1,
+          16, 25, 17, -1,
+          17, 25, 18, -1,
+          18, 22, 19, -1,
+          18, 25, 22, -1,
+          20, 21, 24, -1,
+          20, 22, 21, -1,
+          21, 22, 23, -1,
+          21, 23, 26, -1,
+          21, 26, 24, -1,
+          22, 25, 23, -1,
+          23, 25, 27, -1,
+          23, 27, 26, -1,
+          24, 26, 25, -1,
+          25, 26, 27, -1 ]
+      }
+    }
+  ]
+}
+
+DEF DoCN214Ab_Pin Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material DEF MaterialCO001 Material {
+          diffuseColor 0.8 0.8 0.8
+          emissiveColor 0.0 0.0 0.0
+          specularColor 1.0 1.0 1.0
+          ambientIntensity 0.8000000000000002
+          transparency 0.0
+          shininess 1.0
+        }
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          -3.541217088699341 -1.497599244117737 1.2729595899581907,
+          -3.7190401554107666 -1.497599244117737 1.2729594707489011,
+          -3.7190396785736084 1.497600436210632 1.2729591131210325,
+          -3.5412166118621826 1.497600436210632 1.272959232330322,
+          -3.569279670715332 1.497600436210632 1.472639203071594,
+          -3.5692801475524902 -1.497599244117737 1.4726395606994627,
+          -3.7190396785736084 1.497600436210632 1.472639203071594,
+          -3.7190401554107666 -1.497599244117737 1.4726395606994627,
+          -3.8094818592071533 1.497600436210632 1.4607322216033933,
+          -3.8094823360443115 -1.497599244117737 1.460732579231262,
+          -3.8937602043151855 -1.497599244117737 1.4258235692977903,
+          -3.9661312103271484 -1.497599244117737 1.3702905178070066,
+          -3.8937597274780273 1.497600436210632 1.4258232116699217,
+          -3.9661307334899902 1.497600436210632 1.370290160179138,
+          -4.021663665771484 -1.4975991249084475 1.2979195117950437,
+          -4.021663665771484 1.4976005554199217 1.297919154167175,
+          -4.056572914123535 -1.4975991249084475 1.2136416435241697,
+          -4.056572914123535 1.4976005554199217 1.213641285896301,
+          -4.068479537963867 -1.4975991249084475 1.1231995820999143,
+          -4.068479537963867 1.4976005554199217 1.1231992244720457,
+          -4.068479537963867 1.497600436210632 0.3494392633438107,
+          -4.068479537963867 -1.497599244117737 0.3494396209716796,
+          -4.056572914123535 1.497600436210632 0.2589974999427792,
+          -4.056572914123535 -1.497599244117737 0.2589978575706481,
+          -4.021663665771484 -1.497599244117737 0.17471963167190535,
+          -4.021663665771484 1.497600436210632 0.17471927404403653,
+          -3.9661309719085693 -1.4975993633270266 0.10234820842742906,
+          -3.8937599658966064 -1.4975993633270266 0.046815730631351325,
+          -3.966130495071411 1.4976003170013426 0.10234785825014081,
+          -3.8937594890594482 1.4976003170013426 0.04681537672877279,
+          -3.8094820976257324 -1.4975993633270266 0.011906543746590474,
+          -3.809481620788574 1.4976003170013426 0.011906187050044212,
+          -3.7190399169921875 -1.4975993633270266 -3.211581544288128e-7,
+          -3.7190394401550293 1.4976003170013426 -6.78213723723469e-7,
+          -2.4710395336151123 1.497600197792053 -5.105338803034022e-7,
+          -2.4710400104522705 -1.4975994825363161 -1.534782683761819e-7,
+          -2.4710400104522705 -1.4975994825363161 0.19967983663082117,
+          -2.4710395336151123 1.497600197792053 0.19967947900295235,
+          -3.7190394401550293 1.4976003170013426 0.19967930018901794,
+          -3.7190399169921875 -1.4975993633270266 0.19967965781688676,
+          -3.8687994480133057 1.4976003170013426 0.3494392931461331,
+          -3.868799924850464 -1.4975993633270266 0.34943965077400196,
+          -3.863697052001953 -1.4975993633270266 0.310678869485855,
+          -3.863696575164795 1.4976003170013426 0.3106785118579861,
+          -3.8487355709075928 1.4976003170013426 0.2745592892169949,
+          -3.848736047744751 -1.4975993633270266 0.2745596468448638,
+          -3.8249361515045166 -1.4975993633270266 0.24354334175586687,
+          -3.8249356746673584 1.4976003170013426 0.24354299902915924,
+          -3.793919324874878 1.4976003170013426 0.21974334120750397,
+          -3.793919801712036 -1.4975993633270266 0.21974369883537279,
+          -3.757800817489624 -1.4975993633270266 0.2047825753688811,
+          -3.757800340652466 1.4976003170013426 0.20478221774101227,
+          -3.8687996864318848 1.497600436210632 1.1231992244720457,
+          -3.868800163269043 -1.497599244117737 1.1231995820999143,
+          -3.757801055908203 -1.497599244117737 1.26785671710968,
+          -3.757800579071045 1.497600436210632 1.2678563594818113,
+          -3.793919563293457 1.497600436210632 1.2528953552246092,
+          -3.7939200401306152 -1.497599244117737 1.2528957128524778,
+          -3.8249363899230957 -1.497599244117737 1.2290958166122434,
+          -3.8249359130859375 1.497600436210632 1.2290954589843748,
+          -3.84873628616333 -1.497599244117737 1.1980795860290525,
+          -3.848735809326172 1.497600436210632 1.1980792284011839,
+          -3.863696813583374 1.497600436210632 1.1619601249694822,
+          -3.8636972904205322 -1.497599244117737 1.1619604825973509,
+          3.7190396785736084 1.4975994825363161 1.272960186004639,
+          3.71903920173645 -1.497600197792053 1.2729605436325075,
+          3.5412161350250244 -1.497600197792053 1.272960424423218,
+          3.5412166118621826 1.4975994825363161 1.2729600667953493,
+          3.569279670715332 1.4975994825363161 1.4726402759552004,
+          3.569279193878174 -1.497600197792053 1.472640633583069,
+          3.7190396785736084 1.4975994825363161 1.4726402759552004,
+          3.71903920173645 -1.497600197792053 1.472640633583069,
+          3.8094818592071533 1.4975994825363161 1.4607332944869997,
+          3.809481382369995 -1.497600197792053 1.4607336521148684,
+          3.893759250640869 -1.497600197792053 1.4258246421813967,
+          3.8937597274780273 1.4975994825363161 1.425824284553528,
+          3.966130256652832 -1.497600197792053 1.370291590690613,
+          3.9661307334899902 1.4975994825363161 1.3702912330627444,
+          4.021663665771484 1.4975993633270266 1.2979202270507815,
+          4.021663665771484 -1.4976003170013426 1.2979205846786501,
+          4.056572914123535 1.4975993633270266 1.2136423587799074,
+          4.056572914123535 -1.4976003170013426 1.213642716407776,
+          4.068479537963867 -1.4976003170013426 1.1232006549835207,
+          4.068479537963867 1.4975993633270266 1.123200297355652,
+          4.068479537963867 1.497599244117737 0.3494403362274171,
+          4.068479537963867 -1.497600436210632 0.349440693855286,
+          4.056572914123535 1.497599244117737 0.2589985728263856,
+          4.056572914123535 -1.497600436210632 0.2589989304542545,
+          4.021663665771484 1.497599244117737 0.174720346927643,
+          4.021663665771484 -1.497600436210632 0.1747207045555118,
+          3.966130495071411 -1.4976003170013426 0.10234927386045489,
+          3.9661309719085693 1.4975993633270266 0.10234892368316664,
+          3.8937594890594482 -1.4976003170013426 0.046816777437925665,
+          3.8937599658966064 1.4975993633270266 0.04681642353534713,
+          3.8094820976257324 1.4975993633270266 0.01190721057355418,
+          3.809481620788574 -1.4976003170013426 0.011907567270100441,
+          3.7190399169921875 1.4975993633270266 3.211581544288128e-7,
+          3.7190394401550293 -1.4976003170013426 6.78213723723469e-7,
+          2.4710400104522705 1.4975994825363161 1.534782683761819e-7,
+          2.4710395336151123 -1.497600197792053 5.105338803034022e-7,
+          2.4710395336151123 -1.497600197792053 0.19968049228191398,
+          2.4710400104522705 1.4975994825363161 0.19968013465404516,
+          3.7190399169921875 1.4975993633270266 0.19968031346797957,
+          3.7190394401550293 -1.4976003170013426 0.1996806710958484,
+          3.863696575164795 -1.4976003170013426 0.3106798827648166,
+          3.8687994480133057 -1.4976003170013426 0.3494406640529636,
+          3.868799924850464 1.4975993633270266 0.3494403064250947,
+          3.863697052001953 1.4975993633270266 0.31067952513694774,
+          3.8487355709075928 -1.4976003170013426 0.2745606601238254,
+          3.848736047744751 1.4975993633270266 0.27456030249595653,
+          3.8249356746673584 -1.4976003170013426 0.24354436993598969,
+          3.8249361515045166 1.4975993633270266 0.24354402720928206,
+          3.793919324874878 -1.4976003170013426 0.2197447121143344,
+          3.793919801712036 1.4975993633270266 0.2197443544864656,
+          3.757800340652466 -1.4976003170013426 0.2047835886478427,
+          3.757800817489624 1.4975993633270266 0.2047832310199739,
+          3.8687996864318848 1.4975994825363161 1.123200297355652,
+          3.8687992095947266 -1.497600197792053 1.1232006549835207,
+          3.7578001022338867 -1.497600197792053 1.2678577899932864,
+          3.757800579071045 1.4975994825363161 1.2678574323654177,
+          3.793919086456299 -1.497600197792053 1.2528967857360842,
+          3.793919563293457 1.4975994825363161 1.2528964281082156,
+          3.8249354362487793 -1.497600197792053 1.2290968894958498,
+          3.8487353324890137 -1.497600197792053 1.198080658912659,
+          3.8249359130859375 1.4975994825363161 1.2290965318679812,
+          3.848735809326172 1.4975994825363161 1.1980803012847903,
+          3.863696336746216 -1.497600197792053 1.1619615554809573,
+          3.863696813583374 1.4975994825363161 1.1619611978530886 ] }
+        coordIndex [
+          0, 1, 2, -1,
+          0, 2, 3, -1,
+          0, 3, 4, -1,
+          0, 4, 5, -1,
+          0, 5, 1, -1,
+          1, 5, 7, -1,
+          1, 7, 9, -1,
+          1, 9, 54, -1,
+          1, 54, 2, -1,
+          2, 4, 3, -1,
+          2, 6, 4, -1,
+          2, 8, 6, -1,
+          2, 54, 55, -1,
+          2, 55, 8, -1,
+          4, 6, 5, -1,
+          5, 6, 7, -1,
+          6, 8, 7, -1,
+          7, 8, 9, -1,
+          8, 10, 9, -1,
+          8, 12, 10, -1,
+          8, 55, 56, -1,
+          8, 56, 12, -1,
+          9, 10, 57, -1,
+          9, 57, 54, -1,
+          10, 11, 58, -1,
+          10, 12, 11, -1,
+          10, 58, 57, -1,
+          11, 12, 13, -1,
+          11, 13, 15, -1,
+          11, 14, 58, -1,
+          11, 15, 14, -1,
+          12, 56, 59, -1,
+          12, 59, 13, -1,
+          13, 59, 15, -1,
+          14, 15, 17, -1,
+          14, 16, 60, -1,
+          14, 17, 16, -1,
+          14, 60, 58, -1,
+          15, 59, 61, -1,
+          15, 61, 17, -1,
+          16, 17, 18, -1,
+          16, 18, 53, -1,
+          16, 53, 63, -1,
+          16, 63, 60, -1,
+          17, 19, 18, -1,
+          17, 52, 19, -1,
+          17, 61, 62, -1,
+          17, 62, 52, -1,
+          18, 19, 20, -1,
+          18, 20, 21, -1,
+          18, 21, 53, -1,
+          19, 52, 20, -1,
+          20, 22, 21, -1,
+          20, 40, 43, -1,
+          20, 43, 22, -1,
+          20, 52, 40, -1,
+          21, 22, 23, -1,
+          21, 23, 42, -1,
+          21, 41, 53, -1,
+          21, 42, 41, -1,
+          22, 25, 23, -1,
+          22, 43, 44, -1,
+          22, 44, 25, -1,
+          23, 24, 45, -1,
+          23, 25, 24, -1,
+          23, 45, 42, -1,
+          24, 25, 26, -1,
+          24, 26, 45, -1,
+          25, 28, 26, -1,
+          25, 44, 28, -1,
+          26, 27, 49, -1,
+          26, 28, 27, -1,
+          26, 46, 45, -1,
+          26, 49, 46, -1,
+          27, 28, 29, -1,
+          27, 29, 31, -1,
+          27, 30, 50, -1,
+          27, 31, 30, -1,
+          27, 50, 49, -1,
+          28, 44, 47, -1,
+          28, 47, 29, -1,
+          29, 47, 48, -1,
+          29, 48, 31, -1,
+          30, 31, 33, -1,
+          30, 32, 39, -1,
+          30, 33, 32, -1,
+          30, 39, 50, -1,
+          31, 48, 51, -1,
+          31, 51, 33, -1,
+          32, 33, 34, -1,
+          32, 34, 35, -1,
+          32, 35, 36, -1,
+          32, 36, 39, -1,
+          33, 38, 34, -1,
+          33, 51, 38, -1,
+          34, 36, 35, -1,
+          34, 37, 36, -1,
+          34, 38, 37, -1,
+          36, 37, 38, -1,
+          36, 38, 39, -1,
+          38, 50, 39, -1,
+          38, 51, 50, -1,
+          40, 41, 42, -1,
+          40, 42, 43, -1,
+          40, 52, 41, -1,
+          41, 52, 53, -1,
+          42, 44, 43, -1,
+          42, 45, 44, -1,
+          44, 45, 46, -1,
+          44, 46, 47, -1,
+          46, 48, 47, -1,
+          46, 49, 48, -1,
+          48, 49, 50, -1,
+          48, 50, 51, -1,
+          52, 62, 63, -1,
+          52, 63, 53, -1,
+          54, 56, 55, -1,
+          54, 57, 56, -1,
+          56, 57, 58, -1,
+          56, 58, 59, -1,
+          58, 60, 59, -1,
+          59, 60, 61, -1,
+          60, 62, 61, -1,
+          60, 63, 62, -1,
+          64, 65, 66, -1,
+          64, 66, 67, -1,
+          64, 67, 68, -1,
+          64, 68, 70, -1,
+          64, 70, 72, -1,
+          64, 72, 119, -1,
+          64, 118, 65, -1,
+          64, 119, 118, -1,
+          65, 69, 66, -1,
+          65, 71, 69, -1,
+          65, 73, 71, -1,
+          65, 118, 73, -1,
+          66, 68, 67, -1,
+          66, 69, 68, -1,
+          68, 69, 70, -1,
+          69, 71, 70, -1,
+          70, 71, 72, -1,
+          71, 73, 72, -1,
+          72, 73, 74, -1,
+          72, 74, 75, -1,
+          72, 75, 121, -1,
+          72, 121, 119, -1,
+          73, 118, 120, -1,
+          73, 120, 74, -1,
+          74, 76, 75, -1,
+          74, 120, 122, -1,
+          74, 122, 76, -1,
+          75, 76, 77, -1,
+          75, 77, 121, -1,
+          76, 78, 77, -1,
+          76, 79, 78, -1,
+          76, 122, 123, -1,
+          76, 123, 79, -1,
+          77, 78, 125, -1,
+          77, 124, 121, -1,
+          77, 125, 124, -1,
+          78, 79, 80, -1,
+          78, 80, 127, -1,
+          78, 127, 125, -1,
+          79, 81, 80, -1,
+          79, 123, 81, -1,
+          80, 81, 82, -1,
+          80, 82, 83, -1,
+          80, 83, 116, -1,
+          80, 116, 127, -1,
+          81, 123, 126, -1,
+          81, 126, 82, -1,
+          82, 84, 83, -1,
+          82, 85, 84, -1,
+          82, 117, 85, -1,
+          82, 126, 117, -1,
+          83, 84, 116, -1,
+          84, 85, 86, -1,
+          84, 86, 106, -1,
+          84, 106, 116, -1,
+          85, 87, 86, -1,
+          85, 105, 87, -1,
+          85, 117, 105, -1,
+          86, 87, 88, -1,
+          86, 88, 109, -1,
+          86, 107, 106, -1,
+          86, 109, 107, -1,
+          87, 89, 88, -1,
+          87, 104, 108, -1,
+          87, 105, 104, -1,
+          87, 108, 89, -1,
+          88, 89, 90, -1,
+          88, 90, 91, -1,
+          88, 91, 111, -1,
+          88, 111, 109, -1,
+          89, 108, 90, -1,
+          90, 92, 91, -1,
+          90, 108, 110, -1,
+          90, 110, 112, -1,
+          90, 112, 92, -1,
+          91, 92, 93, -1,
+          91, 93, 111, -1,
+          92, 94, 93, -1,
+          92, 95, 94, -1,
+          92, 112, 114, -1,
+          92, 114, 95, -1,
+          93, 94, 113, -1,
+          93, 113, 111, -1,
+          94, 95, 96, -1,
+          94, 96, 102, -1,
+          94, 102, 115, -1,
+          94, 115, 113, -1,
+          95, 97, 96, -1,
+          95, 114, 97, -1,
+          96, 97, 98, -1,
+          96, 98, 101, -1,
+          96, 101, 102, -1,
+          97, 99, 98, -1,
+          97, 100, 99, -1,
+          97, 103, 100, -1,
+          97, 114, 103, -1,
+          98, 99, 100, -1,
+          98, 100, 101, -1,
+          100, 102, 101, -1,
+          100, 103, 102, -1,
+          102, 103, 114, -1,
+          102, 114, 115, -1,
+          104, 105, 106, -1,
+          104, 106, 107, -1,
+          104, 107, 109, -1,
+          104, 109, 108, -1,
+          105, 116, 106, -1,
+          105, 117, 116, -1,
+          108, 109, 110, -1,
+          109, 111, 110, -1,
+          110, 111, 113, -1,
+          110, 113, 112, -1,
+          112, 113, 114, -1,
+          113, 115, 114, -1,
+          116, 117, 126, -1,
+          116, 126, 127, -1,
+          118, 119, 121, -1,
+          118, 121, 120, -1,
+          120, 121, 122, -1,
+          121, 124, 122, -1,
+          122, 124, 123, -1,
+          123, 124, 125, -1,
+          123, 125, 127, -1,
+          123, 127, 126, -1 ]
+        normal Normal { vector [
+          0.7052408556396815 -0.35608574288731887 -0.6130565057553798,
+          0.02919797059627479 -0.8948100097300868 -0.44549132988185186,
+          0.046195723388586726 0.7078640541579484 -0.7048364604443205,
+          0.6002559894980254 0.6061544257853124 -0.5217945564804453,
+          0.6406621680110433 0.646958210853391 0.41351790757930806,
+          0.3203310796547041 -0.6469582230602575 0.6919776419957264,
+          -0.036249319353530006 0.5554318011448461 0.8307716299461592,
+          -0.07249864738151755 -0.5554316521843259 0.8283958147405384,
+          -0.1822248650838502 0.7101379583744324 0.6800721863309552,
+          -0.1149532284950596 -0.8959549175770252 0.4290111198187162,
+          -0.3251197195415908 -0.7097992915134241 0.6248856965335647,
+          -0.6313635062006099 -0.4502924112565413 0.631361122815495,
+          -0.37861106576282855 0.7097994193157027 0.5940020582632911,
+          -0.4978475315806206 0.7101376806686194 0.4978476773006751,
+          -0.6248861291195056 -0.7097989906377589 0.32511954497332146,
+          -0.5940023452903034 0.7097994526611361 0.37861055293212664,
+          -0.4290114489399954 -0.8959547870632633 0.11495301743246508,
+          -0.6800720027180935 0.7101382685644017 0.18222434151165212,
+          -0.8921291511617444 -0.4479806078616582 0.058471810535714534,
+          -0.7048361329482377 0.707864349514618 0.04619619439760221,
+          -0.5986986193104895 0.8005482952572822 -0.02612259934181288,
+          -0.5969871044167182 -0.800547843037335 -0.052245077934794444,
+          -0.6877408259461418 0.7097994748913921 -0.15230647317439522,
+          -0.671755121993985 -0.7097990731411771 -0.21196776132886935,
+          -0.6097361384224818 -0.7101377441352378 -0.35203156940273944,
+          -0.7732564739067153 0.4502929476952693 -0.4464422547399148,
+          -0.44029516040433 -0.8021895823418863 -0.4032766366982786,
+          -0.39875916182468535 -0.6032981449384206 -0.6906681396841283,
+          -0.47577244726602613 0.7097990735946809 -0.5194476427385432,
+          -0.27570181256072124 0.8342397926381081 -0.4775274640582042,
+          -0.15230768409207845 -0.7097992776826777 -0.6877407613102897,
+          -0.21196856617134002 0.7097992264629053 -0.6717547060258882,
+          -0.030794396250818864 -0.7077799279359727 -0.705761488585554,
+          -0.061588782686824085 0.7077798534214786 -0.7037432066725939,
+          0.5773504112501179 0.5773501177893892 -0.5773502785293327,
+          0.5773502305586289 -0.5773503688750885 -0.5773502081351469,
+          0.5773501696156635 -0.5773503304659015 0.5773503074872991,
+          0.5773502584662754 0.5773502630620073 0.5773502860405941,
+          0.05228154582967288 0.6008230230837952 0.7976705679026331,
+          0.036224873130739806 -0.8325983699428818 0.5526913360413007,
+          0.8283960609618359 0.5554314600937186 0.07249730561251298,
+          0.8307715598581996 -0.5554319380827635 0.03624882740723074,
+          0.7703412582754837 -0.6032983636840747 0.20641082862743024,
+          0.5326138902233847 0.8342395431699431 0.14271239803435762,
+          0.6097356149986534 0.7101378905154256 0.3520321807115299,
+          0.38463985462621786 -0.8959551834370293 0.22207316700907637,
+          0.6313603767813953 -0.450292709373575 0.6313640396122191,
+          0.3898989415327206 0.8342397003111836 0.38990118981143235,
+          0.3987589175939198 0.6032980221448093 0.6906683879514732,
+          0.2757016317456289 -0.8342397086913999 0.4775277151069727,
+          0.2064131123458202 -0.6032982019875319 0.7703407729896704,
+          0.14271385526486907 0.8342398790166875 0.5326129737188726,
+          0.704836589954878 0.707863873854675 -0.046196510173737194,
+          0.44549081982086963 -0.8948102520899337 -0.02919832546702848,
+          0.23109252057344024 -0.4502930526847962 -0.8624571952501883,
+          0.18222317450597736 0.7101380097566434 -0.6800725856640875,
+          0.3987596326525491 0.6032981149283655 -0.6906678940639159,
+          0.2757020597630062 -0.8342398762281608 -0.47752717530341554,
+          0.40327628774778007 -0.8021896216861195 -0.44029540833337133,
+          0.4402948491921192 0.802189423324044 -0.40327729279235003,
+          0.6906674586944024 -0.6032985576277653 -0.3987597169535483,
+          0.47752740884200096 0.83423963380097 -0.27570238881857395,
+          0.7916146236369541 0.5576308854687845 -0.2497880766077971,
+          0.8104525949856979 -0.5576314044252495 -0.17948205503523784,
+          -0.0461952493812762 0.7078640770140141 -0.7048364685568557,
+          -0.02919767116284901 -0.894810015713306 -0.445491337489091,
+          -0.7052403901096969 -0.35608575716897256 -0.613057032990669,
+          -0.6002553780166713 0.6061548060949016 -0.5217948181135142,
+          -0.6406621201265233 0.6469583515237529 0.41351776168461757,
+          -0.3203311191242283 -0.6469581858194293 0.6919776585424218,
+          0.03624931958591336 0.5554317931637313 0.8307716352719804,
+          0.07249864645198491 -0.5554316681465586 0.8283958041193602,
+          0.18222487259199066 0.7101379296133974 0.6800722143517043,
+          0.11495322472539532 -0.8959549247971534 0.4290111057501422,
+          0.32511969565267584 -0.7097993428776949 0.6248856506186585,
+          0.44616563645073554 0.5576312772291769 0.6999882738348313,
+          0.5639285109791761 -0.6032977507147805 0.5639294800658109,
+          0.314058547407466 0.895954759500285 0.3140577936130524,
+          0.5940019272499489 0.7097991290574824 0.3786118154688064,
+          0.736381005782502 -0.557631414075067 0.3831321186736919,
+          0.7703411998859557 0.6032980955588988 0.20641183021637044,
+          0.5326128957378053 -0.8342400994893793 0.14271285750674406,
+          0.7976705503546024 -0.6008231104616061 0.05228080940676125,
+          0.7048365564425634 0.7078639260046987 0.04619622239321783,
+          0.7057617812458888 0.7077796522959384 -0.03079402423313235,
+          0.7037430584540865 -0.7077800853062617 -0.06158781146906612,
+          0.5829455362654786 0.8021895281110856 -0.12909865505522225,
+          0.569394745575391 -0.802189999571523 -0.17966866253906272,
+          0.6906683225232306 0.6032979896469721 -0.39875908008579375,
+          0.6097344959847004 -0.7101382630158517 -0.3520333674626775,
+          0.4402947429209428 -0.8021896728745941 -0.4032769124181704,
+          0.5606646195649554 0.5576309160745312 -0.612129843910557,
+          0.39875926935976647 -0.6032982238278904 -0.6906680086885287,
+          0.27570192866371096 0.834239764715565 -0.47752744580644646,
+          0.17966962087245406 0.8021897090554441 -0.5693948524715435,
+          0.17948371587147818 -0.5576312394767072 -0.8104523406694794,
+          0.061589037081771325 0.7077798406240264 -0.7037431972797803,
+          0.026123029692879184 -0.8005481138746268 -0.5986988430684018,
+          -0.6666665932905609 0.3333333840123948 -0.6666667147032341,
+          -0.5773502619369502 -0.5773502612715156 -0.5773502843604112,
+          -0.577350414720787 -0.5773501159988984 0.5773502768491532,
+          -0.40824823630276263 0.8164966253398254 0.4082482558007575,
+          -0.052281602540663906 0.6008230319183464 0.7976705575312566,
+          -0.04619703273403665 -0.7078641072624083 0.7048363212946421,
+          -0.8624573068293627 -0.4502925657175088 0.23109305302450267,
+          -0.7057618249285446 -0.7077796077874443 0.030794046076829614,
+          -0.7037429650440004 0.7077801516169098 0.0615881167776985,
+          -0.6800722939823459 0.7101382074580338 0.18222349262891513,
+          -0.3846407369619067 -0.895954842703795 0.22207301345507804,
+          -0.6906678476477609 0.6032985662015047 0.39875903029877324,
+          -0.6313604606460168 -0.4502925364799578 0.6313640790568429,
+          -0.3140567857848926 0.8959549481450761 0.3140590170601951,
+          -0.2757017203158399 -0.8342396870500354 0.4775277017781749,
+          -0.3987589885855017 0.6032981105364361 0.6906682697543255,
+          -0.18222555398420864 -0.7101379787131675 0.680071980502303,
+          -0.18222552546038204 0.7101380879774372 0.6800718740504105,
+          -0.7048360473887966 0.7078644022017923 -0.0461966924880746,
+          -0.5526917250566553 -0.8325981218729966 -0.036224639507623474,
+          -0.23109252823013562 -0.45029299402409717 -0.8624572238256333,
+          -0.1822231669979785 0.7101380385173974 -0.6800725576435872,
+          -0.2757020799534269 -0.8342398495380347 -0.47752721027404454,
+          -0.35203280623959887 0.7101379958354445 -0.6097351311855758,
+          -0.4757733696880282 -0.7097989775224831 -0.5194469291503573,
+          -0.6097352280745411 -0.7101378879381647 -0.3520328560796709,
+          -0.6121292364858857 0.5576308860651742 -0.560665312593329,
+          -0.47752665378107967 0.8342400618625657 -0.2757024013536833,
+          -0.6877413153453067 -0.7097989852192924 -0.15230654532478285,
+          -0.6717548431196252 0.7097994951748211 -0.21196723188950026 ] }
+        normalIndex [
+          0, 1, 2, -1,
+          0, 2, 3, -1,
+          0, 3, 4, -1,
+          0, 4, 5, -1,
+          0, 5, 1, -1,
+          1, 5, 7, -1,
+          1, 7, 9, -1,
+          1, 9, 54, -1,
+          1, 54, 2, -1,
+          2, 4, 3, -1,
+          2, 6, 4, -1,
+          2, 8, 6, -1,
+          2, 54, 55, -1,
+          2, 55, 8, -1,
+          4, 6, 5, -1,
+          5, 6, 7, -1,
+          6, 8, 7, -1,
+          7, 8, 9, -1,
+          8, 10, 9, -1,
+          8, 12, 10, -1,
+          8, 55, 56, -1,
+          8, 56, 12, -1,
+          9, 10, 57, -1,
+          9, 57, 54, -1,
+          10, 11, 58, -1,
+          10, 12, 11, -1,
+          10, 58, 57, -1,
+          11, 12, 13, -1,
+          11, 13, 15, -1,
+          11, 14, 58, -1,
+          11, 15, 14, -1,
+          12, 56, 59, -1,
+          12, 59, 13, -1,
+          13, 59, 15, -1,
+          14, 15, 17, -1,
+          14, 16, 60, -1,
+          14, 17, 16, -1,
+          14, 60, 58, -1,
+          15, 59, 61, -1,
+          15, 61, 17, -1,
+          16, 17, 18, -1,
+          16, 18, 53, -1,
+          16, 53, 63, -1,
+          16, 63, 60, -1,
+          17, 19, 18, -1,
+          17, 52, 19, -1,
+          17, 61, 62, -1,
+          17, 62, 52, -1,
+          18, 19, 20, -1,
+          18, 20, 21, -1,
+          18, 21, 53, -1,
+          19, 52, 20, -1,
+          20, 22, 21, -1,
+          20, 40, 43, -1,
+          20, 43, 22, -1,
+          20, 52, 40, -1,
+          21, 22, 23, -1,
+          21, 23, 42, -1,
+          21, 41, 53, -1,
+          21, 42, 41, -1,
+          22, 25, 23, -1,
+          22, 43, 44, -1,
+          22, 44, 25, -1,
+          23, 24, 45, -1,
+          23, 25, 24, -1,
+          23, 45, 42, -1,
+          24, 25, 26, -1,
+          24, 26, 45, -1,
+          25, 28, 26, -1,
+          25, 44, 28, -1,
+          26, 27, 49, -1,
+          26, 28, 27, -1,
+          26, 46, 45, -1,
+          26, 49, 46, -1,
+          27, 28, 29, -1,
+          27, 29, 31, -1,
+          27, 30, 50, -1,
+          27, 31, 30, -1,
+          27, 50, 49, -1,
+          28, 44, 47, -1,
+          28, 47, 29, -1,
+          29, 47, 48, -1,
+          29, 48, 31, -1,
+          30, 31, 33, -1,
+          30, 32, 39, -1,
+          30, 33, 32, -1,
+          30, 39, 50, -1,
+          31, 48, 51, -1,
+          31, 51, 33, -1,
+          32, 33, 34, -1,
+          32, 34, 35, -1,
+          32, 35, 36, -1,
+          32, 36, 39, -1,
+          33, 38, 34, -1,
+          33, 51, 38, -1,
+          34, 36, 35, -1,
+          34, 37, 36, -1,
+          34, 38, 37, -1,
+          36, 37, 38, -1,
+          36, 38, 39, -1,
+          38, 50, 39, -1,
+          38, 51, 50, -1,
+          40, 41, 42, -1,
+          40, 42, 43, -1,
+          40, 52, 41, -1,
+          41, 52, 53, -1,
+          42, 44, 43, -1,
+          42, 45, 44, -1,
+          44, 45, 46, -1,
+          44, 46, 47, -1,
+          46, 48, 47, -1,
+          46, 49, 48, -1,
+          48, 49, 50, -1,
+          48, 50, 51, -1,
+          52, 62, 63, -1,
+          52, 63, 53, -1,
+          54, 56, 55, -1,
+          54, 57, 56, -1,
+          56, 57, 58, -1,
+          56, 58, 59, -1,
+          58, 60, 59, -1,
+          59, 60, 61, -1,
+          60, 62, 61, -1,
+          60, 63, 62, -1,
+          64, 65, 66, -1,
+          64, 66, 67, -1,
+          64, 67, 68, -1,
+          64, 68, 70, -1,
+          64, 70, 72, -1,
+          64, 72, 119, -1,
+          64, 118, 65, -1,
+          64, 119, 118, -1,
+          65, 69, 66, -1,
+          65, 71, 69, -1,
+          65, 73, 71, -1,
+          65, 118, 73, -1,
+          66, 68, 67, -1,
+          66, 69, 68, -1,
+          68, 69, 70, -1,
+          69, 71, 70, -1,
+          70, 71, 72, -1,
+          71, 73, 72, -1,
+          72, 73, 74, -1,
+          72, 74, 75, -1,
+          72, 75, 121, -1,
+          72, 121, 119, -1,
+          73, 118, 120, -1,
+          73, 120, 74, -1,
+          74, 76, 75, -1,
+          74, 120, 122, -1,
+          74, 122, 76, -1,
+          75, 76, 77, -1,
+          75, 77, 121, -1,
+          76, 78, 77, -1,
+          76, 79, 78, -1,
+          76, 122, 123, -1,
+          76, 123, 79, -1,
+          77, 78, 125, -1,
+          77, 124, 121, -1,
+          77, 125, 124, -1,
+          78, 79, 80, -1,
+          78, 80, 127, -1,
+          78, 127, 125, -1,
+          79, 81, 80, -1,
+          79, 123, 81, -1,
+          80, 81, 82, -1,
+          80, 82, 83, -1,
+          80, 83, 116, -1,
+          80, 116, 127, -1,
+          81, 123, 126, -1,
+          81, 126, 82, -1,
+          82, 84, 83, -1,
+          82, 85, 84, -1,
+          82, 117, 85, -1,
+          82, 126, 117, -1,
+          83, 84, 116, -1,
+          84, 85, 86, -1,
+          84, 86, 106, -1,
+          84, 106, 116, -1,
+          85, 87, 86, -1,
+          85, 105, 87, -1,
+          85, 117, 105, -1,
+          86, 87, 88, -1,
+          86, 88, 109, -1,
+          86, 107, 106, -1,
+          86, 109, 107, -1,
+          87, 89, 88, -1,
+          87, 104, 108, -1,
+          87, 105, 104, -1,
+          87, 108, 89, -1,
+          88, 89, 90, -1,
+          88, 90, 91, -1,
+          88, 91, 111, -1,
+          88, 111, 109, -1,
+          89, 108, 90, -1,
+          90, 92, 91, -1,
+          90, 108, 110, -1,
+          90, 110, 112, -1,
+          90, 112, 92, -1,
+          91, 92, 93, -1,
+          91, 93, 111, -1,
+          92, 94, 93, -1,
+          92, 95, 94, -1,
+          92, 112, 114, -1,
+          92, 114, 95, -1,
+          93, 94, 113, -1,
+          93, 113, 111, -1,
+          94, 95, 96, -1,
+          94, 96, 102, -1,
+          94, 102, 115, -1,
+          94, 115, 113, -1,
+          95, 97, 96, -1,
+          95, 114, 97, -1,
+          96, 97, 98, -1,
+          96, 98, 101, -1,
+          96, 101, 102, -1,
+          97, 99, 98, -1,
+          97, 100, 99, -1,
+          97, 103, 100, -1,
+          97, 114, 103, -1,
+          98, 99, 100, -1,
+          98, 100, 101, -1,
+          100, 102, 101, -1,
+          100, 103, 102, -1,
+          102, 103, 114, -1,
+          102, 114, 115, -1,
+          104, 105, 106, -1,
+          104, 106, 107, -1,
+          104, 107, 109, -1,
+          104, 109, 108, -1,
+          105, 116, 106, -1,
+          105, 117, 116, -1,
+          108, 109, 110, -1,
+          109, 111, 110, -1,
+          110, 111, 113, -1,
+          110, 113, 112, -1,
+          112, 113, 114, -1,
+          113, 115, 114, -1,
+          116, 117, 126, -1,
+          116, 126, 127, -1,
+          118, 119, 121, -1,
+          118, 121, 120, -1,
+          120, 121, 122, -1,
+          121, 124, 122, -1,
+          122, 124, 123, -1,
+          123, 124, 125, -1,
+          123, 125, 127, -1,
+          123, 127, 126, -1 ]
+      }
+    }
+  ]
+}
+
+DEF DoCN214Ab_Tex Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material DEF MaterialCO003 Material {
+          diffuseColor 0.1568627450980392 0.1568627450980392 0.1568627450980392
+          emissiveColor 0.0 0.0 0.0
+          specularColor 1.0 1.0 1.0
+          ambientIntensity 0.1568627450980392
+          transparency 0.0
+          shininess 1.0
+        }
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          -0.1070428714156153 0.9865609407424928 2.6657276153564453,
+          -0.057919450104236825 0.9830852746963502 2.6457595825195313,
+          -0.05791945382952713 0.9830852746963502 2.6657276153564453,
+          -0.1070428714156153 0.9865609407424928 2.6457595825195313,
+          -0.15523953735828422 0.9969881772994996 2.6657276153564453,
+          -0.15523953735828422 0.9969881772994996 2.6457595825195313,
+          -0.20250926911830924 1.0143667459487917 2.6457595825195313,
+          -0.20250926911830924 1.0143667459487917 2.6657276153564453,
+          -0.2715022861957552 1.0501663684844973 2.6457595825195313,
+          -0.2715022861957552 1.0501663684844973 2.6657276153564453,
+          -0.3394525945186617 1.096394181251526 2.6457595825195313,
+          -0.3394525945186617 1.096394181251526 2.6657276153564453,
+          -0.4715298116207125 1.2117874622344973 2.6457595825195313,
+          -0.4715298116207125 1.2117874622344973 2.6657276153564453,
+          -0.5980459451675417 1.3403893709182741 2.6457595825195313,
+          -0.5980459451675417 1.3403893709182741 2.6657276153564453,
+          -0.6800728440284731 1.4245015382766726 2.6457595825195313,
+          -0.6800728440284731 1.4245015382766726 2.6657276153564453,
+          -0.7760027050971987 1.5259928703308108 2.6657276153564453,
+          -0.7760027050971987 1.5259928703308108 2.6457595825195313,
+          -0.869151830673218 1.614971160888672 2.6457595825195313,
+          -0.869151830673218 1.614971160888672 2.6657276153564453,
+          -0.8975754976272585 1.634666681289673 2.6457595825195313,
+          -0.8975754976272585 1.634666681289673 2.6657276153564453,
+          -0.9235275387763979 1.6464837789535525 2.6457595825195313,
+          -0.9235275387763979 1.6464837789535525 2.6657276153564453,
+          -0.9355766773223879 1.6494380235672 2.6657276153564453,
+          -0.9355766773223879 1.6494380235672 2.6457595825195313,
+          -0.9470078945159914 1.6504234075546267 2.6657276153564453,
+          -0.9470078945159914 1.6504234075546267 2.6457595825195313,
+          -0.947008013725281 0.9385961890220642 2.6457595825195313,
+          -0.947008013725281 0.9385961890220642 2.6657276153564453,
+          -1.1249643564224245 0.938596248626709 2.6457595825195313,
+          -1.1249643564224245 0.938596248626709 2.6657276153564453,
+          -1.1249642372131352 1.826294541358948 2.645759344100952,
+          -1.1249642372131352 1.826294541358948 2.665727376937866,
+          -1.0999392271041875 1.8283802270889284 2.665727376937866,
+          -1.0999392271041875 1.8283802270889284 2.645759344100952,
+          -1.0770001411437993 1.8283802270889284 2.645759344100952,
+          -1.0770001411437993 1.8283802270889284 2.665727376937866,
+          -0.9931018948554995 1.8212395906448366 2.6457595825195313,
+          -0.9931018948554995 1.8212395906448366 2.6657276153564453,
+          -0.9433155059814455 1.8095254898071291 2.6457595825195313,
+          -0.9433155059814455 1.8095254898071291 2.6657276153564453,
+          -0.8955673575401308 1.792232155799866 2.6457595825195313,
+          -0.8955673575401308 1.792232155799866 2.6657276153564453,
+          -0.8133665919303896 1.7505240440368655 2.6657276153564453,
+          -0.8133665919303896 1.7505240440368655 2.6457595825195313,
+          -0.7363794445991518 1.6976926326751711 2.6457595825195313,
+          -0.7363794445991518 1.6976926326751711 2.6657276153564453,
+          -0.5952652692794802 1.5732620954513552 2.6457595825195313,
+          -0.5952652692794802 1.5732620954513552 2.6657276153564453,
+          -0.4673589169979098 1.4432704448699953 2.6457595825195313,
+          -0.4673589169979098 1.4432704448699953 2.6657276153564453,
+          -0.37003883719444297 1.3424748182296755 2.6457595825195313,
+          -0.37003883719444297 1.3424748182296755 2.6657276153564453,
+          -0.27341389656066917 1.2528004646301272 2.6457595825195313,
+          -0.27341389656066917 1.2528004646301272 2.6657276153564453,
+          -0.22475388646125818 1.2152637243270876 2.6457595825195313,
+          -0.22475388646125818 1.2152637243270876 2.6657276153564453,
+          -0.17470349371433283 1.1860674619674685 2.6457595825195313,
+          -0.17470349371433283 1.1860674619674685 2.6657276153564453,
+          -0.1397146731615069 1.1721647977828982 2.6457595825195313,
+          -0.1397146731615069 1.1721647977828982 2.6657276153564453,
+          -0.10333549231290841 1.1638221740722658 2.6657276153564453,
+          -0.10333549231290841 1.1638221740722658 2.6457595825195313,
+          -0.06556600332260155 1.1610416173934939 2.6657276153564453,
+          -0.06556600332260155 1.1610416173934939 2.6457595825195313,
+          -0.01489775348454737 1.165436625480652 2.6457595825195313,
+          -0.014897756278515096 1.165436625480652 2.6657276153564453,
+          0.013004529289901024 1.1726449728012087 2.6457595825195313,
+          0.013004526495933299 1.1726449728012087 2.6657276153564453,
+          0.03801039606332755 1.183287024497986 2.6657276153564453,
+          0.03801039978861786 1.183287024497986 2.6457595825195313,
+          0.06512098759412742 1.199352264404297 2.6657276153564453,
+          0.06512098759412742 1.199352264404297 2.6457595825195313,
+          0.08898758888244605 1.2188160419464114 2.6657276153564453,
+          0.08898758888244605 1.2188160419464114 2.6457595825195313,
+          0.10961013287305808 1.2416783571243288 2.6657276153564453,
+          0.10961013287305808 1.2416783571243288 2.6457595825195313,
+          0.12729769945144628 1.267707705497742 2.6457595825195313,
+          0.12729769945144628 1.267707705497742 2.6657276153564453,
+          0.1414323598146436 1.296672344207764 2.6457595825195313,
+          0.1414323598146436 1.296672344207764 2.6657276153564453,
+          0.1520140022039411 1.3285721540451052 2.6457595825195313,
+          0.1520140022039411 1.3285721540451052 2.6657276153564453,
+          0.16191971302032446 1.3794904947280886 2.6657276153564453,
+          0.16191971302032446 1.3794904947280886 2.6457595825195313,
+          0.16522164642810797 1.4335379600524905 2.6457595825195313,
+          0.16522164642810797 1.4335379600524905 2.6657276153564453,
+          0.16087701916694616 1.4974914789199831 2.6457595825195313,
+          0.16087701916694616 1.4974914789199831 2.6657276153564453,
+          0.14784310758113836 1.5558838844299319 2.6657276153564453,
+          0.14784310758113836 1.5558838844299319 2.6457595825195313,
+          0.10821992158889744 1.6545937061309817 2.6457595825195313,
+          0.10821992158889744 1.6545937061309817 2.6657276153564453,
+          0.06095020473003361 1.7289744615554812 2.6457595825195313,
+          0.060950201004743305 1.7289744615554812 2.6657276153564453,
+          0.024107595905661312 1.7748539447784426 2.6457595825195313,
+          0.024107594043016163 1.7748539447784426 2.6657276153564453,
+          0.1659168899059293 1.8728687763214114 2.6457595825195313,
+          0.1659168899059293 1.8728687763214114 2.6657276153564453,
+          0.21805262565612765 1.814477324485779 2.6457595825195313,
+          0.21805262565612765 1.814477324485779 2.6657276153564453,
+          0.2771398425102231 1.7213276624679568 2.6657276153564453,
+          0.2771398425102231 1.7213276624679568 2.6457595825195313,
+          0.30268639326095553 1.6639785766601565 2.6657276153564453,
+          0.30268639326095553 1.6639785766601565 2.6457595825195313,
+          0.32371446490287753 1.6003725528717043 2.6457595825195313,
+          0.32371446490287753 1.6003725528717043 2.6657276153564453,
+          0.33831244707107516 1.5303367376327517 2.6657276153564453,
+          0.33831244707107516 1.5303367376327517 2.6457595825195313,
+          0.3431784510612485 1.4550874233245852 2.6657276153564453,
+          0.3431784510612485 1.4550874233245852 2.6457595825195313,
+          0.3337314724922178 1.3239763975143435 2.6457598209381104,
+          0.3337314724922178 1.3239763975143435 2.6657278537750244,
+          0.3053903579711912 1.2142622470855715 2.6657278537750244,
+          0.3053903579711912 1.2142622470855715 2.6457598209381104,
+          0.2759997546672819 1.1530065536499026 2.6657278537750244,
+          0.2759997546672819 1.1530065536499026 2.6457598209381104,
+          0.23821172118186928 1.1012594699859621 2.6457598209381104,
+          0.23821172118186928 1.1012594699859621 2.6657278537750244,
+          0.17627108097076394 1.0467526912689211 2.6457598209381104,
+          0.17627108097076394 1.0467526912689211 2.6657278537750244,
+          0.10213279724121072 1.008969306945801 2.6457598209381104,
+          0.10213279724121072 1.008969306945801 2.6657278537750244,
+          0.026826603338122146 0.9895561933517457 2.6457598209381104,
+          0.026826601475476997 0.9895561933517457 2.6657278537750244,
+          1.5583680868148801 0.0053796372376384936 2.6657280921936035,
+          1.4062269926071165 0.01622733101248766 2.6457600593566895,
+          1.4062269926071165 0.01622733473777796 2.6657280921936035,
+          1.5583680868148801 0.005379634909332056 2.6457600593566895,
+          1.6448105573654173 -0.012417332269251083 2.6657280921936035,
+          1.6448105573654173 -0.012417334131896234 2.6457600593566895,
+          1.724602699279785 -0.038689050823449825 2.6457600593566895,
+          1.724602699279785 -0.03868905082344982 2.6657280921936035,
+          1.8380219936370847 -0.09581099450588199 2.6457600593566895,
+          1.8380219936370847 -0.09581098705530139 2.6657280921936035,
+          1.8998447656631468 -0.13932186365127536 2.6457600593566895,
+          1.8998447656631468 -0.13932186365127536 2.6657280921936035,
+          1.9546949863433836 -0.18884010612964602 2.6457600593566895,
+          1.9546949863433836 -0.18884010612964602 2.6657280921936035,
+          2.011233329772949 -0.25572830438613864 2.6457600593566895,
+          2.01123309135437 -0.25572830438613864 2.6657280921936035,
+          2.0575761795043945 -0.3294135928153989 2.6457600593566895,
+          2.0575759410858154 -0.3294135928153989 2.6657280921936035,
+          2.0937230587005615 -0.4098957180976865 2.6657280921936035,
+          2.0937232971191406 -0.4098957180976865 2.6457600593566895,
+          2.1259238719940186 -0.5248948931694029 2.6457600593566895,
+          2.1259236335754395 -0.5248948931694029 2.6657280921936035,
+          2.136704444885254 -0.5999767780303953 2.6457602977752686,
+          2.136704206466675 -0.5999767780303953 2.6657283306121826,
+          2.14029860496521 -0.6775260567665098 2.6457602977752686,
+          2.140298366546631 -0.6775260567665098 2.6657283306121826,
+          2.131098508834839 -0.7985668778419492 2.6457602977752686,
+          2.1310982704162598 -0.7985668778419492 2.6657283306121826,
+          2.116004467010498 -0.8710097670555113 2.6457602977752686,
+          2.116004228591919 -0.8710097670555113 2.6657283306121826,
+          2.0937230587005615 -0.9409854412078855 2.6457602977752686,
+          2.0937228202819824 -0.9409854412078855 2.6657283306121826,
+          2.0575759410858154 -1.0201549530029292 2.6457602977752686,
+          2.0575757026672363 -1.0201549530029292 2.6657283306121826,
+          2.01123309135437 -1.092680692672729 2.6457602977752686,
+          2.011232852935791 -1.092680692672729 2.6657283306121826,
+          1.954694867134094 -1.1585650444030757 2.6457602977752686,
+          1.954694867134094 -1.1585650444030757 2.6657283306121826,
+          1.8880376815795896 -1.2168027162551875 2.6457602977752686,
+          1.8880376815795896 -1.2168027162551875 2.6657283306121826,
+          1.8113405704498289 -1.2663893699645994 2.6457602977752686,
+          1.8113405704498289 -1.2663893699645994 2.6657283306121826,
+          1.7246025800704954 -1.3073256015777586 2.6457602977752686,
+          1.7246025800704954 -1.3073256015777586 2.6657283306121826,
+          1.6280541419982908 -1.338221192359924 2.6457602977752686,
+          1.6280541419982908 -1.338221192359924 2.6657283306121826,
+          1.5219292640686033 -1.3567584753036497 2.6457602977752686,
+          1.5219292640686033 -1.3567584753036497 2.6657283306121826,
+          1.4062267541885374 -1.3629375696182249 2.6457600593566895,
+          1.4062267541885374 -1.3629375696182249 2.6657280921936035,
+          1.2540845870971677 -1.3519519567489622 2.6457600593566895,
+          1.2540845870971677 -1.3519519567489622 2.6657280921936035,
+          1.167641997337341 -1.3339300155639646 2.6457600593566895,
+          1.167641997337341 -1.3339300155639646 2.6657280921936035,
+          1.087851047515869 -1.307325482368469 2.6657280921936035,
+          1.087851047515869 -1.307325482368469 2.6457600593566895,
+          0.9744305610656738 -1.2508221864700315 2.6657280921936035,
+          0.9744305610656738 -1.2508221864700315 2.6457600593566895,
+          0.9126079082489014 -1.20769727230072 2.6657280921936035,
+          0.9126079082489014 -1.20769727230072 2.6457600593566895,
+          0.857758104801178 -1.1585649251937864 2.6657280921936035,
+          0.857758104801178 -1.1585649251937864 2.6457600593566895,
+          0.8012197613716125 -1.0926805734634397 2.6457600593566895,
+          0.8012197613716125 -1.0926805734634397 2.6657280921936035,
+          0.7548769116401672 -1.02015483379364 2.6457600593566895,
+          0.7548769116401672 -1.02015483379364 2.6657280921936035,
+          0.7187294363975525 -0.9409852623939513 2.6657280921936035,
+          0.7187294363975525 -0.9409852623939513 2.6457600593566895,
+          0.6865296959877013 -0.827839970588684 2.6657280921936035,
+          0.6865296959877013 -0.827839970588684 2.6457600593566895,
+          0.6757485270500182 -0.753916561603546 2.6657280921936035,
+          0.6757485270500182 -0.753916561603546 2.6457600593566895,
+          0.6721547842025756 -0.6775258779525756 2.6457600593566895,
+          0.6721547842025756 -0.6775258779525756 2.6657280921936035,
+          0.6813548207283019 -0.5546313524246215 2.6457600593566895,
+          0.6813548207283019 -0.5546313524246215 2.6657280921936035,
+          0.6964484453201293 -0.48102974891662575 2.6657280921936035,
+          0.6964484453201293 -0.48102974891662575 2.6457600593566895,
+          0.7187294960021972 -0.4098955392837522 2.6457600593566895,
+          0.7187294960021972 -0.4098955392837522 2.6657280921936035,
+          0.7691917419433593 -0.30409640073776223 2.6457600593566895,
+          0.7691917419433593 -0.30409640073776223 2.6657280921936035,
+          0.809934914112091 -0.24410817027091958 2.6657280921936035,
+          0.809934914112091 -0.24410817027091958 2.6457600593566895,
+          0.8577582836151122 -0.18883995711803414 2.6457600593566895,
+          0.8577582836151122 -0.18883995711803414 2.6657280921936035,
+          0.9244148135185241 -0.13013893365859963 2.6457600593566895,
+          0.9244148135185241 -0.13013893365859963 2.6657280921936035,
+          1.0011122226715086 -0.08008862286806084 2.6457600593566895,
+          1.0011122226715086 -0.08008861541748025 2.6657280921936035,
+          1.0878511667251585 -0.038688965141772995 2.6457600593566895,
+          1.0878511667251585 -0.03868896514177299 2.6657280921936035,
+          1.184398531913757 -0.008179903961717848 2.6457600593566895,
+          1.184398531913757 -0.008179902099072697 2.6657280921936035,
+          1.2905234098434446 0.010125527158379798 2.6657280921936035,
+          1.2905234098434446 0.010125525295734647 2.6457600593566895,
+          1.2982989549636839 -0.16873234510421728 2.6457600593566895,
+          1.4062269926071165 -0.16172939538955663 2.6457600593566895,
+          1.4062269926071165 -0.16172939538955663 2.6657280921936035,
+          1.2982989549636839 -0.16873234510421728 2.6657280921936035,
+          1.2354466915130613 -0.18022152781486486 2.6657280921936035,
+          1.2354466915130613 -0.18022152781486486 2.6457600593566895,
+          1.1761337518692014 -0.19718174636363958 2.6457600593566895,
+          1.1761337518692014 -0.19718174636363958 2.6657280921936035,
+          1.090725541114807 -0.23521716892719247 2.6457600593566895,
+          1.090725541114807 -0.23521716892719247 2.6657280921936035,
+          1.0434812307357786 -0.2649860382080076 2.6457600593566895,
+          1.0434812307357786 -0.2649860382080076 2.6657280921936035,
+          1.0009574890136717 -0.2993677258491514 2.6457600593566895,
+          1.0009574890136717 -0.2993677258491514 2.6657280921936035,
+          0.9563913345336913 -0.3466375470161436 2.6657280921936035,
+          0.9563913345336913 -0.3466375470161436 2.6457600593566895,
+          0.9190853238105773 -0.40039527416229226 2.6457600593566895,
+          0.9190853238105773 -0.40039527416229226 2.6657280921936035,
+          0.889039635658264 -0.4606410562992094 2.6657280921936035,
+          0.889039635658264 -0.4606410562992094 2.6457600593566895,
+          0.8674129247665404 -0.5267570614814757 2.6657280921936035,
+          0.8674129247665404 -0.5267570614814757 2.6457600593566895,
+          0.8544369339942931 -0.5981250405311583 2.6657280921936035,
+          0.8544369339942931 -0.5981250405311583 2.6457600593566895,
+          0.8501116037368773 -0.6747453212738036 2.6657280921936035,
+          0.8501116037368773 -0.6747453212738036 2.6457600593566895,
+          0.8578010201454161 -0.7749832868576049 2.6457600593566895,
+          0.8578010201454161 -0.7749832868576049 2.6657280921936035,
+          0.8704166412353515 -0.8327510356903075 2.6457600593566895,
+          0.8704166412353515 -0.8327510356903075 2.6657280921936035,
+          0.8890395760536193 -0.8867640495300292 2.6657280921936035,
+          0.8890395760536193 -0.8867640495300292 2.6457600593566895,
+          0.9190852642059326 -0.9466236829757688 2.6457600593566895,
+          0.9190852642059326 -0.9466236829757688 2.6657280921936035,
+          0.9563912749290466 -1.000149846076965 2.6457600593566895,
+          0.9563912749290466 -1.000149846076965 2.6657280921936035,
+          1.000957369804382 -1.0473423004150388 2.6457600593566895,
+          1.000957369804382 -1.0473423004150388 2.6657280921936035,
+          1.0525525808334348 -1.0879690647125242 2.6457600593566895,
+          1.0525525808334348 -1.0879690647125242 2.6657280921936035,
+          1.1109449863433836 -1.1217999458312986 2.6457600593566895,
+          1.1109449863433836 -1.1217999458312986 2.6657280921936035,
+          1.1761336326599119 -1.148833632469177 2.6657280921936035,
+          1.1761336326599119 -1.148833632469177 2.6457600593566895,
+          1.2727327346801756 -1.1738234758377073 2.6457600593566895,
+          1.2727327346801756 -1.1738234758377073 2.6657280921936035,
+          1.3377096652984617 -1.1821912527084348 2.6657280921936035,
+          1.3377096652984617 -1.1821912527084348 2.6457600593566895,
+          1.406226873397827 -1.1849807500839231 2.6457600593566895,
+          1.406226873397827 -1.1849807500839231 2.6657280921936035,
+          1.5140161514282224 -1.1778402328491209 2.6457600593566895,
+          1.5140161514282224 -1.1778402328491209 2.6657280921936035,
+          1.5766437053680418 -1.1661260128021238 2.6457600593566895,
+          1.5766437053680418 -1.1661260128021238 2.6657280921936035,
+          1.635624289512634 -1.1488337516784666 2.6457600593566895,
+          1.635624289512634 -1.1488337516784666 2.6657280921936035,
+          1.7215125560760496 -1.111277937889099 2.6457602977752686,
+          1.7215125560760496 -1.111277937889099 2.6657283306121826,
+          1.7689175605773924 -1.08167028427124 2.6457602977752686,
+          1.7689175605773924 -1.08167028427124 2.6657283306121826,
+          1.8114953041076658 -1.0473424196243284 2.6657283306121826,
+          1.8114953041076658 -1.0473424196243284 2.6457602977752686,
+          1.8559839725494383 -1.0001499652862544 2.6657283306121826,
+          1.8559839725494383 -1.0001499652862544 2.6457602977752686,
+          1.893058657646179 -0.9466238021850584 2.6657283306121826,
+          1.893058657646179 -0.9466238021850584 2.6457602977752686,
+          1.922718048095703 -0.8867641687393186 2.6457602977752686,
+          1.922718048095703 -0.8867641687393186 2.6657283306121826,
+          1.944730758666992 -0.8214979767799375 2.6457602977752686,
+          1.944730758666992 -0.8214979767799375 2.6657283306121826,
+          1.9579385519027708 -0.7508250474929807 2.6457600593566895,
+          1.9579385519027708 -0.7508250474929807 2.6657280921936035,
+          1.9623415470123289 -0.674745440483093 2.6457600593566895,
+          1.9623415470123289 -0.674745440483093 2.6657280921936035,
+          1.9545140266418455 -0.5737522244453428 2.6457600593566895,
+          1.9545140266418455 -0.5737522244453428 2.6657280921936035,
+          1.9416736364364622 -0.515373110771179 2.6457600593566895,
+          1.9416736364364622 -0.515373110771179 2.6657280921936035,
+          1.922718048095703 -0.46064120531082126 2.6657280921936035,
+          1.922718048095703 -0.46064120531082126 2.6457600593566895,
+          1.8930587768554685 -0.40039542317390414 2.6457600593566895,
+          1.8930587768554685 -0.40039542317390414 2.6657280921936035,
+          1.8559840917587278 -0.34663766622543307 2.6457600593566895,
+          1.8559840917587278 -0.34663766622543307 2.6657280921936035,
+          1.8114954233169553 -0.2993678152561185 2.6657280921936035,
+          1.8114954233169553 -0.2993678152561185 2.6457600593566895,
+          1.7598233222961424 -0.2586633563041684 2.6457600593566895,
+          1.7598233222961424 -0.2586633563041684 2.6657280921936035,
+          1.701199173927307 -0.22460135817527743 2.6457600593566895,
+          1.701199173927307 -0.22460135817527743 2.6657280921936035,
+          1.6356244087219236 -0.19718180596828433 2.6657280921936035,
+          1.6356244087219236 -0.19718180596828433 2.6457600593566895,
+          1.539505362510681 -0.17267157137393926 2.6457600593566895,
+          1.539505362510681 -0.17267157137393926 2.6657280921936035,
+          1.4746892452239988 -0.1644648909568784 2.6657280921936035,
+          1.4746892452239988 -0.1644648909568784 2.6457600593566895,
+          -2.815467119216919 0.36572349071502686 2.665727376937866,
+          -3.0219242572784424 0.27535495162010193 2.645759344100952,
+          -3.0219244956970215 0.27535495162010193 2.665727376937866,
+          -2.81546688079834 0.36572349071502686 2.645759344100952,
+          -2.6660115718841553 0.4310670495033264 2.645759344100952,
+          -2.6660118103027344 0.4310670495033264 2.665727376937866,
+          -2.666011333465576 1.1790411472320557 2.645759344100952,
+          -2.6660115718841553 1.1790411472320557 2.665727376937866,
+          -3.0219240188598633 1.3215457201004028 2.645759344100952,
+          -3.0219242572784424 1.3215457201004028 2.665727376937866,
+          -3.0219240188598633 1.510624647140503 2.645759344100952,
+          -3.0219242572784424 1.510624647140503 2.665727376937866,
+          -2.586764335632324 1.3354483842849731 2.645759344100952,
+          -2.5867645740509033 1.3354483842849731 2.665727376937866,
+          -2.2099971771240234 1.1839072704315186 2.665727376937866,
+          -2.2099969387054443 1.1839072704315186 2.645759344100952,
+          -1.8659008741378786 1.0455738306045532 2.645759344100952,
+          -1.8659008741378786 1.0455738306045532 2.665727376937866,
+          -1.553781032562256 0.9204478859901428 2.6457595825195313,
+          -1.553781032562256 0.9204478859901428 2.6657276153564453,
+          -1.553781032562256 0.7299785017967224 2.6457595825195313,
+          -1.553781032562256 0.7299785017967224 2.6657276153564453,
+          -1.878413796424866 0.588169276714325 2.6457595825195313,
+          -1.878413796424866 0.588169276714325 2.6657276153564453,
+          -2.2176430225372314 0.43940868973732 2.6457595825195313,
+          -2.2176432609558105 0.43940868973732 2.6657276153564453,
+          -2.589545249938965 0.27674517035484314 2.665727376937866,
+          -2.5895450115203857 0.27674517035484314 2.645759344100952,
+          -3.0219244956970215 0.08697097748517989 2.665727376937866,
+          -3.0219242572784424 0.08697097003459929 2.645759344100952,
+          -2.1154582500457764 0.672281801700592 2.665727376937866,
+          -2.4880547523498535 0.5089230537414551 2.645759344100952,
+          -2.4880549907684326 0.5089230537414551 2.665727376937866,
+          -2.1154580116271973 0.672281801700592 2.645759344100952,
+          -1.7762274742126467 0.8210424184799194 2.6457595825195313,
+          -1.7762274742126467 0.8210424184799194 2.6657276153564453,
+          -2.1112864017486572 0.9559003114700317 2.645759344100952,
+          -2.1112866401672363 0.9559003114700317 2.665727376937866,
+          -2.4880547523498535 1.106747031211853 2.665727376937866,
+          -2.4880545139312744 1.106747031211853 2.645759344100952,
+          3.201289415359497 2.9203195571899414 2.6657278537750244,
+          3.201289653778076 2.9203195571899414 2.6457598209381104,
+          2.402569532394409 2.9203197956085205 2.6657278537750244,
+          2.4025697708129883 2.9203197956085205 2.6457598209381104,
+          2.4025685787200928 -2.9303035736083984 2.6657285690307617,
+          3.2012887001037598 -2.9303038120269775 2.6457605361938477,
+          3.2012884616851807 -2.9303038120269775 2.6657285690307617,
+          2.402568817138672 -2.9303035736083984 2.6457605361938477,
+          1.2496218681335447 0.2948340475559237 2.6457600593566895,
+          1.4062269926071165 0.2831624448299411 2.6457600593566895,
+          1.4062269926071165 0.2831624448299411 2.6657280921936035,
+          1.2496218681335447 0.2948340475559237 2.6657280921936035,
+          1.1615061759948728 0.31398266553878806 2.6657278537750244,
+          1.1615061759948728 0.31398266553878806 2.6457598209381104,
+          1.0808992385864256 0.3422496616840365 2.6457598209381104,
+          1.0808992385864256 0.3422496616840365 2.6657278537750244,
+          0.9940064549446105 0.3870479166507723 2.6657278537750244,
+          0.9940064549446105 0.3870479166507723 2.6457598209381104,
+          0.917772352695465 0.4426594078540804 2.6657278537750244,
+          0.917772352695465 0.4426594078540804 2.6457598209381104,
+          0.8521971106529235 0.5090842247009278 2.6657278537750244,
+          0.8521971106529235 0.5090842247009278 2.6457598209381104,
+          0.7969718575477599 0.5856272578239442 2.6457598209381104,
+          0.7969718575477599 0.5856272578239442 2.6657278537750244,
+          0.7517876029014586 0.6715932488441468 2.6457598209381104,
+          0.7517876029014586 0.6715932488441468 2.6657278537750244,
+          0.7166442275047301 0.7669823765754701 2.6457598209381104,
+          0.7166442275047301 0.7669823765754701 2.6657278537750244,
+          0.6858863234519957 0.9057365059852601 2.6657278537750244,
+          0.6858863234519957 0.9057365059852601 2.6457598209381104,
+          0.6755878329277036 0.9984540343284608 2.6657278537750244,
+          0.6755878329277036 0.9984540343284608 2.6457598209381104,
+          0.6721550226211546 1.0957850217819216 2.6457598209381104,
+          0.6721550226211546 1.0957850217819216 2.6657278537750244,
+          0.679106533527374 1.2911210060119631 2.6457598209381104,
+          0.679106533527374 1.2911210060119631 2.6657278537750244,
+          0.6902288198471067 1.392611384391785 2.6457598209381104,
+          0.6902288198471067 1.392611384391785 2.6657278537750244,
+          0.7083025574684141 1.4843703508377077 2.6457598209381104,
+          0.7083025574684141 1.4843703508377077 2.6657278537750244,
+          2.1041507720947266 1.4843702316284184 2.6457598209381104,
+          2.1041505336761475 1.4843702316284184 2.6657278537750244,
+          2.1220510005950928 1.3926112651824956 2.6657278537750244,
+          2.122051239013672 1.3926112651824956 2.6457598209381104,
+          2.1326518058776855 1.2911208868026738 2.6657280921936035,
+          2.1326520442962646 1.2911208868026738 2.6457600593566895,
+          2.140298843383789 1.0957849025726323 2.6457600593566895,
+          2.14029860496521 1.0957849025726323 2.6657280921936035,
+          2.1313729286193848 0.9422699809074404 2.6657280921936035,
+          2.131373167037964 0.9422699809074404 2.6457600593566895,
+          2.116729259490967 0.8523197174072268 2.6457600593566895,
+          2.1167290210723877 0.8523197174072268 2.6657280921936035,
+          2.095114231109619 0.7669821977615359 2.6457600593566895,
+          2.09511399269104 0.7669821977615359 2.6657280921936035,
+          2.0465047359466553 0.6418907046318056 2.6457600593566895,
+          2.046504497528076 0.6418907046318056 2.6657280921936035,
+          2.006920337677002 0.5722154378890993 2.6457600593566895,
+          2.006920099258423 0.5722154378890993 2.6657280921936035,
+          1.9602560997009275 0.5090841054916384 2.6457600593566895,
+          1.9602560997009275 0.5090841054916384 2.6657280921936035,
+          1.894681096076965 0.44265925884246854 2.6457600593566895,
+          1.894681096076965 0.44265925884246854 2.6657280921936035,
+          1.8184462785720823 0.3870477974414828 2.6657280921936035,
+          1.8184462785720823 0.3870477974414828 2.6457600593566895,
+          1.7315535545349119 0.34224957227706937 2.6657280921936035,
+          1.7315535545349119 0.34224957227706937 2.6457600593566895,
+          1.6339249610900877 0.3094234168529513 2.6657280921936035,
+          1.6339249610900877 0.3094234168529513 2.6457600593566895,
+          1.5254818201065061 0.28972768783569364 2.6657280921936035,
+          1.5254818201065061 0.28972768783569364 2.6457600593566895,
+          0.8602243065834043 0.9334633350372316 2.6457598209381104,
+          0.8501118421554563 1.0888342857360842 2.6457598209381104,
+          0.8501118421554563 1.0888342857360842 2.6657278537750244,
+          0.8602243065834043 0.9334633350372316 2.6657278537750244,
+          0.8905620574951171 0.8003404140472413 2.6457598209381104,
+          0.8905620574951171 0.8003404140472413 2.6657278537750244,
+          0.933909237384796 0.7017364501953127 2.6657278537750244,
+          0.933909237384796 0.7017364501953127 2.6457598209381104,
+          0.9628570675849913 0.6569261550903323 2.6457598209381104,
+          0.9628570675849913 0.6569261550903323 2.6657278537750244,
+          0.9960919022560119 0.616831421852112 2.6657278537750244,
+          0.9960919022560119 0.616831421852112 2.6457598209381104,
+          1.0696125030517576 0.5535290837287905 2.6457598209381104,
+          1.0696125030517576 0.5535290837287905 2.6657278537750244,
+          1.1554499864578245 0.5066484212875368 2.6657278537750244,
+          1.1554499864578245 0.5066484212875368 2.6457598209381104,
+          1.25360369682312 0.47618967294693015 2.6457598209381104,
+          1.25360369682312 0.47618967294693015 2.6657278537750244,
+          1.3270899057388303 0.46488678455352805 2.6457600593566895,
+          1.3270899057388303 0.46488678455352805 2.6657280921936035,
+          1.406227111816406 0.46111923456192044 2.6657280921936035,
+          1.406227111816406 0.46111923456192044 2.6457600593566895,
+          1.5328770875930784 0.47123169898986844 2.6457600593566895,
+          1.5328770875930784 0.47123169898986844 2.6657280921936035,
+          1.6442694664001463 0.5015693306922915 2.6457600593566895,
+          1.6442694664001463 0.5015693306922915 2.6657280921936035,
+          1.7324372529983518 0.5467943549156191 2.6457600593566895,
+          1.7324372529983518 0.5467943549156191 2.6657280921936035,
+          1.7760103940963743 0.5792168974876406 2.6657280921936035,
+          1.7760103940963743 0.5792168974876406 2.6457600593566895,
+          1.8156658411025999 0.6168313026428225 2.6457600593566895,
+          1.8156658411025999 0.6168313026428225 2.6657280921936035,
+          1.8776065111160276 0.7007959485054018 2.6457600593566895,
+          1.8776065111160276 0.7007959485054018 2.6657280921936035,
+          1.922659397125244 0.8032487034797671 2.6457600593566895,
+          1.922659397125244 0.8032487034797671 2.6657280921936035,
+          1.9524207115173338 0.9351804852485659 2.6657280921936035,
+          1.9524207115173338 0.9351804852485659 2.6457600593566895,
+          1.962341785430908 1.0888341665267949 2.6657280921936035,
+          1.962341785430908 1.0888341665267949 2.6457600593566895,
+          1.9602560997009275 1.2341191768646245 2.6457598209381104,
+          1.9602560997009275 1.2341191768646245 2.6657278537750244,
+          1.9560848474502561 1.3064134120941167 2.6657278537750244,
+          1.9560848474502561 1.3064134120941167 2.6457598209381104,
+          0.8563681840896604 1.306413531303406 2.6457598209381104,
+          0.8563681840896604 1.306413531303406 2.6657278537750244,
+          0.8521972298622129 1.2341192960739138 2.6657278537750244,
+          0.8521972298622129 1.2341192960739138 2.6457598209381104,
+          0.12299159169197063 0.4619014263153078 2.6457598209381104,
+          0.07624320685863474 0.5826825499534608 2.6457598209381104,
+          0.07624320685863474 0.5826825499534608 2.6657278537750244,
+          0.12299159169197063 0.4619014263153078 2.6657278537750244,
+          0.18120986223220806 0.3442483842372896 2.6657278537750244,
+          0.18120986223220806 0.3442483842372896 2.6457598209381104,
+          0.24512872099876384 0.24442225694656391 2.6657278537750244,
+          0.24512872099876384 0.24442225694656391 2.6457598209381104,
+          0.29163247346878035 0.18607525527477284 2.6657278537750244,
+          0.29163247346878035 0.18607525527477284 2.6457598209381104,
+          0.3431782722473143 0.1308392733335497 2.6457598209381104,
+          0.3431782722473143 0.1308392733335497 2.6657278537750244,
+          0.3431782424449919 0.004323136992752735 2.6457598209381104,
+          0.3431782424449919 0.0043231393210591725 2.6657278537750244,
+          -1.124964475631714 0.004323336761444902 2.6657276153564453,
+          -1.124964475631714 0.004323334433138464 2.6457595825195313,
+          -1.124964475631714 0.18228001892566692 2.6457595825195313,
+          -1.124964475631714 0.18228001892566692 2.6657276153564453,
+          0.07763344049453717 0.18227985501289384 2.6457598209381104,
+          0.07763344049453717 0.18227985501289384 2.6657278537750244,
+          0.028278257697820487 0.2469282746315004 2.6457598209381104,
+          0.028278255835175337 0.2469282746315004 2.6657278537750244,
+          -0.021076921373605912 0.3303454816341402 2.6457598209381104,
+          -0.02107692323625106 0.3303454816341402 2.6657278537750244,
+          -0.06556610018014927 0.4241898953914644 2.6457598209381104,
+          -0.06556610018014927 0.4241898953914644 2.6657278537750244,
+          -0.10171358287334462 0.5194245576858522 2.6457598209381104,
+          -0.10171358287334462 0.5194245576858522 2.6657278537750244,
+          -0.40201574563980114 -0.6407700181007384 2.6457598209381104,
+          -0.6189004182815553 -0.529547095298767 2.6457598209381104,
+          -0.6189004182815553 -0.529547095298767 2.6657278537750244,
+          -0.40201574563980114 -0.6407700181007384 2.6657278537750244,
+          -0.1462029516696931 -0.800653040409088 2.6457598209381104,
+          -0.1462029516696931 -0.800653040409088 2.6657278537750244,
+          0.11308557540178288 -0.9918175935745238 2.6657280921936035,
+          0.11308557540178288 -0.9918175935745238 2.6457600593566895,
+          0.23421433568000782 -1.0941771268844602 2.6457600593566895,
+          0.23421433568000782 -1.0941771268844602 2.6657280921936035,
+          0.34317809343338 -1.1968843936920164 2.6457600593566895,
+          0.34317809343338 -1.1968843936920164 2.6657280921936035,
+          0.3431780636310577 -1.3748413324356077 2.6457600593566895,
+          0.3431780636310577 -1.3748413324356077 2.6657280921936035,
+          -0.5910948514938354 -1.3748412132263181 2.6457598209381104,
+          -0.5910948514938354 -1.3748412132263181 2.6657278537750244,
+          -0.5910949110984802 -1.5527979135513303 2.6457598209381104,
+          -0.5910949110984802 -1.5527979135513303 2.6657278537750244,
+          -0.7690516710281372 -1.5527979135513303 2.6457598209381104,
+          -0.7690516710281372 -1.5527979135513303 2.6657278537750244,
+          -0.7690516114234924 -1.3748412132263181 2.6457598209381104,
+          -0.7690516114234924 -1.3748412132263181 2.6657278537750244,
+          -1.1249647140502932 -1.3748412132263181 2.6457598209381104,
+          -1.1249647140502932 -1.3748412132263181 2.6657278537750244,
+          -1.1249645948410036 -1.1968842744827268 2.6457598209381104,
+          -1.1249645948410036 -1.1968842744827268 2.6657278537750244,
+          -0.7690516114234924 -1.1968842744827268 2.6457598209381104,
+          -0.7690516114234924 -1.1968842744827268 2.6657278537750244,
+          -0.769051492214203 -0.5295470356941222 2.6457598209381104,
+          -0.769051492214203 -0.5295470356941222 2.6657278537750244,
+          -0.07946916669607172 -1.074539542198181 2.6457598209381104,
+          0.06234009563922874 -1.1968843936920164 2.6457600593566895,
+          0.06234009191393843 -1.1968843936920164 2.6657280921936035,
+          -0.07946916669607172 -1.074539542198181 2.6657278537750244,
+          -0.2428279221057893 -0.9542797207832335 2.6457598209381104,
+          -0.2428279221057893 -0.9542797207832335 2.6657278537750244,
+          -0.41730889678001415 -0.8437519073486327 2.6457598209381104,
+          -0.41730889678001415 -0.8437519073486327 2.6657278537750244,
+          -0.5910947918891908 -0.7519929409027098 2.6457598209381104,
+          -0.5910947918891908 -0.7519929409027098 2.6657278537750244,
+          -0.5910948514938354 -1.1968842744827268 2.6457598209381104,
+          -0.5910948514938354 -1.1968842744827268 2.6657278537750244,
+          -3.0198395252227783 -0.40171492099761963 2.645759344100952,
+          -3.0219242572784424 -0.5018156170845033 2.6457595825195313,
+          -3.0219244956970215 -0.5018156170845033 2.6657276153564453,
+          -3.0198397636413574 -0.40171492099761963 2.665727376937866,
+          -3.013582706451416 -0.2939676344394684 2.645759344100952,
+          -3.013582944869995 -0.2939676344394684 2.665727376937866,
+          -3.0031561851501465 -0.18761071562767032 2.645759344100952,
+          -3.0031564235687256 -0.18761071562767032 2.665727376937866,
+          -2.9857771396636963 -0.0909857600927353 2.645759344100952,
+          -2.9857773780822754 -0.09098575264215471 2.665727376937866,
+          -1.5899292230606081 -0.09098593890666955 2.6657276153564453,
+          -1.5899292230606081 -0.09098594635725014 2.6457595825195313,
+          -1.5732460021972658 -0.18622063100337974 2.6457595825195313,
+          -1.5732460021972658 -0.18622063100337974 2.6657276153564453,
+          -1.5621228218078616 -0.29118728637695307 2.6457595825195313,
+          -1.5621228218078616 -0.29118728637695307 2.6657276153564453,
+          -1.555866837501526 -0.39684915542602534 2.6657276153564453,
+          -1.555866837501526 -0.39684915542602534 2.6457595825195313,
+          -1.5537812709808352 -0.49416920542716974 2.6457595825195313,
+          -1.5537812709808352 -0.49416920542716974 2.6657276153564453,
+          -1.5584738254547121 -0.6201639771461487 2.6457595825195313,
+          -1.5584738254547121 -0.6201639771461487 2.6657276153564453,
+          -1.5725502967834475 -0.7381645441055298 2.6457595825195313,
+          -1.5725502967834475 -0.7381645441055298 2.6657276153564453,
+          -1.5979236364364626 -0.8445215821266174 2.6457598209381104,
+          -1.5979236364364626 -0.8445215821266174 2.6657278537750244,
+          -1.6365036964416506 -0.9355853199958801 2.6457598209381104,
+          -1.6365036964416506 -0.9355853199958801 2.6657278537750244,
+          -1.6697933673858645 -0.9871804714202881 2.6457598209381104,
+          -1.6697933673858645 -0.9871804714202881 2.6657278537750244,
+          -1.70941698551178 -1.030742526054382 2.6457598209381104,
+          -1.70941698551178 -1.030742526054382 2.6657278537750244,
+          -1.7553732395172121 -1.0662724971771238 2.6657278537750244,
+          -1.7553732395172121 -1.0662724971771238 2.6457598209381104,
+          -1.808204531669617 -1.0929198265075681 2.6457598209381104,
+          -1.808204531669617 -1.0929198265075681 2.6657278537750244,
+          -1.8684500455856325 -1.1089081764221191 2.6457598209381104,
+          -1.8684500455856325 -1.1089081764221191 2.6657278537750244,
+          -1.9361106157302859 -1.114237666130066 2.6457595825195313,
+          -1.9361106157302859 -1.114237666130066 2.6657276153564453,
+          -2.0114951133728027 -1.1078258752822876 2.6657276153564453,
+          -2.0114948749542236 -1.1078258752822876 2.6457595825195313,
+          -2.0773024559020996 -1.0885937213897705 2.6657276153564453,
+          -2.0773022174835205 -1.0885937213897705 2.6457595825195313,
+          -2.133531093597412 -1.0565401315689087 2.6457595825195313,
+          -2.133531332015991 -1.0565401315689087 2.6657276153564453,
+          -2.1801834106445313 -1.0138275623321533 2.6457595825195313,
+          -2.1801836490631104 -1.0138275623321533 2.6657276153564453,
+          -2.218184471130371 -0.9626186490058899 2.6457595825195313,
+          -2.21818470954895 -0.9626186490058899 2.6657276153564453,
+          -2.247535467147827 -0.902913510799408 2.6457595825195313,
+          -2.2475357055664063 -0.902913510799408 2.6657276153564453,
+          -2.2769622802734375 -0.9884161949157715 2.6457595825195313,
+          -2.2769625186920166 -0.9884161949157715 2.6657276153564453,
+          -2.316122531890869 -1.061406135559082 2.6457595825195313,
+          -2.3161227703094482 -1.061406135559082 2.6657276153564453,
+          -2.36501407623291 -1.1218832731246948 2.6457595825195313,
+          -2.3650143146514893 -1.1218832731246948 2.6657276153564453,
+          -2.4130470752716064 -1.1598734855651855 2.6457595825195313,
+          -2.4130473136901855 -1.1598734855651855 2.6657276153564453,
+          -2.470810651779175 -1.1860054731369019 2.6457595825195313,
+          -2.470810890197754 -1.1860054731369019 2.6657276153564453,
+          -2.5276904106140137 -1.1989128589630127 2.6457595825195313,
+          -2.5276906490325928 -1.1989128589630127 2.6657276153564453,
+          -2.5916309356689453 -1.2032150030136108 2.6457595825195313,
+          -2.5916311740875244 -1.2032150030136108 2.6657276153564453,
+          -2.69026780128479 -1.1931031942367554 2.6457595825195313,
+          -2.690268039703369 -1.1931031942367554 2.6657276153564453,
+          -2.768179178237915 -1.166709542274475 2.6657276153564453,
+          -2.768178939819336 -1.166709542274475 2.6457595825195313,
+          -2.8295018672943115 -1.1289479732513428 2.6457595825195313,
+          -2.8295021057128906 -1.1289479732513428 2.6657276153564453,
+          -2.87481427192688 -1.0867046117782593 2.6657276153564453,
+          -2.874814033508301 -1.0867046117782593 2.6457595825195313,
+          -2.9141783714294434 -1.0349905490875244 2.6657276153564453,
+          -2.9141781330108643 -1.0349905490875244 2.6457595825195313,
+          -2.9616150856018066 -0.9377794265747071 2.6457595825195313,
+          -2.9616153240203857 -0.9377794265747071 2.6657276153564453,
+          -2.995384693145752 -0.8156129717826844 2.6457595825195313,
+          -2.995384931564331 -0.8156129717826844 2.6657276153564453,
+          -3.015289783477783 -0.6708287000656129 2.6457595825195313,
+          -3.0152900218963623 -0.6708287000656129 2.6657276153564453,
+          -2.834930896759033 -0.26894256472587585 2.6457595825195313,
+          -2.354586601257324 -0.26894262433052063 2.6457595825195313,
+          -2.3545868396759033 -0.26894262433052063 2.6657276153564453,
+          -2.8349311351776123 -0.26894256472587585 2.6657276153564453,
+          -2.839102268218994 -0.3322005867958069 2.6457595825195313,
+          -2.8391025066375732 -0.3322005867958069 2.6657276153564453,
+          -2.8432726860046387 -0.40658098459243774 2.6457595825195313,
+          -2.8432729244232178 -0.40658098459243774 2.6657276153564453,
+          -2.843968391418457 -0.5052913427352906 2.6457595825195313,
+          -2.843968629837036 -0.5052913427352906 2.6657276153564453,
+          -2.83354115486145 -0.704102396965027 2.6457595825195313,
+          -2.8335413932800293 -0.704102396965027 2.6657276153564453,
+          -2.8182475566864014 -0.7925594449043275 2.6457595825195313,
+          -2.8182477951049805 -0.7925594449043275 2.6657276153564453,
+          -2.7946126461029053 -0.8688514828681947 2.6457595825195313,
+          -2.7946128845214844 -0.8688514828681947 2.6657276153564453,
+          -2.773681163787842 -0.9129544496536256 2.6457595825195313,
+          -2.773681402206421 -0.9129544496536256 2.6657276153564453,
+          -2.7479615211486816 -0.950723946094513 2.6457595825195313,
+          -2.7479617595672607 -0.950723946094513 2.6657276153564453,
+          -2.71745228767395 -0.9821599125862122 2.6457595825195313,
+          -2.7174525260925293 -0.9821599125862122 2.6657276153564453,
+          -2.6855244636535645 -1.0041399002075195 2.6457595825195313,
+          -2.6855247020721436 -1.0041399002075195 2.6657276153564453,
+          -2.6489663124084473 -1.0183632373809814 2.6457595825195313,
+          -2.6489665508270264 -1.0183632373809814 2.6657276153564453,
+          -2.6220223903656006 -1.0235350131988525 2.6457595825195313,
+          -2.6220226287841797 -1.0235350131988525 2.6657276153564453,
+          -2.593022108078003 -1.0252591371536255 2.6657276153564453,
+          -2.593021869659424 -1.0252591371536255 2.6457595825195313,
+          -2.550849199295044 -1.0217058658599854 2.6457595825195313,
+          -2.550849437713623 -1.0217058658599854 2.6657276153564453,
+          -2.5133118629455566 -1.0110468864440918 2.6657276153564453,
+          -2.5133116245269775 -1.0110468864440918 2.6457595825195313,
+          -2.4804084300994873 -0.9932821989059448 2.6457595825195313,
+          -2.4804086685180664 -0.9932821989059448 2.6657276153564453,
+          -2.451443672180176 -0.9692610502243042 2.6457595825195313,
+          -2.451443910598755 -0.9692610502243042 2.6657276153564453,
+          -2.426650285720825 -0.9389066100120544 2.6457595825195313,
+          -2.4266505241394043 -0.9389066100120544 2.6657276153564453,
+          -2.4060277938842773 -0.9022183418273926 2.6657276153564453,
+          -2.4060275554656982 -0.9022183418273926 2.6457595825195313,
+          -2.382218360900879 -0.8365272879600525 2.6457595825195313,
+          -2.382218599319458 -0.8365272879600525 2.6657276153564453,
+          -2.3664047718048096 -0.7590188384056091 2.6457595825195313,
+          -2.3664050102233887 -0.7590188384056091 2.6657276153564453,
+          -2.357541084289551 -0.671430766582489 2.6457595825195313,
+          -2.35754132270813 -0.671430766582489 2.6657276153564453,
+          -2.354586601257324 -0.5741105675697327 2.6457595825195313,
+          -2.3545868396759033 -0.5741105675697327 2.6657276153564453,
+          -2.1766302585601807 -0.5157185792922974 2.6657276153564453,
+          -2.1766300201416016 -0.26894265413284296 2.6457595825195313,
+          -2.1766302585601807 -0.26894265413284296 2.6657276153564453,
+          -2.1766300201416016 -0.5157185792922974 2.6457595825195313,
+          -2.166898488998413 -0.6797724366188049 2.6457595825195313,
+          -2.166898727416992 -0.6797724366188049 2.6657276153564453,
+          -2.1524736881256104 -0.7522412538528442 2.6657276153564453,
+          -2.1524734497070313 -0.7522412538528442 2.6457595825195313,
+          -2.1300559043884277 -0.8139351606369019 2.6657276153564453,
+          -2.1300556659698486 -0.8139351606369019 2.6457595825195313,
+          -2.1102824211120605 -0.8492329716682434 2.6657276153564453,
+          -2.1102821826934814 -0.8492329716682434 2.6457595825195313,
+          -2.087111473083496 -0.8791241645812988 2.6657276153564453,
+          -2.087111234664917 -0.8791241645812988 2.6457595825195313,
+          -2.0605413913726807 -0.9036087393760681 2.6657276153564453,
+          -2.0605411529541016 -0.9036087393760681 2.6457595825195313,
+          -2.029337167739868 -0.9217596650123596 2.6457595825195313,
+          -2.0293374061584473 -0.9217596650123596 2.6657276153564453,
+          -1.9931901693344118 -0.9326503872871399 2.6657276153564453,
+          -1.9931901693344118 -0.9326503872871399 2.6457595825195313,
+          -1.9520989656448366 -0.9362804889678955 2.6457595825195313,
+          -1.9520989656448366 -0.9362804889678955 2.6657276153564453,
+          -1.913479804992676 -0.9324957728385925 2.6457595825195313,
+          -1.913479804992676 -0.9324957728385925 2.6657276153564453,
+          -1.8791857957839968 -0.9211418032646179 2.6657276153564453,
+          -1.8791857957839968 -0.9211418032646179 2.6457595825195313,
+          -1.849217772483826 -0.9022184014320374 2.6457595825195313,
+          -1.849217772483826 -0.9022184014320374 2.6657276153564453,
+          -1.8231885433197024 -0.8770387768745422 2.6457595825195313,
+          -1.8231885433197024 -0.8770387768745422 2.6657276153564453,
+          -1.800712585449219 -0.8459890484809875 2.6457595825195313,
+          -1.800712585449219 -0.8459890484809875 2.6657276153564453,
+          -1.7817889451980593 -0.8090692162513733 2.6657276153564453,
+          -1.7817889451980593 -0.8090692162513733 2.6457595825195313,
+          -1.759544610977173 -0.744768500328064 2.6457595825195313,
+          -1.759544610977173 -0.744768500328064 2.6657276153564453,
+          -1.7442510128021242 -0.6700405478477478 2.6457595825195313,
+          -1.7442510128021242 -0.6700405478477478 2.6657276153564453,
+          -1.7348670959472658 -0.5881873965263367 2.6457595825195313,
+          -1.7348670959472658 -0.5881873965263367 2.6657276153564453,
+          -1.731738090515137 -0.5011206269264221 2.6657276153564453,
+          -1.731738090515137 -0.5011206269264221 2.6457595825195313,
+          -1.7338235378265383 -0.3607016503810882 2.6457595825195313,
+          -1.7338235378265383 -0.3607016503810882 2.6657276153564453,
+          -1.7407754659652712 -0.26894271373748774 2.6657276153564453,
+          -1.7407754659652712 -0.26894271373748774 2.6457595825195313 ] }
+        coordIndex [
+          0, 1, 2, -1,
+          0, 2, 66, -1,
+          0, 3, 1, -1,
+          0, 4, 3, -1,
+          0, 64, 4, -1,
+          0, 66, 64, -1,
+          1, 3, 67, -1,
+          1, 67, 68, -1,
+          1, 68, 126, -1,
+          1, 126, 127, -1,
+          1, 127, 2, -1,
+          2, 69, 66, -1,
+          2, 127, 69, -1,
+          3, 4, 5, -1,
+          3, 5, 65, -1,
+          3, 65, 67, -1,
+          4, 6, 5, -1,
+          4, 7, 6, -1,
+          4, 63, 7, -1,
+          4, 64, 63, -1,
+          5, 6, 62, -1,
+          5, 62, 65, -1,
+          6, 7, 8, -1,
+          6, 8, 60, -1,
+          6, 60, 62, -1,
+          7, 9, 8, -1,
+          7, 61, 9, -1,
+          7, 63, 61, -1,
+          8, 9, 10, -1,
+          8, 10, 58, -1,
+          8, 58, 60, -1,
+          9, 11, 10, -1,
+          9, 59, 11, -1,
+          9, 61, 59, -1,
+          10, 11, 12, -1,
+          10, 12, 56, -1,
+          10, 56, 58, -1,
+          11, 13, 12, -1,
+          11, 57, 13, -1,
+          11, 59, 57, -1,
+          12, 13, 14, -1,
+          12, 14, 54, -1,
+          12, 54, 56, -1,
+          13, 15, 14, -1,
+          13, 55, 15, -1,
+          13, 57, 55, -1,
+          14, 15, 16, -1,
+          14, 16, 52, -1,
+          14, 52, 54, -1,
+          15, 17, 16, -1,
+          15, 53, 17, -1,
+          15, 55, 53, -1,
+          16, 17, 18, -1,
+          16, 18, 19, -1,
+          16, 19, 50, -1,
+          16, 50, 52, -1,
+          17, 51, 18, -1,
+          17, 53, 51, -1,
+          18, 20, 19, -1,
+          18, 21, 20, -1,
+          18, 49, 21, -1,
+          18, 51, 49, -1,
+          19, 20, 48, -1,
+          19, 48, 50, -1,
+          20, 21, 22, -1,
+          20, 22, 47, -1,
+          20, 47, 48, -1,
+          21, 23, 22, -1,
+          21, 46, 23, -1,
+          21, 49, 46, -1,
+          22, 23, 24, -1,
+          22, 24, 47, -1,
+          23, 25, 24, -1,
+          23, 46, 25, -1,
+          24, 25, 26, -1,
+          24, 26, 27, -1,
+          24, 27, 44, -1,
+          24, 44, 47, -1,
+          25, 45, 26, -1,
+          25, 46, 45, -1,
+          26, 28, 27, -1,
+          26, 45, 28, -1,
+          27, 28, 29, -1,
+          27, 29, 44, -1,
+          28, 30, 29, -1,
+          28, 31, 30, -1,
+          28, 33, 31, -1,
+          28, 35, 33, -1,
+          28, 36, 35, -1,
+          28, 39, 36, -1,
+          28, 41, 39, -1,
+          28, 43, 41, -1,
+          28, 45, 43, -1,
+          29, 30, 32, -1,
+          29, 32, 34, -1,
+          29, 34, 37, -1,
+          29, 37, 38, -1,
+          29, 38, 40, -1,
+          29, 40, 42, -1,
+          29, 42, 44, -1,
+          30, 31, 32, -1,
+          31, 33, 32, -1,
+          32, 33, 34, -1,
+          33, 35, 34, -1,
+          34, 35, 36, -1,
+          34, 36, 37, -1,
+          36, 38, 37, -1,
+          36, 39, 38, -1,
+          38, 39, 40, -1,
+          39, 41, 40, -1,
+          40, 41, 42, -1,
+          41, 43, 42, -1,
+          42, 43, 44, -1,
+          43, 45, 44, -1,
+          44, 45, 46, -1,
+          44, 46, 47, -1,
+          46, 48, 47, -1,
+          46, 49, 48, -1,
+          48, 49, 50, -1,
+          49, 51, 50, -1,
+          50, 51, 52, -1,
+          51, 53, 52, -1,
+          52, 53, 54, -1,
+          53, 55, 54, -1,
+          54, 55, 56, -1,
+          55, 57, 56, -1,
+          56, 57, 58, -1,
+          57, 59, 58, -1,
+          58, 59, 60, -1,
+          59, 61, 60, -1,
+          60, 61, 62, -1,
+          61, 63, 62, -1,
+          62, 63, 64, -1,
+          62, 64, 65, -1,
+          64, 66, 65, -1,
+          65, 66, 67, -1,
+          66, 68, 67, -1,
+          66, 69, 68, -1,
+          68, 69, 70, -1,
+          68, 70, 126, -1,
+          69, 71, 70, -1,
+          69, 127, 71, -1,
+          70, 71, 72, -1,
+          70, 72, 73, -1,
+          70, 73, 124, -1,
+          70, 124, 126, -1,
+          71, 125, 72, -1,
+          71, 127, 125, -1,
+          72, 74, 73, -1,
+          72, 123, 74, -1,
+          72, 125, 123, -1,
+          73, 74, 75, -1,
+          73, 75, 122, -1,
+          73, 122, 124, -1,
+          74, 76, 75, -1,
+          74, 123, 76, -1,
+          75, 76, 77, -1,
+          75, 77, 122, -1,
+          76, 78, 77, -1,
+          76, 121, 78, -1,
+          76, 123, 121, -1,
+          77, 78, 79, -1,
+          77, 79, 120, -1,
+          77, 120, 122, -1,
+          78, 80, 79, -1,
+          78, 81, 80, -1,
+          78, 118, 81, -1,
+          78, 121, 118, -1,
+          79, 80, 119, -1,
+          79, 119, 120, -1,
+          80, 81, 82, -1,
+          80, 82, 117, -1,
+          80, 117, 119, -1,
+          81, 83, 82, -1,
+          81, 116, 83, -1,
+          81, 118, 116, -1,
+          82, 83, 84, -1,
+          82, 84, 117, -1,
+          83, 85, 84, -1,
+          83, 116, 85, -1,
+          84, 85, 86, -1,
+          84, 86, 87, -1,
+          84, 87, 114, -1,
+          84, 114, 117, -1,
+          85, 115, 86, -1,
+          85, 116, 115, -1,
+          86, 88, 87, -1,
+          86, 89, 88, -1,
+          86, 112, 89, -1,
+          86, 115, 112, -1,
+          87, 88, 113, -1,
+          87, 113, 114, -1,
+          88, 89, 90, -1,
+          88, 90, 113, -1,
+          89, 91, 90, -1,
+          89, 112, 91, -1,
+          90, 91, 92, -1,
+          90, 92, 93, -1,
+          90, 93, 111, -1,
+          90, 111, 113, -1,
+          91, 110, 92, -1,
+          91, 112, 110, -1,
+          92, 94, 93, -1,
+          92, 95, 94, -1,
+          92, 106, 95, -1,
+          92, 109, 106, -1,
+          92, 110, 109, -1,
+          93, 94, 107, -1,
+          93, 107, 108, -1,
+          93, 108, 111, -1,
+          94, 95, 96, -1,
+          94, 96, 102, -1,
+          94, 102, 105, -1,
+          94, 105, 107, -1,
+          95, 97, 96, -1,
+          95, 103, 97, -1,
+          95, 104, 103, -1,
+          95, 106, 104, -1,
+          96, 97, 98, -1,
+          96, 98, 100, -1,
+          96, 100, 102, -1,
+          97, 99, 98, -1,
+          97, 101, 99, -1,
+          97, 103, 101, -1,
+          98, 99, 100, -1,
+          99, 101, 100, -1,
+          100, 101, 102, -1,
+          101, 103, 102, -1,
+          102, 103, 104, -1,
+          102, 104, 105, -1,
+          104, 106, 105, -1,
+          105, 106, 107, -1,
+          106, 108, 107, -1,
+          106, 109, 108, -1,
+          108, 109, 110, -1,
+          108, 110, 111, -1,
+          110, 112, 111, -1,
+          111, 112, 113, -1,
+          112, 114, 113, -1,
+          112, 115, 114, -1,
+          114, 115, 116, -1,
+          114, 116, 117, -1,
+          116, 118, 117, -1,
+          117, 118, 119, -1,
+          118, 120, 119, -1,
+          118, 121, 120, -1,
+          120, 121, 122, -1,
+          121, 123, 122, -1,
+          122, 123, 124, -1,
+          123, 125, 124, -1,
+          124, 125, 126, -1,
+          125, 127, 126, -1,
+          128, 129, 130, -1,
+          128, 130, 318, -1,
+          128, 131, 129, -1,
+          128, 132, 131, -1,
+          128, 317, 132, -1,
+          128, 318, 317, -1,
+          129, 131, 319, -1,
+          129, 223, 130, -1,
+          129, 225, 223, -1,
+          129, 319, 225, -1,
+          130, 222, 226, -1,
+          130, 223, 222, -1,
+          130, 226, 318, -1,
+          131, 132, 133, -1,
+          131, 133, 316, -1,
+          131, 316, 319, -1,
+          132, 134, 133, -1,
+          132, 135, 134, -1,
+          132, 314, 135, -1,
+          132, 317, 314, -1,
+          133, 134, 315, -1,
+          133, 315, 316, -1,
+          134, 135, 136, -1,
+          134, 136, 312, -1,
+          134, 312, 315, -1,
+          135, 137, 136, -1,
+          135, 313, 137, -1,
+          135, 314, 313, -1,
+          136, 137, 138, -1,
+          136, 138, 310, -1,
+          136, 310, 312, -1,
+          137, 139, 138, -1,
+          137, 311, 139, -1,
+          137, 313, 311, -1,
+          138, 139, 140, -1,
+          138, 140, 309, -1,
+          138, 309, 310, -1,
+          139, 141, 140, -1,
+          139, 308, 141, -1,
+          139, 311, 308, -1,
+          140, 141, 142, -1,
+          140, 142, 306, -1,
+          140, 306, 309, -1,
+          141, 143, 142, -1,
+          141, 307, 143, -1,
+          141, 308, 307, -1,
+          142, 143, 144, -1,
+          142, 144, 304, -1,
+          142, 304, 306, -1,
+          143, 145, 144, -1,
+          143, 305, 145, -1,
+          143, 307, 305, -1,
+          144, 145, 146, -1,
+          144, 146, 147, -1,
+          144, 147, 303, -1,
+          144, 303, 304, -1,
+          145, 302, 146, -1,
+          145, 305, 302, -1,
+          146, 148, 147, -1,
+          146, 149, 148, -1,
+          146, 301, 149, -1,
+          146, 302, 301, -1,
+          147, 148, 300, -1,
+          147, 300, 303, -1,
+          148, 149, 150, -1,
+          148, 150, 298, -1,
+          148, 298, 300, -1,
+          149, 151, 150, -1,
+          149, 299, 151, -1,
+          149, 301, 299, -1,
+          150, 151, 152, -1,
+          150, 152, 296, -1,
+          150, 296, 298, -1,
+          151, 153, 152, -1,
+          151, 297, 153, -1,
+          151, 299, 297, -1,
+          152, 153, 154, -1,
+          152, 154, 294, -1,
+          152, 294, 296, -1,
+          153, 155, 154, -1,
+          153, 295, 155, -1,
+          153, 297, 295, -1,
+          154, 155, 156, -1,
+          154, 156, 292, -1,
+          154, 292, 294, -1,
+          155, 157, 156, -1,
+          155, 293, 157, -1,
+          155, 295, 293, -1,
+          156, 157, 158, -1,
+          156, 158, 292, -1,
+          157, 159, 158, -1,
+          157, 293, 159, -1,
+          158, 159, 160, -1,
+          158, 160, 290, -1,
+          158, 290, 292, -1,
+          159, 161, 160, -1,
+          159, 291, 161, -1,
+          159, 293, 291, -1,
+          160, 161, 162, -1,
+          160, 162, 289, -1,
+          160, 289, 290, -1,
+          161, 163, 162, -1,
+          161, 288, 163, -1,
+          161, 291, 288, -1,
+          162, 163, 164, -1,
+          162, 164, 287, -1,
+          162, 287, 289, -1,
+          163, 165, 164, -1,
+          163, 286, 165, -1,
+          163, 288, 286, -1,
+          164, 165, 166, -1,
+          164, 166, 285, -1,
+          164, 285, 287, -1,
+          165, 167, 166, -1,
+          165, 284, 167, -1,
+          165, 286, 284, -1,
+          166, 167, 168, -1,
+          166, 168, 282, -1,
+          166, 282, 285, -1,
+          167, 169, 168, -1,
+          167, 283, 169, -1,
+          167, 284, 283, -1,
+          168, 169, 170, -1,
+          168, 170, 280, -1,
+          168, 280, 282, -1,
+          169, 171, 170, -1,
+          169, 281, 171, -1,
+          169, 283, 281, -1,
+          170, 171, 172, -1,
+          170, 172, 278, -1,
+          170, 278, 280, -1,
+          171, 173, 172, -1,
+          171, 279, 173, -1,
+          171, 281, 279, -1,
+          172, 173, 174, -1,
+          172, 174, 274, -1,
+          172, 274, 276, -1,
+          172, 276, 278, -1,
+          173, 175, 174, -1,
+          173, 275, 175, -1,
+          173, 277, 275, -1,
+          173, 279, 277, -1,
+          174, 175, 176, -1,
+          174, 176, 272, -1,
+          174, 272, 274, -1,
+          175, 177, 176, -1,
+          175, 273, 177, -1,
+          175, 275, 273, -1,
+          176, 177, 178, -1,
+          176, 178, 271, -1,
+          176, 271, 272, -1,
+          177, 179, 178, -1,
+          177, 270, 179, -1,
+          177, 273, 270, -1,
+          178, 179, 180, -1,
+          178, 180, 268, -1,
+          178, 268, 271, -1,
+          179, 181, 180, -1,
+          179, 269, 181, -1,
+          179, 270, 269, -1,
+          180, 181, 182, -1,
+          180, 182, 183, -1,
+          180, 183, 267, -1,
+          180, 267, 268, -1,
+          181, 266, 182, -1,
+          181, 269, 266, -1,
+          182, 184, 183, -1,
+          182, 265, 184, -1,
+          182, 266, 265, -1,
+          183, 184, 185, -1,
+          183, 185, 264, -1,
+          183, 264, 267, -1,
+          184, 186, 185, -1,
+          184, 263, 186, -1,
+          184, 265, 263, -1,
+          185, 186, 187, -1,
+          185, 187, 262, -1,
+          185, 262, 264, -1,
+          186, 188, 187, -1,
+          186, 261, 188, -1,
+          186, 263, 261, -1,
+          187, 188, 189, -1,
+          187, 189, 260, -1,
+          187, 260, 262, -1,
+          188, 190, 189, -1,
+          188, 191, 190, -1,
+          188, 259, 191, -1,
+          188, 261, 259, -1,
+          189, 190, 258, -1,
+          189, 258, 260, -1,
+          190, 191, 192, -1,
+          190, 192, 256, -1,
+          190, 256, 258, -1,
+          191, 193, 192, -1,
+          191, 257, 193, -1,
+          191, 259, 257, -1,
+          192, 193, 194, -1,
+          192, 194, 195, -1,
+          192, 195, 255, -1,
+          192, 255, 256, -1,
+          193, 254, 194, -1,
+          193, 257, 254, -1,
+          194, 196, 195, -1,
+          194, 253, 196, -1,
+          194, 254, 253, -1,
+          195, 196, 197, -1,
+          195, 197, 252, -1,
+          195, 252, 255, -1,
+          196, 198, 197, -1,
+          196, 251, 198, -1,
+          196, 253, 251, -1,
+          197, 198, 199, -1,
+          197, 199, 250, -1,
+          197, 250, 252, -1,
+          198, 200, 199, -1,
+          198, 201, 200, -1,
+          198, 248, 201, -1,
+          198, 251, 248, -1,
+          199, 200, 249, -1,
+          199, 249, 250, -1,
+          200, 201, 202, -1,
+          200, 202, 247, -1,
+          200, 247, 249, -1,
+          201, 203, 202, -1,
+          201, 246, 203, -1,
+          201, 248, 246, -1,
+          202, 203, 204, -1,
+          202, 204, 205, -1,
+          202, 205, 245, -1,
+          202, 245, 247, -1,
+          203, 244, 204, -1,
+          203, 246, 244, -1,
+          204, 206, 205, -1,
+          204, 207, 206, -1,
+          204, 244, 207, -1,
+          205, 206, 245, -1,
+          206, 207, 208, -1,
+          206, 208, 243, -1,
+          206, 243, 245, -1,
+          207, 209, 208, -1,
+          207, 242, 209, -1,
+          207, 244, 242, -1,
+          208, 209, 210, -1,
+          208, 210, 211, -1,
+          208, 211, 240, -1,
+          208, 240, 243, -1,
+          209, 241, 210, -1,
+          209, 242, 241, -1,
+          210, 212, 211, -1,
+          210, 213, 212, -1,
+          210, 238, 213, -1,
+          210, 241, 238, -1,
+          211, 212, 239, -1,
+          211, 239, 240, -1,
+          212, 213, 214, -1,
+          212, 214, 236, -1,
+          212, 236, 239, -1,
+          213, 215, 214, -1,
+          213, 237, 215, -1,
+          213, 238, 237, -1,
+          214, 215, 216, -1,
+          214, 216, 234, -1,
+          214, 234, 236, -1,
+          215, 217, 216, -1,
+          215, 235, 217, -1,
+          215, 237, 235, -1,
+          216, 217, 218, -1,
+          216, 218, 232, -1,
+          216, 232, 234, -1,
+          217, 219, 218, -1,
+          217, 233, 219, -1,
+          217, 235, 233, -1,
+          218, 219, 220, -1,
+          218, 220, 230, -1,
+          218, 230, 232, -1,
+          219, 221, 220, -1,
+          219, 231, 221, -1,
+          219, 233, 231, -1,
+          220, 221, 222, -1,
+          220, 222, 223, -1,
+          220, 223, 224, -1,
+          220, 224, 229, -1,
+          220, 229, 230, -1,
+          221, 227, 222, -1,
+          221, 228, 227, -1,
+          221, 231, 228, -1,
+          222, 227, 226, -1,
+          223, 225, 224, -1,
+          224, 225, 226, -1,
+          224, 226, 227, -1,
+          224, 227, 228, -1,
+          224, 228, 229, -1,
+          225, 318, 226, -1,
+          225, 319, 318, -1,
+          228, 230, 229, -1,
+          228, 231, 230, -1,
+          230, 231, 232, -1,
+          231, 233, 232, -1,
+          232, 233, 234, -1,
+          233, 235, 234, -1,
+          234, 235, 236, -1,
+          235, 237, 236, -1,
+          236, 237, 238, -1,
+          236, 238, 239, -1,
+          238, 240, 239, -1,
+          238, 241, 240, -1,
+          240, 241, 242, -1,
+          240, 242, 243, -1,
+          242, 244, 243, -1,
+          243, 244, 245, -1,
+          244, 246, 245, -1,
+          245, 246, 247, -1,
+          246, 248, 247, -1,
+          247, 248, 249, -1,
+          248, 250, 249, -1,
+          248, 251, 250, -1,
+          250, 251, 252, -1,
+          251, 253, 252, -1,
+          252, 253, 254, -1,
+          252, 254, 255, -1,
+          254, 256, 255, -1,
+          254, 257, 256, -1,
+          256, 257, 258, -1,
+          257, 259, 258, -1,
+          258, 259, 260, -1,
+          259, 261, 260, -1,
+          260, 261, 262, -1,
+          261, 263, 262, -1,
+          262, 263, 264, -1,
+          263, 265, 264, -1,
+          264, 265, 266, -1,
+          264, 266, 267, -1,
+          266, 268, 267, -1,
+          266, 269, 268, -1,
+          268, 269, 270, -1,
+          268, 270, 271, -1,
+          270, 272, 271, -1,
+          270, 273, 272, -1,
+          272, 273, 274, -1,
+          273, 275, 274, -1,
+          274, 275, 276, -1,
+          275, 277, 276, -1,
+          276, 277, 278, -1,
+          277, 279, 278, -1,
+          278, 279, 280, -1,
+          279, 281, 280, -1,
+          280, 281, 282, -1,
+          281, 283, 282, -1,
+          282, 283, 284, -1,
+          282, 284, 285, -1,
+          284, 286, 285, -1,
+          285, 286, 287, -1,
+          286, 288, 287, -1,
+          287, 288, 289, -1,
+          288, 290, 289, -1,
+          288, 291, 290, -1,
+          290, 291, 292, -1,
+          291, 293, 292, -1,
+          292, 293, 294, -1,
+          293, 295, 294, -1,
+          294, 295, 296, -1,
+          295, 297, 296, -1,
+          296, 297, 298, -1,
+          297, 299, 298, -1,
+          298, 299, 300, -1,
+          299, 301, 300, -1,
+          300, 301, 302, -1,
+          300, 302, 303, -1,
+          302, 304, 303, -1,
+          302, 305, 304, -1,
+          304, 305, 306, -1,
+          305, 307, 306, -1,
+          306, 307, 308, -1,
+          306, 308, 309, -1,
+          308, 310, 309, -1,
+          308, 311, 310, -1,
+          310, 311, 312, -1,
+          311, 313, 312, -1,
+          312, 313, 314, -1,
+          312, 314, 315, -1,
+          314, 316, 315, -1,
+          314, 317, 316, -1,
+          316, 317, 318, -1,
+          316, 318, 319, -1,
+          320, 321, 322, -1,
+          320, 322, 348, -1,
+          320, 323, 321, -1,
+          320, 324, 323, -1,
+          320, 325, 324, -1,
+          320, 346, 325, -1,
+          320, 348, 346, -1,
+          321, 323, 349, -1,
+          321, 348, 322, -1,
+          321, 349, 348, -1,
+          323, 324, 347, -1,
+          323, 347, 349, -1,
+          324, 325, 326, -1,
+          324, 326, 351, -1,
+          324, 351, 347, -1,
+          325, 327, 326, -1,
+          325, 346, 352, -1,
+          325, 352, 327, -1,
+          326, 327, 328, -1,
+          326, 328, 332, -1,
+          326, 332, 359, -1,
+          326, 359, 351, -1,
+          327, 329, 328, -1,
+          327, 333, 329, -1,
+          327, 352, 358, -1,
+          327, 358, 333, -1,
+          328, 329, 330, -1,
+          328, 330, 332, -1,
+          329, 331, 330, -1,
+          329, 333, 331, -1,
+          330, 331, 332, -1,
+          331, 333, 332, -1,
+          332, 333, 334, -1,
+          332, 334, 335, -1,
+          332, 335, 359, -1,
+          333, 358, 334, -1,
+          334, 336, 335, -1,
+          334, 337, 336, -1,
+          334, 357, 337, -1,
+          334, 358, 357, -1,
+          335, 336, 356, -1,
+          335, 356, 359, -1,
+          336, 337, 338, -1,
+          336, 338, 354, -1,
+          336, 354, 356, -1,
+          337, 339, 338, -1,
+          337, 355, 339, -1,
+          337, 357, 355, -1,
+          338, 339, 340, -1,
+          338, 340, 354, -1,
+          339, 341, 340, -1,
+          339, 355, 341, -1,
+          340, 341, 342, -1,
+          340, 342, 354, -1,
+          341, 343, 342, -1,
+          341, 355, 343, -1,
+          342, 343, 344, -1,
+          342, 344, 353, -1,
+          342, 353, 354, -1,
+          343, 345, 344, -1,
+          343, 350, 345, -1,
+          343, 355, 350, -1,
+          344, 345, 346, -1,
+          344, 346, 347, -1,
+          344, 347, 351, -1,
+          344, 351, 353, -1,
+          345, 350, 352, -1,
+          345, 352, 346, -1,
+          346, 348, 347, -1,
+          347, 348, 349, -1,
+          350, 351, 352, -1,
+          350, 353, 351, -1,
+          350, 354, 353, -1,
+          350, 355, 354, -1,
+          351, 359, 352, -1,
+          352, 359, 358, -1,
+          354, 355, 356, -1,
+          355, 357, 356, -1,
+          356, 357, 358, -1,
+          356, 358, 359, -1,
+          360, 361, 362, -1,
+          360, 362, 366, -1,
+          360, 366, 361, -1,
+          361, 363, 362, -1,
+          361, 365, 363, -1,
+          361, 366, 365, -1,
+          362, 363, 364, -1,
+          362, 364, 366, -1,
+          363, 365, 367, -1,
+          363, 367, 364, -1,
+          364, 365, 366, -1,
+          364, 367, 365, -1,
+          368, 369, 370, -1,
+          368, 370, 371, -1,
+          368, 371, 372, -1,
+          368, 372, 373, -1,
+          368, 373, 446, -1,
+          368, 446, 448, -1,
+          368, 448, 369, -1,
+          369, 428, 370, -1,
+          369, 429, 428, -1,
+          369, 448, 451, -1,
+          369, 451, 429, -1,
+          370, 428, 450, -1,
+          370, 449, 371, -1,
+          370, 450, 449, -1,
+          371, 447, 372, -1,
+          371, 449, 447, -1,
+          372, 374, 373, -1,
+          372, 375, 374, -1,
+          372, 444, 375, -1,
+          372, 447, 444, -1,
+          373, 374, 445, -1,
+          373, 445, 446, -1,
+          374, 375, 376, -1,
+          374, 376, 377, -1,
+          374, 377, 445, -1,
+          375, 444, 376, -1,
+          376, 378, 377, -1,
+          376, 443, 378, -1,
+          376, 444, 443, -1,
+          377, 378, 379, -1,
+          377, 379, 442, -1,
+          377, 442, 445, -1,
+          378, 380, 379, -1,
+          378, 440, 380, -1,
+          378, 443, 440, -1,
+          379, 380, 381, -1,
+          379, 381, 441, -1,
+          379, 441, 442, -1,
+          380, 382, 381, -1,
+          380, 383, 382, -1,
+          380, 439, 383, -1,
+          380, 440, 439, -1,
+          381, 382, 438, -1,
+          381, 438, 441, -1,
+          382, 383, 384, -1,
+          382, 384, 437, -1,
+          382, 437, 438, -1,
+          383, 385, 384, -1,
+          383, 436, 385, -1,
+          383, 439, 436, -1,
+          384, 385, 386, -1,
+          384, 386, 434, -1,
+          384, 434, 437, -1,
+          385, 387, 386, -1,
+          385, 435, 387, -1,
+          385, 436, 435, -1,
+          386, 387, 388, -1,
+          386, 388, 389, -1,
+          386, 389, 430, -1,
+          386, 430, 434, -1,
+          387, 433, 388, -1,
+          387, 435, 433, -1,
+          388, 390, 389, -1,
+          388, 433, 390, -1,
+          389, 390, 391, -1,
+          389, 391, 430, -1,
+          390, 392, 391, -1,
+          390, 393, 392, -1,
+          390, 432, 393, -1,
+          390, 433, 432, -1,
+          391, 392, 431, -1,
+          391, 431, 430, -1,
+          392, 393, 394, -1,
+          392, 394, 477, -1,
+          392, 477, 431, -1,
+          393, 395, 394, -1,
+          393, 432, 476, -1,
+          393, 476, 395, -1,
+          394, 395, 396, -1,
+          394, 396, 474, -1,
+          394, 474, 477, -1,
+          395, 397, 396, -1,
+          395, 475, 397, -1,
+          395, 476, 475, -1,
+          396, 397, 398, -1,
+          396, 398, 474, -1,
+          397, 399, 398, -1,
+          397, 475, 399, -1,
+          398, 399, 400, -1,
+          398, 400, 473, -1,
+          398, 473, 474, -1,
+          399, 401, 400, -1,
+          399, 472, 401, -1,
+          399, 475, 472, -1,
+          400, 401, 402, -1,
+          400, 402, 403, -1,
+          400, 403, 473, -1,
+          401, 472, 402, -1,
+          402, 404, 403, -1,
+          402, 472, 404, -1,
+          403, 404, 405, -1,
+          403, 405, 473, -1,
+          404, 406, 405, -1,
+          404, 407, 406, -1,
+          404, 471, 407, -1,
+          404, 472, 471, -1,
+          405, 406, 470, -1,
+          405, 470, 473, -1,
+          406, 407, 408, -1,
+          406, 408, 409, -1,
+          406, 409, 469, -1,
+          406, 469, 470, -1,
+          407, 468, 408, -1,
+          407, 471, 468, -1,
+          408, 410, 409, -1,
+          408, 411, 410, -1,
+          408, 466, 411, -1,
+          408, 468, 466, -1,
+          409, 410, 467, -1,
+          409, 467, 469, -1,
+          410, 411, 412, -1,
+          410, 412, 464, -1,
+          410, 464, 467, -1,
+          411, 413, 412, -1,
+          411, 465, 413, -1,
+          411, 466, 465, -1,
+          412, 413, 414, -1,
+          412, 414, 464, -1,
+          413, 415, 414, -1,
+          413, 465, 415, -1,
+          414, 415, 416, -1,
+          414, 416, 462, -1,
+          414, 462, 464, -1,
+          415, 417, 416, -1,
+          415, 463, 417, -1,
+          415, 465, 463, -1,
+          416, 417, 418, -1,
+          416, 418, 460, -1,
+          416, 460, 462, -1,
+          417, 419, 418, -1,
+          417, 461, 419, -1,
+          417, 463, 461, -1,
+          418, 419, 420, -1,
+          418, 420, 460, -1,
+          419, 421, 420, -1,
+          419, 461, 421, -1,
+          420, 421, 422, -1,
+          420, 422, 423, -1,
+          420, 423, 456, -1,
+          420, 456, 459, -1,
+          420, 459, 460, -1,
+          421, 457, 422, -1,
+          421, 458, 457, -1,
+          421, 461, 458, -1,
+          422, 424, 423, -1,
+          422, 457, 424, -1,
+          423, 424, 425, -1,
+          423, 425, 456, -1,
+          424, 426, 425, -1,
+          424, 455, 426, -1,
+          424, 457, 455, -1,
+          425, 426, 427, -1,
+          425, 427, 454, -1,
+          425, 454, 456, -1,
+          426, 428, 427, -1,
+          426, 453, 428, -1,
+          426, 455, 453, -1,
+          427, 428, 429, -1,
+          427, 429, 452, -1,
+          427, 452, 454, -1,
+          428, 453, 450, -1,
+          429, 451, 452, -1,
+          430, 431, 432, -1,
+          430, 432, 433, -1,
+          430, 433, 434, -1,
+          431, 476, 432, -1,
+          431, 477, 476, -1,
+          433, 435, 434, -1,
+          434, 435, 436, -1,
+          434, 436, 437, -1,
+          436, 438, 437, -1,
+          436, 439, 438, -1,
+          438, 439, 440, -1,
+          438, 440, 441, -1,
+          440, 442, 441, -1,
+          440, 443, 442, -1,
+          442, 443, 444, -1,
+          442, 444, 445, -1,
+          444, 446, 445, -1,
+          444, 447, 446, -1,
+          446, 447, 448, -1,
+          447, 449, 448, -1,
+          448, 449, 450, -1,
+          448, 450, 451, -1,
+          450, 452, 451, -1,
+          450, 453, 452, -1,
+          452, 453, 454, -1,
+          453, 455, 454, -1,
+          454, 455, 456, -1,
+          455, 457, 456, -1,
+          456, 457, 458, -1,
+          456, 458, 459, -1,
+          458, 460, 459, -1,
+          458, 461, 460, -1,
+          460, 461, 462, -1,
+          461, 463, 462, -1,
+          462, 463, 464, -1,
+          463, 465, 464, -1,
+          464, 465, 466, -1,
+          464, 466, 467, -1,
+          466, 468, 467, -1,
+          467, 468, 469, -1,
+          468, 470, 469, -1,
+          468, 471, 470, -1,
+          470, 471, 472, -1,
+          470, 472, 473, -1,
+          472, 474, 473, -1,
+          472, 475, 474, -1,
+          474, 475, 476, -1,
+          474, 476, 477, -1,
+          478, 479, 480, -1,
+          478, 480, 481, -1,
+          478, 481, 482, -1,
+          478, 482, 483, -1,
+          478, 483, 500, -1,
+          478, 500, 502, -1,
+          478, 502, 479, -1,
+          479, 502, 504, -1,
+          479, 504, 505, -1,
+          479, 505, 480, -1,
+          480, 503, 481, -1,
+          480, 505, 503, -1,
+          481, 501, 482, -1,
+          481, 503, 501, -1,
+          482, 484, 483, -1,
+          482, 497, 484, -1,
+          482, 499, 497, -1,
+          482, 501, 499, -1,
+          483, 484, 485, -1,
+          483, 485, 496, -1,
+          483, 496, 498, -1,
+          483, 498, 500, -1,
+          484, 486, 485, -1,
+          484, 497, 486, -1,
+          485, 486, 487, -1,
+          485, 487, 496, -1,
+          486, 488, 487, -1,
+          486, 489, 488, -1,
+          486, 491, 489, -1,
+          486, 497, 491, -1,
+          487, 488, 490, -1,
+          487, 490, 496, -1,
+          488, 489, 490, -1,
+          489, 491, 490, -1,
+          490, 491, 492, -1,
+          490, 492, 493, -1,
+          490, 493, 496, -1,
+          491, 497, 492, -1,
+          492, 494, 493, -1,
+          492, 495, 494, -1,
+          492, 497, 495, -1,
+          493, 494, 496, -1,
+          494, 495, 496, -1,
+          495, 497, 496, -1,
+          496, 497, 498, -1,
+          497, 499, 498, -1,
+          498, 499, 500, -1,
+          499, 501, 500, -1,
+          500, 501, 502, -1,
+          501, 503, 502, -1,
+          502, 503, 504, -1,
+          503, 505, 504, -1,
+          506, 507, 508, -1,
+          506, 508, 509, -1,
+          506, 509, 510, -1,
+          506, 510, 542, -1,
+          506, 542, 544, -1,
+          506, 544, 507, -1,
+          507, 534, 508, -1,
+          507, 544, 534, -1,
+          508, 534, 535, -1,
+          508, 535, 545, -1,
+          508, 545, 509, -1,
+          509, 511, 510, -1,
+          509, 543, 511, -1,
+          509, 545, 543, -1,
+          510, 511, 512, -1,
+          510, 512, 513, -1,
+          510, 513, 536, -1,
+          510, 536, 540, -1,
+          510, 540, 542, -1,
+          511, 539, 512, -1,
+          511, 541, 539, -1,
+          511, 543, 541, -1,
+          512, 514, 513, -1,
+          512, 515, 514, -1,
+          512, 538, 515, -1,
+          512, 539, 538, -1,
+          513, 514, 537, -1,
+          513, 537, 536, -1,
+          514, 515, 516, -1,
+          514, 516, 537, -1,
+          515, 517, 516, -1,
+          515, 538, 517, -1,
+          516, 517, 518, -1,
+          516, 518, 537, -1,
+          517, 519, 518, -1,
+          517, 538, 519, -1,
+          518, 519, 520, -1,
+          518, 520, 537, -1,
+          519, 521, 520, -1,
+          519, 538, 521, -1,
+          520, 521, 522, -1,
+          520, 522, 526, -1,
+          520, 526, 532, -1,
+          520, 532, 546, -1,
+          520, 546, 537, -1,
+          521, 523, 522, -1,
+          521, 527, 523, -1,
+          521, 533, 527, -1,
+          521, 538, 547, -1,
+          521, 547, 533, -1,
+          522, 523, 524, -1,
+          522, 524, 526, -1,
+          523, 525, 524, -1,
+          523, 527, 525, -1,
+          524, 525, 526, -1,
+          525, 527, 526, -1,
+          526, 527, 528, -1,
+          526, 528, 530, -1,
+          526, 530, 532, -1,
+          527, 529, 528, -1,
+          527, 531, 529, -1,
+          527, 533, 531, -1,
+          528, 529, 530, -1,
+          529, 531, 530, -1,
+          530, 531, 532, -1,
+          531, 533, 532, -1,
+          532, 533, 534, -1,
+          532, 534, 544, -1,
+          532, 544, 546, -1,
+          533, 535, 534, -1,
+          533, 545, 535, -1,
+          533, 547, 545, -1,
+          536, 537, 538, -1,
+          536, 538, 539, -1,
+          536, 539, 540, -1,
+          537, 546, 547, -1,
+          537, 547, 538, -1,
+          539, 541, 540, -1,
+          540, 541, 542, -1,
+          541, 543, 542, -1,
+          542, 543, 544, -1,
+          543, 545, 544, -1,
+          544, 545, 546, -1,
+          545, 547, 546, -1,
+          548, 549, 550, -1,
+          548, 550, 551, -1,
+          548, 551, 552, -1,
+          548, 552, 634, -1,
+          548, 634, 636, -1,
+          548, 636, 549, -1,
+          549, 628, 629, -1,
+          549, 629, 550, -1,
+          549, 636, 638, -1,
+          549, 638, 628, -1,
+          550, 629, 639, -1,
+          550, 637, 551, -1,
+          550, 639, 637, -1,
+          551, 553, 552, -1,
+          551, 635, 553, -1,
+          551, 637, 635, -1,
+          552, 553, 554, -1,
+          552, 554, 630, -1,
+          552, 630, 634, -1,
+          553, 555, 554, -1,
+          553, 633, 555, -1,
+          553, 635, 633, -1,
+          554, 555, 556, -1,
+          554, 556, 630, -1,
+          555, 557, 556, -1,
+          555, 633, 557, -1,
+          556, 557, 558, -1,
+          556, 558, 559, -1,
+          556, 559, 631, -1,
+          556, 631, 630, -1,
+          557, 632, 558, -1,
+          557, 633, 632, -1,
+          558, 560, 559, -1,
+          558, 561, 560, -1,
+          558, 632, 682, -1,
+          558, 682, 724, -1,
+          558, 724, 561, -1,
+          559, 560, 725, -1,
+          559, 681, 631, -1,
+          559, 725, 681, -1,
+          560, 561, 562, -1,
+          560, 562, 725, -1,
+          561, 563, 562, -1,
+          561, 724, 563, -1,
+          562, 563, 564, -1,
+          562, 564, 565, -1,
+          562, 565, 722, -1,
+          562, 722, 725, -1,
+          563, 723, 564, -1,
+          563, 724, 723, -1,
+          564, 566, 565, -1,
+          564, 567, 566, -1,
+          564, 720, 567, -1,
+          564, 723, 720, -1,
+          565, 566, 721, -1,
+          565, 721, 722, -1,
+          566, 567, 568, -1,
+          566, 568, 718, -1,
+          566, 718, 721, -1,
+          567, 569, 568, -1,
+          567, 719, 569, -1,
+          567, 720, 719, -1,
+          568, 569, 570, -1,
+          568, 570, 716, -1,
+          568, 716, 718, -1,
+          569, 571, 570, -1,
+          569, 717, 571, -1,
+          569, 719, 717, -1,
+          570, 571, 572, -1,
+          570, 572, 714, -1,
+          570, 714, 716, -1,
+          571, 573, 572, -1,
+          571, 715, 573, -1,
+          571, 717, 715, -1,
+          572, 573, 574, -1,
+          572, 574, 713, -1,
+          572, 713, 714, -1,
+          573, 575, 574, -1,
+          573, 712, 575, -1,
+          573, 715, 712, -1,
+          574, 575, 576, -1,
+          574, 576, 710, -1,
+          574, 710, 713, -1,
+          575, 577, 576, -1,
+          575, 711, 577, -1,
+          575, 712, 711, -1,
+          576, 577, 578, -1,
+          576, 578, 708, -1,
+          576, 708, 710, -1,
+          577, 579, 578, -1,
+          577, 709, 579, -1,
+          577, 711, 709, -1,
+          578, 579, 580, -1,
+          578, 580, 581, -1,
+          578, 581, 706, -1,
+          578, 706, 708, -1,
+          579, 707, 580, -1,
+          579, 709, 707, -1,
+          580, 582, 581, -1,
+          580, 583, 582, -1,
+          580, 704, 583, -1,
+          580, 707, 704, -1,
+          581, 582, 705, -1,
+          581, 705, 706, -1,
+          582, 583, 584, -1,
+          582, 584, 705, -1,
+          583, 585, 584, -1,
+          583, 704, 585, -1,
+          584, 585, 586, -1,
+          584, 586, 702, -1,
+          584, 702, 705, -1,
+          585, 587, 586, -1,
+          585, 703, 587, -1,
+          585, 704, 703, -1,
+          586, 587, 588, -1,
+          586, 588, 589, -1,
+          586, 589, 700, -1,
+          586, 700, 702, -1,
+          587, 701, 588, -1,
+          587, 703, 701, -1,
+          588, 590, 589, -1,
+          588, 698, 590, -1,
+          588, 701, 698, -1,
+          589, 590, 591, -1,
+          589, 591, 699, -1,
+          589, 699, 700, -1,
+          590, 592, 591, -1,
+          590, 593, 592, -1,
+          590, 697, 593, -1,
+          590, 698, 697, -1,
+          591, 592, 696, -1,
+          591, 696, 699, -1,
+          592, 593, 594, -1,
+          592, 594, 695, -1,
+          592, 695, 696, -1,
+          593, 595, 594, -1,
+          593, 694, 595, -1,
+          593, 697, 694, -1,
+          594, 595, 596, -1,
+          594, 596, 693, -1,
+          594, 693, 695, -1,
+          595, 597, 596, -1,
+          595, 692, 597, -1,
+          595, 694, 692, -1,
+          596, 597, 598, -1,
+          596, 598, 691, -1,
+          596, 691, 693, -1,
+          597, 599, 598, -1,
+          597, 690, 599, -1,
+          597, 692, 690, -1,
+          598, 599, 600, -1,
+          598, 600, 671, -1,
+          598, 671, 672, -1,
+          598, 672, 674, -1,
+          598, 674, 687, -1,
+          598, 687, 689, -1,
+          598, 689, 691, -1,
+          599, 601, 600, -1,
+          599, 670, 601, -1,
+          599, 673, 670, -1,
+          599, 675, 673, -1,
+          599, 686, 675, -1,
+          599, 688, 686, -1,
+          599, 690, 688, -1,
+          600, 601, 602, -1,
+          600, 602, 668, -1,
+          600, 668, 671, -1,
+          601, 603, 602, -1,
+          601, 669, 603, -1,
+          601, 670, 669, -1,
+          602, 603, 604, -1,
+          602, 604, 666, -1,
+          602, 666, 668, -1,
+          603, 605, 604, -1,
+          603, 667, 605, -1,
+          603, 669, 667, -1,
+          604, 605, 606, -1,
+          604, 606, 664, -1,
+          604, 664, 666, -1,
+          605, 607, 606, -1,
+          605, 665, 607, -1,
+          605, 667, 665, -1,
+          606, 607, 608, -1,
+          606, 608, 663, -1,
+          606, 663, 664, -1,
+          607, 609, 608, -1,
+          607, 662, 609, -1,
+          607, 665, 662, -1,
+          608, 609, 610, -1,
+          608, 610, 660, -1,
+          608, 660, 663, -1,
+          609, 611, 610, -1,
+          609, 661, 611, -1,
+          609, 662, 661, -1,
+          610, 611, 612, -1,
+          610, 612, 659, -1,
+          610, 659, 660, -1,
+          611, 613, 612, -1,
+          611, 658, 613, -1,
+          611, 661, 658, -1,
+          612, 613, 614, -1,
+          612, 614, 656, -1,
+          612, 656, 659, -1,
+          613, 615, 614, -1,
+          613, 657, 615, -1,
+          613, 658, 657, -1,
+          614, 615, 616, -1,
+          614, 616, 617, -1,
+          614, 617, 652, -1,
+          614, 652, 654, -1,
+          614, 654, 656, -1,
+          615, 653, 616, -1,
+          615, 655, 653, -1,
+          615, 657, 655, -1,
+          616, 618, 617, -1,
+          616, 619, 618, -1,
+          616, 653, 619, -1,
+          617, 618, 652, -1,
+          618, 619, 620, -1,
+          618, 620, 621, -1,
+          618, 621, 650, -1,
+          618, 650, 652, -1,
+          619, 651, 620, -1,
+          619, 653, 651, -1,
+          620, 622, 621, -1,
+          620, 649, 622, -1,
+          620, 651, 649, -1,
+          621, 622, 623, -1,
+          621, 623, 648, -1,
+          621, 648, 650, -1,
+          622, 624, 623, -1,
+          622, 625, 624, -1,
+          622, 647, 625, -1,
+          622, 649, 647, -1,
+          623, 624, 646, -1,
+          623, 646, 648, -1,
+          624, 625, 626, -1,
+          624, 626, 642, -1,
+          624, 642, 644, -1,
+          624, 644, 646, -1,
+          625, 627, 626, -1,
+          625, 643, 627, -1,
+          625, 645, 643, -1,
+          625, 647, 645, -1,
+          626, 627, 628, -1,
+          626, 628, 640, -1,
+          626, 640, 642, -1,
+          627, 629, 628, -1,
+          627, 641, 629, -1,
+          627, 643, 641, -1,
+          628, 638, 640, -1,
+          629, 641, 639, -1,
+          630, 631, 632, -1,
+          630, 632, 633, -1,
+          630, 633, 634, -1,
+          631, 678, 632, -1,
+          631, 681, 683, -1,
+          631, 683, 678, -1,
+          632, 678, 679, -1,
+          632, 679, 680, -1,
+          632, 680, 682, -1,
+          633, 635, 634, -1,
+          634, 635, 636, -1,
+          635, 637, 636, -1,
+          636, 637, 638, -1,
+          637, 639, 638, -1,
+          638, 639, 640, -1,
+          639, 641, 640, -1,
+          640, 641, 642, -1,
+          641, 643, 642, -1,
+          642, 643, 644, -1,
+          643, 645, 644, -1,
+          644, 645, 646, -1,
+          645, 647, 646, -1,
+          646, 647, 648, -1,
+          647, 649, 648, -1,
+          648, 649, 650, -1,
+          649, 651, 650, -1,
+          650, 651, 652, -1,
+          651, 653, 652, -1,
+          652, 653, 654, -1,
+          653, 655, 654, -1,
+          654, 655, 656, -1,
+          655, 657, 656, -1,
+          656, 657, 658, -1,
+          656, 658, 659, -1,
+          658, 660, 659, -1,
+          658, 661, 660, -1,
+          660, 661, 662, -1,
+          660, 662, 663, -1,
+          662, 664, 663, -1,
+          662, 665, 664, -1,
+          664, 665, 666, -1,
+          665, 667, 666, -1,
+          666, 667, 668, -1,
+          667, 669, 668, -1,
+          668, 669, 670, -1,
+          668, 670, 671, -1,
+          670, 672, 671, -1,
+          670, 673, 672, -1,
+          672, 673, 674, -1,
+          673, 675, 674, -1,
+          674, 675, 676, -1,
+          674, 676, 684, -1,
+          674, 684, 687, -1,
+          675, 677, 676, -1,
+          675, 685, 677, -1,
+          675, 686, 685, -1,
+          676, 677, 678, -1,
+          676, 678, 684, -1,
+          677, 679, 678, -1,
+          677, 685, 679, -1,
+          678, 683, 684, -1,
+          679, 685, 680, -1,
+          680, 681, 682, -1,
+          680, 683, 681, -1,
+          680, 684, 683, -1,
+          680, 685, 684, -1,
+          681, 724, 682, -1,
+          681, 725, 724, -1,
+          684, 685, 686, -1,
+          684, 686, 687, -1,
+          686, 688, 687, -1,
+          687, 688, 689, -1,
+          688, 690, 689, -1,
+          689, 690, 691, -1,
+          690, 692, 691, -1,
+          691, 692, 693, -1,
+          692, 694, 693, -1,
+          693, 694, 695, -1,
+          694, 696, 695, -1,
+          694, 697, 696, -1,
+          696, 697, 698, -1,
+          696, 698, 699, -1,
+          698, 700, 699, -1,
+          698, 701, 700, -1,
+          700, 701, 702, -1,
+          701, 703, 702, -1,
+          702, 703, 704, -1,
+          702, 704, 705, -1,
+          704, 706, 705, -1,
+          704, 707, 706, -1,
+          706, 707, 708, -1,
+          707, 709, 708, -1,
+          708, 709, 710, -1,
+          709, 711, 710, -1,
+          710, 711, 712, -1,
+          710, 712, 713, -1,
+          712, 714, 713, -1,
+          712, 715, 714, -1,
+          714, 715, 716, -1,
+          715, 717, 716, -1,
+          716, 717, 718, -1,
+          717, 719, 718, -1,
+          718, 719, 720, -1,
+          718, 720, 721, -1,
+          720, 722, 721, -1,
+          720, 723, 722, -1,
+          722, 723, 724, -1,
+          722, 724, 725, -1 ]
+        normal Normal { vector [
+          -0.08320467612676495 -0.7013910228454294 0.7079036763165469,
+          0.002227469177329498 -0.7992190024999618 -0.601035792964138,
+          0.0015418946469042336 -0.5536619905423337 0.8327400691630005,
+          -0.11644741368034742 -0.6966436554422056 -0.7079036778964208,
+          -0.222953947258116 -0.7675760981470179 0.6009313363067571,
+          -0.1544662072317934 -0.5317895022745909 -0.8326704726925098,
+          -0.27146457161795107 -0.6522422108418787 -0.7077337668589654,
+          -0.2987146486831318 -0.6402206447075353 0.7077337668589657,
+          -0.3499713710125661 -0.6137884840502754 -0.7076607494547438,
+          -0.3740116462931569 -0.5994427012803082 0.7076607494547438,
+          -0.4205785950493247 -0.5677183432707732 -0.7076789724869775,
+          -0.4430950182559654 -0.5503247011506218 0.7076789724869776,
+          -0.47833171734926194 -0.5204633592752249 -0.7073306580586297,
+          -0.4912811637911702 -0.50825796429996 0.7073306580586297,
+          -0.5047931471544425 -0.4951593835814568 -0.7071075331497644,
+          -0.5055147418059835 -0.49442267583484134 0.7071075331497644,
+          -0.5770767008589116 -0.5540473275236484 -0.6000117000440055,
+          -0.40012664768777195 -0.38415881197845614 0.8320580947202224,
+          -0.5671064948077812 -0.5641276668463845 0.6001251528183823,
+          -0.3931750198554055 -0.39110979797275874 -0.8321337210397193,
+          -0.4604855905039918 -0.5353417110066117 -0.7080693987136456,
+          -0.43188464853778535 -0.5586710811941944 0.7080693987136456,
+          -0.43192609127310017 -0.710093601538718 -0.5560637811720108,
+          -0.3887897172666916 -0.7345989565854093 0.5560637811720108,
+          -0.26174388854748704 -0.7546348719613234 -0.6016779427799873,
+          -0.1812234079519256 -0.5224859461480215 0.8331665574710118,
+          -0.15619660819965964 -0.816565472174245 0.5557188580926279,
+          -0.11389326111473323 -0.8235319519198249 -0.5557188580926279,
+          0.21649450384154492 -0.23595975647950412 0.9473400250852576,
+          0.11266726421465027 -0.12279685840089172 -0.9860157296621882,
+          0.816496489768788 -0.4082484499918757 -0.4082483132536844,
+          0.40824803977654006 -0.8164966948764301 0.4082483132536844,
+          -0.33333320355016627 -0.6666667214942793 -0.6666666767306225,
+          -0.666666967431325 -0.33333306978446814 0.6666664976762995,
+          -0.6086781829383887 0.5600587817482253 -0.5620009169045147,
+          -0.43615966810892315 0.40132079469795445 0.8054230960545621,
+          -0.0371695093951752 0.893499772091998 0.44752271991807224,
+          -0.029377434034441898 0.7061898142092067 -0.7074128304439481,
+          0.023534274850766406 0.8315120764626721 -0.5550079320189792,
+          0.047066118928157014 0.830512551625362 0.5550078216041385,
+          0.11074578892173371 0.8240328876814292 -0.5556124280966976,
+          0.15081194091234004 0.8176492137428139 0.5556127444038801,
+          0.2217221000937378 0.8015641193406515 -0.5552785543451757,
+          0.2526785570948967 0.7923504741392995 0.5552785543451757,
+          0.28063323907469256 0.6483156702309519 -0.7077653402501694,
+          0.1773889001083725 0.4098017898538446 0.8947601193341862,
+          0.36041544576443785 0.6074642594516777 0.707875610501765,
+          0.2277981008085882 0.38394360241328335 -0.8948158108984836,
+          0.4229637306490696 0.5659372332599953 -0.707684061262823,
+          0.4455047155647173 0.5483692349541114 0.707684061262823,
+          0.4799184610212997 0.5190370963646294 -0.7073038691880045,
+          0.4920426717159343 0.5075581206544957 0.7073038691880045,
+          0.50558452209098 0.494347371624323 -0.7071102935116692,
+          0.507140142700805 0.49275136577309286 0.7071102935116692,
+          0.49954924905914583 0.5002834191766456 -0.7072248922806437,
+          0.490320292353079 0.50933187868562 0.7072248922806437,
+          0.46485335655168114 0.5324009257904266 -0.7074324074568058,
+          0.4484742147875068 0.546269409312472 0.7074324074568058,
+          0.407070835713153 0.5773808322545092 -0.7077603473329694,
+          0.38184629487822047 0.5943641121660102 0.7077603473329694,
+          0.32496946205026583 0.6270138637585432 -0.7079890277323116,
+          0.2932019440412117 0.642482806478983 0.7079890277323116,
+          0.23755735009821707 0.7630330529676804 -0.6011215064303839,
+          0.1645566063532023 0.5285550191554597 0.8327969230437207,
+          0.12283196245018402 0.6954343603245112 0.7080136718176243,
+          0.0874073158160732 0.7007685792479246 -0.7080136718176243,
+          -0.005209038935796731 0.7990589534681226 0.6012301180045738,
+          -0.003607975310874321 0.553458236054526 -0.8328691154422576,
+          -0.09984581650573561 0.6989227252909535 -0.7081933613061969,
+          -0.13849427668052816 0.6923022054385826 0.7081927644869098,
+          -0.2571494460094755 0.7566923129804102 -0.6010747922624746,
+          -0.17813564070339125 0.5241850778212335 0.8327650915478744,
+          -0.3050571041588698 0.637152878587882 0.7077968440939677,
+          -0.3329441689557608 0.6230332732882676 -0.7077977965026908,
+          -0.4588547016658811 0.6933290641484838 0.5556502241213469,
+          -0.4928068027122605 0.6696219405875935 -0.5556508902937387,
+          -0.4735613947157789 0.5238736315248237 0.7080226151951925,
+          -0.4996491609367606 0.4990525283113014 -0.7080235094693459,
+          -0.6288059519923241 0.49347695751364545 0.6009022941727736,
+          -0.43565730816565185 0.3418969831903347 -0.8326518856804482,
+          -0.6024106451055273 0.36873625748282496 -0.7079088833183987,
+          -0.6193047088231134 0.3395997339662051 0.707907973058364,
+          -0.7628021382285864 0.3310481673905116 -0.555463778100139,
+          -0.7768121101250719 0.29668784866890835 0.5554631094998551,
+          -0.7733112963049628 0.20258831304625224 -0.600789159709304,
+          -0.5358299750436927 0.14037411498618715 0.8325751291544328,
+          -0.7929846887609202 0.1009153371999556 0.6008255804379219,
+          -0.5494427039038358 0.06992137612299283 -0.832600574277912,
+          -0.8314412210215135 0.015046340237457503 -0.5554089517028992,
+          -0.8313194241159854 -0.020710177588641424 0.5554089517028992,
+          -0.790929213157506 -0.11446244388847245 -0.601106753175446,
+          -0.5478857577254205 -0.07928945063311321 0.8327871153541828,
+          -0.6742739169881311 -0.20907036864236006 0.7082684983996044,
+          -0.42602817388725966 -0.13209745345704765 -0.8950141104163944,
+          -0.5407412391472116 -0.2566284401416328 -0.8010872336993086,
+          -0.5239110261201283 -0.2894417013448331 0.8010872226120966,
+          -0.5820344348713898 -0.40069655115073105 -0.7075861717980725,
+          -0.5668750175922638 -0.42187040353244604 0.707586091619346,
+          -0.8903091169779968 -0.179751582267918 -0.4183766782434695,
+          -0.8019748762421557 0.4263770265473092 0.4183765398645749,
+          -0.12696280489074727 0.7500723567048979 -0.649054624728485,
+          0.29963273028436566 0.6992484068859812 0.6490546143505598,
+          0.6375129713730227 0.48169774663043463 -0.6012856993329388,
+          0.4415441872742098 0.3336259019007528 0.8329060500832413,
+          0.7229491668530305 0.4106564910584328 0.5556129484615027,
+          0.7421255501635946 0.37489187680756386 -0.5556129484615027,
+          0.7457646731503407 0.28855003311488997 0.6004780850875088,
+          0.5168808744029376 0.19999069250006457 -0.8323688392712688,
+          0.8635332094182255 0.2319302760995575 -0.44779319251217087,
+          0.6823511826312461 0.18326787720317675 0.7076791283817696,
+          0.6974659470435516 0.1115231869415914 0.7078868776075967,
+          0.7019387046952323 0.07860167531132363 -0.7078868776075967,
+          0.7062773316715413 -0.0025965852660455226 0.7079304969500072,
+          0.4463771491915788 -0.0016417063458234009 -0.8948434195320838,
+          0.7883131007273502 -0.12912779799225613 -0.6015716640661374,
+          0.5458529686254646 -0.08941138311616785 0.8330967178017334,
+          0.568463841804304 -0.18684234476960052 0.8012108329036054,
+          0.5551198801597917 -0.22339366752293857 -0.8012098276743923,
+          0.685515486252211 -0.41003185901572453 0.601616483069159,
+          0.4746559898150342 -0.283909124763344 -0.8331250207554818,
+          0.5378347671741556 -0.4561586023368382 -0.708980319002456,
+          0.5031007277555039 -0.4942016732385002 0.708981215477638,
+          0.3559508954449417 -0.47967931381696666 -0.8020016932201753,
+          0.314535970775581 -0.5077980354637928 0.802002667244552,
+          0.2736146648769751 -0.6499745600878077 -0.708990893032429,
+          0.2252990854006091 -0.6682596294011313 0.7089918122449029,
+          0.1358552829297891 -0.6926903464854176 -0.7083243790707607,
+          0.09489063264009077 -0.6994791427769461 0.7083252760259173,
+          0.08113447771336013 0.7017483698532014 0.7077898147999551,
+          0.021131269818170095 0.706187388446844 -0.7077095744968397,
+          -0.008069544881709361 0.7064575001215903 0.7077094622564795,
+          0.11193113697837112 0.69749901471714 -0.7077899017670057,
+          0.20597368253725154 0.7725360748031479 0.6006353762723176,
+          0.1427385295052935 0.5353628912857537 -0.8324735952742435,
+          0.2537568734119589 0.6590765608620558 -0.7079728357207159,
+          0.28610472919627755 0.6456923561013257 0.7079727856378688,
+          0.34811530071194147 0.6145071048232696 -0.7079525093761287,
+          0.3777873479783472 0.5967245393660853 0.7079523598560996,
+          0.4296106690542912 0.5609097876347827 -0.7076827560215293,
+          0.4519173423491407 0.5430984108901465 0.7076827197075586,
+          0.4964025399310673 0.502569370378026 -0.7078195718598205,
+          0.5184889307876304 0.4797490458169506 0.7078206564437248,
+          0.5601573775123813 0.4302702309652402 -0.707877984375535,
+          0.5796854002221143 0.40356600333534515 0.7078836894019125,
+          0.7045831967938803 0.3774252380023913 -0.6009265416958668,
+          0.48814188938565317 0.26148376745097723 0.8326726458739039,
+          0.7514032176291324 0.27221929928778693 0.6010739202725842,
+          0.5205285167942229 0.1885777233535491 -0.8327595724209953,
+          0.687907767185804 0.1607592244332824 -0.7077707083547969,
+          0.694242465492677 0.13067628447406124 0.7077789964266411,
+          0.7024348772284894 0.077951333147306 -0.7074664888979229,
+          0.7045667073293874 0.05535310422435986 0.7074756453587308,
+          0.7065134806171883 0.00396415702955834 -0.7076884817242901,
+          0.7060785664220953 -0.024835648957948635 0.707697851190857,
+          0.7014532602979339 -0.08388490432353825 -0.7077617158649018,
+          0.6971631234121779 -0.11412441872361072 0.7077705817602016,
+          0.8079755351289972 -0.19745772494199001 -0.5551450094288374,
+          0.800718208352733 -0.22505469445732335 0.5551582975288308,
+          0.6641289582830711 -0.24111699023530161 -0.7076689365725419,
+          0.6539328398343758 -0.2675170983527046 0.7076767928052312,
+          0.6281278573323171 -0.3230585489228292 -0.7078760970756026,
+          0.6123099513184368 -0.3521043784814114 0.7078834862960377,
+          0.5767391649566317 -0.40777174722293674 -0.7078800306350508,
+          0.5569664648104142 -0.4343802304453904 0.7078857057991771,
+          0.5134071153712971 -0.4850462447621354 -0.7079147366231855,
+          0.4895883127283587 -0.5090761071926733 0.707915814998756,
+          0.4386354368913733 -0.5535736225074478 -0.7079231582361859,
+          0.41149608392085546 -0.5740346461239992 0.7079231582361853,
+          0.35689192905355294 -0.6096272573345235 -0.7078013549656574,
+          0.32949325849650113 -0.624861132183894 0.707801354965657,
+          0.2732972415661143 -0.6514226325045782 -0.7077832801169849,
+          0.24450555745973346 -0.6627662413929134 0.7077838240884115,
+          0.1564414837469241 -0.5784195147334933 -0.800597856066659,
+          0.12987979622499457 -0.5849552733020444 0.8005988800695915,
+          0.0937587899864105 -0.700296450858685 -0.7076681215195534,
+          0.0657482402231965 -0.7034785211910227 0.707668806102434,
+          0.008172185380626798 -0.7064408848777187 -0.7077248699595702,
+          -0.021399361019791036 -0.7061639910313963 0.7077248654092595,
+          -0.0821370630455219 -0.7016149195850383 -0.7078064760158218,
+          -0.11329879958089178 -0.6972613387558446 0.7078064760158218,
+          -0.20838719430214458 -0.7718775490046312 -0.6006495039484202,
+          -0.14440933259500147 -0.5349000550158911 0.8324829582660914,
+          -0.2544886685559815 -0.6588934376128108 0.7078806081871268,
+          -0.2850686472019198 -0.6462514301222787 -0.7078806081871268,
+          -0.34546546042162996 -0.6159984208964518 0.7079544908458091,
+          -0.375249350231246 -0.5983212883077776 -0.7079544908458093,
+          -0.4273132727783118 -0.5626584095015875 0.7076855806957154,
+          -0.4497471537514612 -0.5448932157476615 -0.7076855806957154,
+          -0.5712248334399351 -0.5592052735937066 0.600825808072944,
+          -0.3957902173283108 -0.38746210565452166 -0.8326002765727217,
+          -0.55696762144318 -0.4343823783874654 -0.7078834777068718,
+          -0.5767362028300264 -0.4077699527120989 0.7078834777068718,
+          -0.7020348378806682 -0.3821150732205741 -0.6009452198158325,
+          -0.4863755825131889 -0.2647325051357614 0.8326797064054702,
+          -0.6563528323370763 -0.26063859452371635 0.7080031656199,
+          -0.6686585686535007 -0.22721627591009227 -0.7080031656199008,
+          -0.6873053572955325 -0.16320681136531764 0.7077957915647888,
+          -0.6938458639967194 -0.1326764276645252 -0.7077957915647888,
+          -0.7959797476286918 -0.07658178201675467 0.6004593841619117,
+          -0.5516932900516256 -0.05307880684741793 -0.8323563863968771,
+          -0.7065094563005583 -0.004560398937965782 -0.7076889082919245,
+          -0.7061118219261319 0.024135119986081564 0.7076889082919245,
+          -0.7917589622982293 0.11036097095418423 -0.6007813260334253,
+          -0.5486150039693128 0.07646984423433863 0.8325706818898482,
+          -0.865752393766365 0.22374541652147376 0.4476726273444036,
+          -0.6841739337510107 0.1768182021585787 -0.7075601400312739,
+          -0.6633326727285179 0.24264533094984078 -0.7078933596659057,
+          -0.6511349903090484 0.2736973067754844 0.7078933596659047,
+          -0.6932044675467469 0.39767064110381195 -0.6011036744001107,
+          -0.4801919823829562 0.27547175822876946 0.8327850685942184,
+          -0.6340667676668504 0.4870053736303881 0.6006538938487274,
+          -0.4393974937366197 0.3374864470454194 -0.8324858800956545,
+          -0.5127754084701526 0.48584084496360375 -0.7078277006682628,
+          -0.4902902348588662 0.5085227937553224 0.7078277006682628,
+          -0.44086977434867575 0.5518004266107026 -0.707919579654352,
+          -0.4138737992453399 0.5723271788623853 0.7079195424860452,
+          -0.35950155077225954 0.6080932023589988 -0.7078003194666688,
+          -0.3321906504477892 0.6234326707042294 0.7078001673167834,
+          -0.27436972585088804 0.6508789869445017 -0.7078684891211134,
+          -0.2438304706761521 0.6629245623022204 0.7078684385295446,
+          -0.16681820893920463 0.6863142755798647 -0.7079155318974161,
+          -0.10543274102845769 0.4337655604796902 0.8948359490213649,
+          -0.09261366340274756 0.7004622135777631 0.7076548570460481,
+          -0.06494056632124727 0.7035674935474379 -0.7076549334734068,
+          0.09793188020363115 -0.7934944244899023 -0.6006462728954708,
+          -0.0035611790588618974 -0.70666667092316 -0.7075376556834904,
+          0.02112566040242945 -0.7063598036853966 0.7075376556834901,
+          0.06786557614062137 -0.5498817767044282 0.8324808077208043,
+          0.2035615321853118 -0.8707355340789475 0.44764085191883274,
+          0.1608718693994217 -0.6881302749886082 -0.7075287741710847,
+          0.22573663174944042 -0.6692879575666085 -0.7078817718678277,
+          0.2568582269788704 -0.6579720725764395 0.7078817718678282,
+          0.3177916033797257 -0.6307671041318478 -0.7079133825309887,
+          0.34759052472975016 -0.6148491440602574 0.7079133825309887,
+          0.3998068360466869 -0.5825676928816881 -0.7076506038016536,
+          0.42236431365928045 -0.5664265261146234 0.7076506038016536,
+          0.5433263913717926 -0.5862990808588613 -0.6008742133117048,
+          0.37644417861675383 -0.4062178451527545 0.8326324775463723,
+          0.620771193533537 -0.5033457693187432 0.6010708458974452,
+          0.430028702938076 -0.34868423432701273 -0.8327632432937833,
+          0.687716358091193 -0.4072458822072629 -0.6009966740665161,
+          0.47643440680327726 -0.2821307767798744 0.8327139249511767,
+          0.6466450535334877 -0.2840022692167889 0.7079497763403753,
+          0.6597561694739291 -0.25204942178212214 -0.7079497763403744,
+          0.5773803808791416 -0.16025315035580506 0.8005940441802556,
+          0.584070340739475 -0.13383203462391474 -0.8005940441802556,
+          0.6997203578721238 -0.09769462711995391 0.7077055748057947,
+          0.7031504861784986 -0.0687910835482396 -0.7077055748057947,
+          0.7993218759562724 0.008061441240924819 0.6008490257817388,
+          0.5538229510197964 0.005585498547979078 -0.8326157223651826,
+          0.7010443792931436 0.08643688069763181 -0.707859762888635,
+          0.6963026095882584 0.11873176476338168 0.707859762888635,
+          0.7697864683600253 0.215961352065262 -0.6006575459810222,
+          0.53344725380782 0.1496570736470227 0.8324883108562575,
+          0.7366920879198575 0.3102609307355243 0.6008518306998881,
+          0.5104276613825807 0.21496872830667063 -0.832617588299528,
+          0.6153833113590802 0.34663932951802245 -0.7079156413952364,
+          0.5980782649016445 0.3757097732561823 0.7079156413952347,
+          0.5587866851004786 0.4319007305671154 -0.7079683605147977,
+          0.5367569010486859 0.4589910997901817 0.7079683605147977,
+          0.48913667037365366 0.509454805678122 -0.7079555908863512,
+          0.4635555078856968 0.5328369097966011 0.7079555908863512,
+          0.41025139379993053 0.5749560273854618 -0.7078978460613807,
+          0.3825641658438886 0.593738409195352 0.7078978460613807,
+          0.3542443438001643 0.7165933211543559 -0.6008368804946657,
+          0.24544644113301975 0.49650836631635215 0.8326076427183468,
+          0.2538046163154731 0.7579268393008733 0.6009410312204881,
+          0.17583858930041363 0.5250999298213392 -0.8326769206687941,
+          0.15146041634799692 0.7849570950417538 -0.6007512806672181,
+          0.10495064948956342 0.5439160866743684 0.832550690245681,
+          0.06740301092763389 0.7968793670882905 0.6003666449985833,
+          0.046720753079542744 0.5523611427965223 -0.8322946228110574,
+          0.0035989098564859308 0.7066487751869471 -0.7075553380299185,
+          -0.02158609633621304 0.706328490534284 0.7075550182879938,
+          -0.07455381613533114 0.7026074252026488 -0.7076613134471628,
+          -0.10233128841817987 0.6991030745710938 0.7076603694823661,
+          -0.18015540673765412 0.8120190499632148 -0.5551297973627687,
+          -0.20721415135335508 0.8055395459840192 0.5551291159133784,
+          -0.2272602677653586 0.6689211208290646 -0.7077409870877942,
+          -0.25540470830722567 0.6586898511153436 0.707740146531301,
+          -0.3140932806526244 0.6325812562308314 -0.7079451711215318,
+          -0.34455931491738456 0.6165167717703874 0.7079448768297449,
+          -0.4634909709612689 0.6514156591397314 -0.6006943972311789,
+          -0.32118010824455817 0.4514041589219728 0.8325128367634701,
+          -0.46786822133460615 0.5292126160052759 0.7078370819094211,
+          -0.4914607593581608 0.5073785445651534 -0.7078370819094225,
+          -0.5374487119800251 0.4581437868992938 0.7079923393064268,
+          -0.5597311544886834 0.4306366010665812 -0.7079923393064276,
+          -0.6884097932385257 0.4060374649164365 0.6010204103502009,
+          -0.47690500749167414 0.28128783487654163 -0.8327297087169605,
+          -0.6463900143430852 0.28490516504072105 -0.7078198897252505,
+          -0.6585447154610821 0.25555794146849825 0.7078198897252507,
+          -0.5760734759530073 0.1647056087513601 -0.8006318834203792,
+          -0.5831640015721967 0.13750901308858926 0.8006316372650442,
+          -0.6993155726472082 0.10030671793857796 -0.7077402717024786,
+          -0.7029370647261457 0.07060006311679053 0.7077394394281668,
+          -0.7063301951142538 0.00903187538866516 -0.707824894092334,
+          -0.7060197929166715 -0.022832172905846708 0.7078239497857485,
+          -0.7009476871273346 -0.08715359381829706 -0.707867636635124,
+          -0.6961454673448931 -0.11960550832016832 0.7078672267273252,
+          -0.7694760548775058 -0.21706811410692148 -0.6006563366919676,
+          -0.5332327012238727 -0.15042419592021056 0.8324875059886787,
+          -0.7377498016008426 -0.3079571119651505 0.6007392507802375,
+          -0.5112103130728469 -0.2133932822199432 -0.832542685338933,
+          -0.6176967761780341 -0.34243421491100323 -0.707947385868151,
+          -0.6002431207456168 -0.3721809974192856 0.707947385868151,
+          -0.6217039811338636 -0.5021578633956255 -0.6011003577375784,
+          -0.43066387758606 -0.34785244935358767 0.8327828636693053,
+          -0.5397558725764742 -0.5893994156605721 0.6010590044564553,
+          -0.37391054639922083 -0.4083006202508738 -0.8327553703184315,
+          -0.4105729668051732 -0.5747405466243292 -0.7078863913049647,
+          -0.38310047907204486 -0.5934061677637031 0.7078863913049647,
+          -0.35574475265297023 -0.7158676083131397 -0.6008154777699242,
+          -0.24649059944856913 -0.49601472567903726 0.8325934039451877,
+          -0.25358080609694517 -0.7579318708148441 0.6010291623393444,
+          -0.1756701336181842 -0.5250633715890302 -0.8327355282261766,
+          -0.14926417714633267 -0.785389916086609 -0.6007352870693528,
+          -0.10343025276263904 -0.5442235309978453 0.832540047758481,
+          -0.0662537391740557 -0.7969843758502412 0.6003551837837813,
+          -0.04592458477618684 -0.5524394093120546 -0.8322869886956562,
+          -0.3206317180915262 0.7329380815663364 0.5999975582813104,
+          -0.8019391710323257 0.5243796269811197 -0.2862159547808754,
+          -0.7185056574324374 0.46982332605506105 0.5128505265007932,
+          -0.22231709286899048 0.508198828602133 -0.8320511167144123,
+          -0.45599814436703084 0.46392611012432283 -0.7594986877399719,
+          -0.6077515563643321 0.23196541375196048 0.7594933130446994,
+          -0.5001432069246334 -0.19576985428649016 -0.8435229319466008,
+          -0.36765190703424705 -0.391543332353487 0.8435199429436201,
+          -0.5383635197441724 -0.5733485361922179 -0.6176051948088739,
+          -0.7323876978712847 -0.28667695445627595 0.6175958094016459,
+          -0.7662341419497289 0.4369956584508892 -0.47108389295924386,
+          -0.11924464555900294 0.8739956698436427 0.47107566653359406,
+          0.2639617061797632 0.6559927140100392 -0.7071052091707509,
+          0.16694337108709198 0.4148845553029787 0.8944275916032147,
+          0.29846604377956876 0.7422371361415158 0.600001712033402,
+          0.206949754309801 0.5146507268158584 -0.8320495349310771,
+          0.26354254092219037 0.656159875542458 -0.707106460762721,
+          0.2633291744451921 0.6562453276561225 0.7071066509484419,
+          0.5385712471562268 0.5732082608433992 -0.6175542902753344,
+          0.7324510953216273 0.2866045244820313 0.6175542401348866,
+          0.7372050921274498 -0.28144862734707354 -0.6142599794108407,
+          0.5530202151386386 -0.562897254694147 0.6142599794108407,
+          0.2833646283356247 -0.647846217917564 -0.7071066152555223,
+          0.2836711332620059 -0.6477109148924565 0.7071076713507118,
+          0.32093492186078115 -0.732805104740167 -0.5999978786603892,
+          0.2225268587638274 -0.5081062589388782 0.8320515769805628,
+          0.2406707502200888 -0.5496141860412405 0.8000011478058794,
+          0.24090637632669934 -0.549514174467397 -0.7999989311896323,
+          -0.4035890232908669 -0.6178895581267949 0.6747802562590272,
+          -0.2623794784378979 -0.40169958030670366 -0.8773793116298532,
+          -0.3212573477095738 0.7326638554289148 0.5999978262382691,
+          0.03695715118463405 0.34374683409551987 -0.9383348458975735,
+          0.29997762846607817 0.1718730981717728 0.938335260205383,
+          -0.2227504654680508 0.5080083040743376 -0.8320515567711428,
+          -0.22559457506927852 0.17331873726673194 -0.9586801880771174,
+          -0.22018387443013254 -0.18014399029186967 0.9586799279231096,
+          -0.29802669935269904 -0.7424135848205575 -0.6000017962863318,
+          -0.2066452187896951 -0.5147727565009648 0.832049735722425,
+          0.05809460457207209 -0.420320448004532 0.905514073832585,
+          0.3686165204518432 -0.2101613290100568 -0.9055131565243558,
+          0.5773480940400518 0.5773478982156656 0.577354815286296,
+          0.6666686124823457 0.6666682641091147 -0.3333262467322429,
+          -0.3333340106821853 0.6666685552505631 0.6666644394016046,
+          -0.6666630675511191 0.33333161071537903 -0.666671127064329,
+          -0.6666686124823457 -0.6666682641091147 0.3333262467322429,
+          0.3333340106821853 -0.6666685552505631 -0.6666644394016046,
+          0.6666630675511191 -0.33333161071537903 0.666671127064329,
+          -0.5773480940400518 -0.5773478982156656 -0.577354815286296,
+          -0.11484920682518221 -0.791003026057158 -0.6009358305676618,
+          0.00840239764947031 -0.7063985403574415 -0.7077644395521835,
+          -0.022100297229721972 -0.7061027368363203 0.7077644395521835,
+          -0.07957143413038699 -0.5480170372851471 0.8326738339323767,
+          -0.21757505500112848 -0.7692752544133196 0.60073012109314,
+          -0.15076484447420627 -0.5330600018806978 -0.8325364833240756,
+          -0.3536039188846459 -0.821092322540379 -0.44807551418780645,
+          -0.2793464267413703 -0.6486613809312826 0.7079576164963195,
+          -0.355394881115511 -0.6102230845897221 0.7080411467638703,
+          -0.3863355928736274 -0.5911197375898442 -0.7080411467638703,
+          -0.44619934597285577 -0.5472242666037304 0.7081325763537539,
+          -0.47506850428530967 -0.5223582779498308 -0.7081325763537545,
+          -0.6101970623112423 -0.5160346812617562 0.6011387135111227,
+          -0.4226788295645212 -0.35745326970972097 -0.8328083615164991,
+          -0.5915818168835776 -0.38590741874767226 -0.7078887045915013,
+          -0.6090942992607421 -0.35762790232283886 0.7078887045914999,
+          -0.6390540625433582 -0.30109310767492115 -0.707780224121505,
+          -0.6515973678630096 -0.2728883004756888 0.707780224121505,
+          -0.7669723201556596 -0.22517689432023194 -0.6008733863130731,
+          -0.5313978416776622 -0.15601412527268935 0.8326319274299537,
+          -0.8179361076968759 -0.1507994778090057 0.5551936970267367,
+          -0.8228182359970081 -0.12136766164244935 -0.5551936970267367,
+          -0.7976689350203602 -0.05828345848366947 0.600272695173341,
+          -0.5529533898467234 -0.040402771783650926 -0.8322320377690442,
+          -0.7068616870857299 -0.008235403506130477 -0.7073038480451006,
+          -0.706859035794271 0.008459908781344566 0.7073038480450992,
+          -0.7056179806883291 0.04245502189784651 -0.7073194726889529,
+          -0.7043639621146559 0.05975426703730473 0.7073194726889529,
+          -0.8239818457347554 0.1140911552648447 -0.5550109243878709,
+          -0.8204019288317564 0.1374901777555569 0.5550109243878709,
+          -0.5105401397895352 0.3607357778028939 -0.7805244802545421,
+          -0.255270036565239 0.5706301290285989 0.7805244802546465,
+          0.5336341044164203 0.6477955086807329 -0.5436870621384654,
+          0.3884877877780287 0.471597752124808 0.7916266790212173,
+          0.8207772585477578 0.1351038385685575 0.5550420206208431,
+          0.8244195758313644 0.11079728541469351 -0.5550282195805617,
+          0.7977938379900887 0.05722067573079246 0.600208952227435,
+          0.5530807392605016 0.03966797409424113 -0.8321827609908268,
+          0.7996283250581382 -0.007576926965169225 -0.6004474431142839,
+          0.5542182765305526 -0.005250874386486472 0.8323548103289132,
+          0.7948016901371705 -0.0875656886785383 0.6005185455265729,
+          0.5508576244453934 -0.0606896384934205 -0.83238971964454,
+          0.6940595839284373 -0.13367715532371008 -0.7073978457004554,
+          0.6898971432837299 -0.1536832453877307 0.7074061010311143,
+          0.797161811839604 -0.23693085031000566 -0.5553348700702825,
+          0.786799298537481 -0.2693241882479495 0.555347949888636,
+          0.6450998068926608 -0.28751768856754145 -0.7079405468736976,
+          0.6303154820523431 -0.31860919607115057 0.7079481430613527,
+          0.5999003176778568 -0.3732640137623072 -0.7076677079534283,
+          0.5844890041640208 -0.39695168983526163 0.7076736253021456,
+          0.6444509030585575 -0.5253865820664667 -0.5555645533432867,
+          0.618749535372995 -0.5554232387594673 0.5555664121611805,
+          0.46071675821216135 -0.5348888902343407 -0.7082612115641745,
+          0.29109761989267463 -0.3379622730861219 0.8950104343879358,
+          0.4548290604957426 -0.6959241884779082 0.5557157993254512,
+          0.41840376001392565 -0.7184136997484689 -0.555715799325452,
+          0.2915081365586911 -0.6432296886569535 0.7080102922630138,
+          0.2585762372815753 -0.6571603727880612 -0.7080102922630143,
+          0.19258113654496517 -0.6795209152635859 0.7079292560463848,
+          0.15954376149456753 -0.6880275841866929 -0.7079292560463849,
+          0.09358355038477537 -0.7939432181640003 0.6007464402131494,
+          0.0648466165008857 -0.5501450968688152 -0.832547469349099,
+          0.5947568751276406 0.07048982244340408 -0.8008092434658216,
+          0.7068077061711744 0.008545765370237901 -0.7073541096164493,
+          0.7063341598097059 0.027243683573182235 0.7073541096164503,
+          0.5901749295396855 0.10197111415752082 0.8008092434658212,
+          0.7583689423700016 0.2505772110734158 -0.6017371590148594,
+          0.5250443980622156 0.17348305502199918 0.8332058627276453,
+          0.7035960500103203 0.3787961218331482 0.6012205057165314,
+          0.48734109930694913 0.2623706008933192 -0.8328627262119328,
+          0.6446711283387758 0.47285162196574015 -0.6006750201987581,
+          0.4467379682838875 0.3276721472560034 0.8324999409046372,
+          0.5702334929852737 0.559649900168786 0.6013532678209054,
+          0.3949230443549233 0.38759323166114507 -0.8329509444186429,
+          0.4543377235846078 0.6565096120258309 -0.602139819515077,
+          0.31444375573379785 0.45436541445869605 0.8334729717416162,
+          0.2749308735278624 0.6495645189435171 0.7088574966175385,
+          0.17362350121527176 0.41021099084660523 -0.8953110201569044,
+          0.17576009980891638 0.6840218637789374 -0.7079706753726095,
+          0.14169159416064103 0.6918825775233284 0.7079703320506388,
+          0.07990147733855696 0.7956001176048114 -0.6005299382931097,
+          0.055375029872459354 0.5513969409592537 0.8324031592728379,
+          -0.012832008078052166 0.7993131487427093 0.600777687514858,
+          -0.00889141097638593 0.5538510933808057 -0.8325682609682734,
+          -0.09964920679608101 0.6986712868203413 -0.7084691020487204,
+          -0.14290961837486782 0.6911210982297022 0.7084691020487202,
+          -0.23200640762383928 0.66615725455495 -0.7088071239944563,
+          -0.277753960593588 0.6484174568511275 0.7088071239944559,
+          -0.3730609922376135 0.5992547034747451 -0.7083214640501038,
+          -0.2357014691913517 0.378611586222507 0.895040828230263,
+          -0.5755561455035736 0.6842258982335181 0.4478504700897437,
+          -0.454774111694163 0.540639219124378 -0.7077356442043652,
+          -0.4367622857243038 0.40944945928758403 -0.8009930374591198,
+          -0.4600986880213143 0.38303962095725724 0.8009930374591193,
+          -0.5967328564933984 0.3757468442347296 -0.7090304697464498,
+          -0.6228902844867918 0.3305805294676206 0.7090304697464498,
+          -0.6700782444879881 0.22062953949551284 -0.7087437848516867,
+          -0.423206568409911 0.13934472737747375 0.8952537335341332,
+          -0.6960185573187888 0.11908415962716128 0.7080798901209979,
+          -0.7013135277802719 0.08235414354253935 -0.7080798901209979,
+          -0.7995249815345065 0.020041987146779197 0.6002983613616278,
+          -0.5542276997481687 0.013892348024224377 -0.8322491571027438,
+          -0.7994142021780584 -0.02878735160417833 -0.6000901780096353,
+          -0.5542515740873816 -0.01995823921871368 0.8321098853570652,
+          -0.3451759968165267 -0.36566526619430945 0.8643740187677795,
+          -0.1917214953743476 -0.20310326012205612 -0.9602041105615079,
+          0.40371338148092023 -0.42767667198255144 -0.8087695406326638,
+          0.2345615532587335 -0.24848446713548972 0.9398065478199447,
+          0.799414505361664 -0.028784575515602494 0.6000899072886934,
+          0.5542511040175859 -0.019956959313594817 -0.8321102291585187,
+          0.7320186360225168 0.321993301211593 -0.6003907315162306,
+          0.08703467773830703 0.7439056150337648 -0.6625929374753592,
+          0.5069593470673225 0.5513282322073204 0.6625929374753592,
+          0.507392008450621 0.22318670559689205 0.8323106656803403,
+          0.5271954499459462 0.2853860380514231 0.8003872605442961,
+          0.516366809103777 0.3045415433309256 -0.8003872605442953,
+          0.6845956846892656 0.472366390807743 0.5551565016642626,
+          0.6678988456594116 0.495693847678912 -0.5551565016642613,
+          0.6055384505068808 0.5224683647514192 0.6002915898059076,
+          0.4197594382999853 0.36217522955641857 -0.8322446257284191,
+          0.8242055418419473 0.45676383438188556 -0.33474172790045087,
+          0.9142153627716334 0.2283817989125789 0.3347417279004591,
+          0.48507123721246137 -0.4850713185518862 -0.727606838029651,
+          0.3015112405160981 -0.30151147411582313 0.9045340252411441,
+          -0.5773503446012862 -0.5773502328001545 0.577350230167429,
+          -0.4082482458766234 -0.40824823927979836 -0.8164966288133739,
+          -0.8164965354009827 0.40824833599060467 -0.40824833599060034,
+          -0.4082482651712333 0.8164965910447792 0.4082482955223854,
+          -0.12797962588909254 0.22432032948480676 -0.966075362038136,
+          -0.2559594892817736 -0.034397141327972836 0.9660753472245719,
+          -0.6803239290033927 -0.4783405943993388 -0.5552923800801466,
+          -0.6985924518756754 -0.45124166662231446 0.5552923054448422,
+          -0.6189791490160265 -0.3411726167685577 -0.7074362576590847,
+          -0.6291098586563572 -0.3221099117466038 0.7074362094888652,
+          -0.6465538777987059 -0.28568004988134865 -0.7073577540419319,
+          -0.65393818590411 -0.26834655006795405 0.7073577440610012,
+          -0.9065323361268799 0.0956048732201208 -0.41116764436529596,
+          -0.6598388402634435 0.628930737925002 0.411167644365296,
+          0.3401673913285589 0.6195861957032781 -0.7073889255357777,
+          0.1636014377744163 0.6775482610386752 -0.7170515487199026,
+          0.20872254242794122 0.8644153595802789 0.45740680625031516,
+          0.3575414080023995 0.6097253886734579 0.7073889255357777,
+          0.39733481505533697 0.5846001737689223 -0.7073667235418183,
+          0.2512408381510381 0.36965203019077547 0.8945587838823125,
+          0.4957218009522026 0.6276992640485192 0.600211237793539,
+          0.3436593226392808 0.4351513984104397 -0.8321908016942686,
+          0.5483914093261575 0.6256478831362191 -0.5548257280484012,
+          0.5596147733394091 0.6156295289830097 0.5548257280484019,
+          0.6921168869018492 0.4246927563281185 -0.5836182635830705,
+          0.7837721411382212 0.2123463048604568 0.5836182635830703,
+          0.666666695316666 -0.3333333037972822 -0.6666666527846916,
+          0.33333313987216134 -0.666666810064133 0.6666666199997413,
+          0.18257425105536243 -0.36514835650341393 -0.9128709221978917,
+          0.36514824031230103 -0.18257438423701985 0.9128709420379768,
+          0.6666666170460377 -0.3333335318157083 -0.666666617046075,
+          0.33333330852301885 -0.6666667286924104 0.666666617046075,
+          -0.40824833604327665 -0.816496535348297 -0.4082483360432996,
+          -0.8164966720865533 -0.4082480625666953 0.4082483360432996,
+          -0.3651483798235866 -0.18257406760935901 -0.9128709495590178,
+          -0.1825741899117933 -0.36514831867238484 0.9128709495590178,
+          -0.40824838162253774 -0.8164964897689903 -0.4082483816226293,
+          -0.8164967632450755 -0.4082478346700926 0.4082483816226293,
+          -0.6666665674254778 0.3333337302975236 -0.6666665674256274,
+          -0.33333328371273896 0.6666667907179823 0.6666665674256275,
+          -0.18257418366078562 0.36514839993558007 -0.9128709183039426,
+          -0.36514836732157124 0.18257424888879453 0.9128709183039426,
+          -0.5773500820197223 0.5773504143418008 -0.5773503112073043,
+          -0.40824814325926734 0.408248378246454 0.8164966106387099,
+          -0.44782015385941254 -0.5469234049526374 -0.7073414302247154,
+          -0.10600779217691622 0.20169164287316577 -0.9736954499189668,
+          -0.2120166375754052 -0.08346445175093348 0.9736953479837189,
+          -0.43358379594374413 -0.5582774545495698 0.707341060335583,
+          -0.477451540657977 -0.6812607220176047 -0.5549088708602306,
+          -0.46143798819267706 -0.6922074314057296 0.5549088708602314,
+          -0.36244125922023696 -0.6068695960273478 -0.7073511341847504,
+          -0.3463561256690685 -0.6161913722043337 0.7073511341847504,
+          0.012476497573855246 -0.33344822018310605 -0.9426858551315005,
+          0.28904400532637525 -0.16672414798066298 0.9426858551315005,
+          0.5345225985361848 0.26726115451841825 -0.8017836783943703,
+          0.26726124702764237 0.5345224582487583 0.8017837410829268,
+          -0.7066577755844996 0.023480648699423252 -0.7071657849066381,
+          -0.7068301419704512 -0.013585826090338593 -0.7072528372028456,
+          -0.7069692023385261 5.710079981497919e-4 0.7072441027641687,
+          -0.7063217958641859 0.03223913729061237 0.7071563891487854,
+          -0.7052465941333826 0.05032864189430778 -0.7071734364838221,
+          -0.7045277611420682 0.05966254847776968 0.7071640644781682,
+          -0.8254276561433325 0.10326679114615321 -0.5549821207211105,
+          -0.8223786763984214 0.12531578967639334 0.5549678057896354,
+          -0.4586855575529982 0.5485452394724719 -0.6990748740617012,
+          -0.2920876205236415 0.3493098512054924 0.8903187349413881,
+          0.3910362489758794 0.4654928683520103 0.7939817639595333,
+          0.22997275225766423 0.2737611889966829 -0.9338990012941215,
+          0.8224768905258555 0.12498590764419922 -0.5548966457289821,
+          0.8250937452566648 0.1063486617689838 0.5548966333275741,
+          0.7972111068700128 0.06580445825415739 -0.6001035113686354,
+          0.552716933908639 0.04562309542645085 0.8321192968164735,
+          0.7992998475961528 0.032215321316885044 0.6000682683705386,
+          0.5541819868013009 0.022335986709525784 -0.8320958053028958,
+          0.7069703633668268 0.001327700664208709 -0.7072419264522735,
+          0.706861142656386 -0.012497298531460019 0.707241926452274,
+          0.7053810084796038 -0.0454809622370678 -0.7073677367185243,
+          0.7038843719132187 -0.0646349443106835 0.7073677367185247,
+          0.6978703789446419 -0.1106170216811747 -0.7076304181605313,
+          0.6930922437546847 -0.13741242392260436 0.7076305302902152,
+          0.6766062610401171 -0.20164914916860852 -0.708196009704156,
+          0.6643474028084423 -0.23895567685028438 0.7081968037789355,
+          0.6331552582037613 -0.31219398574906293 -0.7082720764445273,
+          0.6141500285082983 -0.3480935546423699 0.7082729838838241,
+          0.5713373040835187 -0.4148000220626366 -0.7081769741098711,
+          0.547607425406078 -0.4456570544633537 0.7081778713340131,
+          0.5418799942865316 -0.5870324262359753 -0.601464049083179,
+          0.3752497136407508 -0.4065176088296199 0.8330252613960651,
+          0.4260363895186064 -0.675563188028576 0.6017535822798376,
+          0.2949557586167081 -0.4677094672643711 -0.833216031224868,
+          0.32201482277699156 -0.7658755478486164 -0.5565438878646357,
+          0.26807554125207905 -0.7863801055072681 0.5565445479427346,
+          0.13968132790553076 -0.691861293731159 -0.7083904833290706,
+          0.09765237002428136 -0.6990319925408908 0.7083913381972939,
+          -0.0024941465673078158 -0.7990316436722922 -0.6012838029111178,
+          -0.0017289049640011097 -0.5534136150297336 0.8329047854270903,
+          -0.10630357101444686 -0.6974863085290821 0.7086694576486632,
+          -0.15254800467834292 -0.6888502718959219 -0.7086708750735922,
+          -0.31166210788406484 -0.7346484709295638 0.602626214721958,
+          -0.21560687784822907 -0.5082275295141755 -0.8337976088167061,
+          -0.39370817380958945 -0.5849942947967721 -0.7090666745312076,
+          -0.43626388090948615 -0.5539903113427725 0.7090617470658898,
+          -0.5086348453961469 -0.4891386510583072 -0.7085435583573513,
+          -0.5388151835406781 -0.4556896414580688 0.7085373304589122,
+          -0.5911596079444624 -0.38560780788411075 -0.7084045005741847,
+          -0.6134519545441462 -0.3490700713116224 0.7083973353849277,
+          -0.118713294411464 -0.1688241447691511 -0.978471032720408,
+          0.13890222579970093 -0.15264530684241892 0.9784710429884335,
+          0.6543861041530339 -0.2652241485915218 -0.7081207366652363,
+          0.6391824833558445 -0.2999997827362422 0.7081284370290908,
+          0.5998628141902582 -0.3717742952152816 -0.7084832232092193,
+          0.5754082189876689 -0.4085914839780089 0.7084902121709851,
+          0.5142120576534033 -0.4825500720863112 -0.7090355334490291,
+          0.4770263322938802 -0.5193324029631097 0.7090414187696026,
+          0.3908771082134026 -0.5864267008463594 -0.709449653470338,
+          0.34164750063438903 -0.6164024745358202 0.7094539975899725,
+          0.24702095845250302 -0.660847971190559 -0.7087034676495727,
+          0.20192728685293174 -0.6759888933872465 0.7087061357440753,
+          0.12030635180680407 -0.6958269404390939 -0.7080616150266212,
+          0.08391978460059459 -0.7011451327399735 0.7080628309603851,
+          0.007621170459867631 -0.7059373820390998 -0.7082332457606066,
+          -0.03230260455313072 -0.7052392639288071 0.7082330988821677,
+          -0.14996595397202034 -0.6887329589420179 -0.70933569197964,
+          -0.09466792773829358 -0.43477149487055455 0.895551076547709,
+          -0.37991013617617025 -0.8084731655070508 0.4494879632266172,
+          -0.29977044278952636 -0.6379307518531546 -0.709353252949361,
+          -0.4840190236289112 -0.6351744415934474 -0.6018961816723611,
+          -0.33505994000663564 -0.43969658196165284 0.8333077177213644,
+          -0.5098201642821265 -0.48834868049522534 0.7082365186503148,
+          -0.5366820463072657 -0.4586552011757446 -0.7082427462430401,
+          -0.6798683064871288 -0.4189886752543753 0.6018534504702181,
+          -0.4706417871663888 -0.2900467297013626 -0.8332881871011807,
+          -0.5530003087859375 -0.2290154347852934 -0.8010883778415219,
+          -0.5660533884226281 -0.19454727394430324 0.8010835909292496,
+          -0.688543559931725 -0.15785375073866248 -0.7078064420830623,
+          -0.6948811619051493 -0.12712938259341325 0.7077981992847729,
+          -0.7028985717450912 -0.07348869684139125 -0.7074835752688997,
+          -0.7049230390568098 -0.05061995165259097 0.7074751794244099,
+          0.21639438320450777 -0.4479969277643367 -0.8674515684643473,
+          -0.19244964075000093 -0.19245004883451683 -0.9622505466243122,
+          -0.3481566794347507 -0.34815624554068514 0.8703873593153697,
+          0.43278369304922754 -0.24540062764684784 0.8674542103080743,
+          0.7057240480146326 -0.04421341419578771 -0.7071058916873711,
+          0.7058558607814912 -0.041898608899775105 0.7071152737515177,
+          0.7064602801388808 -0.02805527788742938 -0.7071964182380687,
+          0.7068150572994806 -0.016518687754662066 0.7072054918689447,
+          0.7069145413384702 0.009024611323540597 -0.7072413927611133,
+          0.7065883804110639 0.023033483547734077 0.7072498280690677,
+          0.703569413096594 0.0648970159282136 -0.7076570202283924,
+          0.7004364119069413 0.09272825935053783 0.7076653890029873,
+          0.690302588979905 0.1502001871895705 -0.7077586025021939,
+          0.6831772776764535 0.1798193052316316 0.7077667869663022,
+          0.7816465173857339 0.283510424872808 -0.5555632824865172,
+          0.7672501871857114 0.3204097109285257 0.5555760680646615,
+          0.6215240442595383 0.3352349956656814 -0.7080433320696539,
+          0.60337759818753 0.3668784349707942 0.7080506252795968,
+          0.559710925382698 0.4301998615638173 -0.708273788246972,
+          0.5339833882631654 0.4617366818756254 0.7082802959771484,
+          0.4729606438241631 0.5235877818041148 -0.7086353534356581,
+          0.43739347177262194 0.5536381647534427 0.7086407646890858,
+          0.29997983624111096 0.5169737172294824 -0.801717078240627,
+          0.25899807394005175 0.538670493910789 0.8017194625835461,
+          0.2540504859829886 0.7913324590342885 -0.5561036682584942,
+          0.20564618688480849 0.8052665019600443 0.5561074596161897,
+          0.09927530804431492 0.7932003195531412 -0.6008141695012702,
+          0.06878641922527493 0.5495969822229014 0.8325932894646969,
+          -0.009860669442930896 0.7991970298271398 0.6009882483989308,
+          -0.006831298160944416 0.5536696298043261 -0.8327083969780639,
+          -0.14326995340058193 0.7857030739698339 -0.6017843467613202,
+          -0.09918686481925187 0.5439481394121821 0.8332360934797248,
+          -0.30044144310890714 0.7395812770493736 0.6022910209364365,
+          -0.20790479351001764 0.5117885571901203 -0.8335754732265171,
+          -0.37522939931393856 0.5975237795257772 -0.7086382933427541,
+          -0.4137995422771139 0.5714965924489815 0.7086336032326251,
+          -0.4844776559216576 0.5130247406496208 -0.7085809878863849,
+          -0.5166329417296621 0.4806368917045758 0.7085750361481269,
+          -0.6600536894606801 0.4501100410090546 -0.6014400036680063,
+          -0.45710118291165125 0.3117107524294918 0.8330035506530624,
+          -0.7263220918583715 0.33302154055433275 0.6012926678459487,
+          -0.5030431774053779 0.2306472786422579 -0.832916198978518,
+          -0.7945606765876632 0.24486093038556678 -0.555622584126374,
+          -0.8055874699526225 0.20573538595760926 0.5556093764689415,
+          -0.5911446504088771 0.10013877606858478 -0.8003250763411405,
+          -0.5941732668769649 0.08028726339657691 0.8003199886701842,
+          -0.8294164129312341 0.06428923374457314 -0.5549191908600929,
+          -0.8307076587849457 0.044773899062048046 0.5549054726697293,
+          -0.7998701538285388 0.012138582596584672 -0.6000503244119243,
+          -0.5545951786090964 0.008416365270027596 0.8320777323418683,
+          0.7995180247703626 0.023692530746691285 0.6001746346307172,
+          0.4850732434734864 -0.485073309843524 -0.7276041729838829,
+          0.30151032524533394 -0.30151036649940494 0.9045346995355388,
+          0.5542913922160663 0.01642560323324469 -0.8321605927184963,
+          0.7005115941049608 0.0900634256700612 -0.7079350859232081,
+          0.44272490822013544 0.05692028825691991 0.8948490020256052,
+          0.6847390146928598 0.17274672703870236 0.7080191028883809,
+          0.675097609522926 0.20727670799013276 -0.7080110055226572,
+          0.7648582256229634 0.32564776886726654 0.555828593478838,
+          0.7461239892207451 0.36656162764378064 -0.5558161259341652,
+          0.5982885412011788 0.3752534510648345 0.7079799919004047,
+          0.5789223290906064 0.404503639926267 -0.7079729812406039,
+          0.533119172619127 0.46285258400770396 0.7082029605016411,
+          0.5065213654034203 0.4918266331156317 -0.7081967730426316,
+          0.4739785009125083 0.6423391254187897 0.6022830137310496,
+          0.3279995625630447 0.44450740223211604 -0.8335643084485487,
+          0.3179075592759662 0.731959266378328 -0.6026362220428656,
+          0.21992546580051955 0.5063631818886103 0.8338040042600339,
+          0.15109651109182 0.7840613143665258 0.6020113783390773,
+          0.10458471993025933 0.5427036757844617 -0.8333875188933076,
+          0.01853006116010258 0.7055046971558392 -0.708462955364958,
+          -0.025284492601246922 0.7052949278914793 0.708462955364958,
+          -0.16538345777517527 0.7808954868000859 -0.6023707750128517,
+          -0.11443937883856627 0.5403443579874695 0.8336255774399873,
+          -0.3010020647219468 0.6369327142826307 0.7097284512471553,
+          -0.1899470324010126 0.4019355480534635 -0.8957499316734612,
+          -0.41654527605670044 0.5693317583011467 -0.7087675091202841,
+          -0.45466865286227853 0.5393758425302216 0.7087666164536918,
+          -0.5195738082970912 0.47784034041370094 -0.7083160783188364,
+          -0.5466712830023321 0.44658717588916735 0.708315185967322,
+          -0.6812556872873811 0.41778086850406226 -0.601123809585504,
+          -0.4719076118654057 0.2893979236242986 0.8327977231389592,
+          -0.7351454397966226 0.3137218634289748 0.6009490616956498,
+          -0.5093121653480616 0.2173479618157111 -0.8326830019419305,
+          -0.6770624437801114 0.2015677527088416 -0.7077830799690048,
+          -0.6852364649272829 0.1717403639378766 0.7077826181310518,
+          -0.6962979295042104 0.12141486816936894 -0.7074090917959456,
+          -0.6995517893567614 0.10099341984599154 0.7074090917959454,
+          -0.7975292416042825 0.05995417715878296 -0.6002937659407359,
+          -0.5528464720586581 0.04156017560025592 0.8322460754706934,
+          -0.799862774308724 0.008427675826592543 0.6001237510341623,
+          -0.5545456568465931 0.005842916031424246 -0.8321327867623233,
+          -0.7990488239025364 -0.03616924891990708 -0.6001772758548455,
+          -0.5539556848930813 -0.025075014765229633 0.8321684581917057,
+          -0.402050901389807 -0.43366364611060065 0.8064061723063033,
+          -0.23404846631857987 -0.2524513958790965 -0.9388767800582867 ] }
+        normalIndex [
+          0, 1, 2, -1,
+          0, 2, 66, -1,
+          0, 3, 1, -1,
+          0, 4, 3, -1,
+          0, 64, 4, -1,
+          0, 66, 64, -1,
+          1, 3, 67, -1,
+          1, 67, 68, -1,
+          1, 68, 126, -1,
+          1, 126, 127, -1,
+          1, 127, 2, -1,
+          2, 69, 66, -1,
+          2, 127, 69, -1,
+          3, 4, 5, -1,
+          3, 5, 65, -1,
+          3, 65, 67, -1,
+          4, 6, 5, -1,
+          4, 7, 6, -1,
+          4, 63, 7, -1,
+          4, 64, 63, -1,
+          5, 6, 62, -1,
+          5, 62, 65, -1,
+          6, 7, 8, -1,
+          6, 8, 60, -1,
+          6, 60, 62, -1,
+          7, 9, 8, -1,
+          7, 61, 9, -1,
+          7, 63, 61, -1,
+          8, 9, 10, -1,
+          8, 10, 58, -1,
+          8, 58, 60, -1,
+          9, 11, 10, -1,
+          9, 59, 11, -1,
+          9, 61, 59, -1,
+          10, 11, 12, -1,
+          10, 12, 56, -1,
+          10, 56, 58, -1,
+          11, 13, 12, -1,
+          11, 57, 13, -1,
+          11, 59, 57, -1,
+          12, 13, 14, -1,
+          12, 14, 54, -1,
+          12, 54, 56, -1,
+          13, 15, 14, -1,
+          13, 55, 15, -1,
+          13, 57, 55, -1,
+          14, 15, 16, -1,
+          14, 16, 52, -1,
+          14, 52, 54, -1,
+          15, 17, 16, -1,
+          15, 53, 17, -1,
+          15, 55, 53, -1,
+          16, 17, 18, -1,
+          16, 18, 19, -1,
+          16, 19, 50, -1,
+          16, 50, 52, -1,
+          17, 51, 18, -1,
+          17, 53, 51, -1,
+          18, 20, 19, -1,
+          18, 21, 20, -1,
+          18, 49, 21, -1,
+          18, 51, 49, -1,
+          19, 20, 48, -1,
+          19, 48, 50, -1,
+          20, 21, 22, -1,
+          20, 22, 47, -1,
+          20, 47, 48, -1,
+          21, 23, 22, -1,
+          21, 46, 23, -1,
+          21, 49, 46, -1,
+          22, 23, 24, -1,
+          22, 24, 47, -1,
+          23, 25, 24, -1,
+          23, 46, 25, -1,
+          24, 25, 26, -1,
+          24, 26, 27, -1,
+          24, 27, 44, -1,
+          24, 44, 47, -1,
+          25, 45, 26, -1,
+          25, 46, 45, -1,
+          26, 28, 27, -1,
+          26, 45, 28, -1,
+          27, 28, 29, -1,
+          27, 29, 44, -1,
+          28, 30, 29, -1,
+          28, 31, 30, -1,
+          28, 33, 31, -1,
+          28, 35, 33, -1,
+          28, 36, 35, -1,
+          28, 39, 36, -1,
+          28, 41, 39, -1,
+          28, 43, 41, -1,
+          28, 45, 43, -1,
+          29, 30, 32, -1,
+          29, 32, 34, -1,
+          29, 34, 37, -1,
+          29, 37, 38, -1,
+          29, 38, 40, -1,
+          29, 40, 42, -1,
+          29, 42, 44, -1,
+          30, 31, 32, -1,
+          31, 33, 32, -1,
+          32, 33, 34, -1,
+          33, 35, 34, -1,
+          34, 35, 36, -1,
+          34, 36, 37, -1,
+          36, 38, 37, -1,
+          36, 39, 38, -1,
+          38, 39, 40, -1,
+          39, 41, 40, -1,
+          40, 41, 42, -1,
+          41, 43, 42, -1,
+          42, 43, 44, -1,
+          43, 45, 44, -1,
+          44, 45, 46, -1,
+          44, 46, 47, -1,
+          46, 48, 47, -1,
+          46, 49, 48, -1,
+          48, 49, 50, -1,
+          49, 51, 50, -1,
+          50, 51, 52, -1,
+          51, 53, 52, -1,
+          52, 53, 54, -1,
+          53, 55, 54, -1,
+          54, 55, 56, -1,
+          55, 57, 56, -1,
+          56, 57, 58, -1,
+          57, 59, 58, -1,
+          58, 59, 60, -1,
+          59, 61, 60, -1,
+          60, 61, 62, -1,
+          61, 63, 62, -1,
+          62, 63, 64, -1,
+          62, 64, 65, -1,
+          64, 66, 65, -1,
+          65, 66, 67, -1,
+          66, 68, 67, -1,
+          66, 69, 68, -1,
+          68, 69, 70, -1,
+          68, 70, 126, -1,
+          69, 71, 70, -1,
+          69, 127, 71, -1,
+          70, 71, 72, -1,
+          70, 72, 73, -1,
+          70, 73, 124, -1,
+          70, 124, 126, -1,
+          71, 125, 72, -1,
+          71, 127, 125, -1,
+          72, 74, 73, -1,
+          72, 123, 74, -1,
+          72, 125, 123, -1,
+          73, 74, 75, -1,
+          73, 75, 122, -1,
+          73, 122, 124, -1,
+          74, 76, 75, -1,
+          74, 123, 76, -1,
+          75, 76, 77, -1,
+          75, 77, 122, -1,
+          76, 78, 77, -1,
+          76, 121, 78, -1,
+          76, 123, 121, -1,
+          77, 78, 79, -1,
+          77, 79, 120, -1,
+          77, 120, 122, -1,
+          78, 80, 79, -1,
+          78, 81, 80, -1,
+          78, 118, 81, -1,
+          78, 121, 118, -1,
+          79, 80, 119, -1,
+          79, 119, 120, -1,
+          80, 81, 82, -1,
+          80, 82, 117, -1,
+          80, 117, 119, -1,
+          81, 83, 82, -1,
+          81, 116, 83, -1,
+          81, 118, 116, -1,
+          82, 83, 84, -1,
+          82, 84, 117, -1,
+          83, 85, 84, -1,
+          83, 116, 85, -1,
+          84, 85, 86, -1,
+          84, 86, 87, -1,
+          84, 87, 114, -1,
+          84, 114, 117, -1,
+          85, 115, 86, -1,
+          85, 116, 115, -1,
+          86, 88, 87, -1,
+          86, 89, 88, -1,
+          86, 112, 89, -1,
+          86, 115, 112, -1,
+          87, 88, 113, -1,
+          87, 113, 114, -1,
+          88, 89, 90, -1,
+          88, 90, 113, -1,
+          89, 91, 90, -1,
+          89, 112, 91, -1,
+          90, 91, 92, -1,
+          90, 92, 93, -1,
+          90, 93, 111, -1,
+          90, 111, 113, -1,
+          91, 110, 92, -1,
+          91, 112, 110, -1,
+          92, 94, 93, -1,
+          92, 95, 94, -1,
+          92, 106, 95, -1,
+          92, 109, 106, -1,
+          92, 110, 109, -1,
+          93, 94, 107, -1,
+          93, 107, 108, -1,
+          93, 108, 111, -1,
+          94, 95, 96, -1,
+          94, 96, 102, -1,
+          94, 102, 105, -1,
+          94, 105, 107, -1,
+          95, 97, 96, -1,
+          95, 103, 97, -1,
+          95, 104, 103, -1,
+          95, 106, 104, -1,
+          96, 97, 98, -1,
+          96, 98, 100, -1,
+          96, 100, 102, -1,
+          97, 99, 98, -1,
+          97, 101, 99, -1,
+          97, 103, 101, -1,
+          98, 99, 100, -1,
+          99, 101, 100, -1,
+          100, 101, 102, -1,
+          101, 103, 102, -1,
+          102, 103, 104, -1,
+          102, 104, 105, -1,
+          104, 106, 105, -1,
+          105, 106, 107, -1,
+          106, 108, 107, -1,
+          106, 109, 108, -1,
+          108, 109, 110, -1,
+          108, 110, 111, -1,
+          110, 112, 111, -1,
+          111, 112, 113, -1,
+          112, 114, 113, -1,
+          112, 115, 114, -1,
+          114, 115, 116, -1,
+          114, 116, 117, -1,
+          116, 118, 117, -1,
+          117, 118, 119, -1,
+          118, 120, 119, -1,
+          118, 121, 120, -1,
+          120, 121, 122, -1,
+          121, 123, 122, -1,
+          122, 123, 124, -1,
+          123, 125, 124, -1,
+          124, 125, 126, -1,
+          125, 127, 126, -1,
+          128, 129, 130, -1,
+          128, 130, 318, -1,
+          128, 131, 129, -1,
+          128, 132, 131, -1,
+          128, 317, 132, -1,
+          128, 318, 317, -1,
+          129, 131, 319, -1,
+          129, 223, 130, -1,
+          129, 225, 223, -1,
+          129, 319, 225, -1,
+          130, 222, 226, -1,
+          130, 223, 222, -1,
+          130, 226, 318, -1,
+          131, 132, 133, -1,
+          131, 133, 316, -1,
+          131, 316, 319, -1,
+          132, 134, 133, -1,
+          132, 135, 134, -1,
+          132, 314, 135, -1,
+          132, 317, 314, -1,
+          133, 134, 315, -1,
+          133, 315, 316, -1,
+          134, 135, 136, -1,
+          134, 136, 312, -1,
+          134, 312, 315, -1,
+          135, 137, 136, -1,
+          135, 313, 137, -1,
+          135, 314, 313, -1,
+          136, 137, 138, -1,
+          136, 138, 310, -1,
+          136, 310, 312, -1,
+          137, 139, 138, -1,
+          137, 311, 139, -1,
+          137, 313, 311, -1,
+          138, 139, 140, -1,
+          138, 140, 309, -1,
+          138, 309, 310, -1,
+          139, 141, 140, -1,
+          139, 308, 141, -1,
+          139, 311, 308, -1,
+          140, 141, 142, -1,
+          140, 142, 306, -1,
+          140, 306, 309, -1,
+          141, 143, 142, -1,
+          141, 307, 143, -1,
+          141, 308, 307, -1,
+          142, 143, 144, -1,
+          142, 144, 304, -1,
+          142, 304, 306, -1,
+          143, 145, 144, -1,
+          143, 305, 145, -1,
+          143, 307, 305, -1,
+          144, 145, 146, -1,
+          144, 146, 147, -1,
+          144, 147, 303, -1,
+          144, 303, 304, -1,
+          145, 302, 146, -1,
+          145, 305, 302, -1,
+          146, 148, 147, -1,
+          146, 149, 148, -1,
+          146, 301, 149, -1,
+          146, 302, 301, -1,
+          147, 148, 300, -1,
+          147, 300, 303, -1,
+          148, 149, 150, -1,
+          148, 150, 298, -1,
+          148, 298, 300, -1,
+          149, 151, 150, -1,
+          149, 299, 151, -1,
+          149, 301, 299, -1,
+          150, 151, 152, -1,
+          150, 152, 296, -1,
+          150, 296, 298, -1,
+          151, 153, 152, -1,
+          151, 297, 153, -1,
+          151, 299, 297, -1,
+          152, 153, 154, -1,
+          152, 154, 294, -1,
+          152, 294, 296, -1,
+          153, 155, 154, -1,
+          153, 295, 155, -1,
+          153, 297, 295, -1,
+          154, 155, 156, -1,
+          154, 156, 292, -1,
+          154, 292, 294, -1,
+          155, 157, 156, -1,
+          155, 293, 157, -1,
+          155, 295, 293, -1,
+          156, 157, 158, -1,
+          156, 158, 292, -1,
+          157, 159, 158, -1,
+          157, 293, 159, -1,
+          158, 159, 160, -1,
+          158, 160, 290, -1,
+          158, 290, 292, -1,
+          159, 161, 160, -1,
+          159, 291, 161, -1,
+          159, 293, 291, -1,
+          160, 161, 162, -1,
+          160, 162, 289, -1,
+          160, 289, 290, -1,
+          161, 163, 162, -1,
+          161, 288, 163, -1,
+          161, 291, 288, -1,
+          162, 163, 164, -1,
+          162, 164, 287, -1,
+          162, 287, 289, -1,
+          163, 165, 164, -1,
+          163, 286, 165, -1,
+          163, 288, 286, -1,
+          164, 165, 166, -1,
+          164, 166, 285, -1,
+          164, 285, 287, -1,
+          165, 167, 166, -1,
+          165, 284, 167, -1,
+          165, 286, 284, -1,
+          166, 167, 168, -1,
+          166, 168, 282, -1,
+          166, 282, 285, -1,
+          167, 169, 168, -1,
+          167, 283, 169, -1,
+          167, 284, 283, -1,
+          168, 169, 170, -1,
+          168, 170, 280, -1,
+          168, 280, 282, -1,
+          169, 171, 170, -1,
+          169, 281, 171, -1,
+          169, 283, 281, -1,
+          170, 171, 172, -1,
+          170, 172, 278, -1,
+          170, 278, 280, -1,
+          171, 173, 172, -1,
+          171, 279, 173, -1,
+          171, 281, 279, -1,
+          172, 173, 174, -1,
+          172, 174, 274, -1,
+          172, 274, 276, -1,
+          172, 276, 278, -1,
+          173, 175, 174, -1,
+          173, 275, 175, -1,
+          173, 277, 275, -1,
+          173, 279, 277, -1,
+          174, 175, 176, -1,
+          174, 176, 272, -1,
+          174, 272, 274, -1,
+          175, 177, 176, -1,
+          175, 273, 177, -1,
+          175, 275, 273, -1,
+          176, 177, 178, -1,
+          176, 178, 271, -1,
+          176, 271, 272, -1,
+          177, 179, 178, -1,
+          177, 270, 179, -1,
+          177, 273, 270, -1,
+          178, 179, 180, -1,
+          178, 180, 268, -1,
+          178, 268, 271, -1,
+          179, 181, 180, -1,
+          179, 269, 181, -1,
+          179, 270, 269, -1,
+          180, 181, 182, -1,
+          180, 182, 183, -1,
+          180, 183, 267, -1,
+          180, 267, 268, -1,
+          181, 266, 182, -1,
+          181, 269, 266, -1,
+          182, 184, 183, -1,
+          182, 265, 184, -1,
+          182, 266, 265, -1,
+          183, 184, 185, -1,
+          183, 185, 264, -1,
+          183, 264, 267, -1,
+          184, 186, 185, -1,
+          184, 263, 186, -1,
+          184, 265, 263, -1,
+          185, 186, 187, -1,
+          185, 187, 262, -1,
+          185, 262, 264, -1,
+          186, 188, 187, -1,
+          186, 261, 188, -1,
+          186, 263, 261, -1,
+          187, 188, 189, -1,
+          187, 189, 260, -1,
+          187, 260, 262, -1,
+          188, 190, 189, -1,
+          188, 191, 190, -1,
+          188, 259, 191, -1,
+          188, 261, 259, -1,
+          189, 190, 258, -1,
+          189, 258, 260, -1,
+          190, 191, 192, -1,
+          190, 192, 256, -1,
+          190, 256, 258, -1,
+          191, 193, 192, -1,
+          191, 257, 193, -1,
+          191, 259, 257, -1,
+          192, 193, 194, -1,
+          192, 194, 195, -1,
+          192, 195, 255, -1,
+          192, 255, 256, -1,
+          193, 254, 194, -1,
+          193, 257, 254, -1,
+          194, 196, 195, -1,
+          194, 253, 196, -1,
+          194, 254, 253, -1,
+          195, 196, 197, -1,
+          195, 197, 252, -1,
+          195, 252, 255, -1,
+          196, 198, 197, -1,
+          196, 251, 198, -1,
+          196, 253, 251, -1,
+          197, 198, 199, -1,
+          197, 199, 250, -1,
+          197, 250, 252, -1,
+          198, 200, 199, -1,
+          198, 201, 200, -1,
+          198, 248, 201, -1,
+          198, 251, 248, -1,
+          199, 200, 249, -1,
+          199, 249, 250, -1,
+          200, 201, 202, -1,
+          200, 202, 247, -1,
+          200, 247, 249, -1,
+          201, 203, 202, -1,
+          201, 246, 203, -1,
+          201, 248, 246, -1,
+          202, 203, 204, -1,
+          202, 204, 205, -1,
+          202, 205, 245, -1,
+          202, 245, 247, -1,
+          203, 244, 204, -1,
+          203, 246, 244, -1,
+          204, 206, 205, -1,
+          204, 207, 206, -1,
+          204, 244, 207, -1,
+          205, 206, 245, -1,
+          206, 207, 208, -1,
+          206, 208, 243, -1,
+          206, 243, 245, -1,
+          207, 209, 208, -1,
+          207, 242, 209, -1,
+          207, 244, 242, -1,
+          208, 209, 210, -1,
+          208, 210, 211, -1,
+          208, 211, 240, -1,
+          208, 240, 243, -1,
+          209, 241, 210, -1,
+          209, 242, 241, -1,
+          210, 212, 211, -1,
+          210, 213, 212, -1,
+          210, 238, 213, -1,
+          210, 241, 238, -1,
+          211, 212, 239, -1,
+          211, 239, 240, -1,
+          212, 213, 214, -1,
+          212, 214, 236, -1,
+          212, 236, 239, -1,
+          213, 215, 214, -1,
+          213, 237, 215, -1,
+          213, 238, 237, -1,
+          214, 215, 216, -1,
+          214, 216, 234, -1,
+          214, 234, 236, -1,
+          215, 217, 216, -1,
+          215, 235, 217, -1,
+          215, 237, 235, -1,
+          216, 217, 218, -1,
+          216, 218, 232, -1,
+          216, 232, 234, -1,
+          217, 219, 218, -1,
+          217, 233, 219, -1,
+          217, 235, 233, -1,
+          218, 219, 220, -1,
+          218, 220, 230, -1,
+          218, 230, 232, -1,
+          219, 221, 220, -1,
+          219, 231, 221, -1,
+          219, 233, 231, -1,
+          220, 221, 222, -1,
+          220, 222, 223, -1,
+          220, 223, 224, -1,
+          220, 224, 229, -1,
+          220, 229, 230, -1,
+          221, 227, 222, -1,
+          221, 228, 227, -1,
+          221, 231, 228, -1,
+          222, 227, 226, -1,
+          223, 225, 224, -1,
+          224, 225, 226, -1,
+          224, 226, 227, -1,
+          224, 227, 228, -1,
+          224, 228, 229, -1,
+          225, 318, 226, -1,
+          225, 319, 318, -1,
+          228, 230, 229, -1,
+          228, 231, 230, -1,
+          230, 231, 232, -1,
+          231, 233, 232, -1,
+          232, 233, 234, -1,
+          233, 235, 234, -1,
+          234, 235, 236, -1,
+          235, 237, 236, -1,
+          236, 237, 238, -1,
+          236, 238, 239, -1,
+          238, 240, 239, -1,
+          238, 241, 240, -1,
+          240, 241, 242, -1,
+          240, 242, 243, -1,
+          242, 244, 243, -1,
+          243, 244, 245, -1,
+          244, 246, 245, -1,
+          245, 246, 247, -1,
+          246, 248, 247, -1,
+          247, 248, 249, -1,
+          248, 250, 249, -1,
+          248, 251, 250, -1,
+          250, 251, 252, -1,
+          251, 253, 252, -1,
+          252, 253, 254, -1,
+          252, 254, 255, -1,
+          254, 256, 255, -1,
+          254, 257, 256, -1,
+          256, 257, 258, -1,
+          257, 259, 258, -1,
+          258, 259, 260, -1,
+          259, 261, 260, -1,
+          260, 261, 262, -1,
+          261, 263, 262, -1,
+          262, 263, 264, -1,
+          263, 265, 264, -1,
+          264, 265, 266, -1,
+          264, 266, 267, -1,
+          266, 268, 267, -1,
+          266, 269, 268, -1,
+          268, 269, 270, -1,
+          268, 270, 271, -1,
+          270, 272, 271, -1,
+          270, 273, 272, -1,
+          272, 273, 274, -1,
+          273, 275, 274, -1,
+          274, 275, 276, -1,
+          275, 277, 276, -1,
+          276, 277, 278, -1,
+          277, 279, 278, -1,
+          278, 279, 280, -1,
+          279, 281, 280, -1,
+          280, 281, 282, -1,
+          281, 283, 282, -1,
+          282, 283, 284, -1,
+          282, 284, 285, -1,
+          284, 286, 285, -1,
+          285, 286, 287, -1,
+          286, 288, 287, -1,
+          287, 288, 289, -1,
+          288, 290, 289, -1,
+          288, 291, 290, -1,
+          290, 291, 292, -1,
+          291, 293, 292, -1,
+          292, 293, 294, -1,
+          293, 295, 294, -1,
+          294, 295, 296, -1,
+          295, 297, 296, -1,
+          296, 297, 298, -1,
+          297, 299, 298, -1,
+          298, 299, 300, -1,
+          299, 301, 300, -1,
+          300, 301, 302, -1,
+          300, 302, 303, -1,
+          302, 304, 303, -1,
+          302, 305, 304, -1,
+          304, 305, 306, -1,
+          305, 307, 306, -1,
+          306, 307, 308, -1,
+          306, 308, 309, -1,
+          308, 310, 309, -1,
+          308, 311, 310, -1,
+          310, 311, 312, -1,
+          311, 313, 312, -1,
+          312, 313, 314, -1,
+          312, 314, 315, -1,
+          314, 316, 315, -1,
+          314, 317, 316, -1,
+          316, 317, 318, -1,
+          316, 318, 319, -1,
+          320, 321, 322, -1,
+          320, 322, 348, -1,
+          320, 323, 321, -1,
+          320, 324, 323, -1,
+          320, 325, 324, -1,
+          320, 346, 325, -1,
+          320, 348, 346, -1,
+          321, 323, 349, -1,
+          321, 348, 322, -1,
+          321, 349, 348, -1,
+          323, 324, 347, -1,
+          323, 347, 349, -1,
+          324, 325, 326, -1,
+          324, 326, 351, -1,
+          324, 351, 347, -1,
+          325, 327, 326, -1,
+          325, 346, 352, -1,
+          325, 352, 327, -1,
+          326, 327, 328, -1,
+          326, 328, 332, -1,
+          326, 332, 359, -1,
+          326, 359, 351, -1,
+          327, 329, 328, -1,
+          327, 333, 329, -1,
+          327, 352, 358, -1,
+          327, 358, 333, -1,
+          328, 329, 330, -1,
+          328, 330, 332, -1,
+          329, 331, 330, -1,
+          329, 333, 331, -1,
+          330, 331, 332, -1,
+          331, 333, 332, -1,
+          332, 333, 334, -1,
+          332, 334, 335, -1,
+          332, 335, 359, -1,
+          333, 358, 334, -1,
+          334, 336, 335, -1,
+          334, 337, 336, -1,
+          334, 357, 337, -1,
+          334, 358, 357, -1,
+          335, 336, 356, -1,
+          335, 356, 359, -1,
+          336, 337, 338, -1,
+          336, 338, 354, -1,
+          336, 354, 356, -1,
+          337, 339, 338, -1,
+          337, 355, 339, -1,
+          337, 357, 355, -1,
+          338, 339, 340, -1,
+          338, 340, 354, -1,
+          339, 341, 340, -1,
+          339, 355, 341, -1,
+          340, 341, 342, -1,
+          340, 342, 354, -1,
+          341, 343, 342, -1,
+          341, 355, 343, -1,
+          342, 343, 344, -1,
+          342, 344, 353, -1,
+          342, 353, 354, -1,
+          343, 345, 344, -1,
+          343, 350, 345, -1,
+          343, 355, 350, -1,
+          344, 345, 346, -1,
+          344, 346, 347, -1,
+          344, 347, 351, -1,
+          344, 351, 353, -1,
+          345, 350, 352, -1,
+          345, 352, 346, -1,
+          346, 348, 347, -1,
+          347, 348, 349, -1,
+          350, 351, 352, -1,
+          350, 353, 351, -1,
+          350, 354, 353, -1,
+          350, 355, 354, -1,
+          351, 359, 352, -1,
+          352, 359, 358, -1,
+          354, 355, 356, -1,
+          355, 357, 356, -1,
+          356, 357, 358, -1,
+          356, 358, 359, -1,
+          360, 361, 362, -1,
+          360, 362, 366, -1,
+          360, 366, 361, -1,
+          361, 363, 362, -1,
+          361, 365, 363, -1,
+          361, 366, 365, -1,
+          362, 363, 364, -1,
+          362, 364, 366, -1,
+          363, 365, 367, -1,
+          363, 367, 364, -1,
+          364, 365, 366, -1,
+          364, 367, 365, -1,
+          368, 369, 370, -1,
+          368, 370, 371, -1,
+          368, 371, 372, -1,
+          368, 372, 373, -1,
+          368, 373, 446, -1,
+          368, 446, 448, -1,
+          368, 448, 369, -1,
+          369, 428, 370, -1,
+          369, 429, 428, -1,
+          369, 448, 451, -1,
+          369, 451, 429, -1,
+          370, 428, 450, -1,
+          370, 449, 371, -1,
+          370, 450, 449, -1,
+          371, 447, 372, -1,
+          371, 449, 447, -1,
+          372, 374, 373, -1,
+          372, 375, 374, -1,
+          372, 444, 375, -1,
+          372, 447, 444, -1,
+          373, 374, 445, -1,
+          373, 445, 446, -1,
+          374, 375, 376, -1,
+          374, 376, 377, -1,
+          374, 377, 445, -1,
+          375, 444, 376, -1,
+          376, 378, 377, -1,
+          376, 443, 378, -1,
+          376, 444, 443, -1,
+          377, 378, 379, -1,
+          377, 379, 442, -1,
+          377, 442, 445, -1,
+          378, 380, 379, -1,
+          378, 440, 380, -1,
+          378, 443, 440, -1,
+          379, 380, 381, -1,
+          379, 381, 441, -1,
+          379, 441, 442, -1,
+          380, 382, 381, -1,
+          380, 383, 382, -1,
+          380, 439, 383, -1,
+          380, 440, 439, -1,
+          381, 382, 438, -1,
+          381, 438, 441, -1,
+          382, 383, 384, -1,
+          382, 384, 437, -1,
+          382, 437, 438, -1,
+          383, 385, 384, -1,
+          383, 436, 385, -1,
+          383, 439, 436, -1,
+          384, 385, 386, -1,
+          384, 386, 434, -1,
+          384, 434, 437, -1,
+          385, 387, 386, -1,
+          385, 435, 387, -1,
+          385, 436, 435, -1,
+          386, 387, 388, -1,
+          386, 388, 389, -1,
+          386, 389, 430, -1,
+          386, 430, 434, -1,
+          387, 433, 388, -1,
+          387, 435, 433, -1,
+          388, 390, 389, -1,
+          388, 433, 390, -1,
+          389, 390, 391, -1,
+          389, 391, 430, -1,
+          390, 392, 391, -1,
+          390, 393, 392, -1,
+          390, 432, 393, -1,
+          390, 433, 432, -1,
+          391, 392, 431, -1,
+          391, 431, 430, -1,
+          392, 393, 394, -1,
+          392, 394, 477, -1,
+          392, 477, 431, -1,
+          393, 395, 394, -1,
+          393, 432, 476, -1,
+          393, 476, 395, -1,
+          394, 395, 396, -1,
+          394, 396, 474, -1,
+          394, 474, 477, -1,
+          395, 397, 396, -1,
+          395, 475, 397, -1,
+          395, 476, 475, -1,
+          396, 397, 398, -1,
+          396, 398, 474, -1,
+          397, 399, 398, -1,
+          397, 475, 399, -1,
+          398, 399, 400, -1,
+          398, 400, 473, -1,
+          398, 473, 474, -1,
+          399, 401, 400, -1,
+          399, 472, 401, -1,
+          399, 475, 472, -1,
+          400, 401, 402, -1,
+          400, 402, 403, -1,
+          400, 403, 473, -1,
+          401, 472, 402, -1,
+          402, 404, 403, -1,
+          402, 472, 404, -1,
+          403, 404, 405, -1,
+          403, 405, 473, -1,
+          404, 406, 405, -1,
+          404, 407, 406, -1,
+          404, 471, 407, -1,
+          404, 472, 471, -1,
+          405, 406, 470, -1,
+          405, 470, 473, -1,
+          406, 407, 408, -1,
+          406, 408, 409, -1,
+          406, 409, 469, -1,
+          406, 469, 470, -1,
+          407, 468, 408, -1,
+          407, 471, 468, -1,
+          408, 410, 409, -1,
+          408, 411, 410, -1,
+          408, 466, 411, -1,
+          408, 468, 466, -1,
+          409, 410, 467, -1,
+          409, 467, 469, -1,
+          410, 411, 412, -1,
+          410, 412, 464, -1,
+          410, 464, 467, -1,
+          411, 413, 412, -1,
+          411, 465, 413, -1,
+          411, 466, 465, -1,
+          412, 413, 414, -1,
+          412, 414, 464, -1,
+          413, 415, 414, -1,
+          413, 465, 415, -1,
+          414, 415, 416, -1,
+          414, 416, 462, -1,
+          414, 462, 464, -1,
+          415, 417, 416, -1,
+          415, 463, 417, -1,
+          415, 465, 463, -1,
+          416, 417, 418, -1,
+          416, 418, 460, -1,
+          416, 460, 462, -1,
+          417, 419, 418, -1,
+          417, 461, 419, -1,
+          417, 463, 461, -1,
+          418, 419, 420, -1,
+          418, 420, 460, -1,
+          419, 421, 420, -1,
+          419, 461, 421, -1,
+          420, 421, 422, -1,
+          420, 422, 423, -1,
+          420, 423, 456, -1,
+          420, 456, 459, -1,
+          420, 459, 460, -1,
+          421, 457, 422, -1,
+          421, 458, 457, -1,
+          421, 461, 458, -1,
+          422, 424, 423, -1,
+          422, 457, 424, -1,
+          423, 424, 425, -1,
+          423, 425, 456, -1,
+          424, 426, 425, -1,
+          424, 455, 426, -1,
+          424, 457, 455, -1,
+          425, 426, 427, -1,
+          425, 427, 454, -1,
+          425, 454, 456, -1,
+          426, 428, 427, -1,
+          426, 453, 428, -1,
+          426, 455, 453, -1,
+          427, 428, 429, -1,
+          427, 429, 452, -1,
+          427, 452, 454, -1,
+          428, 453, 450, -1,
+          429, 451, 452, -1,
+          430, 431, 432, -1,
+          430, 432, 433, -1,
+          430, 433, 434, -1,
+          431, 476, 432, -1,
+          431, 477, 476, -1,
+          433, 435, 434, -1,
+          434, 435, 436, -1,
+          434, 436, 437, -1,
+          436, 438, 437, -1,
+          436, 439, 438, -1,
+          438, 439, 440, -1,
+          438, 440, 441, -1,
+          440, 442, 441, -1,
+          440, 443, 442, -1,
+          442, 443, 444, -1,
+          442, 444, 445, -1,
+          444, 446, 445, -1,
+          444, 447, 446, -1,
+          446, 447, 448, -1,
+          447, 449, 448, -1,
+          448, 449, 450, -1,
+          448, 450, 451, -1,
+          450, 452, 451, -1,
+          450, 453, 452, -1,
+          452, 453, 454, -1,
+          453, 455, 454, -1,
+          454, 455, 456, -1,
+          455, 457, 456, -1,
+          456, 457, 458, -1,
+          456, 458, 459, -1,
+          458, 460, 459, -1,
+          458, 461, 460, -1,
+          460, 461, 462, -1,
+          461, 463, 462, -1,
+          462, 463, 464, -1,
+          463, 465, 464, -1,
+          464, 465, 466, -1,
+          464, 466, 467, -1,
+          466, 468, 467, -1,
+          467, 468, 469, -1,
+          468, 470, 469, -1,
+          468, 471, 470, -1,
+          470, 471, 472, -1,
+          470, 472, 473, -1,
+          472, 474, 473, -1,
+          472, 475, 474, -1,
+          474, 475, 476, -1,
+          474, 476, 477, -1,
+          478, 479, 480, -1,
+          478, 480, 481, -1,
+          478, 481, 482, -1,
+          478, 482, 483, -1,
+          478, 483, 500, -1,
+          478, 500, 502, -1,
+          478, 502, 479, -1,
+          479, 502, 504, -1,
+          479, 504, 505, -1,
+          479, 505, 480, -1,
+          480, 503, 481, -1,
+          480, 505, 503, -1,
+          481, 501, 482, -1,
+          481, 503, 501, -1,
+          482, 484, 483, -1,
+          482, 497, 484, -1,
+          482, 499, 497, -1,
+          482, 501, 499, -1,
+          483, 484, 485, -1,
+          483, 485, 496, -1,
+          483, 496, 498, -1,
+          483, 498, 500, -1,
+          484, 486, 485, -1,
+          484, 497, 486, -1,
+          485, 486, 487, -1,
+          485, 487, 496, -1,
+          486, 488, 487, -1,
+          486, 489, 488, -1,
+          486, 491, 489, -1,
+          486, 497, 491, -1,
+          487, 488, 490, -1,
+          487, 490, 496, -1,
+          488, 489, 490, -1,
+          489, 491, 490, -1,
+          490, 491, 492, -1,
+          490, 492, 493, -1,
+          490, 493, 496, -1,
+          491, 497, 492, -1,
+          492, 494, 493, -1,
+          492, 495, 494, -1,
+          492, 497, 495, -1,
+          493, 494, 496, -1,
+          494, 495, 496, -1,
+          495, 497, 496, -1,
+          496, 497, 498, -1,
+          497, 499, 498, -1,
+          498, 499, 500, -1,
+          499, 501, 500, -1,
+          500, 501, 502, -1,
+          501, 503, 502, -1,
+          502, 503, 504, -1,
+          503, 505, 504, -1,
+          506, 507, 508, -1,
+          506, 508, 509, -1,
+          506, 509, 510, -1,
+          506, 510, 542, -1,
+          506, 542, 544, -1,
+          506, 544, 507, -1,
+          507, 534, 508, -1,
+          507, 544, 534, -1,
+          508, 534, 535, -1,
+          508, 535, 545, -1,
+          508, 545, 509, -1,
+          509, 511, 510, -1,
+          509, 543, 511, -1,
+          509, 545, 543, -1,
+          510, 511, 512, -1,
+          510, 512, 513, -1,
+          510, 513, 536, -1,
+          510, 536, 540, -1,
+          510, 540, 542, -1,
+          511, 539, 512, -1,
+          511, 541, 539, -1,
+          511, 543, 541, -1,
+          512, 514, 513, -1,
+          512, 515, 514, -1,
+          512, 538, 515, -1,
+          512, 539, 538, -1,
+          513, 514, 537, -1,
+          513, 537, 536, -1,
+          514, 515, 516, -1,
+          514, 516, 537, -1,
+          515, 517, 516, -1,
+          515, 538, 517, -1,
+          516, 517, 518, -1,
+          516, 518, 537, -1,
+          517, 519, 518, -1,
+          517, 538, 519, -1,
+          518, 519, 520, -1,
+          518, 520, 537, -1,
+          519, 521, 520, -1,
+          519, 538, 521, -1,
+          520, 521, 522, -1,
+          520, 522, 526, -1,
+          520, 526, 532, -1,
+          520, 532, 546, -1,
+          520, 546, 537, -1,
+          521, 523, 522, -1,
+          521, 527, 523, -1,
+          521, 533, 527, -1,
+          521, 538, 547, -1,
+          521, 547, 533, -1,
+          522, 523, 524, -1,
+          522, 524, 526, -1,
+          523, 525, 524, -1,
+          523, 527, 525, -1,
+          524, 525, 526, -1,
+          525, 527, 526, -1,
+          526, 527, 528, -1,
+          526, 528, 530, -1,
+          526, 530, 532, -1,
+          527, 529, 528, -1,
+          527, 531, 529, -1,
+          527, 533, 531, -1,
+          528, 529, 530, -1,
+          529, 531, 530, -1,
+          530, 531, 532, -1,
+          531, 533, 532, -1,
+          532, 533, 534, -1,
+          532, 534, 544, -1,
+          532, 544, 546, -1,
+          533, 535, 534, -1,
+          533, 545, 535, -1,
+          533, 547, 545, -1,
+          536, 537, 538, -1,
+          536, 538, 539, -1,
+          536, 539, 540, -1,
+          537, 546, 547, -1,
+          537, 547, 538, -1,
+          539, 541, 540, -1,
+          540, 541, 542, -1,
+          541, 543, 542, -1,
+          542, 543, 544, -1,
+          543, 545, 544, -1,
+          544, 545, 546, -1,
+          545, 547, 546, -1,
+          548, 549, 550, -1,
+          548, 550, 551, -1,
+          548, 551, 552, -1,
+          548, 552, 634, -1,
+          548, 634, 636, -1,
+          548, 636, 549, -1,
+          549, 628, 629, -1,
+          549, 629, 550, -1,
+          549, 636, 638, -1,
+          549, 638, 628, -1,
+          550, 629, 639, -1,
+          550, 637, 551, -1,
+          550, 639, 637, -1,
+          551, 553, 552, -1,
+          551, 635, 553, -1,
+          551, 637, 635, -1,
+          552, 553, 554, -1,
+          552, 554, 630, -1,
+          552, 630, 634, -1,
+          553, 555, 554, -1,
+          553, 633, 555, -1,
+          553, 635, 633, -1,
+          554, 555, 556, -1,
+          554, 556, 630, -1,
+          555, 557, 556, -1,
+          555, 633, 557, -1,
+          556, 557, 558, -1,
+          556, 558, 559, -1,
+          556, 559, 631, -1,
+          556, 631, 630, -1,
+          557, 632, 558, -1,
+          557, 633, 632, -1,
+          558, 560, 559, -1,
+          558, 561, 560, -1,
+          558, 632, 682, -1,
+          558, 682, 724, -1,
+          558, 724, 561, -1,
+          559, 560, 725, -1,
+          559, 681, 631, -1,
+          559, 725, 681, -1,
+          560, 561, 562, -1,
+          560, 562, 725, -1,
+          561, 563, 562, -1,
+          561, 724, 563, -1,
+          562, 563, 564, -1,
+          562, 564, 565, -1,
+          562, 565, 722, -1,
+          562, 722, 725, -1,
+          563, 723, 564, -1,
+          563, 724, 723, -1,
+          564, 566, 565, -1,
+          564, 567, 566, -1,
+          564, 720, 567, -1,
+          564, 723, 720, -1,
+          565, 566, 721, -1,
+          565, 721, 722, -1,
+          566, 567, 568, -1,
+          566, 568, 718, -1,
+          566, 718, 721, -1,
+          567, 569, 568, -1,
+          567, 719, 569, -1,
+          567, 720, 719, -1,
+          568, 569, 570, -1,
+          568, 570, 716, -1,
+          568, 716, 718, -1,
+          569, 571, 570, -1,
+          569, 717, 571, -1,
+          569, 719, 717, -1,
+          570, 571, 572, -1,
+          570, 572, 714, -1,
+          570, 714, 716, -1,
+          571, 573, 572, -1,
+          571, 715, 573, -1,
+          571, 717, 715, -1,
+          572, 573, 574, -1,
+          572, 574, 713, -1,
+          572, 713, 714, -1,
+          573, 575, 574, -1,
+          573, 712, 575, -1,
+          573, 715, 712, -1,
+          574, 575, 576, -1,
+          574, 576, 710, -1,
+          574, 710, 713, -1,
+          575, 577, 576, -1,
+          575, 711, 577, -1,
+          575, 712, 711, -1,
+          576, 577, 578, -1,
+          576, 578, 708, -1,
+          576, 708, 710, -1,
+          577, 579, 578, -1,
+          577, 709, 579, -1,
+          577, 711, 709, -1,
+          578, 579, 580, -1,
+          578, 580, 581, -1,
+          578, 581, 706, -1,
+          578, 706, 708, -1,
+          579, 707, 580, -1,
+          579, 709, 707, -1,
+          580, 582, 581, -1,
+          580, 583, 582, -1,
+          580, 704, 583, -1,
+          580, 707, 704, -1,
+          581, 582, 705, -1,
+          581, 705, 706, -1,
+          582, 583, 584, -1,
+          582, 584, 705, -1,
+          583, 585, 584, -1,
+          583, 704, 585, -1,
+          584, 585, 586, -1,
+          584, 586, 702, -1,
+          584, 702, 705, -1,
+          585, 587, 586, -1,
+          585, 703, 587, -1,
+          585, 704, 703, -1,
+          586, 587, 588, -1,
+          586, 588, 589, -1,
+          586, 589, 700, -1,
+          586, 700, 702, -1,
+          587, 701, 588, -1,
+          587, 703, 701, -1,
+          588, 590, 589, -1,
+          588, 698, 590, -1,
+          588, 701, 698, -1,
+          589, 590, 591, -1,
+          589, 591, 699, -1,
+          589, 699, 700, -1,
+          590, 592, 591, -1,
+          590, 593, 592, -1,
+          590, 697, 593, -1,
+          590, 698, 697, -1,
+          591, 592, 696, -1,
+          591, 696, 699, -1,
+          592, 593, 594, -1,
+          592, 594, 695, -1,
+          592, 695, 696, -1,
+          593, 595, 594, -1,
+          593, 694, 595, -1,
+          593, 697, 694, -1,
+          594, 595, 596, -1,
+          594, 596, 693, -1,
+          594, 693, 695, -1,
+          595, 597, 596, -1,
+          595, 692, 597, -1,
+          595, 694, 692, -1,
+          596, 597, 598, -1,
+          596, 598, 691, -1,
+          596, 691, 693, -1,
+          597, 599, 598, -1,
+          597, 690, 599, -1,
+          597, 692, 690, -1,
+          598, 599, 600, -1,
+          598, 600, 671, -1,
+          598, 671, 672, -1,
+          598, 672, 674, -1,
+          598, 674, 687, -1,
+          598, 687, 689, -1,
+          598, 689, 691, -1,
+          599, 601, 600, -1,
+          599, 670, 601, -1,
+          599, 673, 670, -1,
+          599, 675, 673, -1,
+          599, 686, 675, -1,
+          599, 688, 686, -1,
+          599, 690, 688, -1,
+          600, 601, 602, -1,
+          600, 602, 668, -1,
+          600, 668, 671, -1,
+          601, 603, 602, -1,
+          601, 669, 603, -1,
+          601, 670, 669, -1,
+          602, 603, 604, -1,
+          602, 604, 666, -1,
+          602, 666, 668, -1,
+          603, 605, 604, -1,
+          603, 667, 605, -1,
+          603, 669, 667, -1,
+          604, 605, 606, -1,
+          604, 606, 664, -1,
+          604, 664, 666, -1,
+          605, 607, 606, -1,
+          605, 665, 607, -1,
+          605, 667, 665, -1,
+          606, 607, 608, -1,
+          606, 608, 663, -1,
+          606, 663, 664, -1,
+          607, 609, 608, -1,
+          607, 662, 609, -1,
+          607, 665, 662, -1,
+          608, 609, 610, -1,
+          608, 610, 660, -1,
+          608, 660, 663, -1,
+          609, 611, 610, -1,
+          609, 661, 611, -1,
+          609, 662, 661, -1,
+          610, 611, 612, -1,
+          610, 612, 659, -1,
+          610, 659, 660, -1,
+          611, 613, 612, -1,
+          611, 658, 613, -1,
+          611, 661, 658, -1,
+          612, 613, 614, -1,
+          612, 614, 656, -1,
+          612, 656, 659, -1,
+          613, 615, 614, -1,
+          613, 657, 615, -1,
+          613, 658, 657, -1,
+          614, 615, 616, -1,
+          614, 616, 617, -1,
+          614, 617, 652, -1,
+          614, 652, 654, -1,
+          614, 654, 656, -1,
+          615, 653, 616, -1,
+          615, 655, 653, -1,
+          615, 657, 655, -1,
+          616, 618, 617, -1,
+          616, 619, 618, -1,
+          616, 653, 619, -1,
+          617, 618, 652, -1,
+          618, 619, 620, -1,
+          618, 620, 621, -1,
+          618, 621, 650, -1,
+          618, 650, 652, -1,
+          619, 651, 620, -1,
+          619, 653, 651, -1,
+          620, 622, 621, -1,
+          620, 649, 622, -1,
+          620, 651, 649, -1,
+          621, 622, 623, -1,
+          621, 623, 648, -1,
+          621, 648, 650, -1,
+          622, 624, 623, -1,
+          622, 625, 624, -1,
+          622, 647, 625, -1,
+          622, 649, 647, -1,
+          623, 624, 646, -1,
+          623, 646, 648, -1,
+          624, 625, 626, -1,
+          624, 626, 642, -1,
+          624, 642, 644, -1,
+          624, 644, 646, -1,
+          625, 627, 626, -1,
+          625, 643, 627, -1,
+          625, 645, 643, -1,
+          625, 647, 645, -1,
+          626, 627, 628, -1,
+          626, 628, 640, -1,
+          626, 640, 642, -1,
+          627, 629, 628, -1,
+          627, 641, 629, -1,
+          627, 643, 641, -1,
+          628, 638, 640, -1,
+          629, 641, 639, -1,
+          630, 631, 632, -1,
+          630, 632, 633, -1,
+          630, 633, 634, -1,
+          631, 678, 632, -1,
+          631, 681, 683, -1,
+          631, 683, 678, -1,
+          632, 678, 679, -1,
+          632, 679, 680, -1,
+          632, 680, 682, -1,
+          633, 635, 634, -1,
+          634, 635, 636, -1,
+          635, 637, 636, -1,
+          636, 637, 638, -1,
+          637, 639, 638, -1,
+          638, 639, 640, -1,
+          639, 641, 640, -1,
+          640, 641, 642, -1,
+          641, 643, 642, -1,
+          642, 643, 644, -1,
+          643, 645, 644, -1,
+          644, 645, 646, -1,
+          645, 647, 646, -1,
+          646, 647, 648, -1,
+          647, 649, 648, -1,
+          648, 649, 650, -1,
+          649, 651, 650, -1,
+          650, 651, 652, -1,
+          651, 653, 652, -1,
+          652, 653, 654, -1,
+          653, 655, 654, -1,
+          654, 655, 656, -1,
+          655, 657, 656, -1,
+          656, 657, 658, -1,
+          656, 658, 659, -1,
+          658, 660, 659, -1,
+          658, 661, 660, -1,
+          660, 661, 662, -1,
+          660, 662, 663, -1,
+          662, 664, 663, -1,
+          662, 665, 664, -1,
+          664, 665, 666, -1,
+          665, 667, 666, -1,
+          666, 667, 668, -1,
+          667, 669, 668, -1,
+          668, 669, 670, -1,
+          668, 670, 671, -1,
+          670, 672, 671, -1,
+          670, 673, 672, -1,
+          672, 673, 674, -1,
+          673, 675, 674, -1,
+          674, 675, 676, -1,
+          674, 676, 684, -1,
+          674, 684, 687, -1,
+          675, 677, 676, -1,
+          675, 685, 677, -1,
+          675, 686, 685, -1,
+          676, 677, 678, -1,
+          676, 678, 684, -1,
+          677, 679, 678, -1,
+          677, 685, 679, -1,
+          678, 683, 684, -1,
+          679, 685, 680, -1,
+          680, 681, 682, -1,
+          680, 683, 681, -1,
+          680, 684, 683, -1,
+          680, 685, 684, -1,
+          681, 724, 682, -1,
+          681, 725, 724, -1,
+          684, 685, 686, -1,
+          684, 686, 687, -1,
+          686, 688, 687, -1,
+          687, 688, 689, -1,
+          688, 690, 689, -1,
+          689, 690, 691, -1,
+          690, 692, 691, -1,
+          691, 692, 693, -1,
+          692, 694, 693, -1,
+          693, 694, 695, -1,
+          694, 696, 695, -1,
+          694, 697, 696, -1,
+          696, 697, 698, -1,
+          696, 698, 699, -1,
+          698, 700, 699, -1,
+          698, 701, 700, -1,
+          700, 701, 702, -1,
+          701, 703, 702, -1,
+          702, 703, 704, -1,
+          702, 704, 705, -1,
+          704, 706, 705, -1,
+          704, 707, 706, -1,
+          706, 707, 708, -1,
+          707, 709, 708, -1,
+          708, 709, 710, -1,
+          709, 711, 710, -1,
+          710, 711, 712, -1,
+          710, 712, 713, -1,
+          712, 714, 713, -1,
+          712, 715, 714, -1,
+          714, 715, 716, -1,
+          715, 717, 716, -1,
+          716, 717, 718, -1,
+          717, 719, 718, -1,
+          718, 719, 720, -1,
+          718, 720, 721, -1,
+          720, 722, 721, -1,
+          720, 723, 722, -1,
+          722, 723, 724, -1,
+          722, 724, 725, -1 ]
+      }
+    }
+  ]
+}
+
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/MELF-RM10_Universal_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/MELF-RM10_Universal_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/MELF-RM10_Universal_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/MELF-RM10_Universal_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/MELF_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/MELF_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/MELF_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/MELF_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/MELF_Standard.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/MELF_Standard.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/MELF_Standard.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/MELF_Standard.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Standard.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Standard.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Standard.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/MiniMELF_Standard.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMA-SMB_Universal_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMA-SMB_Universal_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMA-SMB_Universal_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMA-SMB_Universal_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMA_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMA_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMA_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMA_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMA_Standard.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMA_Standard.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMA_Standard.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMA_Standard.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMB-SMC_Universal_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMB-SMC_Universal_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMB-SMC_Universal_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMB-SMC_Universal_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMB_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMB_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMB_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMB_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMB_Standard.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMB_Standard.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMB_Standard.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMB_Standard.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMC-RM10_Universal_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMC-RM10_Universal_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMC-RM10_Universal_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMC-RM10_Universal_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMC_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMC_Handsoldering.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMC_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMC_Handsoldering.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/SMC_Standard.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/SMC_Standard.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/SMC_Standard.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/SMC_Standard.wrl
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wings b/modules/packages3d/Diodes_SMD.3dshapes/TUMD2.wings
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wings
rename to modules/packages3d/Diodes_SMD.3dshapes/TUMD2.wings
diff --git a/modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wrl b/modules/packages3d/Diodes_SMD.3dshapes/TUMD2.wrl
similarity index 100%
rename from modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wrl
rename to modules/packages3d/Diodes_SMD.3dshapes/TUMD2.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wings b/modules/packages3d/Housings_SIP.3dshapes/SLA704XM.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wings
rename to modules/packages3d/Housings_SIP.3dshapes/SLA704XM.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wrl b/modules/packages3d/Housings_SIP.3dshapes/SLA704XM.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wrl
rename to modules/packages3d/Housings_SIP.3dshapes/SLA704XM.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wings b/modules/packages3d/Housings_SIP.3dshapes/STK672-040-E.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wings
rename to modules/packages3d/Housings_SIP.3dshapes/STK672-040-E.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wrl b/modules/packages3d/Housings_SIP.3dshapes/STK672-040-E.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wrl
rename to modules/packages3d/Housings_SIP.3dshapes/STK672-040-E.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wings b/modules/packages3d/Housings_SIP.3dshapes/STK672-080-E.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wings
rename to modules/packages3d/Housings_SIP.3dshapes/STK672-080-E.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wrl b/modules/packages3d/Housings_SIP.3dshapes/STK672-080-E.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wrl
rename to modules/packages3d/Housings_SIP.3dshapes/STK672-080-E.wrl
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wings b/modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing.wings
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wings
rename to modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing.wings
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wrl b/modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing.wrl
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wrl
rename to modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing.wrl
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wings b/modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wings
rename to modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing_Handsoldering.wings
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wrl b/modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wrl
rename to modules/packages3d/SMD_Packages.3dshapes/VLM0806_Housing_Handsoldering.wrl
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/powermite3.wings b/modules/packages3d/SMD_Packages.3dshapes/powermite3.wings
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/powermite3.wings
rename to modules/packages3d/SMD_Packages.3dshapes/powermite3.wings
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/powermite3.wrl b/modules/packages3d/SMD_Packages.3dshapes/powermite3.wrl
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/powermite3.wrl
rename to modules/packages3d/SMD_Packages.3dshapes/powermite3.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_NoHole.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_NoHole.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_NoHole.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_NoHole.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_WithHole.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_WithHole.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_WithHole.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/PowerMacro_M234_WithHole.wrl
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-5.wings
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-5.wings
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-5.wrl
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-5.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6_Handsoldering.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70-6_Handsoldering.wrl
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sc70.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70.wings
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sc70.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70.wings
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sc70.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70.wrl
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sc70.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SC-70.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse_Handsoldering.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143R_Reverse_Handsoldering.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143_Handsoldering.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-143_Handsoldering.wrl
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-223.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-223.wings
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-223.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-223.wings
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-223.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-223.wrl
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-223.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-223.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-5.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-5.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-5.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-5.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-6.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-6.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-6.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23-6.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23_Handsoldering.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-23_Handsoldering.wrl
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-323.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-323.wings
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-323.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-323.wings
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-323.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-323.wrl
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-323.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-323.wrl
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-353.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-353.wings
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-353.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-353.wings
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-353.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-353.wrl
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-353.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-353.wrl
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sot404.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-404.wings
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sot404.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-404.wings
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sot404.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-404.wrl
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sot404.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-404.wrl
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sot428.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-428.wings
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sot428.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-428.wings
diff --git a/modules/packages3d/Transistors_SMD.3dshapes/sot428.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-428.wrl
similarity index 100%
rename from modules/packages3d/Transistors_SMD.3dshapes/sot428.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-428.wrl
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-553.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-553.wings
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-553.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-553.wings
diff --git a/modules/packages3d/SMD_Packages.3dshapes/SOT-553.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-553.wrl
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/SOT-553.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-553.wrl
diff --git a/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK.wings
diff --git a/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK.wrl
diff --git a/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wings
diff --git a/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wrl
diff --git a/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wings
diff --git a/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wrl
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing.wings
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing.wrl
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing_Handsoldering.wings
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-3_Housing_Handsoldering.wrl
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing.wings
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing.wrl
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing_Handsoldering.wings
diff --git a/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/SOT89-5_Housing_Handsoldering.wrl
diff --git a/modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-252-2Lead.wings
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-252-2Lead.wings
diff --git a/modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-252-2Lead.wrl
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-252-2Lead.wrl
diff --git a/modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-3Lead.wings
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-3Lead.wings
diff --git a/modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-3Lead.wrl
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-3Lead.wrl
diff --git a/modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead.wings
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead.wings
diff --git a/modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead.wrl
similarity index 100%
rename from modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead.wrl
diff --git a/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead_HandSoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead_HandSoldering.wings
new file mode 100644
index 00000000..5603791a
Binary files /dev/null and b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead_HandSoldering.wings differ
diff --git a/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead_HandSoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead_HandSoldering.wrl
new file mode 100644
index 00000000..288025a0
--- /dev/null
+++ b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-263-5Lead_HandSoldering.wrl
@@ -0,0 +1,362 @@
+#VRML V2.0 utf8
+#Exported from Wings 3D 0.98.15a
+DEF cube4_copy14 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material DEF pin Material {
+          diffuseColor 0.720000 0.720000 0.720000
+          emissiveColor 0.00000e+0 0.00000e+0 0.00000e+0
+          specularColor 1.00000 1.00000 1.00000
+          ambientIntensity 1.00000
+          transparency 0.00000e+0
+          shininess 1.00000
+        }
+      }
+      geometry IndexedFaceSet {
+        coord Coordinate { point [
+          0.494698 0.904412 0.588550,
+          0.494698 0.904412 0.416550,
+          0.849716 0.904411 0.416550,
+          0.849716 0.904410 0.588550,
+          0.494695 -0.375588 0.188547,
+          0.494695 -0.375588 1.65469e-2,
+          0.849713 -0.375589 1.65469e-2,
+          0.849713 -0.375589 0.188547,
+          0.494697 0.573745 0.588549,
+          0.494696 0.243079 0.188548,
+          0.494697 0.573745 0.416549,
+          0.494696 0.243079 1.65478e-2,
+          0.849715 0.573744 0.416549,
+          0.849714 0.243078 1.65478e-2,
+          0.849715 0.573744 0.588549,
+          0.849714 0.243077 0.188548]
+        }
+        coordIndex [
+          0, 3, 2, 1, -1,
+          0, 8, 14, 3, -1,
+          1, 10, 8, 0, -1,
+          2, 12, 10, 1, -1,
+          3, 14, 12, 2, -1,
+          4, 9, 11, 5, -1,
+          5, 6, 7, 4, -1,
+          5, 11, 13, 6, -1,
+          6, 13, 15, 7, -1,
+          7, 15, 9, 4, -1,
+          8, 10, 11, 9, -1,
+          9, 15, 14, 8, -1,
+          10, 12, 13, 11, -1,
+          12, 14, 15, 13, -1
+        ]
+      }
+    }
+  ]
+}
+
+DEF cube4_copy13 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE pin
+      }
+      geometry IndexedFaceSet {
+        coord Coordinate { point [
+          -0.859302 0.904417 0.588550,
+          -0.859302 0.904417 0.416550,
+          -0.504284 0.904416 0.416550,
+          -0.504284 0.904416 0.588550,
+          -0.859305 -0.375583 0.188547,
+          -0.859305 -0.375582 1.65469e-2,
+          -0.504287 -0.375584 1.65469e-2,
+          -0.504287 -0.375584 0.188547,
+          -0.859303 0.573750 0.588549,
+          -0.859304 0.243084 0.188548,
+          -0.859303 0.573751 0.416549,
+          -0.859304 0.243084 1.65478e-2,
+          -0.504285 0.573749 0.416549,
+          -0.504286 0.243083 1.65478e-2,
+          -0.504285 0.573749 0.588549,
+          -0.504286 0.243083 0.188548]
+        }
+        coordIndex [
+          0, 3, 2, 1, -1,
+          0, 8, 14, 3, -1,
+          1, 10, 8, 0, -1,
+          2, 12, 10, 1, -1,
+          3, 14, 12, 2, -1,
+          4, 9, 11, 5, -1,
+          5, 6, 7, 4, -1,
+          5, 11, 13, 6, -1,
+          6, 13, 15, 7, -1,
+          7, 15, 9, 4, -1,
+          8, 10, 11, 9, -1,
+          9, 15, 14, 8, -1,
+          10, 12, 13, 11, -1,
+          12, 14, 15, 13, -1
+        ]
+      }
+    }
+  ]
+}
+
+DEF cube4_sep12 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE pin
+      }
+      geometry IndexedFaceSet {
+        coord Coordinate { point [
+          1.18070 0.904412 0.588550,
+          1.18070 0.904412 0.416550,
+          1.53572 0.904411 0.416550,
+          1.53572 0.904410 0.588550,
+          1.18069 -0.375588 0.188547,
+          1.18069 -0.375588 1.65469e-2,
+          1.53571 -0.375589 1.65469e-2,
+          1.53571 -0.375589 0.188547,
+          1.18070 0.573745 0.588549,
+          1.18070 0.243079 0.188548,
+          1.18070 0.573745 0.416549,
+          1.18070 0.243079 1.65478e-2,
+          1.53572 0.573744 0.416549,
+          1.53571 0.243078 1.65478e-2,
+          1.53572 0.573744 0.588549,
+          1.53571 0.243077 0.188548]
+        }
+        coordIndex [
+          0, 3, 2, 1, -1,
+          0, 8, 14, 3, -1,
+          1, 10, 8, 0, -1,
+          2, 12, 10, 1, -1,
+          3, 14, 12, 2, -1,
+          4, 9, 11, 5, -1,
+          5, 6, 7, 4, -1,
+          5, 11, 13, 6, -1,
+          6, 13, 15, 7, -1,
+          7, 15, 9, 4, -1,
+          8, 10, 11, 9, -1,
+          9, 15, 14, 8, -1,
+          10, 12, 13, 11, -1,
+          12, 14, 15, 13, -1
+        ]
+      }
+    }
+  ]
+}
+
+DEF cube4_sep11 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material DEF body Material {
+          diffuseColor 0.373333 0.373333 0.373333
+          emissiveColor 0.00000e+0 0.00000e+0 0.00000e+0
+          specularColor 1.00000 1.00000 1.00000
+          ambientIntensity 1.00000
+          transparency 0.00000e+0
+          shininess 1.00000
+        }
+      }
+      geometry IndexedFaceSet {
+        coord Coordinate { point [
+          1.71522 4.64820 0.214554,
+          -1.72128 4.64821 0.214554,
+          1.71522 4.64820 0.915156,
+          2.00022 4.37260 0.915154,
+          -1.97579 4.39237 0.915154,
+          -1.72128 4.64821 0.915156,
+          -1.90059 0.987730 0.990351,
+          1.92501 0.987721 0.990351,
+          1.92502 4.34071 0.990354,
+          1.68481 4.57300 0.990356,
+          -1.69002 4.57301 0.990356,
+          -1.90059 4.36134 0.990354,
+          -1.91529 0.973036 0.975658,
+          -1.87099 0.912530 0.915151,
+          -1.97579 1.01733 0.915151,
+          1.89741 0.912521 0.915151,
+          2.00021 1.01532 0.915151,
+          1.94086 0.971872 0.974503,
+          1.71522 4.64820 0.157952,
+          1.66402 4.64820 0.106752,
+          1.71522 4.69940 0.106752,
+          2.00022 4.37260 0.157950,
+          -1.97579 4.39237 0.157950,
+          -1.67008 4.64821 0.106752,
+          -1.72128 4.64821 0.157952,
+          -1.72128 4.69941 0.106752,
+          -1.97579 1.01733 0.157947,
+          -1.87099 0.912531 0.157947,
+          2.00021 1.01532 0.157947,
+          1.89741 0.912522 0.157947,
+          1.94902 4.35089 0.106750,
+          1.77301 1.03653 0.106747,
+          1.70020 0.963722 0.106747,
+          -1.84979 0.963731 0.106747,
+          -1.92459 1.03854 0.106747,
+          -1.92459 4.37124 0.106750]
+        }
+        coordIndex [
+          0, 2, 3, 21, 18, -1,
+          1, 24, 22, 4, 5, -1,
+          2, 5, 10, 9, -1,
+          4, 14, 12, 6, 11, -1,
+          5, 2, 0, 1, -1,
+          6, 12, 13, 15, 17, 7, -1,
+          7, 8, 9, 10, 11, 6, -1,
+          8, 7, 17, 16, 3, -1,
+          9, 8, 3, 2, -1,
+          11, 10, 5, 4, -1,
+          13, 27, 29, 15, -1,
+          14, 13, 12, -1,
+          16, 28, 21, 3, -1,
+          17, 15, 16, -1,
+          18, 19, 20, -1,
+          19, 30, 31, 32, 33, 34, 35, 23, -1,
+          22, 26, 14, 4, -1,
+          23, 24, 25, -1,
+          24, 23, 35, 22, -1,
+          26, 22, 35, 34, -1,
+          26, 27, 13, 14, -1,
+          28, 29, 32, 31, -1,
+          29, 27, 33, 32, -1,
+          29, 28, 16, 15, -1,
+          30, 19, 18, 21, -1,
+          31, 30, 21, 28, -1,
+          34, 33, 27, 26, -1
+        ]
+      }
+    }
+    ,
+    Shape {
+      appearance Appearance {
+        material USE pin
+      }
+      geometry IndexedFaceSet {
+        coord Coordinate { point [
+          1.71522 4.64820 0.214554,
+          -1.72128 4.64821 0.214554,
+          -1.72128 5.10341 0.214554,
+          1.71522 5.10340 0.214554,
+          1.71522 5.10340 0.106752,
+          -1.72128 5.10341 0.106752,
+          -1.69648 5.12821 0.189754,
+          1.69042 5.12820 0.189754,
+          1.69042 5.12820 0.131552,
+          -1.69648 5.12821 0.131552,
+          1.71522 4.64820 0.157952,
+          1.66402 4.64820 0.106752,
+          1.71522 4.69940 0.106752,
+          -1.67008 4.64821 0.106752,
+          -1.72128 4.64821 0.157952,
+          -1.72128 4.69941 0.106752]
+        }
+        coordIndex [
+          0, 3, 2, 1, -1,
+          2, 3, 7, 6, -1,
+          2, 5, 15, 14, 1, -1,
+          3, 4, 8, 7, -1,
+          4, 5, 9, 8, -1,
+          4, 12, 11, 13, 15, 5, -1,
+          6, 9, 5, 2, -1,
+          7, 8, 9, 6, -1,
+          10, 12, 4, 3, 0, -1
+        ]
+      }
+    }
+  ]
+}
+
+DEF cube4_sep10 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE pin
+      }
+      geometry IndexedFaceSet {
+        coord Coordinate { point [
+          -1.52930 0.904417 0.588550,
+          -1.52930 0.904417 0.416550,
+          -1.17428 0.904416 0.416550,
+          -1.17428 0.904416 0.588550,
+          -1.52931 -0.375583 0.188547,
+          -1.52931 -0.375582 1.65469e-2,
+          -1.17429 -0.375584 1.65469e-2,
+          -1.17429 -0.375584 0.188547,
+          -1.52930 0.573750 0.588549,
+          -1.52930 0.243084 0.188548,
+          -1.52930 0.573751 0.416549,
+          -1.52930 0.243084 1.65478e-2,
+          -1.17428 0.573749 0.416549,
+          -1.17429 0.243083 1.65478e-2,
+          -1.17428 0.573749 0.588549,
+          -1.17429 0.243083 0.188548]
+        }
+        coordIndex [
+          0, 3, 2, 1, -1,
+          0, 8, 14, 3, -1,
+          1, 10, 8, 0, -1,
+          2, 12, 10, 1, -1,
+          3, 14, 12, 2, -1,
+          4, 9, 11, 5, -1,
+          5, 6, 7, 4, -1,
+          5, 11, 13, 6, -1,
+          6, 13, 15, 7, -1,
+          7, 15, 9, 4, -1,
+          8, 10, 11, 9, -1,
+          9, 15, 14, 8, -1,
+          10, 12, 13, 11, -1,
+          12, 14, 15, 13, -1
+        ]
+      }
+    }
+  ]
+}
+
+DEF cube4_sep26 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE pin
+      }
+      geometry IndexedFaceSet {
+        coord Coordinate { point [
+          -0.179302 0.904414 0.588550,
+          -0.179302 0.904415 0.416550,
+          0.175716 0.904413 0.416550,
+          0.175716 0.904413 0.588550,
+          -0.179305 -0.375585 0.188547,
+          -0.179305 -0.375585 1.65469e-2,
+          0.175713 -0.375586 1.65469e-2,
+          0.175713 -0.375587 0.188547,
+          -0.179303 0.573748 0.588549,
+          -0.179304 0.243081 0.188548,
+          -0.179303 0.573748 0.416549,
+          -0.179304 0.243081 1.65478e-2,
+          0.175715 0.573747 0.416549,
+          0.175714 0.243080 1.65478e-2,
+          0.175715 0.573747 0.588549,
+          0.175714 0.243080 0.188548]
+        }
+        coordIndex [
+          0, 3, 2, 1, -1,
+          0, 8, 14, 3, -1,
+          1, 10, 8, 0, -1,
+          2, 12, 10, 1, -1,
+          3, 14, 12, 2, -1,
+          4, 9, 11, 5, -1,
+          5, 6, 7, 4, -1,
+          5, 11, 13, 6, -1,
+          6, 13, 15, 7, -1,
+          7, 15, 9, 4, -1,
+          8, 10, 11, 9, -1,
+          9, 15, 14, 8, -1,
+          10, 12, 13, 11, -1,
+          12, 14, 15, 13, -1
+        ]
+      }
+    }
+  ]
+}
+
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-NoHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-NoHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-NoHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-NoHole_Housing.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-WithHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-WithHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-WithHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_LongPad-WithHole_Housing.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-NoHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-NoHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-NoHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-NoHole_Housing.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-WithHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-WithHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-WithHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_LongPad-WithHole_Housing.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wrl
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wings
diff --git a/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A.wrl
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wings b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A_Handsoldering.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wings
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A_Handsoldering.wings
diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wrl b/modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A_Handsoldering.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wrl
rename to modules/packages3d/TO_SOT_Packages_SMD.3dshapes/TSOT-6-MK06A_Handsoldering.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Horizontal.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Horizontal.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Horizontal.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Horizontal.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Vertical.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Vertical.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Vertical.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Multiwatt_15_Vertical.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings
diff --git a/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl
similarity index 100%
rename from modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal.wings
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal.wrl
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wings
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wrl
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical.wings
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical.wrl
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wings
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wrl
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wings
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wings
diff --git a/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wrl
similarity index 100%
rename from modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wrl
diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_2Pin.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_2Pin.wings
diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_2Pin.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_2Pin.wrl
diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_3Pin.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_3Pin.wings
diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_3Pin.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-18_3Pin.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_PadsOnly.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_PadsOnly.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_PadsOnly.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_PadsOnly.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_LargePads.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_LargePads.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_LargePads.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_LargePads.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wrl
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings
diff --git a/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl
similarity index 100%
rename from modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl
diff --git a/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_10Pin.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_10Pin.wings
diff --git a/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_10Pin.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_10Pin.wrl
diff --git a/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_6Pin.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_6Pin.wings
diff --git a/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_6Pin.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_6Pin.wrl
diff --git a/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_8Pin.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_8Pin.wings
diff --git a/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_8Pin.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-78_Housing_8Pin.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Molded_Narrow.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Molded_Narrow.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Molded_Narrow.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal1_Molded_Narrow.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Molded_Narrow.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Molded_Narrow.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Molded_Narrow.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Horizontal2_Molded_Narrow.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Narrow_Oval.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Narrow_Oval.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Narrow_Oval.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Narrow_Oval.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Wide.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Wide.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Wide.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Inline_Wide.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Oval.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Oval.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Oval.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Oval.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Reverse.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Reverse.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Reverse.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Narrow_Reverse.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Reverse.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Reverse.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Reverse.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Molded_Wide_Reverse.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged.wrl
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged_Reverse.wings
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged_Reverse.wings
diff --git a/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged_Reverse.wrl
similarity index 100%
rename from modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO-92_Rugged_Reverse.wrl
diff --git a/modules/packages3d/Discret.3dshapes/TO3.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO3.wings
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/TO3.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO3.wings
diff --git a/modules/packages3d/Discret.3dshapes/TO3.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO3.wrl
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/TO3.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO3.wrl
diff --git a/modules/packages3d/Discret.3dshapes/TO39EBC.wings b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO39EBC.wings
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/TO39EBC.wings
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO39EBC.wings
diff --git a/modules/packages3d/Discret.3dshapes/TO39EBC.wrl b/modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO39EBC.wrl
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/TO39EBC.wrl
rename to modules/packages3d/TO_SOT_Packages_THT.3dshapes/TO39EBC.wrl
diff --git a/template/fp-lib-table.for-github b/template/fp-lib-table.for-github
index 503cc5c6..6a90f6cd 100644
--- a/template/fp-lib-table.for-github
+++ b/template/fp-lib-table.for-github
@@ -35,14 +35,14 @@
   (lib (name Housings_ROHM)(type Github)(uri ${KIGITHUB}/Housings_ROHM.pretty)(options "")(descr "Deprecated. VML0806 is moved to Transistors_SMD.pretty."))
   (lib (name Housings_SIP)(type Github)(uri ${KIGITHUB}/Housings_SIP.pretty)(options "")(descr "The way you like them."))
   (lib (name Housings_SOIC)(type Github)(uri ${KIGITHUB}/Housings_SOIC.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_SOT-23_SOT-143_TSOT-6)(type Github)(uri ${KIGITHUB}/Housings_SOT-23_SOT-143_TSOT-6.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_SOT-89)(type Github)(uri ${KIGITHUB}/Housings_SOT-89.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_SOT)(type Github)(uri ${KIGITHUB}/Housings_SOT.pretty)(options "")(descr "SOT126, SOT32"))
+  (lib (name Housings_SOT-23_SOT-143_TSOT-6)(type Github)(uri ${KIGITHUB}/Housings_SOT-23_SOT-143_TSOT-6.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Housings_SOT-89)(type Github)(uri ${KIGITHUB}/Housings_SOT-89.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Housings_SOT)(type Github)(uri ${KIGITHUB}/Housings_SOT.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
   (lib (name Housings_SSOP)(type Github)(uri ${KIGITHUB}/Housings_SSOP.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-12_TO-18_TO-42_TO-43)(type Github)(uri ${KIGITHUB}/Housings_TO-12_TO-18_TO-42_TO-43.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-50)(type Github)(uri ${KIGITHUB}/Housings_TO-50.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-78)(type Github)(uri ${KIGITHUB}/Housings_TO-78.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-92)(type Github)(uri ${KIGITHUB}/Housings_TO-92.pretty)(options "")(descr "The way you like them."))
+  (lib (name Housings_TO-12_TO-18_TO-42_TO-43)(type Github)(uri ${KIGITHUB}/Housings_TO-12_TO-18_TO-42_TO-43.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Housings_TO-50)(type Github)(uri ${KIGITHUB}/Housings_TO-50.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Housings_TO-78)(type Github)(uri ${KIGITHUB}/Housings_TO-78.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Housings_TO-92)(type Github)(uri ${KIGITHUB}/Housings_TO-92.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
   (lib (name Inductors_NEOSID)(type Github)(uri ${KIGITHUB}/Inductors_NEOSID.pretty)(options "")(descr "The way you like them."))
   (lib (name Inductors)(type Github)(uri ${KIGITHUB}/Inductors.pretty)(options "")(descr "The way you like them."))
   (lib (name IR-DirectFETs)(type Github)(uri ${KIGITHUB}/IR-DirectFETs.pretty)(options "")(descr "The way you like them."))
@@ -63,8 +63,8 @@
   (lib (name Pin_Headers)(type Github)(uri ${KIGITHUB}/Pin_Headers.pretty)(options "")(descr "2.54mm pin headers."))
   (lib (name Potentiometers)(type Github)(uri ${KIGITHUB}/Potentiometers.pretty)(options "")(descr "The way you like them."))
   (lib (name Power_Integrations)(type Github)(uri ${KIGITHUB}/Power_Integrations.pretty)(options "")(descr "The way you like them."))
-  (lib (name Power_Packages_SMD)(type Github)(uri ${KIGITHUB}/Power_Packages_SMD.pretty)(options "")(descr "The way you like them."))
-  (lib (name Power_Packages_ThroughHole)(type Github)(uri ${KIGITHUB}/Power_Packages_ThroughHole.pretty)(options "")(descr "Pentawatts, Multiwatts, etc."))
+  (lib (name Power_Packages_SMD)(type Github)(uri ${KIGITHUB}/Power_Packages_SMD.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Power_Packages_ThroughHole)(type Github)(uri ${KIGITHUB}/Power_Packages_ThroughHole.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
   (lib (name Relays_ThroughHole)(type Github)(uri ${KIGITHUB}/Relays_ThroughHole.pretty)(options "")(descr "The way you like them."))
   (lib (name Resistors_SMD)(type Github)(uri ${KIGITHUB}/Resistors_SMD.pretty)(options "")(descr "The way you like them."))
   (lib (name Resistors_ThroughHole)(type Github)(uri ${KIGITHUB}/Resistors_ThroughHole.pretty)(options "")(descr "The way you like them."))
@@ -79,12 +79,14 @@
   (lib (name Sockets_WAGO734)(type Github)(uri ${KIGITHUB}/Sockets_WAGO734.pretty)(options "")(descr "The way you like them."))
   (lib (name Symbols)(type Github)(uri ${KIGITHUB}/Symbols.pretty)(options "")(descr "The way you like them."))
   (lib (name Terminal_Blocks)(type Github)(uri ${KIGITHUB}/Terminal_Blocks.pretty)(options "")(descr WAGO236-RM5mm))
+  (lib (name TO_SOT_Packages_SMD)(type Github)(uri ${KIGITHUB}/TO_SOT_Packages_SMD.pretty)(options "")(descr "The way you like them."))
+  (lib (name TO_SOT_Packages_THT)(type Github)(uri ${KIGITHUB}/TO_SOT_Packages_THT.pretty)(options "")(descr "The way you like them."))
   (lib (name Transformers_CHK)(type Github)(uri ${KIGITHUB}/Transformers_CHK.pretty)(options "")(descr "The way you like them."))
   (lib (name Transformers_SMPS_ThroughHole)(type Github)(uri ${KIGITHUB}/Transformers_SMPS_ThroughHole.pretty)(options "")(descr "The way you like them."))
   (lib (name Transistors_OldSowjetAera)(type Github)(uri ${KIGITHUB}/Transistors_OldSowjetAera.pretty)(options "")(descr "The way you like them."))
-  (lib (name Transistors_SMD)(type Github)(uri ${KIGITHUB}/Transistors_SMD.pretty)(options "")(descr "The way you like them."))
-  (lib (name Transistors_TO-220)(type Github)(uri ${KIGITHUB}/Transistors_TO-220.pretty)(options "")(descr "The way you like them."))
-  (lib (name Transistors_TO-247)(type Github)(uri ${KIGITHUB}/Transistors_TO-247.pretty)(options "")(descr "The way you like them."))
+  (lib (name Transistors_SMD)(type Github)(uri ${KIGITHUB}/Transistors_SMD.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Transistors_TO-220)(type Github)(uri ${KIGITHUB}/Transistors_TO-220.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Transistors_TO-247)(type Github)(uri ${KIGITHUB}/Transistors_TO-247.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
   (lib (name Valves)(type Github)(uri ${KIGITHUB}/Valves.pretty)(options "")(descr "The way you like them."))
   (lib (name Varistors)(type Github)(uri ${KIGITHUB}/Varistors.pretty)(options "")(descr "The way you like them."))
   (lib (name Wire_Connections_Bridges)(type Github)(uri ${KIGITHUB}/Wire_Connections_Bridges.pretty)(options "")(descr "The way you like them."))
diff --git a/template/fp-lib-table.for-pretty b/template/fp-lib-table.for-pretty
index 84735eb4..15d2a27b 100644
--- a/template/fp-lib-table.for-pretty
+++ b/template/fp-lib-table.for-pretty
@@ -35,14 +35,14 @@
   (lib (name Housings_ROHM)(type KiCad)(uri ${KISYSMOD}/Housings_ROHM.pretty)(options "")(descr "Deprecated. VML0806 is moved to Transistors_SMD.pretty."))
   (lib (name Housings_SIP)(type KiCad)(uri ${KISYSMOD}/Housings_SIP.pretty)(options "")(descr "The way you like them."))
   (lib (name Housings_SOIC)(type KiCad)(uri ${KISYSMOD}/Housings_SOIC.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_SOT-23_SOT-143_TSOT-6)(type KiCad)(uri ${KISYSMOD}/Housings_SOT-23_SOT-143_TSOT-6.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_SOT-89)(type KiCad)(uri ${KISYSMOD}/Housings_SOT-89.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_SOT)(type KiCad)(uri ${KISYSMOD}/Housings_SOT.pretty)(options "")(descr "SOT126, SOT32"))
+  (lib (name Housings_SOT-23_SOT-143_TSOT-6)(type KiCad)(uri ${KISYSMOD}/Housings_SOT-23_SOT-143_TSOT-6.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Housings_SOT-89)(type KiCad)(uri ${KISYSMOD}/Housings_SOT-89.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Housings_SOT)(type KiCad)(uri ${KISYSMOD}/Housings_SOT.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
   (lib (name Housings_SSOP)(type KiCad)(uri ${KISYSMOD}/Housings_SSOP.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-12_TO-18_TO-42_TO-43)(type KiCad)(uri ${KISYSMOD}/Housings_TO-12_TO-18_TO-42_TO-43.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-50)(type KiCad)(uri ${KISYSMOD}/Housings_TO-50.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-78)(type KiCad)(uri ${KISYSMOD}/Housings_TO-78.pretty)(options "")(descr "The way you like them."))
-  (lib (name Housings_TO-92)(type KiCad)(uri ${KISYSMOD}/Housings_TO-92.pretty)(options "")(descr "The way you like them."))
+  (lib (name Housings_TO-12_TO-18_TO-42_TO-43)(type KiCad)(uri ${KISYSMOD}/Housings_TO-12_TO-18_TO-42_TO-43.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Housings_TO-50)(type KiCad)(uri ${KISYSMOD}/Housings_TO-50.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Housings_TO-78)(type KiCad)(uri ${KISYSMOD}/Housings_TO-78.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Housings_TO-92)(type KiCad)(uri ${KISYSMOD}/Housings_TO-92.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
   (lib (name Inductors_NEOSID)(type KiCad)(uri ${KISYSMOD}/Inductors_NEOSID.pretty)(options "")(descr "The way you like them."))
   (lib (name Inductors)(type KiCad)(uri ${KISYSMOD}/Inductors.pretty)(options "")(descr "The way you like them."))
   (lib (name IR-DirectFETs)(type KiCad)(uri ${KISYSMOD}/IR-DirectFETs.pretty)(options "")(descr "The way you like them."))
@@ -63,8 +63,8 @@
   (lib (name Pin_Headers)(type KiCad)(uri ${KISYSMOD}/Pin_Headers.pretty)(options "")(descr "2.54mm pin headers."))
   (lib (name Potentiometers)(type KiCad)(uri ${KISYSMOD}/Potentiometers.pretty)(options "")(descr "The way you like them."))
   (lib (name Power_Integrations)(type KiCad)(uri ${KISYSMOD}/Power_Integrations.pretty)(options "")(descr "The way you like them."))
-  (lib (name Power_Packages_SMD)(type KiCad)(uri ${KISYSMOD}/Power_Packages_SMD.pretty)(options "")(descr "The way you like them."))
-  (lib (name Power_Packages_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Power_Packages_ThroughHole.pretty)(options "")(descr "Pentawatts, Multiwatts, etc."))
+  (lib (name Power_Packages_SMD)(type KiCad)(uri ${KISYSMOD}/Power_Packages_SMD.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Power_Packages_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Power_Packages_ThroughHole.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
   (lib (name Relays_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Relays_ThroughHole.pretty)(options "")(descr "The way you like them."))
   (lib (name Resistors_SMD)(type KiCad)(uri ${KISYSMOD}/Resistors_SMD.pretty)(options "")(descr "The way you like them."))
   (lib (name Resistors_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Resistors_ThroughHole.pretty)(options "")(descr "The way you like them."))
@@ -79,12 +79,14 @@
   (lib (name Sockets_WAGO734)(type KiCad)(uri ${KISYSMOD}/Sockets_WAGO734.pretty)(options "")(descr "The way you like them."))
   (lib (name Symbols)(type KiCad)(uri ${KISYSMOD}/Symbols.pretty)(options "")(descr "The way you like them."))
   (lib (name Terminal_Blocks)(type KiCad)(uri ${KISYSMOD}/Terminal_Blocks.pretty)(options "")(descr WAGO236-RM5mm))
+  (lib (name TO_SOT_Packages_SMD)(type KiCad)(uri ${KISYSMOD}/TO_SOT_Packages_SMD.pretty)(options "")(descr "The way you like them."))
+  (lib (name TO_SOT_Packages_THT)(type KiCad)(uri ${KISYSMOD}/TO_SOT_Packages_THT.pretty)(options "")(descr "The way you like them."))
   (lib (name Transformers_CHK)(type KiCad)(uri ${KISYSMOD}/Transformers_CHK.pretty)(options "")(descr "The way you like them."))
   (lib (name Transformers_SMPS_ThroughHole)(type KiCad)(uri ${KISYSMOD}/Transformers_SMPS_ThroughHole.pretty)(options "")(descr "The way you like them."))
   (lib (name Transistors_OldSowjetAera)(type KiCad)(uri ${KISYSMOD}/Transistors_OldSowjetAera.pretty)(options "")(descr "The way you like them."))
-  (lib (name Transistors_SMD)(type KiCad)(uri ${KISYSMOD}/Transistors_SMD.pretty)(options "")(descr "The way you like them."))
-  (lib (name Transistors_TO-220)(type KiCad)(uri ${KISYSMOD}/Transistors_TO-220.pretty)(options "")(descr "The way you like them."))
-  (lib (name Transistors_TO-247)(type KiCad)(uri ${KISYSMOD}/Transistors_TO-247.pretty)(options "")(descr "The way you like them."))
+  (lib (name Transistors_SMD)(type KiCad)(uri ${KISYSMOD}/Transistors_SMD.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_SMD."))
+  (lib (name Transistors_TO-220)(type KiCad)(uri ${KISYSMOD}/Transistors_TO-220.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
+  (lib (name Transistors_TO-247)(type KiCad)(uri ${KISYSMOD}/Transistors_TO-247.pretty)(options "")(descr "Deprecated. See TO_SOT_Packages_THT."))
   (lib (name Valves)(type KiCad)(uri ${KISYSMOD}/Valves.pretty)(options "")(descr "The way you like them."))
   (lib (name Varistors)(type KiCad)(uri ${KISYSMOD}/Varistors.pretty)(options "")(descr "The way you like them."))
   (lib (name Wire_Connections_Bridges)(type KiCad)(uri ${KISYSMOD}/Wire_Connections_Bridges.pretty)(options "")(descr "The way you like them."))