Add multi-toolkit support for custom drawn images