Colortable for 1621 and xml fix for 1668