Fixed Issue 2
Migrated Modules to Colour
Added cyan
bug fixes
removed redundant code