Update dependency
Merge shorthand colors