Changed to new colours
Merge branch 'master' of github.com:jonasbhend/NRMgraphics