Refactoring, added color schemes