Replace ERB with Haml, more new-style hashes