Make template filler more flexible and don't forget the about dialog in the template