better handling of Implicit color
Merge branch 'overhaul' of darwin:scout into overhaul