-> to => in xhtml-file.js
Merge branch 'phil-styling' into testing