Update to templates. Possible fix for keypad.