2.04.0:hpgross:1 finished color tweaks

Reverting colours to the old CK2+ ones after integration of ED changed
many back to vanilla.