Swapped highlight to be based on fill instead of opacity