Get rid of .xml and use .lang