Fix canvas and text editor integration, and dsl generation