Refactoring to use rename module, and adding colors