beautifulling and adding EMA6/20

Signed-off-by: Gaetan SEMET <gaetan@xeberon.net>