Add colortable and reorganize a little