Rework color stuff