S20 picture tool compatib test jrs

[jsenning]

Brings in all updates by Gahngnin, fixes crosshair drawing when zooming and scrolling.