Added colors + Fixed some bugs
Merge pull request #3 from dotCipher/feature/color-overhaul

Added colors + Fixed some bugs