Added color palette
Merge