Fixing issues with some of the default colors being hard to read. As well as a re-factoring of some codes.