templates and coffee updated