Removed default themes, added P2