More template changes, yay