Cleanup, added a new theme