More changes for new theme