intermediate commit for config and xbmc