Update template listing (general fixups)