Preparing to branch and add color support.