minimal colour
Merge branch 'master' into ruest
changing it up a bit