Re-add line and curve drawing functions.
Update tool definitions.
Fix lint issues