Fixed: Some code clean-up
Fixed: Diva doesn't over-paint highlights

Fixes #59