Cleanup, added themes