#20 locale template + changes