Added Haml, converted templates