Regenerated with latest Xtend
minor cleanup
hack: replace flat representation with original to make mouse selection work