Badwolf colors updated.
Merge branch 'master' into windows