changed some colors
merge