Changed things for new theme