Refactor color defs