updated colors
merge from master