Refactor color shades