First major templates updates.