Update from master styles repo