PR to merge add-styles into master