It's probably fine, but I don't remember what led to the complex logic in the previous code.  I wonder why 2 old colors were still used...