Resolve colors correctly

Closes #157