Improve light template customisation