Template upload: various updates & fixes

Soon to come: mojo page with HOWTO and documentation to this template upload stuff.