colors blue and grey
color hashes
Merge branch 'feature/colors' into develop