Add js2 mode support (and align face definition attributes)