Re-organise color variations to 'themes'