removed caching of entities, changed colorizing