Fix coloring on diaganoal
Merge branch 'develop'