Enhancements to TemplateFrame and Clacky.