The styles are now pulled from upstream styles, some of the changes I submitted it back to upstream. Fix #796