Update the colors and xaxis
Merge branch 'develop'