changed colors
swichted some colors
Merge commit '2993af1d598ebb1035e4bc7563913c9ef9e5c6c0'