improved colorscheme some more
Merge branch 'master' into work