some clean color
Merge branch 'master' into multi-lang