Update and fixed templets