If templates have been edited for your style then the best way to do it, although it takes rather a long time, is to go through all the announcment threads for 3.6 releases from beta 1 onwards and apply all the template changes that are highlighted there. Otherwise, just revert the templates but then you will lose the changes that have been made for your style.