updated demos and templates