Refactored tag colors, added new colors
CS fixes
Mark version