Fix shorthand colors #64

+ Merge shorthand colors
+ Update dependency package