Couple more aliases
Better js/html (inc django templates) plus mappings
Ack standalone