Templates and localization updated