Fixing issues with some of the default colors being hard to read. As well as a re-factoring of some codes.
Merge remote-tracking branch 'upstream/master'
Merge pull request #81 from SolarCrane/master

Taking color changes from SolarCrane's Branch