Include shape support for video and pointalism + some missing bits