More template work and a little theming