added support for color codes and renaming