Added esis for category color definitions
Merge category color fixes