merged
 added more colors
X