syntax
Merges migration from JS branch
minor changes to stylesheets