Clean up and change theme