(minor) move CustomCanvas to separate file