Some updates to the new theme