Added colors, cleaned up menu & a few files