Various improvements to sl6.x templates