I've switched back to the shape-filling algorithm, rather than doing it heuristically. It just works better for my desktops: