Fixes #17 (an issue with lunch coloring)

I don't know which branch you want this to go to.