Refactor to allow color changes