Overhauled templates