Refactor color scheme