Added basic template system and personalisation