Update Cilantro to 2.2.6 and refactor to 2.2.6 templating