new color scheme
bumped version number
Merge branch 'release/v1.2' into dev