Added color support. Complete refactoring
Added color demo. Complete refactoring support