changed more slate colors
Merge branch 'master' into work