Clean up data part, then make sure new pages have theme options