New Yoke support and searches folders of /templates as well