canvas widget refactor
Merge branch 'master' of github.com:pmitros/x2