Cleanup & Colors

* file cleanup
* added a new color scheme