xcompose: More changes, add Thorn