Category:Expand demo templates

Expand demo templates