I did an upstream fetch/merge and then went from there initially.   I realized after the merge, quite a bit had changed; so 5c0042e *should* be a diff from where I was to where the current master is, and aca9249 should be the changes needed for the no-color feature.  I agree, starting from scratch might make it a bit more clear. Let me know what you think after you take a look.