Merge basic styles into master

Merge basic styles into master