Restore cosmetic pens & try to fix underdrawing

This improves the "under"-drawing a lot (at least on my retina).