pulls significant style changes from JS branch