I did use floodfill, but yeah, the effect is better when it's the same style as the brush indeed, so I painted over all those parts with a brush too.
Having a clear2white button would be nice, or like you said having one white color available all the time would be nice. I would add black as a always available color too.

Cheers