Switched to JQuery-Template