Minor optimisations and some new colourings
Add color for entity type objects