[IMP] Better inclusion of the template on theme list, correct image for the template, add *.swp to layout
[IMP] help: how to push