* Colors refactored
* Adding newly refactored files.