Refactor colorization and add eventual task colors