diff --git a/library/device.dcm b/library/device.dcm
index 132cf3bc..b6dc9462 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -22,7 +22,7 @@ $ENDCMP
 #
 $CMP CRYSTAL_SMD
 D SMD crystal, with GND pin
-K dev oscillator quartz
+K oscillator quartz
 $ENDCMP
 #
 $CMP CTRIM
@@ -55,7 +55,7 @@ $ENDCMP
 #
 $CMP DUAL_POT
 D Potentiometer, dual
-K dev r variable
+K resistor variable
 $ENDCMP
 #
 $CMP D_Schottky
@@ -67,68 +67,68 @@ D Diode Schottky
 $ENDCMP
 #
 $CMP D_Schottky_x2_ACom_AKK
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode, common anode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_ACom_KAK
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode, common anode 
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_ACom_KKA
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode, common anode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_KCom_AAK
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode, common cathode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_KCom_AKA
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode, common cathode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_KCom_KAA
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode, common cathode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_ACK
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_AKC
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_CAK
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_CKA
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_KAC
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode
+K diode
 $ENDCMP
 #
 $CMP D_Schottky_x2_Serial_KCA
-D Double diode Schottky (Serie)
-K DEV DIODE
+D Dual schottky diode
+K diode
 $ENDCMP
 #
 $CMP D_Small
 D Diode
-K dev diode
+K diode
 $ENDCMP
 #
 $CMP Darl_NPN
@@ -143,51 +143,53 @@ $ENDCMP
 #
 $CMP EMI_FILTER
 D EMI Filter
-K dev emi
+K emi
 $ENDCMP
 #
 $CMP EMI_FILTER_Small
 D EMI Filter
-K dev emi
+K emi
 F ~
 $ENDCMP
 #
 $CMP FILTER
-D Filtre EMI
-K EMI
+D EMI Filter
+K emi
 $ENDCMP
 #
 $CMP FP_Small
-D Fuse polarised
+D Fuse, polarised
+K fuse
 $ENDCMP
 #
 $CMP FUSE
 D Fuse, generic
-K dev fuse
+K fuse
 $ENDCMP
 #
 $CMP F_Small
-D Fuse
+D Fuse, small symbol
+K fuse
 $ENDCMP
 #
 $CMP INDUCTOR
 D Inductor
-K dev inductor
+K inductor
 $ENDCMP
 #
 $CMP INDUCTOR_SMALL
 D Inductor, small symbol
-K dev inductor
+K inductor
 $ENDCMP
 #
 $CMP JUMPER
 D Jumper generic NC
-K dev jumper bridge
+K jumper bridge
 $ENDCMP
 #
 $CMP JUMPER3
 D Dual Jumper, NC
-K dev jumper bridge
+K jumper bridge
 $ENDCMP
 #
 $CMP Jumper_NC_Small
@@ -202,26 +204,28 @@ $ENDCMP
 #
 $CMP LED
 D LED generic
-K led
+K led diode
 F ~
 $ENDCMP
 #
 $CMP LED_RABG
-D Common Anode RGB LED
-K RGB LED
+D LED, RGB, common anode
+K RGB LED diode
 $ENDCMP
 #
 $CMP LED_RCBG
-D Common Cathode RGB LED
-K RGB LED
+D LED, RGB, common cathode
+K RGB LED diode
 $ENDCMP
 #
 $CMP LED_RGB
 D LED RGB 6 pins
+K led rgb diode
 $ENDCMP
 #
 $CMP LED_RGB_EP
 D LED RGB 6 pins, exposed pad
+K led rgb diode
 $ENDCMP
 #
 $CMP LED_Small
@@ -232,11 +236,12 @@ $ENDCMP
 #
 $CMP L_Small
 D Inductor
+K inductor
 $ENDCMP
 #
 $CMP Led_RGB_CA
 D Common Anode RGB LED
-K RGB LED
+K led rgb diode
 $ENDCMP
 #
 $CMP Led_x2
@@ -250,12 +255,12 @@ $ENDCMP
 #
 $CMP POT
 D Potentionmeter
-K res variable
+K resistor variable
 $ENDCMP
 #
 $CMP Photores
 D Photoresistor
-K res variable
+K resistor variable
 $ENDCMP
 #
 $CMP Q_NIGBT_CEG
@@ -520,39 +525,39 @@ $ENDCMP
 #
 $CMP R
 D Resistor
-K r dev
+K r
 F ~
 $ENDCMP
 #
 $CMP RR8
 D 8 resistors
-K R DEV
+K r
 $ENDCMP
 #
 $CMP RVAR
 D Variable resistor
-K res var potentiometer
+K resistor var potentiometer
 $ENDCMP
 #
 $CMP R_PACK4
 D 4 resistors Pack
-K R DEV
+K r
 $ENDCMP
 #
 $CMP R_PACK8
 D 8 resistors Pack
-K R DEV
+K r
 $ENDCMP
 #
 $CMP R_Small
-D Resistor
-K res 
+D Resistor, small symbol
+K r resistor 
 F ~
 $ENDCMP
 #
 $CMP SCHDPAK
 D Diode schotty - cms
-K DIODE SCHOTTKY CMS
+K diode SCHOTTKY CMS
 $ENDCMP
 #
 $CMP SCR
@@ -572,67 +577,69 @@ $ENDCMP
 #
 $CMP SPST
 D Switch Single Pole Single Throw
-K sw single spst
+K switch single-pole single-throw spst
 F ~
 $ENDCMP
 #
 $CMP SPST_Small
 D Switch Single Pole Single Throw, small symbol
-K sw single spst
+K switch single-pole single-throw spst
 F ~
 $ENDCMP
 #
 $CMP SW_PUSH
 D Button, generic, normally open
-K switch push no
+K switch push normally-open
 F ~
 $ENDCMP
 #
 $CMP SW_PUSH_SMALL
 D button, generic, small symbol
-K switch no push
+K switch normally-open push
 F ~
 $ENDCMP
 #
 $CMP Switch_DPST
 D Double Pole Single Throw (DPST) Switch
-K switch
+K switch dual double-pole single-throw
+F ~
 $ENDCMP
 #
 $CMP Switch_SPDT
 D Switch Single Pole Double Throw
-K switch double spdt
+K switch single-pole double-throw spdt
 F ~
 $ENDCMP
 #
 $CMP Switch_SPDT_MSM
 D Switch Single Pole Double Throw, with centre OFF position
-K switch spdt
+K switch spdt single-pole double-throw
 F ~
 $ENDCMP
 #
 $CMP Switch_SPDT_x2
-D Double Single Pole Double Throw (SPDT) switch
+D Dual Single Pole Double Throw (SPDT) switch
+K switch single-pole double-throw spdt
 $ENDCMP
 #
 $CMP THERMISTOR
-D Resistance
-K R DEV
+D Thermistor, temperature-dependent resistor
+K R thermistor
 $ENDCMP
 #
 $CMP THYRISTOR
 D Diode simple
-K DEV DIODE
+K diode
 $ENDCMP
 #
 $CMP TVS
 D Transient voltage suppressor diode (bi-directional)
-K dev tvs esd
+K tvs esd
 $ENDCMP
 #
 $CMP VARICAP
 D Variable capacitor
-K cap
+K capacitor
 F ~
 $ENDCMP
 #
@@ -643,13 +650,13 @@ $ENDCMP
 #
 $CMP ZENER
 D Diode zener
-K DEV DIODE
+K diode
 F ~
 $ENDCMP
 #
 $CMP ZENERsmall
 D Zener diode, small symbol
-K dev diode zener
+K diode zener
 F ~
 $ENDCMP
 #
diff --git a/library/device.lib b/library/device.lib
index 0195d794..c3a10dc6 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -3113,8 +3113,8 @@ ENDDEF
 # SW_PUSH_SMALL
 #
 DEF SW_PUSH_SMALL SW 0 40 N N 1 F N
-F0 "SW" 0 150 50 H V C CNN
-F1 "SW_PUSH_SMALL" 0 -90 50 H V C CNN
+F0 "SW" 150 110 50 H V C CNN
+F1 "SW_PUSH_SMALL" 0 -79 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
diff --git a/library/interface.lib b/library/interface.lib
index 1e4d2581..fe014433 100644
--- a/library/interface.lib
+++ b/library/interface.lib
@@ -1352,7 +1352,7 @@ X TXD 1 -500 200 100 R 50 50 1 1 I
 X GND 2 0 -400 100 U 50 50 1 1 W
 X VCC 3 0 400 100 D 50 50 1 1 W
 X RXD 4 -500 100 100 R 50 50 1 1 O
-X SPLIT 5 -500 -100 100 R 50 50 1 1 I
+X SPLIT 5 500 0 100 L 50 50 1 1 I
 X CANL 6 500 -100 100 L 50 50 1 1 B
 X CANH 7 500 100 100 L 50 50 1 1 B
 X RS 8 -500 -200 100 R 50 50 1 1 I
@@ -1376,7 +1376,7 @@ X TXD 1 -500 200 100 R 50 50 1 1 I
 X GND 2 0 -400 100 U 50 50 1 1 W
 X VCC 3 0 400 100 D 50 50 1 1 W
 X RXD 4 -500 100 100 R 50 50 1 1 O
-X SPLIT 5 -500 -100 100 R 50 50 1 1 I
+X SPLIT 5 500 0 100 L 50 50 1 1 I
 X CANL 6 500 -100 100 L 50 50 1 1 B
 X CANH 7 500 100 100 L 50 50 1 1 B
 X RS 8 -500 -200 100 R 50 50 1 1 I
@@ -2048,7 +2048,7 @@ X TXD 1 -500 200 100 R 50 50 1 1 I
 X VSS 2 0 -400 100 U 50 50 1 1 W
 X VDD 3 0 400 100 D 50 50 1 1 W
 X RXD 4 -500 100 100 R 50 50 1 1 O
-X SPLIT 5 -500 -100 100 R 50 50 1 1 P
+X SPLIT 5 500 0 100 L 50 50 1 1 P
 X CANL 6 500 -100 100 L 50 50 1 1 B
 X CANH 7 500 100 100 L 50 50 1 1 B
 X STBY 8 -500 -200 100 R 50 50 1 1 I
@@ -2073,7 +2073,7 @@ X TXD 1 -500 200 100 R 50 50 1 1 I
 X VSS 2 0 -400 100 U 50 50 1 1 W
 X VDD 3 0 400 100 D 50 50 1 1 W
 X RXD 4 -500 100 100 R 50 50 1 1 O
-X SPLIT 5 -500 -100 100 R 50 50 1 1 P
+X SPLIT 5 500 0 100 L 50 50 1 1 P
 X CANL 6 500 -100 100 L 50 50 1 1 B
 X CANH 7 500 100 100 L 50 50 1 1 B
 X STBY 8 -500 -200 100 R 50 50 1 1 I
@@ -2097,7 +2097,7 @@ X TXD 1 -500 200 100 R 50 50 1 1 I
 X VSS 2 0 -400 100 U 50 50 1 1 W
 X VDD 3 0 400 100 D 50 50 1 1 W
 X RXD 4 -500 100 100 R 50 50 1 1 O
-X SPLIT 5 -500 -100 100 R 50 50 1 1 P
+X SPLIT 5 500 0 100 L 50 50 1 1 P
 X CANL 6 500 -100 100 L 50 50 1 1 B
 X CANH 7 500 100 100 L 50 50 1 1 B
 X STBY 8 -500 -200 100 R 50 50 1 1 I
diff --git a/library/ir.lib b/library/ir.lib
index 0b70ac4e..551d5189 100644
--- a/library/ir.lib
+++ b/library/ir.lib
@@ -56,7 +56,7 @@ DRAW
 S -200 -400 200 400 0 1 10 f
 X VCC 1 -300 300 100 R 50 50 1 1 W
 X IN 2 -300 -100 100 R 50 50 1 1 I
-X ~SD 2 -300 -200 100 R 50 50 1 1 I
+X ~SD 3 -300 -200 100 R 50 50 1 1 I
 X COM 4 -300 -300 100 R 50 50 1 1 W
 X LO 5 300 -300 100 L 50 50 1 1 O
 X VS 6 300 -200 100 L 50 50 1 1 P