Updating to work with new theme