Cleaning up theme