Merge styles into master