Convert remaining templates over to the base layout.