Now gadgetName is toolName

and compacting the use of some `this`
If styles.point drags virtual points instead real.