Updated elan5 file from Stefan Schnell.
Fix elan5 to be valid XML.
Adding elan6 and some minor improvements.