Cleaning up, adding new theme+core