Finalising template changes. Theming updates are mostly completed now.