Templates reintegrated with Grill