Simplify markup and switch to new code developed for Paperjs.org