new color theme
Merge branch 'dev-sass'