Clean up settings and themes