use xsbt-util, improve key names, cleanup